New upstream version 0.9.4upstream/0.9.4

38 files changed, 60338 insertions, 30281 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index e4f2e57..1616042 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,3 +1,5 @@
+install.py
+upgrade.py
 raphodo/aboutdialog.py
 raphodo/backupfile.py
 raphodo/backuppanel.py
@@ -28,9 +30,11 @@ raphodo/renameandmovefile.py
 raphodo/renamepanel.py
 raphodo/rpdfile.py
 raphodo/storage.py
+raphodo/timeutils.py
 raphodo/thumbnaildaemon.py
 raphodo/thumbnaildisplay.py
 raphodo/utilities.py
+raphodo/viewutils.py
 data/net.damonlynch.rapid-photo-downloader.appdata.xml.in
 data/net.damonlynch.rapid-photo-downloader.desktop.in
 data/kde/net.damonlynch.rapid-photo-downloader.desktop.in
diff --git a/po/ar.po b/po/ar.po
index 79211f4..1188ce6 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,35 +7,386 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: damonlynch@gmail.com\n"
-"POT-Creation-Date: 2017-07-08 19:16-0500\n"
-"PO-Revision-Date: 2017-07-04 11:06+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2017-09-12 17:01-0400\n"
+"PO-Revision-Date: 2017-09-13 18:43+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
-"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-07-05 23:04+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-09-26 22:04+0000\n"
+"X-Generator: Launchpad (build 18463)\n"
+"Language: ar\n"
+
+#: ../install.py:65
+msgid "Rapid Photo Downloader installer"
+msgstr ""
+
+#: ../install.py:66
+msgid "Download and install latest version of Rapid Photo Downloader."
+msgstr ""
+
+#: ../install.py:236 ../install.py:1732
+msgid "Installer not found:"
+msgstr ""
+
+#. Translators: do not translate the term tar.gz
+#: ../install.py:240 ../install.py:1736
+msgid "Installer not in tar.gz format:"
+msgstr ""
+
+#: ../install.py:465
+msgid ""
+"Incorrect folder ownership detected. Changing ownership of and resetting "
+"permissions for"
+msgstr ""
+
+#: ../install.py:540
+msgid "The following command will be run:"
+msgstr ""
+
+#: ../install.py:543 ../install.py:1479 ../install.py:1484
+msgid "sudo may prompt you for the sudo password."
+msgstr ""
+
+#: ../install.py:547
+msgid "Would you like to run the command now?"
+msgstr ""
+
+#: ../install.py:549
+msgid "Answer is not yes, exiting."
+msgstr ""
+
+#: ../install.py:559 ../install.py:751 ../install.py:966
+msgid "Command failed"
+msgstr ""
+
+#: ../install.py:561 ../install.py:752 ../install.py:967
+msgid "Exiting"
+msgstr ""
+
+#: ../install.py:582
+msgid "The Universe repository must be enabled."
+msgstr ""
+
+#: ../install.py:606
+msgid ""
+"Do you want to to uninstall the previous version of Rapid Photo Downloader:"
+msgstr ""
+
+#: ../install.py:715 ../install.py:740
+msgid ""
+"Querying package system to see if an older version of Rapid Photo Downloader "
+"is installed (this may take a while)..."
+msgstr ""
+
+#: ../install.py:726
+msgid ""
+"Unable to query package system. Please check your Internet connection and "
+"try again"
+msgstr ""
+
+#: ../install.py:756
+msgid "Checking if previous version installed with pip..."
+msgstr ""
+
+#: ../install.py:850
+msgid "The following package is unknown on your system: {}\n"
+msgstr ""
+
+#: ../install.py:857 ../install.py:929 ../install.py:974
+msgid ""
+"To continue, some packages required to run the application will be installed."
+msgstr ""
+
+#: ../install.py:886
+msgid "Querying installed and available packages (this may take a while)"
+msgstr ""
+
+#: ../install.py:958
+msgid ""
+"Querying zypper to see if any required packages are already installed (this "
+"may take a while)... "
+msgstr ""
+
+#: ../install.py:1004
+msgid "Query to confirm action at each step."
+msgstr ""
+
+#: ../install.py:1011
+msgid ""
+"When downloading the latest version, install the development version if it "
+"is newer than the stable version."
+msgstr ""
+
+#: ../install.py:1020
+msgid ""
+"Optional tar.gz Rapid Photo Downloader installer archive. If not specified, "
+"the latest version is downloaded from the Internet."
+msgstr ""
+
+#: ../install.py:1043
+msgid ""
+"Do not run the installer in the tar.gz Rapid Photo Downloader installer "
+"archive if it is newer than this version ({}). The default is to run "
+"whichever installer is newer."
+msgstr ""
+
+#: ../install.py:1050
+msgid ""
+"Uninstall Rapid Photo Downloader that was installed with pip, keeping its "
+"dependencies."
+msgstr ""
+
+#: ../install.py:1054
+msgid ""
+"Uninstall the dependencies installed by pip during Rapid Photo Downloader's "
+"installation, and Rapid Photo Downloader itself, then exit."
+msgstr ""
+
+#: ../install.py:1059
+msgid ""
+"Note: this will not uninstall any version of Rapid Photo Downloader "
+"installed by your Linux distribution's package manager."
+msgstr ""
+
+#: ../install.py:1066
+msgid ""
+"Dependencies will only be removed if they are not required by other programs."
+msgstr ""
+
+#: ../install.py:1072
+msgid ""
+"Note: this option will remove the dependencies regardless of whether they "
+"are required by another program pip has installed. Upgrade to pip 9.0 or "
+"above if you want to avoid this behavior. You can do so using the command "
+"'python3 -m pip install pip -U --user'. Also note that any version of Rapid "
+"Photo Downloader installed by your Linux distribution's package manager will "
+"not be uninstalled."
+msgstr ""
+
+#: ../install.py:1122
+msgid "Failed to download versions file"
+msgstr ""
+
+#: ../install.py:1126
+msgid "Got error code {} while accessing versions file"
+msgstr ""
+
+#: ../install.py:1234
+msgid ""
+"Sorry, could not locate installer. Please check your Internet connection and "
+"verify if you can reach https://www.damonlynch.net\n"
+"\n"
+"Exiting.\n"
+msgstr ""
+
+#: ../install.py:1408
+msgid "Installing application requirements..."
+msgstr ""
+
+#: ../install.py:1424
+msgid "Received error code"
+msgstr ""
+
+#: ../install.py:1425
+msgid "Failed to install application requirements: exiting"
+msgstr ""
+
+#: ../install.py:1428
+msgid "Installing application..."
+msgstr ""
+
+#: ../install.py:1441
+msgid "Failed to install application: exiting..."
+msgstr ""
+
+#: ../install.py:1465
+msgid ""
+"You may have to restart the computer to be able to run the program from the "
+"commmand line or application launcher."
+msgstr ""
+
+#: ../install.py:1476
+msgid "Do you want to install the application's man pages?"
+msgstr ""
+
+#: ../install.py:1477
+msgid "They will be installed into {}"
+msgstr ""
+
+#: ../install.py:1478 ../install.py:1483
+msgid "If you uninstall the application, remove these manpages yourself."
+msgstr ""
+
+#: ../install.py:1480
+msgid "Do want to install the man pages?"
+msgstr ""
+
+#: ../install.py:1482
+msgid "Installing man pages into {}"
+msgstr ""
+
+#: ../install.py:1499
+msgid "Failed to create man page directory: exiting"
+msgstr ""
+
+#: ../install.py:1511
+msgid "Failed to copy man page."
+msgstr ""
+
+#: ../install.py:1521
+msgid "(If a segmentation fault occurs at exit, you can ignore it...)"
+msgstr ""
+
+#: ../install.py:1534
+msgid ""
+"The python3 tool pip is required to uninstall a version of Rapid Photo "
+"Downloader that was installed with pip.\n"
+"Cannot continue. Exiting."
+msgstr ""
+
+#: ../install.py:1575
+msgid ""
+"Do not run this installer script as sudo / root user.\n"
+"Run it using the user who will run the program.\n"
+msgstr ""
+
+#: ../install.py:1585 ../install.py:1599
+msgid "Do not include any other command line arguments when specifying"
+msgstr ""
+
+#: ../install.py:1614
+msgid ""
+"Sorry, this installer does not support a custom python installation.\n"
+"Exiting..."
+msgstr ""
+
+#: ../install.py:1620
+msgid "Restarting script using system python..."
+msgstr ""
+
+#: ../install.py:1651
+msgid "Exiting..."
+msgstr ""
+
+#. Translators: do not translate the term python3-apt
+#: ../install.py:1670
+msgid "To continue, the package python3-apt must be installed."
+msgstr ""
+
+#: ../install.py:1689
+msgid ""
+"Install the following packages using your Linux distribution's standard "
+"package manager, and then rerun this installer"
+msgstr ""
+
+#: ../install.py:1698
+msgid ""
+"To run this program, programs to assist Python 3 and its package management "
+"must be installed."
+msgstr ""
 
-#. type: QPushButton
-#: ../raphodo/aboutdialog.py:217
+#. Translators: do not translate the terms Python 3, pip and setuptools
+#: ../install.py:1713
+msgid "Python 3's pip and setuptools must be upgraded for your user."
+msgstr ""
+
+#. Translators: do not translate the term python or requests
+#: ../install.py:1726
+msgid "Installing python requests"
+msgstr ""
+
+#: ../upgrade.py:79
+msgid "Upgrade Rapid Photo Downloader"
+msgstr ""
+
+#: ../upgrade.py:401 ../raphodo/viewutils.py:242
+msgid "&Cancel"
+msgstr ""
+
+#: ../upgrade.py:405
+msgid "&Upgrade"
+msgstr ""
+
+#: ../upgrade.py:410
+#, python-format
+msgid "Click the Upgrade button to upgrade to version %s."
+msgstr ""
+
+#: ../upgrade.py:413
+msgid "Click the Upgrade button to start the upgrade."
+msgstr ""
+
+#: ../upgrade.py:416 ../upgrade.py:422 ../raphodo/viewutils.py:241
+msgid "&Close"
+msgstr ""
+
+#: ../upgrade.py:417
+msgid "&Run"
+msgstr ""
+
+#: ../upgrade.py:447
+msgid "Close Rapid Photo Downloader before running this upgrade"
+msgstr ""
+
+#: ../upgrade.py:450
+msgid "Upgrade running..."
+msgstr ""
+
+#: ../upgrade.py:486
+#, python-format
+msgid ""
+"Successfully upgraded to %s. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:491
+msgid ""
+"Upgrade finished successfully. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:495
+msgid "Upgrade failed. Click Close to exit."
+msgstr ""
+
+#: ../upgrade.py:6967
+#, python-format
+msgid "Upgrading %s..."
+msgstr ""
+
+#: ../upgrade.py:6969
+msgid "Press any key to continue..."
+msgstr ""
+
+#: ../upgrade.py:6982
+msgid "Rapid Photo Downloader upgrade failed"
+msgstr ""
+
+#: ../upgrade.py:6984
+#, python-format
+msgid ""
+"The python package %s could not be updated. The upgrade cannot continue."
+msgstr ""
+
+#: ../raphodo/aboutdialog.py:225
 msgid "Credits"
 msgstr "شكر المساهمين"
 
-#: ../raphodo/backuppanel.py:239
+#: ../raphodo/backuppanel.py:240
 msgid "Backups are not configured"
 msgstr "الأرشفة ليست مهيأة"
 
-#: ../raphodo/backuppanel.py:241
+#: ../raphodo/backuppanel.py:242
 msgid "No backup devices detected"
 msgstr "لم نعثر على جهاز أرشفة"
 
-#: ../raphodo/backuppanel.py:243
+#: ../raphodo/backuppanel.py:244
 msgid "Valid backup locations not yet specified"
 msgstr "لم يحدد مكان أرشفة مقبول"
 
-#: ../raphodo/backuppanel.py:401
+#: ../raphodo/backuppanel.py:404
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
@@ -43,18 +394,18 @@ msgstr ""
 "بإمكان جعل الصور والمقاطع تأرشف الى عدة أماكن ريثمى يتم انزيلها (مثلا الى "
 "قرص صلب خارجي)"
 
-#: ../raphodo/backuppanel.py:407
+#: ../raphodo/backuppanel.py:412
 msgid "Back up photos and videos when downloading"
 msgstr "أرشف الصور والمقاطع عند التنزيل"
 
-#: ../raphodo/backuppanel.py:413
+#: ../raphodo/backuppanel.py:418
 msgid "Automatically detect backup devices"
 msgstr "تعرف على جهاز الارشفة آليا"
 
-#: ../raphodo/backuppanel.py:417
+#: ../raphodo/backuppanel.py:424
 msgid ""
-"Specify the folder in which backups are stored on the device."
-"<br><br><i>Note: the presence of a folder with this name is used to "
+"Specify the folder in which backups are stored on the "
+"device.<br><br><i>Note: the presence of a folder with this name is used to "
 "determine if 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 folder names. By "
 "adding both folders, the same device can be used to back up both photos and "
@@ -62,80 +413,89 @@ msgid ""
 msgstr ""
 "حدد مجلد الأرشفة على الجهاز.<br><br><i>ملاحظة: يستخدم وجود مجلد بهذا الاسم "
 "لتحديد إذا كان الجهاز سيستخدم للأرشفة. لكل جهاز تريد أستخدامه للأرشفة, أنشيء "
-"مجلد بهذه الاسماء. بإضافة مجلدين سيستخدم الجهاز لأرشفة كلا الصور والمقاطع.</"
-"i>"
+"مجلد بهذه الاسماء. بإضافة مجلدين سيستخدم الجهاز لأرشفة كلا الصور "
+"والمقاطع.</i>"
 
-#: ../raphodo/backuppanel.py:428
+#: ../raphodo/backuppanel.py:439
 msgid "Photo folder name:"
 msgstr "اسم مجلد الصور:"
 
-#: ../raphodo/backuppanel.py:433
+#: ../raphodo/backuppanel.py:444
 msgid "Video folder name:"
 msgstr "اسم مجلد المقاطع (الفيديو):"
 
-#: ../raphodo/backuppanel.py:438 ../raphodo/nameeditor.py:883
+#: ../raphodo/backuppanel.py:449 ../raphodo/nameeditor.py:890
 #: ../raphodo/renamepanel.py:123
 msgid "Example:"
 msgstr "مثال:"
 
-#: ../raphodo/backuppanel.py:448
-msgid "If you disable automatic detection, choose the exact backup locations."
+#: ../raphodo/backuppanel.py:460
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr "إذا عطلت التعرف الآلي, أختر مكان الأرشفة بالتحديد."
 
-#: ../raphodo/backuppanel.py:452
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:468
 msgid "Photo backup location:"
 msgstr "مكان أرشفة الصور:"
 
-#: ../raphodo/backuppanel.py:454
+#: ../raphodo/backuppanel.py:474
 msgid "Select Photo Backup Location"
 msgstr "أختر مكان أرشفة الصور"
 
-#: ../raphodo/backuppanel.py:460
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:485
 msgid "Video backup location:"
 msgstr "مكان أرشفة المقاطع (الفيديو):"
 
-#: ../raphodo/backuppanel.py:462
+#: ../raphodo/backuppanel.py:491
 msgid "Select Video Backup Location"
 msgstr "أختر مكان أرشفة المقاطع (الفيديو)"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:564
+#: ../raphodo/backuppanel.py:595
 msgid "drive1"
 msgstr "القرص1"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:567
+#: ../raphodo/backuppanel.py:598
 msgid "drive2"
 msgstr "القرص2"
 
-#: ../raphodo/backuppanel.py:628
+#: ../raphodo/backuppanel.py:663
 msgid "Projected Backup Storage Use"
 msgstr "مساحة الأرشفة المتوقعة"
 
-#: ../raphodo/backuppanel.py:632
+#: ../raphodo/backuppanel.py:669
 msgid "Backup Options"
 msgstr "خيارات الأرشفة"
 
 #. translators: refers to the video thumbnail file that some
 #. cameras generate -- it has a .THM file extension
-#: ../raphodo/copyfiles.py:476
+#: ../raphodo/copyfiles.py:491
 msgid "video THM"
 msgstr "مصغرات المقاطع (THM)"
 
-#: ../raphodo/copyfiles.py:482
+#: ../raphodo/copyfiles.py:497
 msgid "audio"
 msgstr "صوتيات"
 
 #: ../raphodo/destinationdisplay.py:78 ../raphodo/devicedisplay.py:1079
-#: ../raphodo/rpdfile.py:321
+#: ../raphodo/rpdfile.py:342
 #, python-format
 msgid "%(no_photos)s Photos"
 msgstr "%(no_photos)s صور"
 
 #: ../raphodo/destinationdisplay.py:82 ../raphodo/devicedisplay.py:1081
-#: ../raphodo/rpdfile.py:316
+#: ../raphodo/rpdfile.py:333
 #, python-format
 msgid "%(no_videos)s Videos"
 msgstr "%(no_videos)s مقطع فيديو"
@@ -163,15 +523,15 @@ msgid "%(size_free)s free of %(size_total)s"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:190 ../raphodo/devicedisplay.py:993
-#: ../raphodo/rapid.py:1964 ../raphodo/rapid.py:2079 ../raphodo/rapid.py:5753
-#: ../raphodo/rpdfile.py:905
+#: ../raphodo/rapid.py:2023 ../raphodo/rapid.py:2151 ../raphodo/rapid.py:6043
+#: ../raphodo/rpdfile.py:930
 msgid "Photos"
 msgstr "صور"
 
 #. translators: the name of the Videos folder
 #: ../raphodo/destinationdisplay.py:191 ../raphodo/devicedisplay.py:994
-#: ../raphodo/rapid.py:1967 ../raphodo/rapid.py:2080 ../raphodo/rapid.py:5754
-#: ../raphodo/rpdfile.py:933 ../raphodo/storage.py:445
+#: ../raphodo/rapid.py:2028 ../raphodo/rapid.py:2152 ../raphodo/rapid.py:6044
+#: ../raphodo/rpdfile.py:958 ../raphodo/storage.py:449
 msgid "Videos"
 msgstr "مقاطع"
 
@@ -179,7 +539,7 @@ msgstr "مقاطع"
 msgid "Projected storage use after download"
 msgstr "المساحة المستخدمة المتوقعة بعد التنزيل"
 
-#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:516
+#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:521
 msgid "Custom..."
 msgstr "مخصص..."
 
@@ -217,57 +577,58 @@ msgstr "إعادة المسح"
 msgid "%s full"
 msgstr "%s ممتلىء"
 
-#: ../raphodo/devices.py:459
+#: ../raphodo/devices.py:463
 msgid "Cameras"
 msgstr "كاميرات"
 
-#: ../raphodo/devices.py:460 ../raphodo/devices.py:920
-#: ../raphodo/preferencedialog.py:85 ../raphodo/rapid.py:1927
+#: ../raphodo/devices.py:464 ../raphodo/devices.py:927
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/rapid.py:1979
 msgid "Devices"
 msgstr "أجهزة"
 
-#: ../raphodo/devices.py:720
+#: ../raphodo/devices.py:724
 #, python-format
 msgid "Downloading from %(device_names)s"
 msgstr "يتم التنزيل من %(device_names)s"
 
 #. Translators: e.g. Three Devices
-#: ../raphodo/devices.py:780
+#: ../raphodo/devices.py:784
 #, python-format
 msgid "%(no_devices)s %(device_type)s"
 msgstr "%(no_devices)s %(device_type)s"
 
-#: ../raphodo/devices.py:905 ../raphodo/rapid.py:1764
+#: ../raphodo/devices.py:912 ../raphodo/rapid.py:1807
 msgid "Select Source"
 msgstr "اختر المصدر"
 
-#: ../raphodo/devices.py:936 ../raphodo/devices.py:947
+#: ../raphodo/devices.py:943 ../raphodo/devices.py:954
 #, python-format
 msgid "%(device1)s + %(device2)s"
 msgstr "%(device1)s + %(device2)s"
 
 #. Number of cameras e.g. 3 Cameras
-#: ../raphodo/devices.py:958
+#: ../raphodo/devices.py:965
 #, python-format
 msgid "%(no_cameras)s Cameras"
 msgstr "%(no_cameras)s كاميرات"
 
-#: ../raphodo/devices.py:963
+#: ../raphodo/devices.py:970
 #, python-format
 msgid "%(no_devices)s Devices"
 msgstr "%(no_devices)s أجهزة"
 
 #. Translators: two folder names, separated by a plus sign
-#: ../raphodo/devices.py:1258
+#: ../raphodo/devices.py:1265
 #, python-format
 msgid "%s + %s"
 msgstr "%s + %s"
 
-#: ../raphodo/didyouknow.py:44
+#: ../raphodo/didyouknow.py:45
 msgid "Click on a file's checkbox to mark or unmark it for download."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:50
+#: ../raphodo/didyouknow.py:51
 msgid ""
 "Files that have already been downloaded are remembered. You can still mark "
 "previously downloaded files to download again, but they are unchecked by "
@@ -275,34 +636,67 @@ msgid ""
 "files that are yet to be downloaded."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:59
+#: ../raphodo/didyouknow.py:60
 msgid ""
 "If more than one file is selected, they'll all take the mark of the file "
 "whose checkbox was clicked, regardless of whether they previously had a "
 "checkmark or not."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:67
+#: ../raphodo/didyouknow.py:68
 msgid ""
 "Click on a device's checkbox to quickly mark or unmark all its files for "
 "downloading."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:74
+#: ../raphodo/didyouknow.py:75
+msgid ""
+"After a download finishes, an icon replaces the thumbnail's checkbox. The "
+"icon's color indicates whether the download was successful (green), had file "
+"renaming problems (yellow/orange), or failed (red)."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:83
+msgid ""
+"\n"
+"            In case of any problems, a red icon will appear at the bottom of "
+"the window\n"
+"            indicating how many error reports there are. Clicking on it "
+"opens the Error Report \n"
+"            window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:91
+msgid ""
+"\n"
+"            The Error Report window lists any problems encountered before, "
+"during or after the \n"
+"            download. An orange triangle represents a warning, a red circle "
+"indicates a failure, \n"
+"            and a black circle indicates more serious failures. You can "
+"click on the hyperlinks to \n"
+"            open its file or device in a file manager. You can also search "
+"the reports using the \n"
+"            search box in the lower left of the Error Report window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:103
 msgid ""
 "You can simultaneously download from multiple cameras, smartphones, memory "
 "cards, and hard drives&mdash;as many devices as your computer can handle at "
 "one time."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:81
+#: ../raphodo/didyouknow.py:110
 msgid ""
 "The <b>Timeline</b> groups photos and videos based on how much time elapsed "
 "between consecutive shots. Use it to identify photos and videos taken at "
 "different periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:88
+#: ../raphodo/didyouknow.py:117
 msgid ""
 "\n"
 "<p>In the illustration above, the first row of the Timeline is black because "
@@ -314,7 +708,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:99
+#: ../raphodo/didyouknow.py:128
 msgid ""
 "To view photos and videos for a particular time range, use the mouse "
 "(optionally in combination with the <tt>Shift</tt> or <tt>Ctrl</tt> keys) to "
@@ -322,20 +716,20 @@ msgid ""
 "the left side of the main window will be highlighted."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:106
+#: ../raphodo/didyouknow.py:135
 msgid ""
 "A download always includes all files that are checked for download, "
 "including those that are not currently displayed because the Timeline is "
 "being used."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:113
+#: ../raphodo/didyouknow.py:142
 msgid ""
 "You can hide or display the download sources by clicking on the name of the "
 "device you're downloading from at the top left of the program window."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:120
+#: ../raphodo/didyouknow.py:149
 msgid ""
 "\n"
 "          Thumbnails can be sorted using a variety of criteria:\n"
@@ -354,33 +748,33 @@ msgid ""
 "</ol> "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:137
+#: ../raphodo/didyouknow.py:166
 msgid ""
 "One of Rapid Photo Downloader's most useful features is its ability to "
 "automatically generate download subfolders and rename files as it downloads, "
 "using a scheme of your choosing."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:143
+#: ../raphodo/didyouknow.py:172
 msgid ""
 "To specify where you want your files downloaded and how you want them named, "
 "open the appropriate panel on the right-side of the application window: "
 "<b>Destination</b>, <b>Rename</b>, or <b>Job Code</b>."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:150
+#: ../raphodo/didyouknow.py:179
 msgid ""
 "\n"
 "When thinking about your download directory structure, keep in mind two "
 "different types\n"
 "of directory:\n"
 "<ol>\n"
-"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, &quot;"
-"Photos&quot;, or\n"
+"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, "
+"&quot;Photos&quot;, or\n"
 "&quot;Videos&quot;. This directory should already exist on your computer. In "
 "the illustration \n"
-"below, the destination folders are &quot;Pictures&quot; and &quot;"
-"Videos&quot;. The\n"
+"below, the destination folders are &quot;Pictures&quot; and "
+"&quot;Videos&quot;. The\n"
 "name of the destination folder is displayed in the grey bar directly above "
 "the folder tree, \n"
 "with a folder icon to its left and a gear icon to its far right.</li>\n"
@@ -393,7 +787,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:167
+#: ../raphodo/didyouknow.py:196
 msgid ""
 "\n"
 "You can download photos and videos to the same destination folder, or "
@@ -406,14 +800,14 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:177
+#: ../raphodo/didyouknow.py:206
 msgid ""
 "Automatically generated download subfolders can contain further "
 "automatically generated subfolders if need be. A common scheme is to create "
 "a year subfolder and then a series of year-month-day subfolders within it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:186
+#: ../raphodo/didyouknow.py:215
 msgid ""
 "\n"
 "Whenever possible, the program previews the download subfolders of photos "
@@ -431,7 +825,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:201
+#: ../raphodo/didyouknow.py:230
 msgid ""
 "\n"
 "Download subfolder names are typically generated using some or all of the "
@@ -455,7 +849,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:219
+#: ../raphodo/didyouknow.py:248
 msgid ""
 "\n"
 "To automatically create download subfolders as you download, \n"
@@ -465,7 +859,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:227
+#: ../raphodo/didyouknow.py:256
 msgid ""
 "\n"
 "Using the drop-down menu, select a built-in preset or click on <b>Custom</b> "
@@ -475,20 +869,20 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:237
+#: ../raphodo/didyouknow.py:266
 msgid ""
 "It's easy to download raw images into one folder, and jpeg images into "
 "another. Simply use the <b>Filename Extension</b> as part of your download "
 "subfolder generation scheme:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:242
+#: ../raphodo/didyouknow.py:271
 msgid ""
 "This illustration shows a saved custom preset named &quot;My custom "
 "preset&quot;."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:246
+#: ../raphodo/didyouknow.py:275
 msgid ""
 "\n"
 "You do not have to create nested download subfolders. This illustration "
@@ -499,7 +893,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:256
+#: ../raphodo/didyouknow.py:285
 msgid ""
 "\n"
 "Although there are many built-in date/time naming options, you may find that "
@@ -513,7 +907,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:265
+#: ../raphodo/didyouknow.py:294
 msgid ""
 "\n"
 "Read more about all the ways you can generate download subfolder names and "
@@ -523,7 +917,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:273
+#: ../raphodo/didyouknow.py:302
 msgid ""
 "\n"
 "<b>Job Codes</b> let you easily enter text that describes sets of photos and "
@@ -535,7 +929,7 @@ msgid ""
 "&quot;Green Bazaar&quot;: \n"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:282
+#: ../raphodo/didyouknow.py:311
 msgid ""
 "\n"
 "You can apply new or existing Job Codes before you start a download. If "
@@ -546,36 +940,36 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:291
+#: ../raphodo/didyouknow.py:320
 msgid "Look for hints to guide you when working with Job Codes:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:295
+#: ../raphodo/didyouknow.py:324
 msgid ""
 "Hints will vary depending on the context, such as when the mouse is hovering "
 "over a button."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:301
+#: ../raphodo/didyouknow.py:330
 msgid ""
 "\n"
 "When you give your photos and videos unique filenames, you'll never be "
 "confused as to \n"
 "which file is which. Using <b>sequence numbers</b> to make filenames unique "
 "is highly \n"
-"recommended!.\n"
+"recommended!\n"
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:309
+#: ../raphodo/didyouknow.py:338
 msgid ""
 "\n"
 "<p>Four types of sequence values are available to help you assign unique "
 "names to your photos and \n"
 "videos:\n"
 "<ol>\n"
-"<li><b>Downloads today</b>: tracks downloads completed during that day.</"
-"li>\n"
+"<li><b>Downloads today</b>: tracks downloads completed during that "
+"day.</li>\n"
 "<li><b>Stored number</b>: similar to Downloads today, but it is remembered "
 "from the last time the  \n"
 "program was run.</li>\n"
@@ -589,7 +983,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:327
+#: ../raphodo/didyouknow.py:356
 msgid ""
 "\n"
 "The <b>Rename</b> panel allows you to configure file renaming. To rename "
@@ -598,7 +992,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:334
+#: ../raphodo/didyouknow.py:363
 msgid ""
 "\n"
 "<p>The <b>Synchronize RAW + JPEG</b> option is useful if you use the RAW + "
@@ -617,7 +1011,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:348
+#: ../raphodo/didyouknow.py:377
 msgid ""
 "\n"
 "You can have your photos and videos backed up to multiple locations as they "
@@ -628,13 +1022,13 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:356
+#: ../raphodo/didyouknow.py:385
 msgid ""
 "In this example, the drive <b>photobackup</b> does not contain a folder "
 "named <tt>Videos</tt>, so videos will not be backed up to it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:362
+#: ../raphodo/didyouknow.py:391
 msgid ""
 "\n"
 "Several of the program's preferences can be set from the command line, "
@@ -645,7 +1039,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:372
+#: ../raphodo/didyouknow.py:396
+msgid "You can also import program preferences from the older 0.4 version."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:401
 msgid ""
 "\n"
 "Rapid Photo Downloader deals with three types of cache:\n"
@@ -655,8 +1053,8 @@ msgid ""
 "memory cards, and other devices.</li>\n"
 "<li>A <b>temporary cache</b> of files downloaded from a camera, one for "
 "photos and another for \n"
-"videos. They are located in temporary subfolders in the download destination."
-"</li>\n"
+"videos. They are located in temporary subfolders in the download "
+"destination.</li>\n"
 "<li>The <b>desktop's thumbnail cache</b>, in which Rapid Photo Downloader "
 "stores thumbnails of \n"
 "RAW and TIFF photos once they have been downloaded. File browsers like Gnome "
@@ -671,23 +1069,23 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:431
+#: ../raphodo/didyouknow.py:460
 msgid "Tip of the Day"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:439
+#: ../raphodo/didyouknow.py:468
 msgid "Did you know...?"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:466
+#: ../raphodo/didyouknow.py:495
 msgid "Show tips on startup"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:470
+#: ../raphodo/didyouknow.py:499
 msgid "&Next"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:471
+#: ../raphodo/didyouknow.py:500
 msgid "&Previous"
 msgstr ""
 
@@ -794,68 +1192,68 @@ msgstr ""
 msgid "%(days)d days, %(hours)d hours"
 msgstr ""
 
-#: ../raphodo/errorlog.py:65
+#: ../raphodo/errorlog.py:66
 msgid "Find"
 msgstr ""
 
-#: ../raphodo/errorlog.py:135
+#: ../raphodo/errorlog.py:136
 msgid "Error Reports - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/errorlog.py:170
+#: ../raphodo/errorlog.py:171
 msgid "Find in reports"
 msgstr ""
 
-#: ../raphodo/errorlog.py:187
+#: ../raphodo/errorlog.py:188
 msgid "Find the previous occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:192
+#: ../raphodo/errorlog.py:193
 msgid "Find the next occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:194
+#: ../raphodo/errorlog.py:195
 msgid "&Highlight All"
 msgstr ""
 
-#: ../raphodo/errorlog.py:195
+#: ../raphodo/errorlog.py:196
 msgid "Highlight all occurrences of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:196
+#: ../raphodo/errorlog.py:197
 msgid "&Match Case"
 msgstr ""
 
-#: ../raphodo/errorlog.py:197
+#: ../raphodo/errorlog.py:198
 msgid "Search with case sensitivity"
 msgstr ""
 
-#: ../raphodo/errorlog.py:198
+#: ../raphodo/errorlog.py:199
 msgid "&Whole Words"
 msgstr ""
 
-#: ../raphodo/errorlog.py:199
+#: ../raphodo/errorlog.py:200
 msgid "Search whole words only"
 msgstr ""
 
-#: ../raphodo/errorlog.py:209 ../raphodo/errorlog.py:341
+#: ../raphodo/errorlog.py:210 ../raphodo/errorlog.py:345
 #, python-format
 msgid "%s of %s matches"
 msgstr ""
 
-#: ../raphodo/errorlog.py:228
+#: ../raphodo/errorlog.py:232
 msgid "Clear"
 msgstr ""
 
-#: ../raphodo/errorlog.py:328
+#: ../raphodo/errorlog.py:332
 msgid "Phrase not found"
 msgstr ""
 
-#: ../raphodo/errorlog.py:487
+#: ../raphodo/errorlog.py:491
 msgid "Search pending..."
 msgstr ""
 
-#: ../raphodo/errorlog.py:535
+#: ../raphodo/errorlog.py:539
 msgid ""
 "The number of new entries added to the Error Report since it was last open. "
 "Click to open the Error Report."
@@ -869,8 +1267,8 @@ msgstr ""
 #, python-brace-format
 msgid ""
 "<b>A problem occurred in Rapid Photo Downloader</b><br><br>\n"
-"    Please report the problem at <a href=\"{website}\">{website}</a>."
-"<br><br>\n"
+"    Please report the problem at <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
 "    Attach the log file <i>{log_file}</i> to your bug report (click\n"
 "    <a href=\"{log_path}\">here</a> to open the log directory).<br><br>If "
 "the same problem occurs\n"
@@ -891,7 +1289,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1601
+#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1643
 msgid "Open in File Browser..."
 msgstr ""
 
@@ -909,531 +1307,531 @@ msgstr ""
 msgid "%s (location does not exist)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:186
+#: ../raphodo/generatenameconfig.py:190
 msgid "Date time"
 msgstr "التاريخ الوقت"
 
-#: ../raphodo/generatenameconfig.py:187
+#: ../raphodo/generatenameconfig.py:191
 msgid "Text"
 msgstr "نص"
 
-#: ../raphodo/generatenameconfig.py:188 ../raphodo/rapid.py:2053
+#: ../raphodo/generatenameconfig.py:192 ../raphodo/rapid.py:2125
 msgid "Filename"
 msgstr "اسم الملف"
 
-#: ../raphodo/generatenameconfig.py:189 ../raphodo/preferencedialog.py:488
+#: ../raphodo/generatenameconfig.py:193 ../raphodo/preferencedialog.py:724
 msgid "Metadata"
 msgstr "البيانات الوصفية"
 
-#: ../raphodo/generatenameconfig.py:190
+#: ../raphodo/generatenameconfig.py:194
 msgid "Sequences"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: ../raphodo/generatenameconfig.py:193
+#: ../raphodo/generatenameconfig.py:197
 msgid "Job code"
 msgstr "رمز المهمة"
 
-#: ../raphodo/generatenameconfig.py:194
+#: ../raphodo/generatenameconfig.py:198
 msgid "Image date"
 msgstr "تاريخ الصورة"
 
-#: ../raphodo/generatenameconfig.py:195
+#: ../raphodo/generatenameconfig.py:199
 msgid "Video date"
 msgstr "تاريخ مقطع الفيديو"
 
-#: ../raphodo/generatenameconfig.py:196
+#: ../raphodo/generatenameconfig.py:200
 msgid "Today"
 msgstr "اليوم"
 
-#: ../raphodo/generatenameconfig.py:197
+#: ../raphodo/generatenameconfig.py:201
 msgid "Yesterday"
 msgstr "الأمس"
 
 #. Translators: Download time is the time and date that the download started (when the
 #. user clicked the Download button)
-#: ../raphodo/generatenameconfig.py:200
+#: ../raphodo/generatenameconfig.py:204
 msgid "Download time"
 msgstr "وقت التنزيل"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:203
+#: ../raphodo/generatenameconfig.py:207
 msgid "Name"
 msgstr "الاسم"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:206 ../raphodo/rapid.py:2054
+#: ../raphodo/generatenameconfig.py:210 ../raphodo/rapid.py:2126
 msgid "Extension"
 msgstr "امتداد"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:209
+#: ../raphodo/generatenameconfig.py:213
 msgid "Image number"
 msgstr "رقم الصورة"
 
-#: ../raphodo/generatenameconfig.py:210
+#: ../raphodo/generatenameconfig.py:214
 msgid "Video number"
 msgstr "رقم مقطع الفيديو"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:213
+#: ../raphodo/generatenameconfig.py:217
 msgid "Aperture"
 msgstr "فتحة"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:216
+#: ../raphodo/generatenameconfig.py:220
 msgid "ISO"
 msgstr "الحساسية (ايزو)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:219
+#: ../raphodo/generatenameconfig.py:223
 msgid "Exposure time"
 msgstr "التعريض"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:222
+#: ../raphodo/generatenameconfig.py:226
 msgid "Focal length"
 msgstr "الطول البؤري"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:225
+#: ../raphodo/generatenameconfig.py:229
 msgid "Camera make"
 msgstr "مصنع الكاميرا"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:228
+#: ../raphodo/generatenameconfig.py:232
 msgid "Camera model"
 msgstr "موديل الكاميرا"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:231
+#: ../raphodo/generatenameconfig.py:235
 msgid "Short camera model"
 msgstr "موديل الكاميرا المختصر"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:234
+#: ../raphodo/generatenameconfig.py:238
 msgid "Hyphenated short camera model"
 msgstr "موديل الكاميرا المختصر بوصلة"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:237
+#: ../raphodo/generatenameconfig.py:241
 msgid "Serial number"
 msgstr "الرقم التسلسلي"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:240
+#: ../raphodo/generatenameconfig.py:244
 msgid "Shutter count"
 msgstr "تعداد شغل المصراع"
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: ../raphodo/generatenameconfig.py:242
+#: ../raphodo/generatenameconfig.py:246
 msgid "File number"
 msgstr "رقم الملف"
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:244
+#: ../raphodo/generatenameconfig.py:248
 msgid "Folder only"
 msgstr "مجلد فقط"
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:246
+#: ../raphodo/generatenameconfig.py:250
 msgid "Folder and file"
 msgstr "مجلد وملف"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:249
+#: ../raphodo/generatenameconfig.py:253
 msgid "Owner name"
 msgstr "اسم المالك"
 
-#: ../raphodo/generatenameconfig.py:250
+#: ../raphodo/generatenameconfig.py:254
 msgid "Codec"
 msgstr "نمط الترميز"
 
-#: ../raphodo/generatenameconfig.py:251
+#: ../raphodo/generatenameconfig.py:255
 msgid "Width"
 msgstr "العرض"
 
-#: ../raphodo/generatenameconfig.py:252
+#: ../raphodo/generatenameconfig.py:256
 msgid "Height"
 msgstr "الطول"
 
-#: ../raphodo/generatenameconfig.py:253
+#: ../raphodo/generatenameconfig.py:257
 msgid "Length"
 msgstr "طول المقطع"
 
-#: ../raphodo/generatenameconfig.py:254
+#: ../raphodo/generatenameconfig.py:258
 msgid "Frames Per Second"
 msgstr "لقطات لكل ثانية"
 
-#: ../raphodo/generatenameconfig.py:255
+#: ../raphodo/generatenameconfig.py:259
 msgid "Artist"
 msgstr "الفنان"
 
-#: ../raphodo/generatenameconfig.py:256
+#: ../raphodo/generatenameconfig.py:260
 msgid "Copyright"
 msgstr "حقوق المؤلف"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:259
+#: ../raphodo/generatenameconfig.py:263
 msgid "Downloads today"
 msgstr "عدد الملفات المستوردة اليوم"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:262
+#: ../raphodo/generatenameconfig.py:266
 msgid "Session number"
 msgstr "رقم الجلسة"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:265
+#: ../raphodo/generatenameconfig.py:269
 msgid "Subfolder number"
 msgstr "عدد المجلد الفرعي"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:268
+#: ../raphodo/generatenameconfig.py:272
 msgid "Stored number"
 msgstr "الرقم المخزن"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: ../raphodo/generatenameconfig.py:271
+#: ../raphodo/generatenameconfig.py:275
 msgid "Sequence letter"
 msgstr "احرف التسلسل"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:274
+#: ../raphodo/generatenameconfig.py:278
 msgid "All digits"
 msgstr "كل خانات الارقام"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:277
+#: ../raphodo/generatenameconfig.py:281
 msgid "Last digit"
 msgstr "الخانة الاخيرة"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:280
+#: ../raphodo/generatenameconfig.py:284
 msgid "Last 2 digits"
 msgstr "الخانتان الاخيرتان"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:283
+#: ../raphodo/generatenameconfig.py:287
 msgid "Last 3 digits"
 msgstr "الخانات الثلاث الاخيرة"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:286
+#: ../raphodo/generatenameconfig.py:290
 msgid "Last 4 digits"
 msgstr "الخانات الاربع الاخيرة"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:289
+#: ../raphodo/generatenameconfig.py:293
 msgid "Original Case"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:292
+#: ../raphodo/generatenameconfig.py:296
 msgid "UPPERCASE"
 msgstr "أحرف كبيرة"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:295
+#: ../raphodo/generatenameconfig.py:299
 msgid "lowercase"
 msgstr "أحرف صغيرة"
 
-#: ../raphodo/generatenameconfig.py:296
+#: ../raphodo/generatenameconfig.py:300
 msgid "One digit"
 msgstr "خانة واحدة"
 
-#: ../raphodo/generatenameconfig.py:297
+#: ../raphodo/generatenameconfig.py:301
 msgid "Two digits"
 msgstr "خانتان"
 
-#: ../raphodo/generatenameconfig.py:298
+#: ../raphodo/generatenameconfig.py:302
 msgid "Three digits"
 msgstr "ثلاث خانات"
 
-#: ../raphodo/generatenameconfig.py:299
+#: ../raphodo/generatenameconfig.py:303
 msgid "Four digits"
 msgstr "اربع خانات"
 
-#: ../raphodo/generatenameconfig.py:300
+#: ../raphodo/generatenameconfig.py:304
 msgid "Five digits"
 msgstr "خمس خانات"
 
-#: ../raphodo/generatenameconfig.py:301
+#: ../raphodo/generatenameconfig.py:305
 msgid "Six digits"
 msgstr "ست خانات"
 
-#: ../raphodo/generatenameconfig.py:302
+#: ../raphodo/generatenameconfig.py:306
 msgid "Seven digits"
 msgstr "سبع خانات"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:305
+#: ../raphodo/generatenameconfig.py:309
 msgid "Subseconds"
 msgstr "جزء من الثانية"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:308 ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:312 ../raphodo/generatenameconfig.py:393
 msgid "YYYYMMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:311 ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:315 ../raphodo/generatenameconfig.py:394
 msgid "YYYY-MM-DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:314 ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:318 ../raphodo/generatenameconfig.py:395
 msgid "YYYY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:317
+#: ../raphodo/generatenameconfig.py:321
 msgid "YYMMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:320
+#: ../raphodo/generatenameconfig.py:324
 msgid "YY-MM-DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:323
+#: ../raphodo/generatenameconfig.py:327
 msgid "YY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:326
+#: ../raphodo/generatenameconfig.py:330
 msgid "MMDDYYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:329
+#: ../raphodo/generatenameconfig.py:333
 msgid "MMDDYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:332
+#: ../raphodo/generatenameconfig.py:336
 msgid "MMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:335
+#: ../raphodo/generatenameconfig.py:339
 msgid "DDMMYYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:338
+#: ../raphodo/generatenameconfig.py:342
 msgid "DDMMYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:341 ../raphodo/generatenameconfig.py:389
-#: ../raphodo/generatenameconfig.py:390 ../raphodo/generatenameconfig.py:391
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:345 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:394 ../raphodo/generatenameconfig.py:395
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:397
 msgid "YYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:344
+#: ../raphodo/generatenameconfig.py:348
 msgid "YY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:347
+#: ../raphodo/generatenameconfig.py:351
 msgid "MM"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:350
+#: ../raphodo/generatenameconfig.py:354
 msgid "DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:353
+#: ../raphodo/generatenameconfig.py:357
 msgid "Month (full)"
 msgstr "الشهر (كاملا)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:356
+#: ../raphodo/generatenameconfig.py:360
 msgid "Month (abbreviated)"
 msgstr "الشهر (مختصر)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:359
+#: ../raphodo/generatenameconfig.py:363
 msgid "HHMMSS"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:362
+#: ../raphodo/generatenameconfig.py:366
 msgid "HHMM"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:365
+#: ../raphodo/generatenameconfig.py:369
 msgid "HH-MM-SS"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:368
+#: ../raphodo/generatenameconfig.py:372
 msgid "HH-MM"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:371
+#: ../raphodo/generatenameconfig.py:375
 msgid "HH"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:374
+#: ../raphodo/generatenameconfig.py:378
 msgid "MM (minutes)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:377
+#: ../raphodo/generatenameconfig.py:381
 msgid "SS"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:393
 msgid "Date"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:394
 msgid "Date (hyphens)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:395
 msgid "Date (underscores)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:438
-#: ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:442
+#: ../raphodo/generatenameconfig.py:537
 msgid "Date and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392
+#: ../raphodo/generatenameconfig.py:396
 msgid "YYYYMM_Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "Date and Job Code Subfolder"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "YYYYMM"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393 ../raphodo/jobcodepanel.py:198
-#: ../raphodo/nameeditor.py:827 ../raphodo/rapid.py:1809
+#: ../raphodo/generatenameconfig.py:397 ../raphodo/jobcodepanel.py:199
+#: ../raphodo/nameeditor.py:833 ../raphodo/rapid.py:1852
 #: ../raphodo/renamepanel.py:83 ../raphodo/renamepanel.py:241
 msgid "Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:433 ../raphodo/generatenameconfig.py:512
+#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:532
 msgid "Original Filename"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "Date-Time and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "YYYYMMDD-HHMM-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "Date and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "YYYYMMDD-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "Date-Time and Image number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "YYYYMMDD-1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "Date-Time and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "YYYYMMDD-HHMM-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:442 ../raphodo/generatenameconfig.py:537
 msgid "YYYYMMDD-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "Date-Time and Video number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "YYYYMMDD_1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "Resolution"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "YYYYMMDD-HHMM-1-1920x1080"
 msgstr ""
 
@@ -1492,76 +1890,77 @@ msgstr ""
 msgid "&Remember this choice"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:185
+#: ../raphodo/jobcodepanel.py:186
 msgid ""
 "Select photos and videos to be able to apply a new or existing Job Code to "
 "them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:186
-msgid "The new Job Code will be applied to all selected photos and/or videos."
+#: ../raphodo/jobcodepanel.py:187
+msgid ""
+"The new Job Code will be applied to all selected photos and/or videos."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:187
+#: ../raphodo/jobcodepanel.py:188
 msgid ""
 "Click the Apply button to apply the current Job Code to all selected photos "
 "and/or videos. You can also simply double click the Job Code."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:189
+#: ../raphodo/jobcodepanel.py:190
 msgid ""
 "Removing a Job Code removes it only from the list of saved Job Codes, not "
 "from any photos or videos that it may have been applied to."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:191
+#: ../raphodo/jobcodepanel.py:192
 msgid ""
 "If you want to use Job Codes, configure file renaming or destination "
 "subfolder names to use them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:197
+#: ../raphodo/jobcodepanel.py:198
 msgid "Last Used"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:202
+#: ../raphodo/jobcodepanel.py:203
 msgid "Job Code Sort:"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:205 ../raphodo/rapid.py:2061
+#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2133
 msgid "Ascending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2062
+#: ../raphodo/jobcodepanel.py:207 ../raphodo/rapid.py:2134
 msgid "Descending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:216
+#: ../raphodo/jobcodepanel.py:217
 msgid "&New..."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:220
+#: ../raphodo/jobcodepanel.py:221
 msgid "&Apply"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:224
+#: ../raphodo/jobcodepanel.py:225
 msgid "&Remove"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:228 ../raphodo/preferencedialog.py:125
-#: ../raphodo/preferencedialog.py:154 ../raphodo/preferencedialog.py:433
+#: ../raphodo/jobcodepanel.py:229 ../raphodo/preferencedialog.py:200
+#: ../raphodo/preferencedialog.py:229 ../raphodo/preferencedialog.py:531
 msgid "Remove All"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:427
+#: ../raphodo/jobcodepanel.py:428
 msgid "Do you really want to remove all the Job Codes?"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:429
+#: ../raphodo/jobcodepanel.py:430
 msgid "Remove all Job Codes"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:492
+#: ../raphodo/jobcodepanel.py:493
 msgid "Job Codes"
 msgstr ""
 
@@ -1572,42 +1971,58 @@ msgstr ""
 msgid "<i><b>Hint:</b> %(message)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:418 ../raphodo/nameeditor.py:432
+#: ../raphodo/nameeditor.py:423 ../raphodo/nameeditor.py:437
 #, python-format
 msgid "%(description)s - %(elements)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:512
+#: ../raphodo/nameeditor.py:517
 msgid "Save New Custom Preset..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:513
+#: ../raphodo/nameeditor.py:518
 msgid "Remove All Custom Presets..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:559
+#: ../raphodo/nameeditor.py:564
 msgid "(New Custom Preset)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:576
+#: ../raphodo/nameeditor.py:581
 #, python-format
 msgid "%s (edited)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:579 ../raphodo/nameeditor.py:1370
+#: ../raphodo/nameeditor.py:584 ../raphodo/nameeditor.py:1379
 #, python-format
 msgid "Update Custom Preset \"%s\""
 msgstr ""
 
-#: ../raphodo/nameeditor.py:667
+#: ../raphodo/nameeditor.py:672
 msgid "Save New Custom Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:675
+#: ../raphodo/nameeditor.py:680
 msgid "Preset Name:"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:836
+#: ../raphodo/nameeditor.py:799
+msgid "Photo Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:805
+msgid "Video Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:811
+msgid "Photo Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:817
+msgid "Video Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:842
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>There is insufficient data to "
 "fully generate the name. Please use other renaming options.</i>"
@@ -1616,7 +2031,7 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees.
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:846
+#: ../raphodo/nameeditor.py:853
 #, python-format
 msgid "The character</i> %(separator)s <i>creates a new subfolder level."
 msgstr ""
@@ -1624,50 +2039,50 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:851
+#: ../raphodo/nameeditor.py:858
 #, python-format
 msgid ""
 "There is no need start or end with the folder separator </i> "
 "%(separator)s<i>, because it is added automatically."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:859
+#: ../raphodo/nameeditor.py:866
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>Unique filenames may not be "
 "generated. Make filenames unique by using Sequence values.</i>"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:882 ../raphodo/renamepanel.py:121
+#: ../raphodo/nameeditor.py:889 ../raphodo/renamepanel.py:121
 msgid "Preset:"
 msgstr ""
 
 #. Translators: appears in a combobox, e.g. Image Date (YYYY)
-#: ../raphodo/nameeditor.py:959 ../raphodo/nameeditor.py:980
+#: ../raphodo/nameeditor.py:966 ../raphodo/nameeditor.py:987
 #, python-brace-format
 msgid "{choice} ({variant})"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1005 ../raphodo/preferencedialog.py:530
+#: ../raphodo/nameeditor.py:1012 ../raphodo/preferencedialog.py:783
 msgid "Get help online..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1025
+#: ../raphodo/nameeditor.py:1034
 msgid "Insert"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1351
+#: ../raphodo/nameeditor.py:1360
 msgid "Save Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1356
+#: ../raphodo/nameeditor.py:1365
 msgid ""
-"<b>Do you want to save the changes in a new custom preset?</"
-"b><br><br>Creating a custom preset is not required, but can help you keep "
-"organized.<br><br>The changes to the preferences will still be applied "
-"regardless of whether you create a new custom preset or not."
+"<b>Do you want to save the changes in a new custom "
+"preset?</b><br><br>Creating a custom preset is not required, but can help "
+"you keep organized.<br><br>The changes to the preferences will still be "
+"applied regardless of whether you create a new custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1365
+#: ../raphodo/nameeditor.py:1374
 msgid ""
 "<b>Do you want to save the changes in a custom preset?</b><br><br>If you "
 "like, you can create a new custom preset or update the existing custom "
@@ -1675,136 +2090,167 @@ msgid ""
 "regardless of whether you save a custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1372
+#: ../raphodo/nameeditor.py:1381
 msgid "Save New Custom Preset"
 msgstr ""
 
-#: ../raphodo/newversion.py:306
+#: ../raphodo/newversion.py:312
 msgid "Checking for new version..."
 msgstr ""
 
-#: ../raphodo/newversion.py:307
+#: ../raphodo/newversion.py:313
 msgid "You are running the latest version."
 msgstr ""
 
-#: ../raphodo/newversion.py:308
+#: ../raphodo/newversion.py:314
 msgid "Failed to contact the update server."
 msgstr ""
 
-#: ../raphodo/newversion.py:310
+#: ../raphodo/newversion.py:316
 #, python-format
 msgid "A new version of Rapid Photo Downloader (%s) is available."
 msgstr ""
 
-#: ../raphodo/newversion.py:312
+#: ../raphodo/newversion.py:318
 msgid "Do you want to download the new version?"
 msgstr ""
 
-#: ../raphodo/newversion.py:313
+#: ../raphodo/newversion.py:319
 #, python-format
 msgid "Changes in the new release can be viewed <a href=\"%s\">here</a>."
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the s key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:340 ../raphodo/newversion.py:353
+#: ../raphodo/newversion.py:348 ../raphodo/newversion.py:363
 msgid "&Skip this release"
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the o key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:356
+#: ../raphodo/newversion.py:366
 msgid "&Open Download Page"
 msgstr ""
 
-#: ../raphodo/newversion.py:376
+#: ../raphodo/newversion.py:386
 msgid "Rapid Photo Downloader updates"
 msgstr ""
 
 #. Translators: shows how much of a file has been downloaded e.g  123 KB of 1.3 MB
-#: ../raphodo/newversion.py:478
+#: ../raphodo/newversion.py:488
 #, python-format
 msgid "%(downloaded)s of %(total)s"
 msgstr ""
 
-#: ../raphodo/newversion.py:495
+#: ../raphodo/newversion.py:507
 msgid "Downloading..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:76
+#: ../raphodo/preferencedialog.py:86
 msgid "Preferences"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Automation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Thumbnails"
 msgstr "صويرات"
 
-#: ../raphodo/preferencedialog.py:85 ../raphodo/preferencedialog.py:343
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/preferencedialog.py:428
 msgid "Error Handling"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:109
+msgid "Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:109 ../raphodo/preferencedialog.py:119
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:94
+#: ../raphodo/preferencedialog.py:147
 msgid "Device Scanning"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:96
+#: ../raphodo/preferencedialog.py:148
 msgid "Scan only external devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:98
+#: ../raphodo/preferencedialog.py:150
 msgid ""
 "Scan for photos and videos only on devices that are external to the "
 "computer,\n"
 "including cameras, memory cards, external hard drives, and USB flash drives."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:102
-msgid "Scan non-camera devices lacking a DCIM folder"
+#: ../raphodo/preferencedialog.py:153
+msgid "Scan only specific folders on devices"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:155
+msgid ""
+"Scan for photos and videos only in the folders specified below (except "
+"paths\n"
+"specified in Ignored Paths).\n"
+"\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:161
+msgid "Folders to scan:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:164
+msgid ""
+"Folders at the base level of device file systems that will be scanned\n"
+"for photos and videos."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:104
+#: ../raphodo/preferencedialog.py:167 ../raphodo/preferencedialog.py:219
+msgid "Add..."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:169
 msgid ""
-"Scan the entirety of a device for photos and videos, irrespective of whether "
-"it contains a DCIM folder,\n"
-"as opposed to only scanning within a DCIM folder.\n"
+"Add a folder to the list of folders to scan for photos and videos.\n"
 "\n"
-"Changing this setting causes all devices to be scanned again.\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:172 ../raphodo/preferencedialog.py:198
+#: ../raphodo/preferencedialog.py:224 ../raphodo/preferencedialog.py:529
+msgid "Remove"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:174
+msgid ""
+"Remove a folder from the list of folders to scan for photos and videos.\n"
 "\n"
-"Note: With cameras, only the DCIM folder is scanned."
+"Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:116
+#: ../raphodo/preferencedialog.py:191
 msgid "Devices that have been set to automatically ignore or download from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:117
+#: ../raphodo/preferencedialog.py:192
 msgid "Remembered Devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:121
+#: ../raphodo/preferencedialog.py:196
 msgid ""
 "Remove a device from the list of devices to automatically ignore or download "
 "from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:123 ../raphodo/preferencedialog.py:149
-#: ../raphodo/preferencedialog.py:431
-msgid "Remove"
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:127
+#: ../raphodo/preferencedialog.py:202
 msgid ""
 "Clear the list of devices from which to automatically ignore or download "
 "from.\n"
@@ -1812,315 +2258,436 @@ msgid ""
 "Note: Changes take effect when the computer is next scanned for devices."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:140
+#: ../raphodo/preferencedialog.py:215
 msgid "Ignored Paths"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:141
+#: ../raphodo/preferencedialog.py:216
 msgid ""
 "The end part of a path that should never be scanned for photos or videos."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:144
-msgid "Add..."
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:146
+#: ../raphodo/preferencedialog.py:221
 msgid ""
 "Add a path to the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:151
+#: ../raphodo/preferencedialog.py:226
 msgid ""
 "Remove a path from the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:156
+#: ../raphodo/preferencedialog.py:231
 msgid ""
 "Clear the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:164
+#: ../raphodo/preferencedialog.py:239
 msgid ""
-"Use python-style <a href=\"http://damonlynch.net/rapid/documentation/"
-"#regularexpressions\">regular expressions</a>"
+"Use python-style <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">regula"
+"r expressions</a>"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:168
+#: ../raphodo/preferencedialog.py:243
 msgid ""
 "Use regular expressions in the list of ignored paths.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:208
+#: ../raphodo/preferencedialog.py:283
 msgid "Program Automation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:209
+#: ../raphodo/preferencedialog.py:284
 msgid "Start downloading at program startup"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:210
+#: ../raphodo/preferencedialog.py:285
 msgid "Start downloading upon device insertion"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:211
+#: ../raphodo/preferencedialog.py:286
 msgid "Unmount (eject) device upon download completion"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:212
+#: ../raphodo/preferencedialog.py:287
 msgid "Exit program when download completes"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:213
+#: ../raphodo/preferencedialog.py:288
 msgid "Exit program even if download had warnings or errors"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:240
+#: ../raphodo/preferencedialog.py:315
 msgid "Thumbnail Generation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:241
+#: ../raphodo/preferencedialog.py:316
 msgid "Generate thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:242
+#: ../raphodo/preferencedialog.py:318
 msgid "Generate thumbnails to show in the main program window"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:244
+#: ../raphodo/preferencedialog.py:320
 msgid "Cache thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:245
+#: ../raphodo/preferencedialog.py:323
 msgid ""
 "Save thumbnails shown in the main program window in a thumbnail cache unique "
 "to Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:247
+#: ../raphodo/preferencedialog.py:327
 msgid "Generate system thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:248
+#: ../raphodo/preferencedialog.py:330
 msgid ""
 "While downloading, save thumbnails that can be used by desktop file managers "
 "and other programs"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:255
+#: ../raphodo/preferencedialog.py:339
 msgid "Number of CPU cores used to generate thumbnails."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:256
+#: ../raphodo/preferencedialog.py:340
 msgid "CPU cores:"
 msgstr ""
 
 #. Translators: the * acts as an asterisk to denote a reference to an annotation
 #. such as '* Takes effect upon program restart'
-#: ../raphodo/preferencedialog.py:271 ../raphodo/preferencedialog.py:317
+#: ../raphodo/preferencedialog.py:355 ../raphodo/preferencedialog.py:401
 msgid "*"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:294
+#: ../raphodo/preferencedialog.py:378
 msgid "Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:296
+#: ../raphodo/preferencedialog.py:380
 msgid "Calculating..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:302
+#: ../raphodo/preferencedialog.py:386
 msgid "days"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:303
+#: ../raphodo/preferencedialog.py:387
 msgid "forever"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:308
+#: ../raphodo/preferencedialog.py:392
 msgid "Cache size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:310
+#: ../raphodo/preferencedialog.py:394
 msgid "Number of thumbnails:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:312
+#: ../raphodo/preferencedialog.py:396
 msgid "Database size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:314
+#: ../raphodo/preferencedialog.py:398
 msgid "Cache unaccessed thumbnails for:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:322
+#: ../raphodo/preferencedialog.py:406
 msgid "Purge Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:323
+#: ../raphodo/preferencedialog.py:408
 msgid "Optimize Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:336
+#: ../raphodo/preferencedialog.py:421
 msgid "* Takes effect upon program restart"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:346
+#: ../raphodo/preferencedialog.py:431
 msgid "Skip download"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:347
+#: ../raphodo/preferencedialog.py:432
 msgid "Don't download the file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:348
+#: ../raphodo/preferencedialog.py:433
 msgid "Add unique identifier"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:349
+#: ../raphodo/preferencedialog.py:436
 msgid ""
 "Add an identifier like _1 or _2 to the end of the filename, immediately "
 "before the file's extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:355
+#: ../raphodo/preferencedialog.py:444
 msgid "Overwrite"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:356
+#: ../raphodo/preferencedialog.py:445
 msgid "Overwrite the previously backed up file"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:357
+#: ../raphodo/preferencedialog.py:446
 msgid "Skip"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:358
+#: ../raphodo/preferencedialog.py:448
 msgid "Don't overwrite the backup file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:364
+#: ../raphodo/preferencedialog.py:455
 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 identifier:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:378
+#: ../raphodo/preferencedialog.py:464
+msgid ""
+"Using sequence numbers to automatically generate unique filenames is "
+"strongly recommended. Configure file renaming in the Rename panel in the "
+"main window."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:473
 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 ""
 
-#: ../raphodo/preferencedialog.py:398
+#: ../raphodo/preferencedialog.py:494
 msgid "Program Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:399
+#: ../raphodo/preferencedialog.py:495
 msgid "Show a warning when:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:402
+#: ../raphodo/preferencedialog.py:498
 msgid "Downloading files currently not displayed"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:403
+#: ../raphodo/preferencedialog.py:499
 msgid ""
 "Warn when about to download files that are not displayed in the main window."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:405
+#: ../raphodo/preferencedialog.py:501
 msgid "Backup destinations are missing"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:406
-msgid "Warn before starting a download if it is not possible to back up files."
+#: ../raphodo/preferencedialog.py:502
+msgid ""
+"Warn before starting a download if it is not possible to back up files."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:408
+#: ../raphodo/preferencedialog.py:504
 msgid "Program libraries are missing or broken"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:409
+#: ../raphodo/preferencedialog.py:505
 msgid ""
 "Warn if a software library used by Rapid Photo Downloader is missing or not "
 "functioning."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:412
+#: ../raphodo/preferencedialog.py:508
 msgid "Filesystem metadata cannot be set"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:413
+#: ../raphodo/preferencedialog.py:509
 msgid ""
 "Warn if there is an error setting a file's filesystem metadata, such as its "
 "modification time."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:416
+#: ../raphodo/preferencedialog.py:512
 msgid "Encountering unhandled files"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:417
+#: ../raphodo/preferencedialog.py:513
 msgid ""
 "Warn after scanning a device or this computer if there are unrecognized "
 "files that will not be included in the download."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:420
+#: ../raphodo/preferencedialog.py:517
 msgid "Do not warn about unhandled files with extensions:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:424
+#: ../raphodo/preferencedialog.py:522
 msgid ""
 "File extensions are case insensitive and do not need to include the leading "
 "dot."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:427
+#: ../raphodo/preferencedialog.py:525
 msgid "Add"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:428
+#: ../raphodo/preferencedialog.py:526
 msgid ""
 "Add a file extension to the list of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:430
+#: ../raphodo/preferencedialog.py:528
 msgid ""
 "Remove a file extension from the list of unhandled file types to not warn "
 "about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:434
+#: ../raphodo/preferencedialog.py:532
 msgid ""
 "Clear the list of file extensions of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:469
+#: ../raphodo/preferencedialog.py:568
+msgid "Photo and Video Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:571
+msgid "Consolidate files across devices and downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:574
+msgid ""
+"Analyze the results of device scans looking for duplicate files and matching "
+"RAW and JPEG pairs,\n"
+"comparing them across multiple devices and download sessions."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:580
+msgid "Treat matching RAW and JPEG files as:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:581
+msgid "One photo"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:582
+msgid "Two photos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:584
+msgid ""
+"Display matching pairs of RAW and JPEG photos as one photo, and if marked, "
+"download both."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:589
+msgid ""
+"Display matching pairs of RAW and JPEG photos as two different photos. You "
+"can still synchronize their sequence numbers."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:598
+msgid "With matching RAW and JPEG photos:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:600
+msgid "Do not mark JPEG for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:601
+msgid "Do not mark RAW for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:602
+msgid "Mark both for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:609
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"JPEG for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:614
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"RAW for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:619
+msgid ""
+"When matching RAW and JPEG photos are found, automatically mark both for "
+"download."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:625
+msgid ""
+"If you disable file consolidation, choose what to do when a download device "
+"is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:631
+msgid ""
+"When a download device is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:642
+msgid "Clear completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:643
+msgid "Keep displaying completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:644
+msgid "Prompt for what to do"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:649
+msgid ""
+"Automatically clear the display of completed downloads whenever a new "
+"download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:654
+msgid ""
+"Keep displaying completed downloads whenever a new download device is "
+"inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:658
+msgid ""
+"Prompt whether to keep displaying completed downloads or clear them whenever "
+"a new download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:702
 msgid "Version Check"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:470
+#: ../raphodo/preferencedialog.py:703
 msgid "Check for new version at startup"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:471
+#: ../raphodo/preferencedialog.py:705
 msgid "Check for a new version of the program each time the program starts."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:473
+#: ../raphodo/preferencedialog.py:707
 msgid "Include development releases"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:474
+#: ../raphodo/preferencedialog.py:709
 msgid ""
 "Include alpha, beta and other development releases when checking for a new "
 "version of the program.\n"
@@ -2129,11 +2696,11 @@ msgid ""
 "occur."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:489
+#: ../raphodo/preferencedialog.py:725
 msgid "Ignore DNG date/time metadata on MTP devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:490
+#: ../raphodo/preferencedialog.py:727
 msgid ""
 "Ignore date/time metadata in DNG files located on MTP devices, and use the "
 "file's modification time instead.\n"
@@ -2142,70 +2709,86 @@ msgid ""
 "metadata."
 msgstr ""
 
+#: ../raphodo/preferencedialog.py:741
+msgid "Completed Downloads"
+msgstr ""
+
 #. Translators: substituted value is a description for the set of preferences
 #. shown in the preference dialog window, e.g. Devices, Automation, etc.
 #. This string is shown in a tooltip for the "Restore Defaults" button
-#: ../raphodo/preferencedialog.py:710
+#: ../raphodo/preferencedialog.py:1067
 #, python-format
 msgid "Restores default %s preference values"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:832
+#: ../raphodo/preferencedialog.py:1208
 msgid ""
 "Do you want to purge the thumbnail cache? The cache will be purged when the "
 "program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:835
+#: ../raphodo/preferencedialog.py:1212
 msgid "Purge Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:847
+#: ../raphodo/preferencedialog.py:1225
 msgid ""
 "Do you want to optimize the thumbnail cache? The cache will be optimized "
 "when the program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:850
+#: ../raphodo/preferencedialog.py:1229
 msgid "Optimize Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1045
+#: ../raphodo/preferencedialog.py:1481
+msgid "Enter a Folder to Scan"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1482
+msgid "Specify a folder that will be scanned for photos and videos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1483
+msgid "Folder:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1497
 msgid "Enter a Path to Ignore"
 msgstr "ادخل مسار لتجاهله"
 
-#: ../raphodo/preferencedialog.py:1046
+#: ../raphodo/preferencedialog.py:1498
 msgid "Specify a path that will never be scanned for photos or videos"
 msgstr "حدد مسار لن يتم أبدا مسح ما فيه من صور أو مقاطع فيديو"
 
-#: ../raphodo/preferencedialog.py:1047
+#: ../raphodo/preferencedialog.py:1499
 msgid "Path:"
 msgstr "مسار:"
 
-#: ../raphodo/preferencedialog.py:1061
+#: ../raphodo/preferencedialog.py:1513
 msgid "Enter a File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1062
+#: ../raphodo/preferencedialog.py:1514
 msgid "Specify a file extension (without the leading dot)"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1063 ../raphodo/renamepanel.py:122
+#: ../raphodo/preferencedialog.py:1515 ../raphodo/renamepanel.py:122
 msgid "Extension:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1078
+#: ../raphodo/preferencedialog.py:1530
 msgid "Invalid File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1079
+#: ../raphodo/preferencedialog.py:1531
 #, python-format
 msgid ""
 "The file extension <b>%s</b> is recognized by Rapid Photo Downloader, so it "
 "makes no sense to warn about its presence."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1081
+#: ../raphodo/preferencedialog.py:1533
 #, python-format
 msgid ""
 "Recognized file types:\n"
@@ -2231,104 +2814,103 @@ msgstr ""
 msgid "Birthday"
 msgstr ""
 
-#: ../raphodo/preferences.py:614
+#: ../raphodo/preferences.py:624
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "خيارات المجلد الفرعي يجب أن لا تبدأ بـ %s"
 
-#: ../raphodo/preferences.py:617
+#: ../raphodo/preferences.py:627
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "خيارات المجلد الفرعي يجب أن لا تبتهي بـ %s"
 
-#: ../raphodo/preferences.py:622
+#: ../raphodo/preferences.py:632
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr "خيارات المجلد الفرعي يبجب أن لا تحتوى %s اثنتان الواحد تلوى الاخرى"
 
-#. self.setFlat(True)
 #: ../raphodo/primarybutton.py:72
 msgid "Download 8 Photos and 10 Videos"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:86 ../raphodo/problemnotification.py:208
+#: ../raphodo/problemnotification.py:87 ../raphodo/problemnotification.py:209
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:89
+#: ../raphodo/problemnotification.py:90
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:116
+#: ../raphodo/problemnotification.py:117
 #, python-format
 msgid "GPhoto2 Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:124
+#: ../raphodo/problemnotification.py:125
 msgid ""
 "Unable to initialize the camera, probably because another program is using "
 "it. No files were copied from it."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:134
+#: ../raphodo/problemnotification.py:135
 #, python-format
 msgid "Unable to read directory %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:140
+#: ../raphodo/problemnotification.py:141
 #, python-format
 msgid "Unable to access modification time or size from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:146
+#: ../raphodo/problemnotification.py:147
 #, python-format
 msgid "Unable to read file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:152
+#: ../raphodo/problemnotification.py:153
 #, python-format
 msgid "Unable to write file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:158
+#: ../raphodo/problemnotification.py:159
 #, python-format
 msgid "Unable to move file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:164
+#: ../raphodo/problemnotification.py:165
 #, python-format
 msgid "Unable to remove file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:170
+#: ../raphodo/problemnotification.py:171
 #, python-format
 msgid "Unable to copy file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:176
+#: ../raphodo/problemnotification.py:177
 #, python-format
 msgid "Zero length file %s will not be downloaded"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:182
+#: ../raphodo/problemnotification.py:183
 #, python-format
 msgid "Could not determine filesystem modification time for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:188
+#: ../raphodo/problemnotification.py:189
 #, python-format
 msgid "Unable to load metadata from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:194
+#: ../raphodo/problemnotification.py:195
 #, python-format
 msgid ""
 "Unable to load metadata from %(name)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:202
+#: ../raphodo/problemnotification.py:203
 #, python-format
 msgid ""
 "An error occurred setting a file's filesystem metadata on the filesystem %s. "
@@ -2336,212 +2918,212 @@ msgid ""
 "again."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:216
+#: ../raphodo/problemnotification.py:217
 #, python-format
 msgid "Encountered unhandled file %s. It will not be downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:223
+#: ../raphodo/problemnotification.py:224
 #, python-format
 msgid "%(filetype)s %(destination)s already exists."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:234 ../raphodo/problemnotification.py:262
+#: ../raphodo/problemnotification.py:235 ../raphodo/problemnotification.py:263
 #, python-format
 msgid ""
 "The existing %(filetype)s %(destination)s was last modified on %(date)s at "
 "%(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:245
+#: ../raphodo/problemnotification.py:246
 #, python-format
 msgid "The %(filetype)s %(source)s was not downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:273
+#: ../raphodo/problemnotification.py:274
 #, python-format
 msgid "The %(filetype)s %(source)s was downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:282
+#: ../raphodo/problemnotification.py:283
 #, python-format
 msgid "The unique identifier '%s' was added to the filename."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:298
+#: ../raphodo/problemnotification.py:299
 #, python-format
 msgid ""
 "The existing backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:309
+#: ../raphodo/problemnotification.py:310
 #, python-format
 msgid "The %(filetype)s %(source)s was not backed up from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:326
+#: ../raphodo/problemnotification.py:327
 #, python-format
 msgid ""
 "The previous backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:337
+#: ../raphodo/problemnotification.py:338
 #, python-format
 msgid ""
 "The %(filetype)s %(source)s from %(device)s was backed up, overwriting the "
 "previous backup %(filetype)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:356
+#: ../raphodo/problemnotification.py:357
 #, python-format
 msgid ""
 "When synchronizing RAW + JPEG sequence values, a duplicate %(filetype)s "
 "%(file)s was encountered, and was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:366
+#: ../raphodo/problemnotification.py:367
 msgid ""
 "When synchronizing RAW + JPEG sequence values, photos were detected with the "
 "same filenames, but taken at different times:"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:373
+#: ../raphodo/problemnotification.py:374
 #, 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 ""
 
-#: ../raphodo/problemnotification.py:389
+#: ../raphodo/problemnotification.py:390
 #, python-format
 msgid "Unable to finalize the filename for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:424
+#: ../raphodo/problemnotification.py:425
 #, python-format
 msgid ""
 "The filename %(destination)s was not fully generated for %(filetype)s "
 "%(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:433
+#: ../raphodo/problemnotification.py:434
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:439
+#: ../raphodo/problemnotification.py:440
 #, python-format
 msgid "The following metadata is missing: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:445
+#: ../raphodo/problemnotification.py:446
 #, python-format
 msgid "Date/time conversion failed: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:451
+#: ../raphodo/problemnotification.py:452
 msgid ""
 "Could not extract valid date/time metadata or determine the file "
 "modification time."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:457
+#: ../raphodo/problemnotification.py:458
 msgid "Filename does not have an extension."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:460
+#: ../raphodo/problemnotification.py:461
 msgid "Filename does not have a number component."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:464
+#: ../raphodo/problemnotification.py:465
 #, python-format
 msgid "Error generating component %(component)s. Error: %(error)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:477
+#: ../raphodo/problemnotification.py:478
 #, python-format
 msgid ""
 "The download subfolders %(folder)s were only partially generated for "
 "%(filetype)s %(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:486
+#: ../raphodo/problemnotification.py:487
 #, python-format
 msgid ""
 "There is no data with which to generate the %(subfolder_file)s for "
 "%(filename)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:499
+#: ../raphodo/problemnotification.py:500
 #, python-format
 msgid ""
 "Unable to create the %(filetype)s %(destination)s in %(folder)s. The "
 "download file was %(source)s in %(device)s. It was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:514
+#: ../raphodo/problemnotification.py:515
 #, python-format
 msgid "Unable to create the download subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:526
+#: ../raphodo/problemnotification.py:527
 #, python-format
 msgid "Unable to create the backup subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:577
+#: ../raphodo/problemnotification.py:578
 #, python-format
 msgid "Problems scanning %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:584
+#: ../raphodo/problemnotification.py:585
 #, python-format
 msgid "Problems copying from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:591
+#: ../raphodo/problemnotification.py:592
 msgid "Problems while finalizing filenames and generating subfolders"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:598
+#: ../raphodo/problemnotification.py:599
 #, python-format
 msgid "Problems backing up to %s"
 msgstr ""
 
-#. Translators: for example Nov 3 or Dec 31
-#. The start and end dates are on a different day
-#. Translators: for example Nov 3 or Dec 31
-#: ../raphodo/proximity.py:105 ../raphodo/proximity.py:221
-#: ../raphodo/proximity.py:224 ../raphodo/proximity.py:828
+#. Translators: for example Nov 3 2015, 11:25 AM
+#. Translators: for example, Nov 3, 12:15 PM
+#: ../raphodo/proximity.py:188 ../raphodo/proximity.py:213
+#: ../raphodo/proximity.py:236 ../raphodo/proximity.py:239
 #, python-format
-msgid "%(month)s %(numeric_day)s"
+msgid "%(date)s, %(time)s"
 msgstr ""
 
-#. Translators: for example Nov 15 2015
-#. Translators: for example Nov 3 2015
-#: ../raphodo/proximity.py:109 ../raphodo/proximity.py:230
-#: ../raphodo/proximity.py:231 ../raphodo/proximity.py:831
+#: ../raphodo/proximity.py:204
 #, python-format
-msgid "%(date)s %(year)s"
+msgid "%(starttime)s - %(endtime)s"
 msgstr ""
 
-#. Translators: for example Nov 3 2015, 11:25 AM
-#. Translators: for example, Nov 3, 12:15 PM
-#: ../raphodo/proximity.py:197 ../raphodo/proximity.py:215
-#: ../raphodo/proximity.py:234 ../raphodo/proximity.py:236
+#. The start and end dates are on a different day
+#. Translators: for example Nov 3 or Dec 31
+#: ../raphodo/proximity.py:221 ../raphodo/proximity.py:225
+#: ../raphodo/proximity.py:980 ../raphodo/timeutils.py:105
 #, python-format
-msgid "%(date)s, %(time)s"
+msgid "%(month)s %(numeric_day)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:209
+#. Translators: for example Nov 3 2015
+#. Translators: for example Nov 2 2015
+#. Translators: for example Nov 15 2015
+#: ../raphodo/proximity.py:232 ../raphodo/proximity.py:233
+#: ../raphodo/proximity.py:985 ../raphodo/timeutils.py:110
 #, python-format
-msgid "%(starttime)s - %(endtime)s"
+msgid "%(date)s %(year)s"
 msgstr ""
 
 #. Translators: for example, Nov 3, 12:15 PM - Nov 4, 1:00 AM
-#: ../raphodo/proximity.py:241
+#: ../raphodo/proximity.py:245
 #, python-format
 msgid "%(earlier_time)s - %(later_time)s"
 msgstr ""
@@ -2550,25 +3132,25 @@ msgstr ""
 #. Nov 3 2012, 12:15 PM -
 #. Nov 4 2012, 1:00 AM
 #. (please keep the line break signified by \n)
-#: ../raphodo/proximity.py:248
+#: ../raphodo/proximity.py:253
 #, python-format
 msgid ""
 "%(earlier_time)s -\n"
 "%(later_time)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:359
+#: ../raphodo/proximity.py:382
 #, python-format
 msgid "%(month)s  %(year)s"
 msgstr ""
 
 #. Translators: for example Nov 2015
-#: ../raphodo/proximity.py:833
+#: ../raphodo/proximity.py:987
 #, python-format
 msgid "%(month)s %(year)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:1344
+#: ../raphodo/proximity.py:1595
 msgid ""
 "The time elapsed between consecutive photos and videos that is used to build "
 "the Timeline"
@@ -2578,47 +3160,47 @@ msgstr ""
 #. Replace the very last character (after the d) with the correct
 #. localized value, keeping everything else. In other words, change
 #. only the m character.
-#: ../raphodo/proximity.py:1406
+#: ../raphodo/proximity.py:1652
 #, python-format
 msgid "%(minutes)dm"
 msgstr ""
 
 #. Translators: i.e. "1.5h", which is short for 1.5 hours.
 #. Replace the entire string with the correct localized value
-#: ../raphodo/proximity.py:1410
+#: ../raphodo/proximity.py:1656
 msgid "1.5h"
 msgstr ""
 
 #. Translators: e.g. "5h", which is short for 5 hours.
 #. Replace the very last character (after the d) with the correct localized value,
 #. keeping everything else. In other words, change only the h character.
-#: ../raphodo/proximity.py:1415
+#: ../raphodo/proximity.py:1661
 #, python-format
 msgid "%(hours)dh"
 msgstr ""
 
-#: ../raphodo/proximity.py:1461
+#: ../raphodo/proximity.py:1710
 msgid ""
 "The Timeline groups photos and videos based on how much time elapsed between "
 "consecutive shots. Use it to identify photos and videos taken at different "
 "periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/proximity.py:1464
+#: ../raphodo/proximity.py:1715
 msgid ""
 "Use the slider (below) to adjust the time elapsed between consecutive shots "
 "that is used to build the Timeline."
 msgstr ""
 
-#: ../raphodo/proximity.py:1466
+#: ../raphodo/proximity.py:1718
 msgid "Timeline build pending..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1467
+#: ../raphodo/proximity.py:1719
 msgid "Timeline is building..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1468
+#: ../raphodo/proximity.py:1721
 msgid ""
 "The Timeline needs to be rebuilt because the file modification time does not "
 "match the time a shot was taken for one or more shots.<br><br>The Timeline "
@@ -2630,61 +3212,61 @@ msgid ""
 "downloading, which is when the metadata is read."
 msgstr ""
 
-#: ../raphodo/rapid.py:485 ../raphodo/rapid.py:2461 ../raphodo/rapid.py:3728
-#: ../raphodo/rapid.py:3846 ../raphodo/rapid.py:3850 ../raphodo/rapid.py:3870
-#: ../raphodo/rapid.py:3874 ../raphodo/rapid.py:3998 ../raphodo/rapid.py:4007
-#: ../raphodo/rapid.py:4495 ../raphodo/rapid.py:4888 ../raphodo/rapid.py:5722
-#: ../raphodo/rememberthisdialog.py:97
+#: ../raphodo/rapid.py:493 ../raphodo/rapid.py:2555 ../raphodo/rapid.py:3934
+#: ../raphodo/rapid.py:4065 ../raphodo/rapid.py:4069 ../raphodo/rapid.py:4092
+#: ../raphodo/rapid.py:4096 ../raphodo/rapid.py:4226 ../raphodo/rapid.py:4237
+#: ../raphodo/rapid.py:4743 ../raphodo/rapid.py:5195 ../raphodo/rapid.py:5997
+#: ../raphodo/rememberthisdialog.py:99
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:3
 msgid "Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:1100
+#: ../raphodo/rapid.py:1131
 msgid ""
 "<b>ExifTool has a problem</b><br><br> Rapid Photo Downloader uses ExifTool "
 "to get metadata from videos and photos. The program will run without it, but "
 "installing it is <b>highly</b> recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1110 ../raphodo/rapid.py:1130
+#: ../raphodo/rapid.py:1141 ../raphodo/rapid.py:1161
 msgid "Problem with libmediainfo"
 msgstr ""
 
-#: ../raphodo/rapid.py:1119
+#: ../raphodo/rapid.py:1150
 msgid ""
 "<b>The library libmediainfo appears to be missing</b><br><br> Rapid Photo "
 "Downloader uses libmediainfo to get the date and time a video was shot. The "
 "program will run  without it, but installing it is recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1417
+#: ../raphodo/rapid.py:1448
 msgid "Download failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1419
+#: ../raphodo/rapid.py:1450
 msgid ""
 "Sorry, the download of the new version of Rapid Photo Downloader failed."
 msgstr ""
 
-#: ../raphodo/rapid.py:1425
+#: ../raphodo/rapid.py:1457
 msgid ""
 "The new version was successfully downloaded. Do you want to close Rapid "
 "Photo Downloader and install it now?"
 msgstr ""
 
-#: ../raphodo/rapid.py:1428
+#: ../raphodo/rapid.py:1461
 msgid "Update Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:1432
+#: ../raphodo/rapid.py:1465
 msgid "Install"
 msgstr ""
 
-#: ../raphodo/rapid.py:1450
+#: ../raphodo/rapid.py:1483
 msgid "New version saved"
 msgstr ""
 
-#: ../raphodo/rapid.py:1451
+#: ../raphodo/rapid.py:1485
 #, python-format
 msgid ""
 "The tar file and installer script are saved at:\n"
@@ -2692,163 +3274,163 @@ msgid ""
 " %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:1468
+#: ../raphodo/rapid.py:1502
 msgid "Upgrade failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1469
+#: ../raphodo/rapid.py:1505
 msgid ""
 "Sorry, upgrading Rapid Photo Downloader failed because there was an error "
 "opening the installer."
 msgstr ""
 
-#: ../raphodo/rapid.py:1667 ../raphodo/rapid.py:2331
+#: ../raphodo/rapid.py:1709 ../raphodo/rapid.py:2425
 msgid "Download"
 msgstr "تنزيل"
 
-#: ../raphodo/rapid.py:1671
+#: ../raphodo/rapid.py:1713
 msgid "&Refresh..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1675
+#: ../raphodo/rapid.py:1717
 msgid "&Preferences"
 msgstr ""
 
-#: ../raphodo/rapid.py:1679
+#: ../raphodo/rapid.py:1721
 msgid "&Quit"
 msgstr ""
 
-#: ../raphodo/rapid.py:1683
+#: ../raphodo/rapid.py:1725
 msgid "Error &Reports"
 msgstr ""
 
-#: ../raphodo/rapid.py:1687
+#: ../raphodo/rapid.py:1729
 msgid "Clear Completed Downloads"
 msgstr ""
 
-#: ../raphodo/rapid.py:1691
+#: ../raphodo/rapid.py:1733
 msgid "Get Help Online..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1695
+#: ../raphodo/rapid.py:1737
 msgid "&Tip of the Day..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1699
+#: ../raphodo/rapid.py:1741
 msgid "Report a Problem..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1703
+#: ../raphodo/rapid.py:1745
 msgid "Make a Donation..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1707
+#: ../raphodo/rapid.py:1749
 msgid "Translate this Application..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1711
+#: ../raphodo/rapid.py:1753
 msgid "&About..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1715
+#: ../raphodo/rapid.py:1757
 msgid "Check for Updates..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1797
+#: ../raphodo/rapid.py:1840
 msgid "Timeline"
 msgstr ""
 
-#: ../raphodo/rapid.py:1807
+#: ../raphodo/rapid.py:1850
 msgid "Destination"
 msgstr ""
 
-#: ../raphodo/rapid.py:1808
+#: ../raphodo/rapid.py:1851
 msgid "Rename"
 msgstr ""
 
-#: ../raphodo/rapid.py:1810
+#: ../raphodo/rapid.py:1853
 msgid "Back Up"
 msgstr ""
 
 #. Devices Header and View
-#: ../raphodo/rapid.py:1926
+#: ../raphodo/rapid.py:1977
 msgid ""
 "Turn on or off the use of devices attached to this computer as download "
 "sources"
 msgstr ""
 
 #. This Computer Header and View
-#: ../raphodo/rapid.py:1940
+#: ../raphodo/rapid.py:1994
 msgid ""
 "Turn on or off the use of a folder on this computer as a download source"
 msgstr ""
 
-#: ../raphodo/rapid.py:1941
+#: ../raphodo/rapid.py:1996
 msgid "This Computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:1952
+#: ../raphodo/rapid.py:2009
 msgid "Select a source folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:1975
+#: ../raphodo/rapid.py:2038
 msgid "Projected Storage Use"
 msgstr ""
 
-#: ../raphodo/rapid.py:1989 ../raphodo/rapid.py:1997
+#: ../raphodo/rapid.py:2056 ../raphodo/rapid.py:2068
 msgid "Select a destination folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:2045
+#: ../raphodo/rapid.py:2117
 msgid "All"
 msgstr ""
 
-#: ../raphodo/rapid.py:2046
+#: ../raphodo/rapid.py:2118
 msgid "New"
 msgstr ""
 
-#: ../raphodo/rapid.py:2048
+#: ../raphodo/rapid.py:2120
 msgid "Show:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2051
+#: ../raphodo/rapid.py:2123
 msgid "Modification Time"
 msgstr ""
 
-#: ../raphodo/rapid.py:2052
+#: ../raphodo/rapid.py:2124
 msgid "Checked State"
 msgstr ""
 
-#: ../raphodo/rapid.py:2055
+#: ../raphodo/rapid.py:2127
 msgid "File Type"
 msgstr ""
 
-#: ../raphodo/rapid.py:2056
+#: ../raphodo/rapid.py:2128
 msgid "Device"
 msgstr "جهاز"
 
-#: ../raphodo/rapid.py:2058
+#: ../raphodo/rapid.py:2130
 msgid "Sort:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2069
+#: ../raphodo/rapid.py:2141
 msgid "Select All:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2311
+#: ../raphodo/rapid.py:2405
 #, python-format
 msgid "Download %(files)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2327
+#: ../raphodo/rapid.py:2421
 msgid "Resume Download"
 msgstr ""
 
-#: ../raphodo/rapid.py:2329
+#: ../raphodo/rapid.py:2423
 msgid "Pause"
 msgstr "إيقاف"
 
-#: ../raphodo/rapid.py:2417
+#: ../raphodo/rapid.py:2511
 #, python-brace-format
 msgid ""
 "Please report the problem at <a href=\"{website}\">{website}</a>.<br><br>\n"
@@ -2857,11 +3439,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/rapid.py:2431
+#: ../raphodo/rapid.py:2525
 msgid "Thank you for reporting a problem in Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:2529
+#: ../raphodo/rapid.py:2624
 #, python-format
 msgid ""
 "<b>Changing This Computer source path</b><br><br>Do you really want to "
@@ -2870,30 +3452,29 @@ msgid ""
 "from This Computer will be cancelled."
 msgstr ""
 
-#: ../raphodo/rapid.py:2595
+#: ../raphodo/rapid.py:2694
 msgid "You cannot change the download destination while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:2604
+#: ../raphodo/rapid.py:2704
 #, python-format
 msgid ""
 "<b>Confirm Download Destination</b><br><br>Are you sure you want to set the "
 "%(file_type)s download destination to %(path)s?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2682
+#: ../raphodo/rapid.py:2785
 msgid ""
+"\n"
 "<b>Downloading all files</b><br><br>\n"
-"                    A download always includes all files that are checked "
-"for download,\n"
-"                    including those that are not currently displayed because "
-"the Timeline\n"
-"                    is being used or because only new files are being shown."
-"<br><br>\n"
-"                    Do you want to proceed with the download?"
+"A download always includes all files that are checked for download,\n"
+"including those that are not currently displayed because the Timeline\n"
+"is being used or because only new files are being shown.<br><br>\n"
+"Do you want to proceed with the download?\n"
+"                        "
 msgstr ""
 
-#: ../raphodo/rapid.py:2820
+#: ../raphodo/rapid.py:2937
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -2904,7 +3485,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: ../raphodo/rapid.py:2824
+#: ../raphodo/rapid.py:2940
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -2913,199 +3494,193 @@ msgstr ""
 "مجلد التنزيل هذا غير صحيح: \n"
 "%s"
 
-#: ../raphodo/rapid.py:2827
+#: ../raphodo/rapid.py:2943
 msgid "Download Failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:2828
+#: ../raphodo/rapid.py:2944
 msgid "The download cannot proceed."
 msgstr ""
 
-#: ../raphodo/rapid.py:2842
+#: ../raphodo/rapid.py:2962
 msgid ""
 "Photos and videos will not be backed up because there is nowhere to back "
 "them up. Do you still want to start the download?"
 msgstr ""
 
-#. Translators: filetype will be replaced with 'photos' or 'videos'
-#: ../raphodo/rapid.py:2847 ../raphodo/rapid.py:2854
+#: ../raphodo/rapid.py:2969 ../raphodo/rapid.py:2979
 #, python-format
 msgid ""
 "No backup device exists for backing up %(filetype)s. Do you still want to "
 "start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2848 ../raphodo/rpdfile.py:228
+#: ../raphodo/rapid.py:2971 ../raphodo/rpdfile.py:228
 msgid "photos"
 msgstr "صور"
 
-#: ../raphodo/rapid.py:2855 ../raphodo/rpdfile.py:223
+#: ../raphodo/rapid.py:2981 ../raphodo/rpdfile.py:223
 msgid "videos"
 msgstr "فيديو"
 
-#: ../raphodo/rapid.py:2861
+#: ../raphodo/rapid.py:2989
 msgid ""
 "<b>The photo and video backup destinations do not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2869 ../raphodo/rapid.py:2876
+#: ../raphodo/rapid.py:2999 ../raphodo/rapid.py:3008
 #, python-format
 msgid ""
 "<b>The %(filetype)s backup destination does not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2871 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:818
+#: ../raphodo/rapid.py:3001 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:843
 msgid "photo"
 msgstr "صورة"
 
-#: ../raphodo/rapid.py:2878 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:858
+#: ../raphodo/rapid.py:3010 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:883
 msgid "video"
 msgstr "فيديو"
 
-#: ../raphodo/rapid.py:2886
+#: ../raphodo/rapid.py:3018
 msgid "Backup problem"
 msgstr ""
 
-#. Translators - in the middle is a unicode em dash - please retain it
-#. This string is displayed in the status bar when the download is running
-#: ../raphodo/rapid.py:3571
+#: ../raphodo/rapid.py:3756
 #, python-format
 msgid "%(downloading_from)s — %(time_left)s left (%(speed)s)"
 msgstr ""
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3640
+#: ../raphodo/rapid.py:3828
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s تم تنزيلها"
 
-#. Translators: e.g. 2 videos failed to download
-#: ../raphodo/rapid.py:3645
+#: ../raphodo/rapid.py:3836
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "%(noFiles)s %(filetypes)s فشل تنزيلها"
 
-#: ../raphodo/rapid.py:3650 ../raphodo/rapid.py:3723
+#: ../raphodo/rapid.py:3842 ../raphodo/rapid.py:3927
 msgid "warnings"
 msgstr "تحذير"
 
-#: ../raphodo/rapid.py:3679
+#: ../raphodo/rapid.py:3873
 msgid "All downloads complete"
 msgstr "كل التنزيلات أكتملت"
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3686 ../raphodo/rapid.py:3695 ../raphodo/rapid.py:3704
-#: ../raphodo/rapid.py:3713 ../raphodo/rapid.py:3721
+#: ../raphodo/rapid.py:3881 ../raphodo/rapid.py:3892 ../raphodo/rapid.py:3903
+#: ../raphodo/rapid.py:3914 ../raphodo/rapid.py:3924
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: ../raphodo/rapid.py:3688 ../raphodo/rapid.py:3706
+#: ../raphodo/rapid.py:3884 ../raphodo/rapid.py:3906
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s نوع تم تنزيلها"
 
-#: ../raphodo/rapid.py:3697 ../raphodo/rapid.py:3715
+#: ../raphodo/rapid.py:3895 ../raphodo/rapid.py:3917
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "%(filetype)s نوع فشل تنزيلها"
 
-#: ../raphodo/rapid.py:3742
+#: ../raphodo/rapid.py:3950
 msgid "1 failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:3744
+#: ../raphodo/rapid.py:3952
 #, python-format
 msgid "%d failures"
 msgstr ""
 
-#: ../raphodo/rapid.py:3749
+#: ../raphodo/rapid.py:3957
 msgid "1 warning"
 msgstr ""
 
-#: ../raphodo/rapid.py:3751
+#: ../raphodo/rapid.py:3959
 #, python-format
 msgid "%d warnings"
 msgstr ""
 
-#: ../raphodo/rapid.py:3771
+#: ../raphodo/rapid.py:3981
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3774
+#: ../raphodo/rapid.py:3985
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3779
+#: ../raphodo/rapid.py:3989
 #, python-format
 msgid "No files downloaded — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3781
+#: ../raphodo/rapid.py:3991
 msgid "No files downloaded"
 msgstr ""
 
-#: ../raphodo/rapid.py:3805
+#: ../raphodo/rapid.py:4021
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3809
+#: ../raphodo/rapid.py:4026
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3812
+#: ../raphodo/rapid.py:4031
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3820
+#: ../raphodo/rapid.py:4039
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3833
+#: ../raphodo/rapid.py:4052
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3837
+#: ../raphodo/rapid.py:4056
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3841
+#: ../raphodo/rapid.py:4060
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices"
 msgstr ""
 
-#: ../raphodo/rapid.py:3867
+#: ../raphodo/rapid.py:4087
 msgid "The Destination subfolders and Timeline have been rebuilt"
 msgstr ""
 
-#: ../raphodo/rapid.py:3922
+#: ../raphodo/rapid.py:4144
 msgid "Program preferences are invalid"
 msgstr "خيارات البرنامج غير صحيحة"
 
-#: ../raphodo/rapid.py:3999
+#: ../raphodo/rapid.py:4228
 #, python-format
 msgid ""
 "<b>All files on the %(camera)s are inaccessible</b>.<br><br>It may be locked "
@@ -3115,179 +3690,205 @@ msgid ""
 "ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4008
+#: ../raphodo/rapid.py:4239
 #, python-format
 msgid ""
-"<b>The %(camera)s appears to be in use by another application.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again.<br><br>Alternatively, you can ignore this "
-"device."
+"<b>The %(camera)s appears to be in use by another "
+"application.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again.<br><br>Alternatively, you "
+"can ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4019
+#: ../raphodo/rapid.py:4250
 msgid "&Try Again"
 msgstr ""
 
-#: ../raphodo/rapid.py:4020
+#: ../raphodo/rapid.py:4251
 msgid "&Ignore This Device"
 msgstr ""
 
-#: ../raphodo/rapid.py:4086
+#: ../raphodo/rapid.py:4323
 #, python-format
 msgid "Sorry, an unexpected problem occurred while scanning %s."
 msgstr ""
 
-#: ../raphodo/rapid.py:4087
+#: ../raphodo/rapid.py:4324
 msgid "Unfortunately you cannot download from this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4091
+#: ../raphodo/rapid.py:4328
 msgid ""
 "A possible workaround for the problem might be downloading from the camera's "
 "memory card using a card reader."
 msgstr ""
 
-#: ../raphodo/rapid.py:4096
+#: ../raphodo/rapid.py:4333
 msgid "Device scan failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:4472
+#: ../raphodo/rapid.py:4720
 #, python-format
 msgid ""
-"<b>The %(camera)s cannot be scanned because it cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again."
+"<b>The %(camera)s cannot be scanned because it cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again."
 msgstr ""
 
-#: ../raphodo/rapid.py:4496
+#: ../raphodo/rapid.py:4745
 #, python-format
 msgid ""
-"<b>The download cannot start because the %(camera)s cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again, and choose which files you want to "
-"download from it."
+"<b>The download cannot start because the %(camera)s cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again, and choose which files "
+"you want to download from it."
+msgstr ""
+
+#: ../raphodo/rapid.py:4842
+msgid "Completed Downloads Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4844
+#, python-format
+msgid "%s whose download have completed are displayed."
 msgstr ""
 
-#: ../raphodo/rapid.py:4635
+#: ../raphodo/rapid.py:4846
+msgid "Do you want to clear the completed downloads?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4848
+msgid "Completed Download Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4850
+#, python-format
+msgid "%s whose download has completed is displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4852
+msgid "Do you want to clear the completed download?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4933
 #, python-format
 msgid ""
 "Do you want to download photos and videos from the device <i>%(device)s</i>?"
 msgstr ""
 
-#: ../raphodo/rapid.py:4877
+#: ../raphodo/rapid.py:5183
 #, python-format
 msgid "<b>Do you want to ignore the %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4879
+#: ../raphodo/rapid.py:5186
 msgid ""
 "All cameras, phones and tablets with the same model name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:4883
+#: ../raphodo/rapid.py:5190
 #, python-format
 msgid ""
 "<b>Do you want to ignore the device %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4885
+#: ../raphodo/rapid.py:5192
 msgid "Any device with the same name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:5178
+#: ../raphodo/rapid.py:5492
 #, python-format
 msgid "Downloading from %(location)s on This Computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5180
+#: ../raphodo/rapid.py:5496
 msgid ""
 "Do you really want to download from here?<br><br>On some systems, scanning "
 "this location can take a very long time."
 msgstr ""
 
-#: ../raphodo/rapid.py:5224
+#: ../raphodo/rapid.py:5537
 #, python-format
 msgid "Generating thumbnails for %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5227
+#: ../raphodo/rapid.py:5540
 #, python-format
 msgid "Scanning %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5237
+#: ../raphodo/rapid.py:5551
 #, python-format
 msgid ""
 "%(number)s of %(available files)s checked for download (%(hidden)s hidden)"
 msgstr ""
 
-#: ../raphodo/rapid.py:5243
+#: ../raphodo/rapid.py:5559
 #, python-format
 msgid "%(number)s of %(available files)s checked for download"
 msgstr ""
 
-#: ../raphodo/rapid.py:5494
+#: ../raphodo/rapid.py:5764
 msgid "Display program information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5496
+#: ../raphodo/rapid.py:5766
 msgid "Display debugging information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5499
+#: ../raphodo/rapid.py:5769
 msgid "List photo and video file extensions the program recognizes and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5502
+#: ../raphodo/rapid.py:5772
 msgid "Turn on or off the the renaming of photos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5504
+#: ../raphodo/rapid.py:5774
 msgid "turn on or off the the renaming of videos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5506
+#: ../raphodo/rapid.py:5776
 msgid ""
 "Turn on or off the automatic detection of devices from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5510
+#: ../raphodo/rapid.py:5780
 msgid "Turn on or off downloading from this computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5512 ../raphodo/rapid.py:5515 ../raphodo/rapid.py:5518
-#: ../raphodo/rapid.py:5539 ../raphodo/rapid.py:5543
+#: ../raphodo/rapid.py:5782 ../raphodo/rapid.py:5785 ../raphodo/rapid.py:5788
+#: ../raphodo/rapid.py:5809 ../raphodo/rapid.py:5813
 msgid "PATH"
 msgstr ""
 
-#: ../raphodo/rapid.py:5513
+#: ../raphodo/rapid.py:5783
 msgid "The PATH on this computer from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5516
+#: ../raphodo/rapid.py:5786
 msgid "The PATH where photos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5519
+#: ../raphodo/rapid.py:5789
 msgid "The PATH where videos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5521
+#: ../raphodo/rapid.py:5791
 msgid "Turn on or off the backing up of photos and videos while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:5525
+#: ../raphodo/rapid.py:5795
 msgid "Turn on or off the automatic detection of backup devices."
 msgstr ""
 
-#: ../raphodo/rapid.py:5527 ../raphodo/rapid.py:5533
+#: ../raphodo/rapid.py:5797 ../raphodo/rapid.py:5803
 msgid "FOLDER"
 msgstr ""
 
-#: ../raphodo/rapid.py:5528
+#: ../raphodo/rapid.py:5798
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected photo "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3295,7 +3896,7 @@ msgid ""
 "photos up to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5534
+#: ../raphodo/rapid.py:5804
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected video "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3303,115 +3904,124 @@ msgid ""
 "up videos to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5540
+#: ../raphodo/rapid.py:5810
 msgid ""
 "The PATH where photos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5544
+#: ../raphodo/rapid.py:5814
 msgid ""
 "The PATH where videos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5547
+#: ../raphodo/rapid.py:5817
 #, python-format
 msgid "Ignore photos with the following extensions: %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5551
-msgid "Turn on or off starting downloads as soon as the program itself starts."
+#: ../raphodo/rapid.py:5821
+msgid ""
+"Turn on or off starting downloads as soon as the program itself starts."
 msgstr ""
 
-#: ../raphodo/rapid.py:5554
+#: ../raphodo/rapid.py:5824
 msgid "Turn on or off starting downloads as soon as a device is inserted."
 msgstr ""
 
-#: ../raphodo/rapid.py:5557
+#: ../raphodo/rapid.py:5827
 msgid ""
 "Turn on or off use of the Rapid Photo Downloader Thumbnail Cache. Turning it "
 "off does not delete existing cache contents."
 msgstr ""
 
-#: ../raphodo/rapid.py:5561
+#: ../raphodo/rapid.py:5831
 msgid ""
 "Delete all thumbnails in the Rapid Photo Downloader Thumbnail Cache, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5565
+#: ../raphodo/rapid.py:5835
 msgid "Forget which files have been previously downloaded, and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5568
+#: ../raphodo/rapid.py:5838
 msgid ""
 "Import preferences from an old program version and exit. Requires the "
 "command line program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5571
+#: ../raphodo/rapid.py:5841
 msgid ""
 "Reset all program settings to their default values, delete all thumbnails in "
 "the Thumbnail cache, forget which files have been previously downloaded, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5575
+#: ../raphodo/rapid.py:5845
 msgid "Include gphoto2 debugging information in log files."
 msgstr ""
 
-#: ../raphodo/rapid.py:5579
+#: ../raphodo/rapid.py:5849
 msgid "Print information to the terminal about attached cameras and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5640
+#: ../raphodo/rapid.py:5911
 msgid ""
 "To import preferences from the old version of Rapid Photo Downloader, you "
 "must install the program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5649
+#: ../raphodo/rapid.py:5920
 msgid "No prior program preferences detected: exiting"
 msgstr ""
 
-#: ../raphodo/rapid.py:5652
+#: ../raphodo/rapid.py:5923
 #, python-format
 msgid "Importing preferences from Rapid Photo Downloader %(version)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5714
+#: ../raphodo/rapid.py:5989
 #, python-format
-msgid "Do you want to copy the stored sequence number, which has the value %d?"
+msgid ""
+"Do you want to copy the stored sequence number, which has the value %d?"
 msgstr ""
 
-#: ../raphodo/rapid.py:5726
+#: ../raphodo/rapid.py:6000
 msgid "Program aborting."
 msgstr ""
 
-#: ../raphodo/rapid.py:5736
+#: ../raphodo/rapid.py:6010
 msgid "Never run this program as the sudo / root user."
 msgstr ""
 
-#: ../raphodo/rapid.py:5740
+#: ../raphodo/rapid.py:6014
 msgid "You must install ExifTool to run Rapid Photo Downloader."
 msgstr ""
 
-#: ../raphodo/rapid.py:5794
+#: ../raphodo/rapid.py:6026
+msgid ""
+"Rapid Photo Downloader is installed in multiple locations.\n"
+"\n"
+"Uninstall all copies except the version you want to run."
+msgstr ""
+
+#: ../raphodo/rapid.py:6083
 msgid ""
 "When specifying a path on the command line, do not also specify an\n"
 "option for device auto detection or a path on \"This Computer\"."
 msgstr ""
 
-#: ../raphodo/rapid.py:5950
+#: ../raphodo/rapid.py:6243
 msgid "All settings and caches have been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5958
+#: ../raphodo/rapid.py:6251
 msgid "Thumbnail Cache has been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5964
+#: ../raphodo/rapid.py:6257
 msgid "Remembered files have been forgotten"
 msgstr ""
 
@@ -3427,15 +4037,15 @@ msgstr ""
 msgid "&Don't warn me again about missing or broken program libraries"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:546
+#: ../raphodo/renameandmovefile.py:554
 msgid "subfolder and filename"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:548
+#: ../raphodo/renameandmovefile.py:556
 msgid "filename"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:550
+#: ../raphodo/renameandmovefile.py:558
 msgid "subfolder"
 msgstr ""
 
@@ -3515,160 +4125,237 @@ msgstr "صور وفيديو"
 msgid "photos or videos"
 msgstr "صور وفيديو"
 
-#: ../raphodo/rpdfile.py:306
+#: ../raphodo/rpdfile.py:315
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:318
+#. translators: natural language expression signifying a single video
+#: ../raphodo/rpdfile.py:337
+msgid "a video"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:339
 msgid "1 Video"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:323
+#. translators: natural language expression signifying a single photo
+#: ../raphodo/rpdfile.py:346
+msgid "a photo"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:348
 msgid "1 Photo"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:803
+#: ../raphodo/rpdfile.py:828
 #, python-format
 msgid "%(path)s on %(camera)s"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:819
+#: ../raphodo/rpdfile.py:844
 msgid "Photo"
 msgstr "صورة"
 
-#: ../raphodo/rpdfile.py:859
+#: ../raphodo/rpdfile.py:884
 msgid "Video"
 msgstr "مقطع فيديو"
 
-#: ../raphodo/storage.py:138
+#: ../raphodo/storage.py:141
 msgid "File system root"
 msgstr ""
 
 #. translators: the name of the Pictures folder
-#: ../raphodo/storage.py:433
+#: ../raphodo/storage.py:437
 msgid "Pictures"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:426
+#: ../raphodo/thumbnaildisplay.py:432
 #, python-format
 msgid "Taken on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:431
+#: ../raphodo/thumbnaildisplay.py:439
 #, python-format
 msgid "Modified on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:437 ../raphodo/thumbnaildisplay.py:466
+#: ../raphodo/thumbnaildisplay.py:447 ../raphodo/thumbnaildisplay.py:481
 #, python-format
 msgid "%(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:451
+#: ../raphodo/thumbnaildisplay.py:464
 #, python-format
 msgid "Memory cards: %s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:457
+#: ../raphodo/thumbnaildisplay.py:468
+#, python-format
+msgid "Memory card: %s"
+msgstr ""
+
+#: ../raphodo/thumbnaildisplay.py:473
 msgid "Downloaded as:"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:472
+#: ../raphodo/thumbnaildisplay.py:489
 #, python-format
 msgid "<br><br>Previous download:<br>%(filename)s<br>%(path)s<br>%(date)s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:1603
+#: ../raphodo/thumbnaildisplay.py:1645
 msgid "Copy Path"
 msgstr ""
 
+#. Translators: these values are file size suffixes like B representing bytes, KB representing
+#. kilobytes, etc.
+#: ../raphodo/utilities.py:170
+msgid "B"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "KB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "MB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "GB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "TB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "PB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "EB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "ZB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "YB"
+msgstr ""
+
 #. two things in a list e.g. "device1 and device2"
-#: ../raphodo/utilities.py:391
+#: ../raphodo/utilities.py:394
 #, python-format
 msgid "%(first_item)s and %(last_item)s"
 msgstr ""
 
-#: ../raphodo/utilities.py:464
+#: ../raphodo/utilities.py:468
 msgid "one"
 msgstr ""
 
-#: ../raphodo/utilities.py:465
+#: ../raphodo/utilities.py:469
 msgid "two"
 msgstr ""
 
-#: ../raphodo/utilities.py:466
+#: ../raphodo/utilities.py:470
 msgid "three"
 msgstr ""
 
-#: ../raphodo/utilities.py:467
+#: ../raphodo/utilities.py:471
 msgid "four"
 msgstr ""
 
-#: ../raphodo/utilities.py:468
+#: ../raphodo/utilities.py:472
 msgid "five"
 msgstr ""
 
-#: ../raphodo/utilities.py:469
+#: ../raphodo/utilities.py:473
 msgid "six"
 msgstr ""
 
-#: ../raphodo/utilities.py:470
+#: ../raphodo/utilities.py:474
 msgid "seven"
 msgstr ""
 
-#: ../raphodo/utilities.py:471
+#: ../raphodo/utilities.py:475
 msgid "eight"
 msgstr ""
 
-#: ../raphodo/utilities.py:472
+#: ../raphodo/utilities.py:476
 msgid "nine"
 msgstr ""
 
-#: ../raphodo/utilities.py:473
+#: ../raphodo/utilities.py:477
 msgid "ten"
 msgstr ""
 
-#: ../raphodo/utilities.py:474
+#: ../raphodo/utilities.py:478
 msgid "eleven"
 msgstr ""
 
-#: ../raphodo/utilities.py:475
+#: ../raphodo/utilities.py:479
 msgid "twelve"
 msgstr ""
 
-#: ../raphodo/utilities.py:476
+#: ../raphodo/utilities.py:480
 msgid "thirteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:477
+#: ../raphodo/utilities.py:481
 msgid "fourteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:478
+#: ../raphodo/utilities.py:482
 msgid "fifteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:479
+#: ../raphodo/utilities.py:483
 msgid "sixteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:480
+#: ../raphodo/utilities.py:484
 msgid "seventeen"
 msgstr ""
 
-#: ../raphodo/utilities.py:481
+#: ../raphodo/utilities.py:485
 msgid "eighteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:482
+#: ../raphodo/utilities.py:486
 msgid "ninenteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:483
+#: ../raphodo/utilities.py:487
 msgid "twenty"
 msgstr ""
 
+#: ../raphodo/viewutils.py:240
+msgid "&OK"
+msgstr ""
+
+#: ../raphodo/viewutils.py:243
+msgid "&Save"
+msgstr ""
+
+#: ../raphodo/viewutils.py:244
+msgid "&Help"
+msgstr ""
+
+#: ../raphodo/viewutils.py:245
+msgid "Restore Defaults"
+msgstr ""
+
+#: ../raphodo/viewutils.py:246
+msgid "&Yes"
+msgstr ""
+
+#: ../raphodo/viewutils.py:247
+msgid "&No"
+msgstr ""
+
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:1
 msgid ""
 "Rapid Photo Downloader imports photos and videos from cameras, phones, "
@@ -3722,8 +4409,8 @@ msgstr ""
 #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:5
 msgid ""
-"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;"
-"memory;card;"
+"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;memory"
+";card;"
 msgstr ""
 
 #: ../data/kde/net.damonlynch.rapid-photo-downloader.desktop.in.h:1
@@ -3739,6 +4426,7 @@ msgstr ""
 #~ msgid "scanning..."
 #~ msgstr "جاري المسح ..."
 
+#, python-format
 #~ msgid "About %i seconds remaining"
 #~ msgstr "تبقى حوالي %i ثانية"
 
@@ -3755,12 +4443,14 @@ msgstr ""
 #~ "هل فعلا تريد التنزيل من هنا؟ في بعض الانظمة, مسح هذا المكان يستغرق وقتا "
 #~ "طويلا جدا."
 
+#, python-format
 #~ msgid "Downloading from %(location)s."
 #~ msgstr "تنزيل من %(location)s"
 
 #~ msgid "Download cannot proceed"
 #~ msgstr "لا يمكن بدء التنزيل"
 
+#, python-format
 #~ msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 #~ msgstr "تبقى حوالي %(minutes)i:%(seconds)02i دقيقة"
 
@@ -3773,12 +4463,15 @@ msgstr ""
 #~ msgid "Auto Detect"
 #~ msgstr "اكتشاف تلقائي"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s"
 #~ msgstr "%(number)s من %(total)s من الـ %(filetypes)s"
 
+#, python-format
 #~ msgid "Select a folder containing %(file_types)s"
 #~ msgstr "اختر مجلد يحتوى %(file_types)s"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 #~ msgstr ""
 #~ "اكتمل %(number)s  من %(total)s من نوع %(filetypes)s (تبقى %(remaining)s)"
@@ -3816,49 +4509,60 @@ msgstr ""
 #~ msgid "."
 #~ msgstr "."
 
+#, python-format
 #~ msgid "%(free)s free"
 #~ msgstr "%(free)s خالية"
 
+#, python-format
 #~ msgid "Backing up photos to %(path)s and videos to %(path2)s"
 #~ msgstr ""
 #~ "جاري أرشفة الصور الى المسار %(path)s ومقاطع الفيديو الى المسار %(path2)s"
 
+#, python-format
 #~ msgid "Backing up photos and videos to %(path)s"
 #~ msgstr "جاري ارشفة الصور ومقاطع الفيديو الى المسار  %(path)s"
 
+#, python-format
 #~ msgid "Backing up to %(path)s"
 #~ msgstr "جاري الارشفة الى المسار  %(path)s"
 
 #~ msgid "Free space:"
 #~ msgstr "المساحة الخالية:"
 
+#, python-format
 #~ msgid "%(freespace)s. %(backuppaths)s."
 #~ msgstr "%(freespace)s. %(backuppaths)s."
 
+#, python-format
 #~ msgid "(%(file_type)s)"
 #~ msgstr "(%(file_type)s)"
 
+#, python-format
 #~ msgid "%(free)s %(file_type)s"
 #~ msgstr "%(free)s %(file_type)s"
 
+#, python-format
 #~ msgid "%(file_type)s download folder is not writable"
 #~ msgstr "مجلد التنزيل لـ %(file_type)s لا يمكن الكتابة فيه"
 
+#, python-format
 #~ msgid "Folder: %s"
 #~ msgstr "مجلد: %s"
 
+#, python-format
 #~ msgid "%(file_type)s download folder is invalid"
 #~ msgstr "مجلد التنزيل لـ %(file_type)s غير صحيح"
 
+#, python-format
 #~ msgid "%(file_type)s download folder does not exist"
 #~ msgstr "مجلد التنزيل لـ %(file_type)s غير موجود"
 
+#, python-format
 #~ msgid ""
 #~ "display program information on the command line as the program runs "
 #~ "(default: %default)"
 #~ msgstr ""
-#~ "اعرض معلومات البرنامج على سطر الأوامر خلال عمل البرنامج (الافتراضي: "
-#~ "%default)"
+#~ "اعرض معلومات البرنامج على سطر الأوامر خلال عمل البرنامج (الافتراضي: %default)"
 
 #~ msgid "display debugging information when run from the command line"
 #~ msgstr "اعرض معلومات التدقيق (ديبوق) عند العمل من سطر الأوامر"
@@ -3867,8 +4571,8 @@ msgstr ""
 #~ "Error: specify device auto-detection or manually specify a device's path "
 #~ "from which to download, but do not do both."
 #~ msgstr ""
-#~ "خطأ: اختر كشف جهاز التنزيل تلقائيا أو حدد مسار جهاز التنزيل يدويا, ولا "
-#~ "تختار الاثنين معا."
+#~ "خطأ: اختر كشف جهاز التنزيل تلقائيا أو حدد مسار جهاز التنزيل يدويا, ولا تختار "
+#~ "الاثنين معا."
 
 #~ msgid "reset all program settings and preferences and exit"
 #~ msgstr "استعد كل اعدادات البرنامج الافتراضية واغلق"
@@ -3877,12 +4581,13 @@ msgstr ""
 #~ msgstr "كل الاعدادات والخيارات تم استعادتها للافتراضي"
 
 #~ msgid "list photo and video file extensions the program recognizes and exit"
-#~ msgstr ""
-#~ "اعرض امتدادات الصور ومقاطع الفيديوات التي يتعرف عليها البرنامج واغلق"
+#~ msgstr "اعرض امتدادات الصور ومقاطع الفيديوات التي يتعرف عليها البرنامج واغلق"
 
+#, python-format
 #~ msgid "Destination directory could not be created: %(directory)s\n"
 #~ msgstr "لم نستطع إنشاء المجلد الهدف: %(directory)s\n"
 
+#, python-format
 #~ msgid "and %s"
 #~ msgstr "و  %s"
 
@@ -3890,8 +4595,8 @@ msgstr ""
 #~ msgstr "فقط اخرج الأخطاء الى سطر الأوامر"
 
 #~ msgid ""
-#~ "manually specify the PATH of the device from which to download, "
-#~ "overwriting existing program preferences"
+#~ "manually specify the PATH of the device from which to download, overwriting "
+#~ "existing program preferences"
 #~ msgstr "حدد مسار جهاز التنزيل يدويا, وتخطى بذلك الاعدادات الحالية للبرنامج"
 
 #~ msgid ""
@@ -3909,6 +4614,7 @@ msgstr ""
 #~ msgstr ""
 #~ "هل تريد استخدام هذا الجهاز أو جزء القرص الصلب لإستيراد صور ومقاطع فيديو؟"
 
+#, python-format
 #~ msgid ""
 #~ "%(problem)s\n"
 #~ "File: %(file)s"
@@ -3922,6 +4628,7 @@ msgstr ""
 #~ msgid "MB/s"
 #~ msgstr "م.بايت/ث"
 
+#, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
 #~ "Destination: %(destination)s"
@@ -3932,6 +4639,7 @@ msgstr ""
 #~ msgid "_Remember this choice"
 #~ msgstr "تذكر هذا الخيار"
 
+#, python-format
 #~ msgid "Error: %(inst)s"
 #~ msgstr "خطأ: %(inst)s"
 
diff --git a/po/be.po b/po/be.po
index 6a22af9..ee98922 100644
--- a/po/be.po
+++ b/po/be.po
@@ -7,35 +7,386 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: damonlynch@gmail.com\n"
-"POT-Creation-Date: 2017-07-08 19:16-0500\n"
-"PO-Revision-Date: 2017-07-04 11:06+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2017-09-12 17:01-0400\n"
+"PO-Revision-Date: 2017-09-13 18:34+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: Belarusian <be@li.org>\n"
-"Language: be\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-07-05 23:04+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-09-26 22:04+0000\n"
+"X-Generator: Launchpad (build 18463)\n"
+"Language: be\n"
+
+#: ../install.py:65
+msgid "Rapid Photo Downloader installer"
+msgstr ""
+
+#: ../install.py:66
+msgid "Download and install latest version of Rapid Photo Downloader."
+msgstr ""
+
+#: ../install.py:236 ../install.py:1732
+msgid "Installer not found:"
+msgstr ""
+
+#. Translators: do not translate the term tar.gz
+#: ../install.py:240 ../install.py:1736
+msgid "Installer not in tar.gz format:"
+msgstr ""
+
+#: ../install.py:465
+msgid ""
+"Incorrect folder ownership detected. Changing ownership of and resetting "
+"permissions for"
+msgstr ""
+
+#: ../install.py:540
+msgid "The following command will be run:"
+msgstr ""
+
+#: ../install.py:543 ../install.py:1479 ../install.py:1484
+msgid "sudo may prompt you for the sudo password."
+msgstr ""
+
+#: ../install.py:547
+msgid "Would you like to run the command now?"
+msgstr ""
+
+#: ../install.py:549
+msgid "Answer is not yes, exiting."
+msgstr ""
+
+#: ../install.py:559 ../install.py:751 ../install.py:966
+msgid "Command failed"
+msgstr ""
+
+#: ../install.py:561 ../install.py:752 ../install.py:967
+msgid "Exiting"
+msgstr ""
+
+#: ../install.py:582
+msgid "The Universe repository must be enabled."
+msgstr ""
+
+#: ../install.py:606
+msgid ""
+"Do you want to to uninstall the previous version of Rapid Photo Downloader:"
+msgstr ""
+
+#: ../install.py:715 ../install.py:740
+msgid ""
+"Querying package system to see if an older version of Rapid Photo Downloader "
+"is installed (this may take a while)..."
+msgstr ""
+
+#: ../install.py:726
+msgid ""
+"Unable to query package system. Please check your Internet connection and "
+"try again"
+msgstr ""
+
+#: ../install.py:756
+msgid "Checking if previous version installed with pip..."
+msgstr ""
+
+#: ../install.py:850
+msgid "The following package is unknown on your system: {}\n"
+msgstr ""
+
+#: ../install.py:857 ../install.py:929 ../install.py:974
+msgid ""
+"To continue, some packages required to run the application will be installed."
+msgstr ""
+
+#: ../install.py:886
+msgid "Querying installed and available packages (this may take a while)"
+msgstr ""
+
+#: ../install.py:958
+msgid ""
+"Querying zypper to see if any required packages are already installed (this "
+"may take a while)... "
+msgstr ""
+
+#: ../install.py:1004
+msgid "Query to confirm action at each step."
+msgstr ""
+
+#: ../install.py:1011
+msgid ""
+"When downloading the latest version, install the development version if it "
+"is newer than the stable version."
+msgstr ""
+
+#: ../install.py:1020
+msgid ""
+"Optional tar.gz Rapid Photo Downloader installer archive. If not specified, "
+"the latest version is downloaded from the Internet."
+msgstr ""
+
+#: ../install.py:1043
+msgid ""
+"Do not run the installer in the tar.gz Rapid Photo Downloader installer "
+"archive if it is newer than this version ({}). The default is to run "
+"whichever installer is newer."
+msgstr ""
+
+#: ../install.py:1050
+msgid ""
+"Uninstall Rapid Photo Downloader that was installed with pip, keeping its "
+"dependencies."
+msgstr ""
+
+#: ../install.py:1054
+msgid ""
+"Uninstall the dependencies installed by pip during Rapid Photo Downloader's "
+"installation, and Rapid Photo Downloader itself, then exit."
+msgstr ""
+
+#: ../install.py:1059
+msgid ""
+"Note: this will not uninstall any version of Rapid Photo Downloader "
+"installed by your Linux distribution's package manager."
+msgstr ""
+
+#: ../install.py:1066
+msgid ""
+"Dependencies will only be removed if they are not required by other programs."
+msgstr ""
+
+#: ../install.py:1072
+msgid ""
+"Note: this option will remove the dependencies regardless of whether they "
+"are required by another program pip has installed. Upgrade to pip 9.0 or "
+"above if you want to avoid this behavior. You can do so using the command "
+"'python3 -m pip install pip -U --user'. Also note that any version of Rapid "
+"Photo Downloader installed by your Linux distribution's package manager will "
+"not be uninstalled."
+msgstr ""
+
+#: ../install.py:1122
+msgid "Failed to download versions file"
+msgstr ""
+
+#: ../install.py:1126
+msgid "Got error code {} while accessing versions file"
+msgstr ""
+
+#: ../install.py:1234
+msgid ""
+"Sorry, could not locate installer. Please check your Internet connection and "
+"verify if you can reach https://www.damonlynch.net\n"
+"\n"
+"Exiting.\n"
+msgstr ""
+
+#: ../install.py:1408
+msgid "Installing application requirements..."
+msgstr ""
+
+#: ../install.py:1424
+msgid "Received error code"
+msgstr ""
+
+#: ../install.py:1425
+msgid "Failed to install application requirements: exiting"
+msgstr ""
+
+#: ../install.py:1428
+msgid "Installing application..."
+msgstr ""
+
+#: ../install.py:1441
+msgid "Failed to install application: exiting..."
+msgstr ""
+
+#: ../install.py:1465
+msgid ""
+"You may have to restart the computer to be able to run the program from the "
+"commmand line or application launcher."
+msgstr ""
+
+#: ../install.py:1476
+msgid "Do you want to install the application's man pages?"
+msgstr ""
+
+#: ../install.py:1477
+msgid "They will be installed into {}"
+msgstr ""
+
+#: ../install.py:1478 ../install.py:1483
+msgid "If you uninstall the application, remove these manpages yourself."
+msgstr ""
+
+#: ../install.py:1480
+msgid "Do want to install the man pages?"
+msgstr ""
+
+#: ../install.py:1482
+msgid "Installing man pages into {}"
+msgstr ""
+
+#: ../install.py:1499
+msgid "Failed to create man page directory: exiting"
+msgstr ""
+
+#: ../install.py:1511
+msgid "Failed to copy man page."
+msgstr ""
+
+#: ../install.py:1521
+msgid "(If a segmentation fault occurs at exit, you can ignore it...)"
+msgstr ""
+
+#: ../install.py:1534
+msgid ""
+"The python3 tool pip is required to uninstall a version of Rapid Photo "
+"Downloader that was installed with pip.\n"
+"Cannot continue. Exiting."
+msgstr ""
+
+#: ../install.py:1575
+msgid ""
+"Do not run this installer script as sudo / root user.\n"
+"Run it using the user who will run the program.\n"
+msgstr ""
+
+#: ../install.py:1585 ../install.py:1599
+msgid "Do not include any other command line arguments when specifying"
+msgstr ""
+
+#: ../install.py:1614
+msgid ""
+"Sorry, this installer does not support a custom python installation.\n"
+"Exiting..."
+msgstr ""
+
+#: ../install.py:1620
+msgid "Restarting script using system python..."
+msgstr ""
+
+#: ../install.py:1651
+msgid "Exiting..."
+msgstr ""
+
+#. Translators: do not translate the term python3-apt
+#: ../install.py:1670
+msgid "To continue, the package python3-apt must be installed."
+msgstr ""
+
+#: ../install.py:1689
+msgid ""
+"Install the following packages using your Linux distribution's standard "
+"package manager, and then rerun this installer"
+msgstr ""
+
+#: ../install.py:1698
+msgid ""
+"To run this program, programs to assist Python 3 and its package management "
+"must be installed."
+msgstr ""
+
+#. Translators: do not translate the terms Python 3, pip and setuptools
+#: ../install.py:1713
+msgid "Python 3's pip and setuptools must be upgraded for your user."
+msgstr ""
+
+#. Translators: do not translate the term python or requests
+#: ../install.py:1726
+msgid "Installing python requests"
+msgstr ""
+
+#: ../upgrade.py:79
+msgid "Upgrade Rapid Photo Downloader"
+msgstr ""
+
+#: ../upgrade.py:401 ../raphodo/viewutils.py:242
+msgid "&Cancel"
+msgstr ""
+
+#: ../upgrade.py:405
+msgid "&Upgrade"
+msgstr ""
+
+#: ../upgrade.py:410
+#, python-format
+msgid "Click the Upgrade button to upgrade to version %s."
+msgstr ""
+
+#: ../upgrade.py:413
+msgid "Click the Upgrade button to start the upgrade."
+msgstr ""
+
+#: ../upgrade.py:416 ../upgrade.py:422 ../raphodo/viewutils.py:241
+msgid "&Close"
+msgstr ""
+
+#: ../upgrade.py:417
+msgid "&Run"
+msgstr ""
+
+#: ../upgrade.py:447
+msgid "Close Rapid Photo Downloader before running this upgrade"
+msgstr ""
 
-#. type: QPushButton
-#: ../raphodo/aboutdialog.py:217
+#: ../upgrade.py:450
+msgid "Upgrade running..."
+msgstr ""
+
+#: ../upgrade.py:486
+#, python-format
+msgid ""
+"Successfully upgraded to %s. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:491
+msgid ""
+"Upgrade finished successfully. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:495
+msgid "Upgrade failed. Click Close to exit."
+msgstr ""
+
+#: ../upgrade.py:6967
+#, python-format
+msgid "Upgrading %s..."
+msgstr ""
+
+#: ../upgrade.py:6969
+msgid "Press any key to continue..."
+msgstr ""
+
+#: ../upgrade.py:6982
+msgid "Rapid Photo Downloader upgrade failed"
+msgstr ""
+
+#: ../upgrade.py:6984
+#, python-format
+msgid ""
+"The python package %s could not be updated. The upgrade cannot continue."
+msgstr ""
+
+#: ../raphodo/aboutdialog.py:225
 msgid "Credits"
 msgstr "Аўтары"
 
-#: ../raphodo/backuppanel.py:239
+#: ../raphodo/backuppanel.py:240
 msgid "Backups are not configured"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:241
+#: ../raphodo/backuppanel.py:242
 msgid "No backup devices detected"
 msgstr "Не знойдзены прылады для рэзервовых копій"
 
-#: ../raphodo/backuppanel.py:243
+#: ../raphodo/backuppanel.py:244
 msgid "Valid backup locations not yet specified"
 msgstr "Лакацыя рэзервовых копій не вызначана"
 
-#: ../raphodo/backuppanel.py:401
+#: ../raphodo/backuppanel.py:404
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
@@ -43,106 +394,115 @@ msgstr ""
 "Маецца магчымасць стварыць рэзервовую копію вашых фотаздымкаў  і відэа "
 "наўпрост падчас іх загрузкі, у тым ліку на вонкавыя цвёрдыя дыскі."
 
-#: ../raphodo/backuppanel.py:407
+#: ../raphodo/backuppanel.py:412
 msgid "Back up photos and videos when downloading"
 msgstr "Ствараць рэзервовыі копіі фотаздымкаў і відэа падчас загрузкі"
 
-#: ../raphodo/backuppanel.py:413
+#: ../raphodo/backuppanel.py:418
 msgid "Automatically detect backup devices"
 msgstr "Аўтаматычна вызначаць прыладу для рэзервовых копій"
 
-#: ../raphodo/backuppanel.py:417
+#: ../raphodo/backuppanel.py:424
 msgid ""
-"Specify the folder in which backups are stored on the device."
-"<br><br><i>Note: the presence of a folder with this name is used to "
+"Specify the folder in which backups are stored on the "
+"device.<br><br><i>Note: the presence of a folder with this name is used to "
 "determine if 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 folder names. By "
 "adding both folders, the same device can be used to back up both photos and "
 "videos.</i>"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:428
+#: ../raphodo/backuppanel.py:439
 msgid "Photo folder name:"
 msgstr "Назва папкі з фота:"
 
-#: ../raphodo/backuppanel.py:433
+#: ../raphodo/backuppanel.py:444
 msgid "Video folder name:"
 msgstr "Назва папкі з відэа:"
 
-#: ../raphodo/backuppanel.py:438 ../raphodo/nameeditor.py:883
+#: ../raphodo/backuppanel.py:449 ../raphodo/nameeditor.py:890
 #: ../raphodo/renamepanel.py:123
 msgid "Example:"
 msgstr "Прыклад:"
 
-#: ../raphodo/backuppanel.py:448
-msgid "If you disable automatic detection, choose the exact backup locations."
+#: ../raphodo/backuppanel.py:460
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
 
-#: ../raphodo/backuppanel.py:452
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:468
 msgid "Photo backup location:"
 msgstr "Лакацыя для рэзервовых копій фотаздымкаў:"
 
-#: ../raphodo/backuppanel.py:454
+#: ../raphodo/backuppanel.py:474
 msgid "Select Photo Backup Location"
 msgstr "Выбраць лакацыю рэзервовых копій фотаздымкаў"
 
-#: ../raphodo/backuppanel.py:460
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:485
 msgid "Video backup location:"
 msgstr "Лакацыя рэзервовых копій відэа:"
 
-#: ../raphodo/backuppanel.py:462
+#: ../raphodo/backuppanel.py:491
 msgid "Select Video Backup Location"
 msgstr "Выбраць лакацыю рэзервовых копій відэа"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:564
+#: ../raphodo/backuppanel.py:595
 msgid "drive1"
-msgstr ""
+msgstr "Дыск 1"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:567
+#: ../raphodo/backuppanel.py:598
 msgid "drive2"
-msgstr ""
+msgstr "Дыск 2"
 
-#: ../raphodo/backuppanel.py:628
+#: ../raphodo/backuppanel.py:663
 msgid "Projected Backup Storage Use"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:632
+#: ../raphodo/backuppanel.py:669
 msgid "Backup Options"
 msgstr "Налады рэзервовых копій"
 
 #. translators: refers to the video thumbnail file that some
 #. cameras generate -- it has a .THM file extension
-#: ../raphodo/copyfiles.py:476
+#: ../raphodo/copyfiles.py:491
 msgid "video THM"
-msgstr ""
+msgstr "мініятуры відэа"
 
-#: ../raphodo/copyfiles.py:482
+#: ../raphodo/copyfiles.py:497
 msgid "audio"
 msgstr "аўдыё"
 
 #: ../raphodo/destinationdisplay.py:78 ../raphodo/devicedisplay.py:1079
-#: ../raphodo/rpdfile.py:321
+#: ../raphodo/rpdfile.py:342
 #, python-format
 msgid "%(no_photos)s Photos"
 msgstr "%(no_photos)s фотаздымкаў"
 
 #: ../raphodo/destinationdisplay.py:82 ../raphodo/devicedisplay.py:1081
-#: ../raphodo/rpdfile.py:316
+#: ../raphodo/rpdfile.py:333
 #, python-format
 msgid "%(no_videos)s Videos"
 msgstr "%(no_videos)s відэа"
 
 #: ../raphodo/destinationdisplay.py:92
 msgid "Used"
-msgstr ""
+msgstr "Ужыта"
 
 #: ../raphodo/destinationdisplay.py:93
 msgid "Excess"
-msgstr ""
+msgstr "Перавышэнне"
 
 #: ../raphodo/destinationdisplay.py:102
 msgid "Device size unknown"
@@ -159,15 +519,15 @@ msgid "%(size_free)s free of %(size_total)s"
 msgstr "Свабодна %(size_free)s з %(size_total)s"
 
 #: ../raphodo/destinationdisplay.py:190 ../raphodo/devicedisplay.py:993
-#: ../raphodo/rapid.py:1964 ../raphodo/rapid.py:2079 ../raphodo/rapid.py:5753
-#: ../raphodo/rpdfile.py:905
+#: ../raphodo/rapid.py:2023 ../raphodo/rapid.py:2151 ../raphodo/rapid.py:6043
+#: ../raphodo/rpdfile.py:930
 msgid "Photos"
 msgstr "Фотаздымкі"
 
 #. translators: the name of the Videos folder
 #: ../raphodo/destinationdisplay.py:191 ../raphodo/devicedisplay.py:994
-#: ../raphodo/rapid.py:1967 ../raphodo/rapid.py:2080 ../raphodo/rapid.py:5754
-#: ../raphodo/rpdfile.py:933 ../raphodo/storage.py:445
+#: ../raphodo/rapid.py:2028 ../raphodo/rapid.py:2152 ../raphodo/rapid.py:6044
+#: ../raphodo/rpdfile.py:958 ../raphodo/storage.py:449
 msgid "Videos"
 msgstr "Відэа"
 
@@ -175,9 +535,9 @@ msgstr "Відэа"
 msgid "Projected storage use after download"
 msgstr ""
 
-#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:516
+#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:521
 msgid "Custom..."
-msgstr ""
+msgstr "Уласнае..."
 
 #: ../raphodo/destinationdisplay.py:678
 msgid "Configure photo subfolder creation"
@@ -193,7 +553,7 @@ msgstr "Іншае"
 
 #: ../raphodo/devicedisplay.py:984
 msgid "Probing device..."
-msgstr ""
+msgstr "Праверка прылады..."
 
 #: ../raphodo/devicedisplay.py:1000
 msgid "Temporarily ignore this device"
@@ -213,92 +573,130 @@ msgstr "Перасканаваць"
 msgid "%s full"
 msgstr "Запоўнена %s"
 
-#: ../raphodo/devices.py:459
+#: ../raphodo/devices.py:463
 msgid "Cameras"
 msgstr "Камеры"
 
-#: ../raphodo/devices.py:460 ../raphodo/devices.py:920
-#: ../raphodo/preferencedialog.py:85 ../raphodo/rapid.py:1927
+#: ../raphodo/devices.py:464 ../raphodo/devices.py:927
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/rapid.py:1979
 msgid "Devices"
 msgstr "Прылады"
 
-#: ../raphodo/devices.py:720
+#: ../raphodo/devices.py:724
 #, python-format
 msgid "Downloading from %(device_names)s"
 msgstr "Ідзе загрузка з %(device_names)s"
 
 #. Translators: e.g. Three Devices
-#: ../raphodo/devices.py:780
+#: ../raphodo/devices.py:784
 #, python-format
 msgid "%(no_devices)s %(device_type)s"
 msgstr ""
 
-#: ../raphodo/devices.py:905 ../raphodo/rapid.py:1764
+#: ../raphodo/devices.py:912 ../raphodo/rapid.py:1807
 msgid "Select Source"
 msgstr "Выбраць крыніцу"
 
-#: ../raphodo/devices.py:936 ../raphodo/devices.py:947
+#: ../raphodo/devices.py:943 ../raphodo/devices.py:954
 #, python-format
 msgid "%(device1)s + %(device2)s"
 msgstr ""
 
 #. Number of cameras e.g. 3 Cameras
-#: ../raphodo/devices.py:958
+#: ../raphodo/devices.py:965
 #, python-format
 msgid "%(no_cameras)s Cameras"
 msgstr "%(no_cameras)s камераў"
 
-#: ../raphodo/devices.py:963
+#: ../raphodo/devices.py:970
 #, python-format
 msgid "%(no_devices)s Devices"
 msgstr "%(no_devices)s прыладаў"
 
 #. Translators: two folder names, separated by a plus sign
-#: ../raphodo/devices.py:1258
+#: ../raphodo/devices.py:1265
 #, python-format
 msgid "%s + %s"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:44
+#: ../raphodo/didyouknow.py:45
 msgid "Click on a file's checkbox to mark or unmark it for download."
-msgstr ""
+msgstr "Націсніце на сцяжок файла, каб пазначыць яго для загрузкі"
 
-#: ../raphodo/didyouknow.py:50
+#: ../raphodo/didyouknow.py:51
 msgid ""
 "Files that have already been downloaded are remembered. You can still mark "
 "previously downloaded files to download again, but they are unchecked by "
 "default, and their thumbnails are dimmed so you can differentiate them from "
 "files that are yet to be downloaded."
 msgstr ""
+"Файлы, якія ўжо былі загружаныя запамінаюцца. Вы можаце зноў пазначыць ужо "
+"загружаныя файлы, але яны не пазначаных па змаўчанні, і іх мініяцюры "
+"выглядаюць больш цьмянымі, каб вы маглі адрозніць іх ад файлаў, якія яшчэ "
+"будуць загружаны."
 
-#: ../raphodo/didyouknow.py:59
+#: ../raphodo/didyouknow.py:60
 msgid ""
 "If more than one file is selected, they'll all take the mark of the file "
 "whose checkbox was clicked, regardless of whether they previously had a "
 "checkmark or not."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:67
+#: ../raphodo/didyouknow.py:68
 msgid ""
 "Click on a device's checkbox to quickly mark or unmark all its files for "
 "downloading."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:74
+#: ../raphodo/didyouknow.py:75
+msgid ""
+"After a download finishes, an icon replaces the thumbnail's checkbox. The "
+"icon's color indicates whether the download was successful (green), had file "
+"renaming problems (yellow/orange), or failed (red)."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:83
+msgid ""
+"\n"
+"            In case of any problems, a red icon will appear at the bottom of "
+"the window\n"
+"            indicating how many error reports there are. Clicking on it "
+"opens the Error Report \n"
+"            window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:91
+msgid ""
+"\n"
+"            The Error Report window lists any problems encountered before, "
+"during or after the \n"
+"            download. An orange triangle represents a warning, a red circle "
+"indicates a failure, \n"
+"            and a black circle indicates more serious failures. You can "
+"click on the hyperlinks to \n"
+"            open its file or device in a file manager. You can also search "
+"the reports using the \n"
+"            search box in the lower left of the Error Report window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:103
 msgid ""
 "You can simultaneously download from multiple cameras, smartphones, memory "
 "cards, and hard drives&mdash;as many devices as your computer can handle at "
 "one time."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:81
+#: ../raphodo/didyouknow.py:110
 msgid ""
 "The <b>Timeline</b> groups photos and videos based on how much time elapsed "
 "between consecutive shots. Use it to identify photos and videos taken at "
 "different periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:88
+#: ../raphodo/didyouknow.py:117
 msgid ""
 "\n"
 "<p>In the illustration above, the first row of the Timeline is black because "
@@ -310,7 +708,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:99
+#: ../raphodo/didyouknow.py:128
 msgid ""
 "To view photos and videos for a particular time range, use the mouse "
 "(optionally in combination with the <tt>Shift</tt> or <tt>Ctrl</tt> keys) to "
@@ -318,20 +716,20 @@ msgid ""
 "the left side of the main window will be highlighted."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:106
+#: ../raphodo/didyouknow.py:135
 msgid ""
 "A download always includes all files that are checked for download, "
 "including those that are not currently displayed because the Timeline is "
 "being used."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:113
+#: ../raphodo/didyouknow.py:142
 msgid ""
 "You can hide or display the download sources by clicking on the name of the "
 "device you're downloading from at the top left of the program window."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:120
+#: ../raphodo/didyouknow.py:149
 msgid ""
 "\n"
 "          Thumbnails can be sorted using a variety of criteria:\n"
@@ -350,33 +748,33 @@ msgid ""
 "</ol> "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:137
+#: ../raphodo/didyouknow.py:166
 msgid ""
 "One of Rapid Photo Downloader's most useful features is its ability to "
 "automatically generate download subfolders and rename files as it downloads, "
 "using a scheme of your choosing."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:143
+#: ../raphodo/didyouknow.py:172
 msgid ""
 "To specify where you want your files downloaded and how you want them named, "
 "open the appropriate panel on the right-side of the application window: "
 "<b>Destination</b>, <b>Rename</b>, or <b>Job Code</b>."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:150
+#: ../raphodo/didyouknow.py:179
 msgid ""
 "\n"
 "When thinking about your download directory structure, keep in mind two "
 "different types\n"
 "of directory:\n"
 "<ol>\n"
-"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, &quot;"
-"Photos&quot;, or\n"
+"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, "
+"&quot;Photos&quot;, or\n"
 "&quot;Videos&quot;. This directory should already exist on your computer. In "
 "the illustration \n"
-"below, the destination folders are &quot;Pictures&quot; and &quot;"
-"Videos&quot;. The\n"
+"below, the destination folders are &quot;Pictures&quot; and "
+"&quot;Videos&quot;. The\n"
 "name of the destination folder is displayed in the grey bar directly above "
 "the folder tree, \n"
 "with a folder icon to its left and a gear icon to its far right.</li>\n"
@@ -389,7 +787,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:167
+#: ../raphodo/didyouknow.py:196
 msgid ""
 "\n"
 "You can download photos and videos to the same destination folder, or "
@@ -402,14 +800,14 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:177
+#: ../raphodo/didyouknow.py:206
 msgid ""
 "Automatically generated download subfolders can contain further "
 "automatically generated subfolders if need be. A common scheme is to create "
 "a year subfolder and then a series of year-month-day subfolders within it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:186
+#: ../raphodo/didyouknow.py:215
 msgid ""
 "\n"
 "Whenever possible, the program previews the download subfolders of photos "
@@ -427,7 +825,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:201
+#: ../raphodo/didyouknow.py:230
 msgid ""
 "\n"
 "Download subfolder names are typically generated using some or all of the "
@@ -451,7 +849,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:219
+#: ../raphodo/didyouknow.py:248
 msgid ""
 "\n"
 "To automatically create download subfolders as you download, \n"
@@ -461,7 +859,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:227
+#: ../raphodo/didyouknow.py:256
 msgid ""
 "\n"
 "Using the drop-down menu, select a built-in preset or click on <b>Custom</b> "
@@ -471,20 +869,20 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:237
+#: ../raphodo/didyouknow.py:266
 msgid ""
 "It's easy to download raw images into one folder, and jpeg images into "
 "another. Simply use the <b>Filename Extension</b> as part of your download "
 "subfolder generation scheme:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:242
+#: ../raphodo/didyouknow.py:271
 msgid ""
 "This illustration shows a saved custom preset named &quot;My custom "
 "preset&quot;."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:246
+#: ../raphodo/didyouknow.py:275
 msgid ""
 "\n"
 "You do not have to create nested download subfolders. This illustration "
@@ -495,7 +893,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:256
+#: ../raphodo/didyouknow.py:285
 msgid ""
 "\n"
 "Although there are many built-in date/time naming options, you may find that "
@@ -509,7 +907,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:265
+#: ../raphodo/didyouknow.py:294
 msgid ""
 "\n"
 "Read more about all the ways you can generate download subfolder names and "
@@ -519,7 +917,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:273
+#: ../raphodo/didyouknow.py:302
 msgid ""
 "\n"
 "<b>Job Codes</b> let you easily enter text that describes sets of photos and "
@@ -531,7 +929,7 @@ msgid ""
 "&quot;Green Bazaar&quot;: \n"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:282
+#: ../raphodo/didyouknow.py:311
 msgid ""
 "\n"
 "You can apply new or existing Job Codes before you start a download. If "
@@ -542,36 +940,36 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:291
+#: ../raphodo/didyouknow.py:320
 msgid "Look for hints to guide you when working with Job Codes:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:295
+#: ../raphodo/didyouknow.py:324
 msgid ""
 "Hints will vary depending on the context, such as when the mouse is hovering "
 "over a button."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:301
+#: ../raphodo/didyouknow.py:330
 msgid ""
 "\n"
 "When you give your photos and videos unique filenames, you'll never be "
 "confused as to \n"
 "which file is which. Using <b>sequence numbers</b> to make filenames unique "
 "is highly \n"
-"recommended!.\n"
+"recommended!\n"
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:309
+#: ../raphodo/didyouknow.py:338
 msgid ""
 "\n"
 "<p>Four types of sequence values are available to help you assign unique "
 "names to your photos and \n"
 "videos:\n"
 "<ol>\n"
-"<li><b>Downloads today</b>: tracks downloads completed during that day.</"
-"li>\n"
+"<li><b>Downloads today</b>: tracks downloads completed during that "
+"day.</li>\n"
 "<li><b>Stored number</b>: similar to Downloads today, but it is remembered "
 "from the last time the  \n"
 "program was run.</li>\n"
@@ -585,7 +983,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:327
+#: ../raphodo/didyouknow.py:356
 msgid ""
 "\n"
 "The <b>Rename</b> panel allows you to configure file renaming. To rename "
@@ -594,7 +992,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:334
+#: ../raphodo/didyouknow.py:363
 msgid ""
 "\n"
 "<p>The <b>Synchronize RAW + JPEG</b> option is useful if you use the RAW + "
@@ -613,7 +1011,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:348
+#: ../raphodo/didyouknow.py:377
 msgid ""
 "\n"
 "You can have your photos and videos backed up to multiple locations as they "
@@ -624,13 +1022,13 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:356
+#: ../raphodo/didyouknow.py:385
 msgid ""
 "In this example, the drive <b>photobackup</b> does not contain a folder "
 "named <tt>Videos</tt>, so videos will not be backed up to it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:362
+#: ../raphodo/didyouknow.py:391
 msgid ""
 "\n"
 "Several of the program's preferences can be set from the command line, "
@@ -641,7 +1039,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:372
+#: ../raphodo/didyouknow.py:396
+msgid "You can also import program preferences from the older 0.4 version."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:401
 msgid ""
 "\n"
 "Rapid Photo Downloader deals with three types of cache:\n"
@@ -651,8 +1053,8 @@ msgid ""
 "memory cards, and other devices.</li>\n"
 "<li>A <b>temporary cache</b> of files downloaded from a camera, one for "
 "photos and another for \n"
-"videos. They are located in temporary subfolders in the download destination."
-"</li>\n"
+"videos. They are located in temporary subfolders in the download "
+"destination.</li>\n"
 "<li>The <b>desktop's thumbnail cache</b>, in which Rapid Photo Downloader "
 "stores thumbnails of \n"
 "RAW and TIFF photos once they have been downloaded. File browsers like Gnome "
@@ -667,25 +1069,25 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:431
+#: ../raphodo/didyouknow.py:460
 msgid "Tip of the Day"
-msgstr ""
+msgstr "Парада дня"
 
-#: ../raphodo/didyouknow.py:439
+#: ../raphodo/didyouknow.py:468
 msgid "Did you know...?"
-msgstr ""
+msgstr "Ці ведаеце вы, што...?"
 
-#: ../raphodo/didyouknow.py:466
+#: ../raphodo/didyouknow.py:495
 msgid "Show tips on startup"
-msgstr ""
+msgstr "Паказваць парады пры запуске"
 
-#: ../raphodo/didyouknow.py:470
+#: ../raphodo/didyouknow.py:499
 msgid "&Next"
-msgstr ""
+msgstr "&Далей"
 
-#: ../raphodo/didyouknow.py:471
+#: ../raphodo/didyouknow.py:500
 msgid "&Previous"
-msgstr ""
+msgstr "&Назад"
 
 #: ../raphodo/downloadtracker.py:402
 msgid "MB/sec"
@@ -698,160 +1100,160 @@ msgstr ""
 
 #: ../raphodo/downloadtracker.py:588
 msgid "1 second"
-msgstr ""
+msgstr "1 секунда"
 
 #: ../raphodo/downloadtracker.py:590
 #, python-format
 msgid "%d seconds"
-msgstr ""
+msgstr "%d секунд"
 
 #: ../raphodo/downloadtracker.py:595
 msgid "1 minute"
-msgstr ""
+msgstr "1 хвіліна"
 
 #: ../raphodo/downloadtracker.py:597
 #, python-format
 msgid "%d minutes"
-msgstr ""
+msgstr "%d хвілін(ы)"
 
 #: ../raphodo/downloadtracker.py:602 ../raphodo/downloadtracker.py:784
 msgid "1 hour"
-msgstr ""
+msgstr "1 гадзіна"
 
 #: ../raphodo/downloadtracker.py:604
 #, python-format
 msgid "%d hours"
-msgstr ""
+msgstr "%d гадзін(ы)"
 
 #: ../raphodo/downloadtracker.py:609 ../raphodo/downloadtracker.py:813
 #: ../raphodo/downloadtracker.py:821
 msgid "1 day"
-msgstr ""
+msgstr "1 дзень"
 
 #: ../raphodo/downloadtracker.py:611
 #, python-format
 msgid "%d days"
-msgstr ""
+msgstr "%d дзён"
 
 #: ../raphodo/downloadtracker.py:790
 msgid "1 minute, 1 second"
-msgstr ""
+msgstr "1 хвіліна, 1 секунда"
 
 #: ../raphodo/downloadtracker.py:792
 #, python-format
 msgid "1 minute, %d seconds"
-msgstr ""
+msgstr "1 хвіліна, %d секунд(ы)"
 
 #: ../raphodo/downloadtracker.py:795
 #, python-format
 msgid "%d minutes, 1 second"
-msgstr ""
+msgstr "%d хвілін(ы), 1 секунда"
 
 #: ../raphodo/downloadtracker.py:797
 #, python-format
 msgid "%(minutes)d minutes, %(seconds)d seconds"
-msgstr ""
+msgstr "%(minutes)d хвілін(ы), %(seconds)d секунд(ы)"
 
 #: ../raphodo/downloadtracker.py:828
 msgid "1 hour, 1 minute"
-msgstr ""
+msgstr "1 гадзіна, 1 хвіліна"
 
 #: ../raphodo/downloadtracker.py:830
 #, python-format
 msgid "1 hour, %d minutes"
-msgstr ""
+msgstr "1 гадзіна, %d хвілін(ы)"
 
 #: ../raphodo/downloadtracker.py:833
 #, python-format
 msgid "%d hours, 1 minute"
-msgstr ""
+msgstr "%d гадзін(ы), 1 хвіліна"
 
 #: ../raphodo/downloadtracker.py:835
 #, python-format
 msgid "%(hours)d hours, %(minutes)d minutes"
-msgstr ""
+msgstr "%(hours)d гадзін(ы), %(minutes)d хвілін(ы)"
 
 #: ../raphodo/downloadtracker.py:861
 msgid "1 day, 1 hour"
-msgstr ""
+msgstr "1 дзень, 1 гадзіна"
 
 #: ../raphodo/downloadtracker.py:863
 #, python-format
 msgid "1 day, %d hours"
-msgstr ""
+msgstr "1 дзень, %d гадзін(ы)"
 
 #: ../raphodo/downloadtracker.py:866
 #, python-format
 msgid "%d days, 1 hour"
-msgstr ""
+msgstr "%d дзён, 1 гадзіна"
 
 #: ../raphodo/downloadtracker.py:868
 #, python-format
 msgid "%(days)d days, %(hours)d hours"
-msgstr ""
+msgstr "%(days)d дзён, %(hours)d гадзін(ы)"
 
-#: ../raphodo/errorlog.py:65
+#: ../raphodo/errorlog.py:66
 msgid "Find"
-msgstr ""
+msgstr "Знайсці"
 
-#: ../raphodo/errorlog.py:135
+#: ../raphodo/errorlog.py:136
 msgid "Error Reports - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/errorlog.py:170
+#: ../raphodo/errorlog.py:171
 msgid "Find in reports"
 msgstr ""
 
-#: ../raphodo/errorlog.py:187
+#: ../raphodo/errorlog.py:188
 msgid "Find the previous occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:192
+#: ../raphodo/errorlog.py:193
 msgid "Find the next occurrence of the phrase"
-msgstr ""
+msgstr "Знайсці наступнае супадзенне з фразай"
 
-#: ../raphodo/errorlog.py:194
+#: ../raphodo/errorlog.py:195
 msgid "&Highlight All"
-msgstr ""
+msgstr "&Падсвяціць усё"
 
-#: ../raphodo/errorlog.py:195
+#: ../raphodo/errorlog.py:196
 msgid "Highlight all occurrences of the phrase"
-msgstr ""
+msgstr "Падсвяціць усе супадзенні з фразай"
 
-#: ../raphodo/errorlog.py:196
+#: ../raphodo/errorlog.py:197
 msgid "&Match Case"
 msgstr ""
 
-#: ../raphodo/errorlog.py:197
+#: ../raphodo/errorlog.py:198
 msgid "Search with case sensitivity"
-msgstr ""
+msgstr "Шукаць з улікам рэгістра"
 
-#: ../raphodo/errorlog.py:198
+#: ../raphodo/errorlog.py:199
 msgid "&Whole Words"
-msgstr ""
+msgstr "&Словы цалкам"
 
-#: ../raphodo/errorlog.py:199
+#: ../raphodo/errorlog.py:200
 msgid "Search whole words only"
-msgstr ""
+msgstr "Шукаць толькі словы цалкам"
 
-#: ../raphodo/errorlog.py:209 ../raphodo/errorlog.py:341
+#: ../raphodo/errorlog.py:210 ../raphodo/errorlog.py:345
 #, python-format
 msgid "%s of %s matches"
-msgstr ""
+msgstr "%s з %s супадзенняў"
 
-#: ../raphodo/errorlog.py:228
+#: ../raphodo/errorlog.py:232
 msgid "Clear"
-msgstr ""
+msgstr "Ачысціць"
 
-#: ../raphodo/errorlog.py:328
+#: ../raphodo/errorlog.py:332
 msgid "Phrase not found"
-msgstr ""
+msgstr "Выраз не знойдзены"
 
-#: ../raphodo/errorlog.py:487
+#: ../raphodo/errorlog.py:491
 msgid "Search pending..."
 msgstr ""
 
-#: ../raphodo/errorlog.py:535
+#: ../raphodo/errorlog.py:539
 msgid ""
 "The number of new entries added to the Error Report since it was last open. "
 "Click to open the Error Report."
@@ -859,24 +1261,33 @@ msgstr ""
 
 #: ../raphodo/excepthook.py:77
 msgid "Problem in Rapid Photo Downloader"
-msgstr ""
+msgstr "Праблема ў Rapid Photo Downloader"
 
 #: ../raphodo/excepthook.py:81
 #, python-brace-format
 msgid ""
 "<b>A problem occurred in Rapid Photo Downloader</b><br><br>\n"
-"    Please report the problem at <a href=\"{website}\">{website}</a>."
-"<br><br>\n"
+"    Please report the problem at <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
 "    Attach the log file <i>{log_file}</i> to your bug report (click\n"
 "    <a href=\"{log_path}\">here</a> to open the log directory).<br><br>If "
 "the same problem occurs\n"
 "    again before the program exits, this is the only notification about it.\n"
 "    "
 msgstr ""
+"<b>У Rapid Photo Downloader праблема</b><br><br>\n"
+"    Калі ласка, паведаміце пра яе на <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
+"    Дадайце log файл <i>{log_file}</i> да справаздачы аб памылке (націсніце\n"
+"    <a href=\"{log_path}\">сюды</a>, каб адкрыць папку з log "
+"файлам).<br><br>Калі гэтая самая праблема \n"
+"    адбываецца перад закрыццём праграмы, то гэта проста нагадванне пра "
+"праблему.\n"
+"    "
 
 #: ../raphodo/excepthook.py:98
 msgid "A problem occurred in Rapid Photo Downloader\n"
-msgstr ""
+msgstr "Праблема адбылася ў Rapid Photo Downloader\n"
 
 #: ../raphodo/excepthook.py:99
 #, python-brace-format
@@ -886,18 +1297,23 @@ msgid ""
 "    Attach the log file to your bug report, found at {log_path}\n"
 "\n"
 msgstr ""
+"Калі ласка, паведаміце пра праблему на {website}\n"
+"\n"
+"    Дадайце log файл да вашай справаздачы аб памылке, які знаходзіцца ў "
+"{log_path}\n"
+"\n"
 
-#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1601
+#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1643
 msgid "Open in File Browser..."
-msgstr ""
+msgstr "Адкрыць у Файлавым Мэнаджары..."
 
 #: ../raphodo/foldercombo.py:120
 msgid "File System"
-msgstr ""
+msgstr "Файлавая сістэма"
 
 #: ../raphodo/foldercombo.py:157
 msgid "Other..."
-msgstr ""
+msgstr "Іншыя..."
 
 #. Translators: indicate in combobox that a path does not exist
 #: ../raphodo/foldercombo.py:235
@@ -905,533 +1321,533 @@ msgstr ""
 msgid "%s (location does not exist)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:186
+#: ../raphodo/generatenameconfig.py:190
 msgid "Date time"
 msgstr "Дата/час"
 
-#: ../raphodo/generatenameconfig.py:187
+#: ../raphodo/generatenameconfig.py:191
 msgid "Text"
 msgstr "Тэкст"
 
-#: ../raphodo/generatenameconfig.py:188 ../raphodo/rapid.py:2053
+#: ../raphodo/generatenameconfig.py:192 ../raphodo/rapid.py:2125
 msgid "Filename"
 msgstr "Назва файла"
 
-#: ../raphodo/generatenameconfig.py:189 ../raphodo/preferencedialog.py:488
+#: ../raphodo/generatenameconfig.py:193 ../raphodo/preferencedialog.py:724
 msgid "Metadata"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:190
+#: ../raphodo/generatenameconfig.py:194
 msgid "Sequences"
-msgstr ""
+msgstr "Нумерацыя"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: ../raphodo/generatenameconfig.py:193
+#: ../raphodo/generatenameconfig.py:197
 msgid "Job code"
-msgstr ""
+msgstr "Метка"
 
-#: ../raphodo/generatenameconfig.py:194
+#: ../raphodo/generatenameconfig.py:198
 msgid "Image date"
-msgstr ""
+msgstr "Дата здымка"
 
-#: ../raphodo/generatenameconfig.py:195
+#: ../raphodo/generatenameconfig.py:199
 msgid "Video date"
-msgstr ""
+msgstr "Дата відэа"
 
-#: ../raphodo/generatenameconfig.py:196
+#: ../raphodo/generatenameconfig.py:200
 msgid "Today"
 msgstr "Сёння"
 
-#: ../raphodo/generatenameconfig.py:197
+#: ../raphodo/generatenameconfig.py:201
 msgid "Yesterday"
 msgstr "Учора"
 
 #. Translators: Download time is the time and date that the download started (when the
 #. user clicked the Download button)
-#: ../raphodo/generatenameconfig.py:200
+#: ../raphodo/generatenameconfig.py:204
 msgid "Download time"
-msgstr ""
+msgstr "Час загрузкі"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:203
+#: ../raphodo/generatenameconfig.py:207
 msgid "Name"
 msgstr "Назва"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:206 ../raphodo/rapid.py:2054
+#: ../raphodo/generatenameconfig.py:210 ../raphodo/rapid.py:2126
 msgid "Extension"
 msgstr "Пашырэнне"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:209
+#: ../raphodo/generatenameconfig.py:213
 msgid "Image number"
 msgstr "Нумар здымка"
 
-#: ../raphodo/generatenameconfig.py:210
+#: ../raphodo/generatenameconfig.py:214
 msgid "Video number"
 msgstr "Нумар відэа"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:213
+#: ../raphodo/generatenameconfig.py:217
 msgid "Aperture"
-msgstr ""
+msgstr "Дыяфрагма"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:216
+#: ../raphodo/generatenameconfig.py:220
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:219
+#: ../raphodo/generatenameconfig.py:223
 msgid "Exposure time"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:222
+#: ../raphodo/generatenameconfig.py:226
 msgid "Focal length"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:225
+#: ../raphodo/generatenameconfig.py:229
 msgid "Camera make"
 msgstr "Вытворца камеры"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:228
+#: ../raphodo/generatenameconfig.py:232
 msgid "Camera model"
 msgstr "Мадэль камеры"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:231
+#: ../raphodo/generatenameconfig.py:235
 msgid "Short camera model"
 msgstr "Кароткая мадэль камеры"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:234
+#: ../raphodo/generatenameconfig.py:238
 msgid "Hyphenated short camera model"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:237
+#: ../raphodo/generatenameconfig.py:241
 msgid "Serial number"
 msgstr "Серыйны нумар"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:240
+#: ../raphodo/generatenameconfig.py:244
 msgid "Shutter count"
 msgstr ""
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: ../raphodo/generatenameconfig.py:242
+#: ../raphodo/generatenameconfig.py:246
 msgid "File number"
 msgstr ""
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:244
+#: ../raphodo/generatenameconfig.py:248
 msgid "Folder only"
 msgstr ""
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:246
+#: ../raphodo/generatenameconfig.py:250
 msgid "Folder and file"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:249
+#: ../raphodo/generatenameconfig.py:253
 msgid "Owner name"
 msgstr "Імя ўладальніка"
 
-#: ../raphodo/generatenameconfig.py:250
+#: ../raphodo/generatenameconfig.py:254
 msgid "Codec"
 msgstr "Кодэк"
 
-#: ../raphodo/generatenameconfig.py:251
+#: ../raphodo/generatenameconfig.py:255
 msgid "Width"
 msgstr "Шырыня"
 
-#: ../raphodo/generatenameconfig.py:252
+#: ../raphodo/generatenameconfig.py:256
 msgid "Height"
 msgstr "Вышыня"
 
-#: ../raphodo/generatenameconfig.py:253
+#: ../raphodo/generatenameconfig.py:257
 msgid "Length"
-msgstr ""
+msgstr "Даўжыня"
 
-#: ../raphodo/generatenameconfig.py:254
+#: ../raphodo/generatenameconfig.py:258
 msgid "Frames Per Second"
 msgstr "Кадраў за секунду"
 
-#: ../raphodo/generatenameconfig.py:255
+#: ../raphodo/generatenameconfig.py:259
 msgid "Artist"
 msgstr "Артыст"
 
-#: ../raphodo/generatenameconfig.py:256
+#: ../raphodo/generatenameconfig.py:260
 msgid "Copyright"
 msgstr "Аўтарскія правы"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:259
+#: ../raphodo/generatenameconfig.py:263
 msgid "Downloads today"
 msgstr "Сцягнута сёння"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:262
+#: ../raphodo/generatenameconfig.py:266
 msgid "Session number"
 msgstr "Нумар сеанса"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:265
+#: ../raphodo/generatenameconfig.py:269
 msgid "Subfolder number"
 msgstr "Нумар падпапкі"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:268
+#: ../raphodo/generatenameconfig.py:272
 msgid "Stored number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: ../raphodo/generatenameconfig.py:271
+#: ../raphodo/generatenameconfig.py:275
 msgid "Sequence letter"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:274
+#: ../raphodo/generatenameconfig.py:278
 msgid "All digits"
 msgstr "Усе лічбы"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:277
+#: ../raphodo/generatenameconfig.py:281
 msgid "Last digit"
 msgstr "Апошняя лічба"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:280
+#: ../raphodo/generatenameconfig.py:284
 msgid "Last 2 digits"
 msgstr "Апошнія 2 лічбы"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:283
+#: ../raphodo/generatenameconfig.py:287
 msgid "Last 3 digits"
 msgstr "Апошнія 3 лічбы"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:286
+#: ../raphodo/generatenameconfig.py:290
 msgid "Last 4 digits"
 msgstr "Апошнія 4 лічбы"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:289
+#: ../raphodo/generatenameconfig.py:293
 msgid "Original Case"
 msgstr "Арыгінальнае напісанне"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:292
+#: ../raphodo/generatenameconfig.py:296
 msgid "UPPERCASE"
 msgstr "ВЯЛІКІЯ ЛІТАРЫ"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:295
+#: ../raphodo/generatenameconfig.py:299
 msgid "lowercase"
 msgstr "малыя літары"
 
-#: ../raphodo/generatenameconfig.py:296
+#: ../raphodo/generatenameconfig.py:300
 msgid "One digit"
 msgstr "Адна лічба"
 
-#: ../raphodo/generatenameconfig.py:297
+#: ../raphodo/generatenameconfig.py:301
 msgid "Two digits"
 msgstr "Дзве лічбы"
 
-#: ../raphodo/generatenameconfig.py:298
+#: ../raphodo/generatenameconfig.py:302
 msgid "Three digits"
 msgstr "Тры лічбы"
 
-#: ../raphodo/generatenameconfig.py:299
+#: ../raphodo/generatenameconfig.py:303
 msgid "Four digits"
 msgstr "Чатыры лічбы"
 
-#: ../raphodo/generatenameconfig.py:300
+#: ../raphodo/generatenameconfig.py:304
 msgid "Five digits"
 msgstr "Пяць лічбаў"
 
-#: ../raphodo/generatenameconfig.py:301
+#: ../raphodo/generatenameconfig.py:305
 msgid "Six digits"
 msgstr "Шэсць лічбаў"
 
-#: ../raphodo/generatenameconfig.py:302
+#: ../raphodo/generatenameconfig.py:306
 msgid "Seven digits"
 msgstr "Сем лічбаў"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:305
+#: ../raphodo/generatenameconfig.py:309
 msgid "Subseconds"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:308 ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:312 ../raphodo/generatenameconfig.py:393
 msgid "YYYYMMDD"
 msgstr "ГГГГММДД"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:311 ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:315 ../raphodo/generatenameconfig.py:394
 msgid "YYYY-MM-DD"
 msgstr "ГГГГ-ММ-ДД"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:314 ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:318 ../raphodo/generatenameconfig.py:395
 msgid "YYYY_MM_DD"
-msgstr ""
+msgstr "ГГГГ_ММ_ДД"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:317
+#: ../raphodo/generatenameconfig.py:321
 msgid "YYMMDD"
 msgstr "ГГММДД"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:320
+#: ../raphodo/generatenameconfig.py:324
 msgid "YY-MM-DD"
 msgstr "ГГ-ММ-ДД"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:323
+#: ../raphodo/generatenameconfig.py:327
 msgid "YY_MM_DD"
-msgstr ""
+msgstr "ГГ_ММ_ДД"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:326
+#: ../raphodo/generatenameconfig.py:330
 msgid "MMDDYYYY"
 msgstr "ММДДГГГГ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:329
+#: ../raphodo/generatenameconfig.py:333
 msgid "MMDDYY"
 msgstr "ММДДГГ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:332
+#: ../raphodo/generatenameconfig.py:336
 msgid "MMDD"
 msgstr "ММДД"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:335
+#: ../raphodo/generatenameconfig.py:339
 msgid "DDMMYYYY"
 msgstr "ДДММГГГГ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:338
+#: ../raphodo/generatenameconfig.py:342
 msgid "DDMMYY"
 msgstr "ДДММГГ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:341 ../raphodo/generatenameconfig.py:389
-#: ../raphodo/generatenameconfig.py:390 ../raphodo/generatenameconfig.py:391
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:345 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:394 ../raphodo/generatenameconfig.py:395
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:397
 msgid "YYYY"
 msgstr "ГГГГ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:344
+#: ../raphodo/generatenameconfig.py:348
 msgid "YY"
 msgstr "ГГ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:347
+#: ../raphodo/generatenameconfig.py:351
 msgid "MM"
 msgstr "ММ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:350
+#: ../raphodo/generatenameconfig.py:354
 msgid "DD"
 msgstr "ДД"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:353
+#: ../raphodo/generatenameconfig.py:357
 msgid "Month (full)"
 msgstr "Месяц (цалкам)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:356
+#: ../raphodo/generatenameconfig.py:360
 msgid "Month (abbreviated)"
 msgstr "Месяц (скарочана)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:359
+#: ../raphodo/generatenameconfig.py:363
 msgid "HHMMSS"
 msgstr "ГГХХСС"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:362
+#: ../raphodo/generatenameconfig.py:366
 msgid "HHMM"
 msgstr "ГГХХ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:365
+#: ../raphodo/generatenameconfig.py:369
 msgid "HH-MM-SS"
 msgstr "ГГ-ХХ-СС"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:368
+#: ../raphodo/generatenameconfig.py:372
 msgid "HH-MM"
 msgstr "ГГ-ХХ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:371
+#: ../raphodo/generatenameconfig.py:375
 msgid "HH"
 msgstr "ГГ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:374
+#: ../raphodo/generatenameconfig.py:378
 msgid "MM (minutes)"
 msgstr "ХХ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:377
+#: ../raphodo/generatenameconfig.py:381
 msgid "SS"
 msgstr "СС"
 
-#: ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:393
 msgid "Date"
-msgstr ""
+msgstr "Дата"
 
-#: ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:394
 msgid "Date (hyphens)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:395
 msgid "Date (underscores)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:438
-#: ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:442
+#: ../raphodo/generatenameconfig.py:537
 msgid "Date and Job Code"
-msgstr ""
+msgstr "Дата і метка"
 
-#: ../raphodo/generatenameconfig.py:392
+#: ../raphodo/generatenameconfig.py:396
 msgid "YYYYMM_Job Code"
-msgstr ""
+msgstr "ГГГГММ_Метка"
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "Date and Job Code Subfolder"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "YYYYMM"
-msgstr ""
+msgstr "ГГГГММ"
 
-#: ../raphodo/generatenameconfig.py:393 ../raphodo/jobcodepanel.py:198
-#: ../raphodo/nameeditor.py:827 ../raphodo/rapid.py:1809
+#: ../raphodo/generatenameconfig.py:397 ../raphodo/jobcodepanel.py:199
+#: ../raphodo/nameeditor.py:833 ../raphodo/rapid.py:1852
 #: ../raphodo/renamepanel.py:83 ../raphodo/renamepanel.py:241
 msgid "Job Code"
 msgstr "Цэтлікі"
 
-#: ../raphodo/generatenameconfig.py:433 ../raphodo/generatenameconfig.py:512
+#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:532
 msgid "Original Filename"
-msgstr ""
+msgstr "Арыгінальная назва файла"
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "Date-Time and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "YYYYMMDD-HHMM-1"
-msgstr ""
+msgstr "ГГГГММДД-ГГХХ-1"
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "Date and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "YYYYMMDD-1"
-msgstr ""
+msgstr "ГГГГММДД-1"
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "Date-Time and Image number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "YYYYMMDD-1234"
-msgstr ""
+msgstr "ГГГГММДД-1234"
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "Date-Time and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "YYYYMMDD-HHMM-Job Code-1"
-msgstr ""
+msgstr "ГГГГММДД-ГГХХ-Метка-1"
 
-#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:442 ../raphodo/generatenameconfig.py:537
 msgid "YYYYMMDD-Job Code-1"
-msgstr ""
+msgstr "ГГГГММДД-Метка-1"
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "Date-Time and Video number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "YYYYMMDD_1234"
-msgstr ""
+msgstr "ГГГГММДД_1234"
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "Resolution"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "YYYYMMDD-HHMM-1-1920x1080"
-msgstr ""
+msgstr "ГГГГММДД-ГГХХ-1-1920x1080"
 
 #: ../raphodo/jobcodepanel.py:64
 msgid "Enter a new Job Code, or select a previous one"
@@ -1441,18 +1857,18 @@ msgstr "Увядзіце новы цэтлік або выбярыце стар�
 #: ../raphodo/jobcodepanel.py:70
 #, python-format
 msgid "The Job Code will be applied to %s that does not yet have a Job Code."
-msgstr ""
+msgstr "Меткі  будуць даданы на %s, у якія яшчэ няма метак."
 
 #. Translators: the value substituted will be something like '85 photos and 5
 #. videos'.
 #: ../raphodo/jobcodepanel.py:75
 #, python-format
 msgid "The Job Code will be applied to %s that do not yet have a Job Code."
-msgstr ""
+msgstr "Меткі  будуць даданы на %s, у якія яшчэ няма метак."
 
 #: ../raphodo/jobcodepanel.py:78
 msgid "Apply Job Code to Download"
-msgstr ""
+msgstr "Дадаць метку да загружаных"
 
 #: ../raphodo/jobcodepanel.py:80
 msgid "Enter a new Job Code"
@@ -1467,14 +1883,14 @@ msgstr ""
 #: ../raphodo/jobcodepanel.py:92
 #, python-format
 msgid "The new Job Code will <b>not</b> be applied to %s."
-msgstr ""
+msgstr "Новая метка <b>не</b> будзе дадана на %s."
 
 #. Translators: the value substituted will be something like '100 photos and 5
 #. videos'.
 #: ../raphodo/jobcodepanel.py:97
 #, python-format
 msgid "The new Job Code will be applied to %s."
-msgstr ""
+msgstr "Новая метка будзе дадана на %s."
 
 #: ../raphodo/jobcodepanel.py:99
 msgid "New Job Code"
@@ -1488,76 +1904,77 @@ msgstr ""
 msgid "&Remember this choice"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:185
+#: ../raphodo/jobcodepanel.py:186
 msgid ""
 "Select photos and videos to be able to apply a new or existing Job Code to "
 "them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:186
-msgid "The new Job Code will be applied to all selected photos and/or videos."
+#: ../raphodo/jobcodepanel.py:187
+msgid ""
+"The new Job Code will be applied to all selected photos and/or videos."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:187
+#: ../raphodo/jobcodepanel.py:188
 msgid ""
 "Click the Apply button to apply the current Job Code to all selected photos "
 "and/or videos. You can also simply double click the Job Code."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:189
+#: ../raphodo/jobcodepanel.py:190
 msgid ""
 "Removing a Job Code removes it only from the list of saved Job Codes, not "
 "from any photos or videos that it may have been applied to."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:191
+#: ../raphodo/jobcodepanel.py:192
 msgid ""
 "If you want to use Job Codes, configure file renaming or destination "
 "subfolder names to use them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:197
+#: ../raphodo/jobcodepanel.py:198
 msgid "Last Used"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:202
+#: ../raphodo/jobcodepanel.py:203
 msgid "Job Code Sort:"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:205 ../raphodo/rapid.py:2061
+#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2133
 msgid "Ascending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2062
+#: ../raphodo/jobcodepanel.py:207 ../raphodo/rapid.py:2134
 msgid "Descending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:216
+#: ../raphodo/jobcodepanel.py:217
 msgid "&New..."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:220
+#: ../raphodo/jobcodepanel.py:221
 msgid "&Apply"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:224
+#: ../raphodo/jobcodepanel.py:225
 msgid "&Remove"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:228 ../raphodo/preferencedialog.py:125
-#: ../raphodo/preferencedialog.py:154 ../raphodo/preferencedialog.py:433
+#: ../raphodo/jobcodepanel.py:229 ../raphodo/preferencedialog.py:200
+#: ../raphodo/preferencedialog.py:229 ../raphodo/preferencedialog.py:531
 msgid "Remove All"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:427
+#: ../raphodo/jobcodepanel.py:428
 msgid "Do you really want to remove all the Job Codes?"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:429
+#: ../raphodo/jobcodepanel.py:430
 msgid "Remove all Job Codes"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:492
+#: ../raphodo/jobcodepanel.py:493
 msgid "Job Codes"
 msgstr "Цэтлікі"
 
@@ -1568,42 +1985,58 @@ msgstr "Цэтлікі"
 msgid "<i><b>Hint:</b> %(message)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:418 ../raphodo/nameeditor.py:432
+#: ../raphodo/nameeditor.py:423 ../raphodo/nameeditor.py:437
 #, python-format
 msgid "%(description)s - %(elements)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:512
+#: ../raphodo/nameeditor.py:517
 msgid "Save New Custom Preset..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:513
+#: ../raphodo/nameeditor.py:518
 msgid "Remove All Custom Presets..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:559
+#: ../raphodo/nameeditor.py:564
 msgid "(New Custom Preset)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:576
+#: ../raphodo/nameeditor.py:581
 #, python-format
 msgid "%s (edited)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:579 ../raphodo/nameeditor.py:1370
+#: ../raphodo/nameeditor.py:584 ../raphodo/nameeditor.py:1379
 #, python-format
 msgid "Update Custom Preset \"%s\""
 msgstr ""
 
-#: ../raphodo/nameeditor.py:667
+#: ../raphodo/nameeditor.py:672
 msgid "Save New Custom Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:675
+#: ../raphodo/nameeditor.py:680
 msgid "Preset Name:"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:836
+#: ../raphodo/nameeditor.py:799
+msgid "Photo Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:805
+msgid "Video Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:811
+msgid "Photo Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:817
+msgid "Video Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:842
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>There is insufficient data to "
 "fully generate the name. Please use other renaming options.</i>"
@@ -1612,7 +2045,7 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees.
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:846
+#: ../raphodo/nameeditor.py:853
 #, python-format
 msgid "The character</i> %(separator)s <i>creates a new subfolder level."
 msgstr ""
@@ -1620,50 +2053,50 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:851
+#: ../raphodo/nameeditor.py:858
 #, python-format
 msgid ""
 "There is no need start or end with the folder separator </i> "
 "%(separator)s<i>, because it is added automatically."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:859
+#: ../raphodo/nameeditor.py:866
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>Unique filenames may not be "
 "generated. Make filenames unique by using Sequence values.</i>"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:882 ../raphodo/renamepanel.py:121
+#: ../raphodo/nameeditor.py:889 ../raphodo/renamepanel.py:121
 msgid "Preset:"
 msgstr ""
 
 #. Translators: appears in a combobox, e.g. Image Date (YYYY)
-#: ../raphodo/nameeditor.py:959 ../raphodo/nameeditor.py:980
+#: ../raphodo/nameeditor.py:966 ../raphodo/nameeditor.py:987
 #, python-brace-format
 msgid "{choice} ({variant})"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1005 ../raphodo/preferencedialog.py:530
+#: ../raphodo/nameeditor.py:1012 ../raphodo/preferencedialog.py:783
 msgid "Get help online..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1025
+#: ../raphodo/nameeditor.py:1034
 msgid "Insert"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1351
+#: ../raphodo/nameeditor.py:1360
 msgid "Save Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1356
+#: ../raphodo/nameeditor.py:1365
 msgid ""
-"<b>Do you want to save the changes in a new custom preset?</"
-"b><br><br>Creating a custom preset is not required, but can help you keep "
-"organized.<br><br>The changes to the preferences will still be applied "
-"regardless of whether you create a new custom preset or not."
+"<b>Do you want to save the changes in a new custom "
+"preset?</b><br><br>Creating a custom preset is not required, but can help "
+"you keep organized.<br><br>The changes to the preferences will still be "
+"applied regardless of whether you create a new custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1365
+#: ../raphodo/nameeditor.py:1374
 msgid ""
 "<b>Do you want to save the changes in a custom preset?</b><br><br>If you "
 "like, you can create a new custom preset or update the existing custom "
@@ -1671,136 +2104,167 @@ msgid ""
 "regardless of whether you save a custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1372
+#: ../raphodo/nameeditor.py:1381
 msgid "Save New Custom Preset"
 msgstr ""
 
-#: ../raphodo/newversion.py:306
+#: ../raphodo/newversion.py:312
 msgid "Checking for new version..."
 msgstr ""
 
-#: ../raphodo/newversion.py:307
+#: ../raphodo/newversion.py:313
 msgid "You are running the latest version."
 msgstr ""
 
-#: ../raphodo/newversion.py:308
+#: ../raphodo/newversion.py:314
 msgid "Failed to contact the update server."
 msgstr ""
 
-#: ../raphodo/newversion.py:310
+#: ../raphodo/newversion.py:316
 #, python-format
 msgid "A new version of Rapid Photo Downloader (%s) is available."
 msgstr ""
 
-#: ../raphodo/newversion.py:312
+#: ../raphodo/newversion.py:318
 msgid "Do you want to download the new version?"
 msgstr ""
 
-#: ../raphodo/newversion.py:313
+#: ../raphodo/newversion.py:319
 #, python-format
 msgid "Changes in the new release can be viewed <a href=\"%s\">here</a>."
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the s key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:340 ../raphodo/newversion.py:353
+#: ../raphodo/newversion.py:348 ../raphodo/newversion.py:363
 msgid "&Skip this release"
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the o key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:356
+#: ../raphodo/newversion.py:366
 msgid "&Open Download Page"
 msgstr ""
 
-#: ../raphodo/newversion.py:376
+#: ../raphodo/newversion.py:386
 msgid "Rapid Photo Downloader updates"
 msgstr ""
 
 #. Translators: shows how much of a file has been downloaded e.g  123 KB of 1.3 MB
-#: ../raphodo/newversion.py:478
+#: ../raphodo/newversion.py:488
 #, python-format
 msgid "%(downloaded)s of %(total)s"
 msgstr ""
 
-#: ../raphodo/newversion.py:495
+#: ../raphodo/newversion.py:507
 msgid "Downloading..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:76
+#: ../raphodo/preferencedialog.py:86
 msgid "Preferences"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Automation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Thumbnails"
 msgstr "Мініяцюры"
 
-#: ../raphodo/preferencedialog.py:85 ../raphodo/preferencedialog.py:343
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/preferencedialog.py:428
 msgid "Error Handling"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:109
+msgid "Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:109 ../raphodo/preferencedialog.py:119
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:94
+#: ../raphodo/preferencedialog.py:147
 msgid "Device Scanning"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:96
+#: ../raphodo/preferencedialog.py:148
 msgid "Scan only external devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:98
+#: ../raphodo/preferencedialog.py:150
 msgid ""
 "Scan for photos and videos only on devices that are external to the "
 "computer,\n"
 "including cameras, memory cards, external hard drives, and USB flash drives."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:102
-msgid "Scan non-camera devices lacking a DCIM folder"
+#: ../raphodo/preferencedialog.py:153
+msgid "Scan only specific folders on devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:104
+#: ../raphodo/preferencedialog.py:155
 msgid ""
-"Scan the entirety of a device for photos and videos, irrespective of whether "
-"it contains a DCIM folder,\n"
-"as opposed to only scanning within a DCIM folder.\n"
+"Scan for photos and videos only in the folders specified below (except "
+"paths\n"
+"specified in Ignored Paths).\n"
 "\n"
-"Changing this setting causes all devices to be scanned again.\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:161
+msgid "Folders to scan:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:164
+msgid ""
+"Folders at the base level of device file systems that will be scanned\n"
+"for photos and videos."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:167 ../raphodo/preferencedialog.py:219
+msgid "Add..."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:169
+msgid ""
+"Add a folder to the list of folders to scan for photos and videos.\n"
 "\n"
-"Note: With cameras, only the DCIM folder is scanned."
+"Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:116
+#: ../raphodo/preferencedialog.py:172 ../raphodo/preferencedialog.py:198
+#: ../raphodo/preferencedialog.py:224 ../raphodo/preferencedialog.py:529
+msgid "Remove"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:174
+msgid ""
+"Remove a folder from the list of folders to scan for photos and videos.\n"
+"\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:191
 msgid "Devices that have been set to automatically ignore or download from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:117
+#: ../raphodo/preferencedialog.py:192
 msgid "Remembered Devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:121
+#: ../raphodo/preferencedialog.py:196
 msgid ""
 "Remove a device from the list of devices to automatically ignore or download "
 "from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:123 ../raphodo/preferencedialog.py:149
-#: ../raphodo/preferencedialog.py:431
-msgid "Remove"
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:127
+#: ../raphodo/preferencedialog.py:202
 msgid ""
 "Clear the list of devices from which to automatically ignore or download "
 "from.\n"
@@ -1808,315 +2272,436 @@ msgid ""
 "Note: Changes take effect when the computer is next scanned for devices."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:140
+#: ../raphodo/preferencedialog.py:215
 msgid "Ignored Paths"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:141
+#: ../raphodo/preferencedialog.py:216
 msgid ""
 "The end part of a path that should never be scanned for photos or videos."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:144
-msgid "Add..."
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:146
+#: ../raphodo/preferencedialog.py:221
 msgid ""
 "Add a path to the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:151
+#: ../raphodo/preferencedialog.py:226
 msgid ""
 "Remove a path from the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:156
+#: ../raphodo/preferencedialog.py:231
 msgid ""
 "Clear the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:164
+#: ../raphodo/preferencedialog.py:239
 msgid ""
-"Use python-style <a href=\"http://damonlynch.net/rapid/documentation/"
-"#regularexpressions\">regular expressions</a>"
+"Use python-style <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">regula"
+"r expressions</a>"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:168
+#: ../raphodo/preferencedialog.py:243
 msgid ""
 "Use regular expressions in the list of ignored paths.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:208
+#: ../raphodo/preferencedialog.py:283
 msgid "Program Automation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:209
+#: ../raphodo/preferencedialog.py:284
 msgid "Start downloading at program startup"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:210
+#: ../raphodo/preferencedialog.py:285
 msgid "Start downloading upon device insertion"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:211
+#: ../raphodo/preferencedialog.py:286
 msgid "Unmount (eject) device upon download completion"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:212
+#: ../raphodo/preferencedialog.py:287
 msgid "Exit program when download completes"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:213
+#: ../raphodo/preferencedialog.py:288
 msgid "Exit program even if download had warnings or errors"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:240
+#: ../raphodo/preferencedialog.py:315
 msgid "Thumbnail Generation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:241
+#: ../raphodo/preferencedialog.py:316
 msgid "Generate thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:242
+#: ../raphodo/preferencedialog.py:318
 msgid "Generate thumbnails to show in the main program window"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:244
+#: ../raphodo/preferencedialog.py:320
 msgid "Cache thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:245
+#: ../raphodo/preferencedialog.py:323
 msgid ""
 "Save thumbnails shown in the main program window in a thumbnail cache unique "
 "to Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:247
+#: ../raphodo/preferencedialog.py:327
 msgid "Generate system thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:248
+#: ../raphodo/preferencedialog.py:330
 msgid ""
 "While downloading, save thumbnails that can be used by desktop file managers "
 "and other programs"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:255
+#: ../raphodo/preferencedialog.py:339
 msgid "Number of CPU cores used to generate thumbnails."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:256
+#: ../raphodo/preferencedialog.py:340
 msgid "CPU cores:"
 msgstr ""
 
 #. Translators: the * acts as an asterisk to denote a reference to an annotation
 #. such as '* Takes effect upon program restart'
-#: ../raphodo/preferencedialog.py:271 ../raphodo/preferencedialog.py:317
+#: ../raphodo/preferencedialog.py:355 ../raphodo/preferencedialog.py:401
 msgid "*"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:294
+#: ../raphodo/preferencedialog.py:378
 msgid "Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:296
+#: ../raphodo/preferencedialog.py:380
 msgid "Calculating..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:302
+#: ../raphodo/preferencedialog.py:386
 msgid "days"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:303
+#: ../raphodo/preferencedialog.py:387
 msgid "forever"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:308
+#: ../raphodo/preferencedialog.py:392
 msgid "Cache size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:310
+#: ../raphodo/preferencedialog.py:394
 msgid "Number of thumbnails:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:312
+#: ../raphodo/preferencedialog.py:396
 msgid "Database size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:314
+#: ../raphodo/preferencedialog.py:398
 msgid "Cache unaccessed thumbnails for:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:322
+#: ../raphodo/preferencedialog.py:406
 msgid "Purge Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:323
+#: ../raphodo/preferencedialog.py:408
 msgid "Optimize Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:336
+#: ../raphodo/preferencedialog.py:421
 msgid "* Takes effect upon program restart"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:346
+#: ../raphodo/preferencedialog.py:431
 msgid "Skip download"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:347
+#: ../raphodo/preferencedialog.py:432
 msgid "Don't download the file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:348
+#: ../raphodo/preferencedialog.py:433
 msgid "Add unique identifier"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:349
+#: ../raphodo/preferencedialog.py:436
 msgid ""
 "Add an identifier like _1 or _2 to the end of the filename, immediately "
 "before the file's extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:355
+#: ../raphodo/preferencedialog.py:444
 msgid "Overwrite"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:356
+#: ../raphodo/preferencedialog.py:445
 msgid "Overwrite the previously backed up file"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:357
+#: ../raphodo/preferencedialog.py:446
 msgid "Skip"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:358
+#: ../raphodo/preferencedialog.py:448
 msgid "Don't overwrite the backup file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:364
+#: ../raphodo/preferencedialog.py:455
 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 identifier:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:378
+#: ../raphodo/preferencedialog.py:464
+msgid ""
+"Using sequence numbers to automatically generate unique filenames is "
+"strongly recommended. Configure file renaming in the Rename panel in the "
+"main window."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:473
 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 ""
 
-#: ../raphodo/preferencedialog.py:398
+#: ../raphodo/preferencedialog.py:494
 msgid "Program Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:399
+#: ../raphodo/preferencedialog.py:495
 msgid "Show a warning when:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:402
+#: ../raphodo/preferencedialog.py:498
 msgid "Downloading files currently not displayed"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:403
+#: ../raphodo/preferencedialog.py:499
 msgid ""
 "Warn when about to download files that are not displayed in the main window."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:405
+#: ../raphodo/preferencedialog.py:501
 msgid "Backup destinations are missing"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:406
-msgid "Warn before starting a download if it is not possible to back up files."
+#: ../raphodo/preferencedialog.py:502
+msgid ""
+"Warn before starting a download if it is not possible to back up files."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:408
+#: ../raphodo/preferencedialog.py:504
 msgid "Program libraries are missing or broken"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:409
+#: ../raphodo/preferencedialog.py:505
 msgid ""
 "Warn if a software library used by Rapid Photo Downloader is missing or not "
 "functioning."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:412
+#: ../raphodo/preferencedialog.py:508
 msgid "Filesystem metadata cannot be set"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:413
+#: ../raphodo/preferencedialog.py:509
 msgid ""
 "Warn if there is an error setting a file's filesystem metadata, such as its "
 "modification time."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:416
+#: ../raphodo/preferencedialog.py:512
 msgid "Encountering unhandled files"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:417
+#: ../raphodo/preferencedialog.py:513
 msgid ""
 "Warn after scanning a device or this computer if there are unrecognized "
 "files that will not be included in the download."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:420
+#: ../raphodo/preferencedialog.py:517
 msgid "Do not warn about unhandled files with extensions:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:424
+#: ../raphodo/preferencedialog.py:522
 msgid ""
 "File extensions are case insensitive and do not need to include the leading "
 "dot."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:427
+#: ../raphodo/preferencedialog.py:525
 msgid "Add"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:428
+#: ../raphodo/preferencedialog.py:526
 msgid ""
 "Add a file extension to the list of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:430
+#: ../raphodo/preferencedialog.py:528
 msgid ""
 "Remove a file extension from the list of unhandled file types to not warn "
 "about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:434
+#: ../raphodo/preferencedialog.py:532
 msgid ""
 "Clear the list of file extensions of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:469
+#: ../raphodo/preferencedialog.py:568
+msgid "Photo and Video Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:571
+msgid "Consolidate files across devices and downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:574
+msgid ""
+"Analyze the results of device scans looking for duplicate files and matching "
+"RAW and JPEG pairs,\n"
+"comparing them across multiple devices and download sessions."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:580
+msgid "Treat matching RAW and JPEG files as:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:581
+msgid "One photo"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:582
+msgid "Two photos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:584
+msgid ""
+"Display matching pairs of RAW and JPEG photos as one photo, and if marked, "
+"download both."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:589
+msgid ""
+"Display matching pairs of RAW and JPEG photos as two different photos. You "
+"can still synchronize their sequence numbers."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:598
+msgid "With matching RAW and JPEG photos:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:600
+msgid "Do not mark JPEG for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:601
+msgid "Do not mark RAW for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:602
+msgid "Mark both for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:609
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"JPEG for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:614
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"RAW for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:619
+msgid ""
+"When matching RAW and JPEG photos are found, automatically mark both for "
+"download."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:625
+msgid ""
+"If you disable file consolidation, choose what to do when a download device "
+"is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:631
+msgid ""
+"When a download device is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:642
+msgid "Clear completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:643
+msgid "Keep displaying completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:644
+msgid "Prompt for what to do"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:649
+msgid ""
+"Automatically clear the display of completed downloads whenever a new "
+"download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:654
+msgid ""
+"Keep displaying completed downloads whenever a new download device is "
+"inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:658
+msgid ""
+"Prompt whether to keep displaying completed downloads or clear them whenever "
+"a new download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:702
 msgid "Version Check"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:470
+#: ../raphodo/preferencedialog.py:703
 msgid "Check for new version at startup"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:471
+#: ../raphodo/preferencedialog.py:705
 msgid "Check for a new version of the program each time the program starts."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:473
+#: ../raphodo/preferencedialog.py:707
 msgid "Include development releases"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:474
+#: ../raphodo/preferencedialog.py:709
 msgid ""
 "Include alpha, beta and other development releases when checking for a new "
 "version of the program.\n"
@@ -2125,11 +2710,11 @@ msgid ""
 "occur."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:489
+#: ../raphodo/preferencedialog.py:725
 msgid "Ignore DNG date/time metadata on MTP devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:490
+#: ../raphodo/preferencedialog.py:727
 msgid ""
 "Ignore date/time metadata in DNG files located on MTP devices, and use the "
 "file's modification time instead.\n"
@@ -2138,70 +2723,86 @@ msgid ""
 "metadata."
 msgstr ""
 
+#: ../raphodo/preferencedialog.py:741
+msgid "Completed Downloads"
+msgstr ""
+
 #. Translators: substituted value is a description for the set of preferences
 #. shown in the preference dialog window, e.g. Devices, Automation, etc.
 #. This string is shown in a tooltip for the "Restore Defaults" button
-#: ../raphodo/preferencedialog.py:710
+#: ../raphodo/preferencedialog.py:1067
 #, python-format
 msgid "Restores default %s preference values"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:832
+#: ../raphodo/preferencedialog.py:1208
 msgid ""
 "Do you want to purge the thumbnail cache? The cache will be purged when the "
 "program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:835
+#: ../raphodo/preferencedialog.py:1212
 msgid "Purge Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:847
+#: ../raphodo/preferencedialog.py:1225
 msgid ""
 "Do you want to optimize the thumbnail cache? The cache will be optimized "
 "when the program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:850
+#: ../raphodo/preferencedialog.py:1229
 msgid "Optimize Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1045
+#: ../raphodo/preferencedialog.py:1481
+msgid "Enter a Folder to Scan"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1482
+msgid "Specify a folder that will be scanned for photos and videos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1483
+msgid "Folder:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1497
 msgid "Enter a Path to Ignore"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1046
+#: ../raphodo/preferencedialog.py:1498
 msgid "Specify a path that will never be scanned for photos or videos"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1047
+#: ../raphodo/preferencedialog.py:1499
 msgid "Path:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1061
+#: ../raphodo/preferencedialog.py:1513
 msgid "Enter a File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1062
+#: ../raphodo/preferencedialog.py:1514
 msgid "Specify a file extension (without the leading dot)"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1063 ../raphodo/renamepanel.py:122
+#: ../raphodo/preferencedialog.py:1515 ../raphodo/renamepanel.py:122
 msgid "Extension:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1078
+#: ../raphodo/preferencedialog.py:1530
 msgid "Invalid File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1079
+#: ../raphodo/preferencedialog.py:1531
 #, python-format
 msgid ""
 "The file extension <b>%s</b> is recognized by Rapid Photo Downloader, so it "
 "makes no sense to warn about its presence."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1081
+#: ../raphodo/preferencedialog.py:1533
 #, python-format
 msgid ""
 "Recognized file types:\n"
@@ -2227,104 +2828,103 @@ msgstr ""
 msgid "Birthday"
 msgstr ""
 
-#: ../raphodo/preferences.py:614
+#: ../raphodo/preferences.py:624
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr ""
 
-#: ../raphodo/preferences.py:617
+#: ../raphodo/preferences.py:627
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr ""
 
-#: ../raphodo/preferences.py:622
+#: ../raphodo/preferences.py:632
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
 
-#. self.setFlat(True)
 #: ../raphodo/primarybutton.py:72
 msgid "Download 8 Photos and 10 Videos"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:86 ../raphodo/problemnotification.py:208
+#: ../raphodo/problemnotification.py:87 ../raphodo/problemnotification.py:209
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:89
+#: ../raphodo/problemnotification.py:90
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:116
+#: ../raphodo/problemnotification.py:117
 #, python-format
 msgid "GPhoto2 Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:124
+#: ../raphodo/problemnotification.py:125
 msgid ""
 "Unable to initialize the camera, probably because another program is using "
 "it. No files were copied from it."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:134
+#: ../raphodo/problemnotification.py:135
 #, python-format
 msgid "Unable to read directory %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:140
+#: ../raphodo/problemnotification.py:141
 #, python-format
 msgid "Unable to access modification time or size from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:146
+#: ../raphodo/problemnotification.py:147
 #, python-format
 msgid "Unable to read file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:152
+#: ../raphodo/problemnotification.py:153
 #, python-format
 msgid "Unable to write file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:158
+#: ../raphodo/problemnotification.py:159
 #, python-format
 msgid "Unable to move file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:164
+#: ../raphodo/problemnotification.py:165
 #, python-format
 msgid "Unable to remove file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:170
+#: ../raphodo/problemnotification.py:171
 #, python-format
 msgid "Unable to copy file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:176
+#: ../raphodo/problemnotification.py:177
 #, python-format
 msgid "Zero length file %s will not be downloaded"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:182
+#: ../raphodo/problemnotification.py:183
 #, python-format
 msgid "Could not determine filesystem modification time for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:188
+#: ../raphodo/problemnotification.py:189
 #, python-format
 msgid "Unable to load metadata from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:194
+#: ../raphodo/problemnotification.py:195
 #, python-format
 msgid ""
 "Unable to load metadata from %(name)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:202
+#: ../raphodo/problemnotification.py:203
 #, python-format
 msgid ""
 "An error occurred setting a file's filesystem metadata on the filesystem %s. "
@@ -2332,78 +2932,78 @@ msgid ""
 "again."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:216
+#: ../raphodo/problemnotification.py:217
 #, python-format
 msgid "Encountered unhandled file %s. It will not be downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:223
+#: ../raphodo/problemnotification.py:224
 #, python-format
 msgid "%(filetype)s %(destination)s already exists."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:234 ../raphodo/problemnotification.py:262
+#: ../raphodo/problemnotification.py:235 ../raphodo/problemnotification.py:263
 #, python-format
 msgid ""
 "The existing %(filetype)s %(destination)s was last modified on %(date)s at "
 "%(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:245
+#: ../raphodo/problemnotification.py:246
 #, python-format
 msgid "The %(filetype)s %(source)s was not downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:273
+#: ../raphodo/problemnotification.py:274
 #, python-format
 msgid "The %(filetype)s %(source)s was downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:282
+#: ../raphodo/problemnotification.py:283
 #, python-format
 msgid "The unique identifier '%s' was added to the filename."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:298
+#: ../raphodo/problemnotification.py:299
 #, python-format
 msgid ""
 "The existing backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:309
+#: ../raphodo/problemnotification.py:310
 #, python-format
 msgid "The %(filetype)s %(source)s was not backed up from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:326
+#: ../raphodo/problemnotification.py:327
 #, python-format
 msgid ""
 "The previous backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:337
+#: ../raphodo/problemnotification.py:338
 #, python-format
 msgid ""
 "The %(filetype)s %(source)s from %(device)s was backed up, overwriting the "
 "previous backup %(filetype)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:356
+#: ../raphodo/problemnotification.py:357
 #, python-format
 msgid ""
 "When synchronizing RAW + JPEG sequence values, a duplicate %(filetype)s "
 "%(file)s was encountered, and was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:366
+#: ../raphodo/problemnotification.py:367
 msgid ""
 "When synchronizing RAW + JPEG sequence values, photos were detected with the "
 "same filenames, but taken at different times:"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:373
+#: ../raphodo/problemnotification.py:374
 #, python-format
 msgid ""
 "%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
@@ -2412,134 +3012,134 @@ msgstr ""
 "%(image1)s быў зняты %(image1_date)s а %(image1_time)s, і %(image2)s зняты "
 "%(image2_date)s а %(image2_time)s."
 
-#: ../raphodo/problemnotification.py:389
+#: ../raphodo/problemnotification.py:390
 #, python-format
 msgid "Unable to finalize the filename for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:424
+#: ../raphodo/problemnotification.py:425
 #, python-format
 msgid ""
 "The filename %(destination)s was not fully generated for %(filetype)s "
 "%(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:433
+#: ../raphodo/problemnotification.py:434
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:439
+#: ../raphodo/problemnotification.py:440
 #, python-format
 msgid "The following metadata is missing: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:445
+#: ../raphodo/problemnotification.py:446
 #, python-format
 msgid "Date/time conversion failed: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:451
+#: ../raphodo/problemnotification.py:452
 msgid ""
 "Could not extract valid date/time metadata or determine the file "
 "modification time."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:457
+#: ../raphodo/problemnotification.py:458
 msgid "Filename does not have an extension."
 msgstr "Адсутнічае пашырэнне."
 
-#: ../raphodo/problemnotification.py:460
+#: ../raphodo/problemnotification.py:461
 msgid "Filename does not have a number component."
 msgstr "Адсутнічае нумар."
 
-#: ../raphodo/problemnotification.py:464
+#: ../raphodo/problemnotification.py:465
 #, python-format
 msgid "Error generating component %(component)s. Error: %(error)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:477
+#: ../raphodo/problemnotification.py:478
 #, python-format
 msgid ""
 "The download subfolders %(folder)s were only partially generated for "
 "%(filetype)s %(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:486
+#: ../raphodo/problemnotification.py:487
 #, python-format
 msgid ""
 "There is no data with which to generate the %(subfolder_file)s for "
 "%(filename)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:499
+#: ../raphodo/problemnotification.py:500
 #, python-format
 msgid ""
 "Unable to create the %(filetype)s %(destination)s in %(folder)s. The "
 "download file was %(source)s in %(device)s. It was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:514
+#: ../raphodo/problemnotification.py:515
 #, python-format
 msgid "Unable to create the download subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:526
+#: ../raphodo/problemnotification.py:527
 #, python-format
 msgid "Unable to create the backup subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:577
+#: ../raphodo/problemnotification.py:578
 #, python-format
 msgid "Problems scanning %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:584
+#: ../raphodo/problemnotification.py:585
 #, python-format
 msgid "Problems copying from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:591
+#: ../raphodo/problemnotification.py:592
 msgid "Problems while finalizing filenames and generating subfolders"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:598
+#: ../raphodo/problemnotification.py:599
 #, python-format
 msgid "Problems backing up to %s"
 msgstr ""
 
-#. Translators: for example Nov 3 or Dec 31
-#. The start and end dates are on a different day
-#. Translators: for example Nov 3 or Dec 31
-#: ../raphodo/proximity.py:105 ../raphodo/proximity.py:221
-#: ../raphodo/proximity.py:224 ../raphodo/proximity.py:828
+#. Translators: for example Nov 3 2015, 11:25 AM
+#. Translators: for example, Nov 3, 12:15 PM
+#: ../raphodo/proximity.py:188 ../raphodo/proximity.py:213
+#: ../raphodo/proximity.py:236 ../raphodo/proximity.py:239
 #, python-format
-msgid "%(month)s %(numeric_day)s"
+msgid "%(date)s, %(time)s"
 msgstr ""
 
-#. Translators: for example Nov 15 2015
-#. Translators: for example Nov 3 2015
-#: ../raphodo/proximity.py:109 ../raphodo/proximity.py:230
-#: ../raphodo/proximity.py:231 ../raphodo/proximity.py:831
+#: ../raphodo/proximity.py:204
 #, python-format
-msgid "%(date)s %(year)s"
+msgid "%(starttime)s - %(endtime)s"
 msgstr ""
 
-#. Translators: for example Nov 3 2015, 11:25 AM
-#. Translators: for example, Nov 3, 12:15 PM
-#: ../raphodo/proximity.py:197 ../raphodo/proximity.py:215
-#: ../raphodo/proximity.py:234 ../raphodo/proximity.py:236
+#. The start and end dates are on a different day
+#. Translators: for example Nov 3 or Dec 31
+#: ../raphodo/proximity.py:221 ../raphodo/proximity.py:225
+#: ../raphodo/proximity.py:980 ../raphodo/timeutils.py:105
 #, python-format
-msgid "%(date)s, %(time)s"
+msgid "%(month)s %(numeric_day)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:209
+#. Translators: for example Nov 3 2015
+#. Translators: for example Nov 2 2015
+#. Translators: for example Nov 15 2015
+#: ../raphodo/proximity.py:232 ../raphodo/proximity.py:233
+#: ../raphodo/proximity.py:985 ../raphodo/timeutils.py:110
 #, python-format
-msgid "%(starttime)s - %(endtime)s"
+msgid "%(date)s %(year)s"
 msgstr ""
 
 #. Translators: for example, Nov 3, 12:15 PM - Nov 4, 1:00 AM
-#: ../raphodo/proximity.py:241
+#: ../raphodo/proximity.py:245
 #, python-format
 msgid "%(earlier_time)s - %(later_time)s"
 msgstr ""
@@ -2548,25 +3148,25 @@ msgstr ""
 #. Nov 3 2012, 12:15 PM -
 #. Nov 4 2012, 1:00 AM
 #. (please keep the line break signified by \n)
-#: ../raphodo/proximity.py:248
+#: ../raphodo/proximity.py:253
 #, python-format
 msgid ""
 "%(earlier_time)s -\n"
 "%(later_time)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:359
+#: ../raphodo/proximity.py:382
 #, python-format
 msgid "%(month)s  %(year)s"
 msgstr ""
 
 #. Translators: for example Nov 2015
-#: ../raphodo/proximity.py:833
+#: ../raphodo/proximity.py:987
 #, python-format
 msgid "%(month)s %(year)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:1344
+#: ../raphodo/proximity.py:1595
 msgid ""
 "The time elapsed between consecutive photos and videos that is used to build "
 "the Timeline"
@@ -2576,47 +3176,47 @@ msgstr ""
 #. Replace the very last character (after the d) with the correct
 #. localized value, keeping everything else. In other words, change
 #. only the m character.
-#: ../raphodo/proximity.py:1406
+#: ../raphodo/proximity.py:1652
 #, python-format
 msgid "%(minutes)dm"
 msgstr ""
 
 #. Translators: i.e. "1.5h", which is short for 1.5 hours.
 #. Replace the entire string with the correct localized value
-#: ../raphodo/proximity.py:1410
+#: ../raphodo/proximity.py:1656
 msgid "1.5h"
 msgstr ""
 
 #. Translators: e.g. "5h", which is short for 5 hours.
 #. Replace the very last character (after the d) with the correct localized value,
 #. keeping everything else. In other words, change only the h character.
-#: ../raphodo/proximity.py:1415
+#: ../raphodo/proximity.py:1661
 #, python-format
 msgid "%(hours)dh"
 msgstr ""
 
-#: ../raphodo/proximity.py:1461
+#: ../raphodo/proximity.py:1710
 msgid ""
 "The Timeline groups photos and videos based on how much time elapsed between "
 "consecutive shots. Use it to identify photos and videos taken at different "
 "periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/proximity.py:1464
+#: ../raphodo/proximity.py:1715
 msgid ""
 "Use the slider (below) to adjust the time elapsed between consecutive shots "
 "that is used to build the Timeline."
 msgstr ""
 
-#: ../raphodo/proximity.py:1466
+#: ../raphodo/proximity.py:1718
 msgid "Timeline build pending..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1467
+#: ../raphodo/proximity.py:1719
 msgid "Timeline is building..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1468
+#: ../raphodo/proximity.py:1721
 msgid ""
 "The Timeline needs to be rebuilt because the file modification time does not "
 "match the time a shot was taken for one or more shots.<br><br>The Timeline "
@@ -2628,61 +3228,61 @@ msgid ""
 "downloading, which is when the metadata is read."
 msgstr ""
 
-#: ../raphodo/rapid.py:485 ../raphodo/rapid.py:2461 ../raphodo/rapid.py:3728
-#: ../raphodo/rapid.py:3846 ../raphodo/rapid.py:3850 ../raphodo/rapid.py:3870
-#: ../raphodo/rapid.py:3874 ../raphodo/rapid.py:3998 ../raphodo/rapid.py:4007
-#: ../raphodo/rapid.py:4495 ../raphodo/rapid.py:4888 ../raphodo/rapid.py:5722
-#: ../raphodo/rememberthisdialog.py:97
+#: ../raphodo/rapid.py:493 ../raphodo/rapid.py:2555 ../raphodo/rapid.py:3934
+#: ../raphodo/rapid.py:4065 ../raphodo/rapid.py:4069 ../raphodo/rapid.py:4092
+#: ../raphodo/rapid.py:4096 ../raphodo/rapid.py:4226 ../raphodo/rapid.py:4237
+#: ../raphodo/rapid.py:4743 ../raphodo/rapid.py:5195 ../raphodo/rapid.py:5997
+#: ../raphodo/rememberthisdialog.py:99
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:3
 msgid "Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:1100
+#: ../raphodo/rapid.py:1131
 msgid ""
 "<b>ExifTool has a problem</b><br><br> Rapid Photo Downloader uses ExifTool "
 "to get metadata from videos and photos. The program will run without it, but "
 "installing it is <b>highly</b> recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1110 ../raphodo/rapid.py:1130
+#: ../raphodo/rapid.py:1141 ../raphodo/rapid.py:1161
 msgid "Problem with libmediainfo"
 msgstr ""
 
-#: ../raphodo/rapid.py:1119
+#: ../raphodo/rapid.py:1150
 msgid ""
 "<b>The library libmediainfo appears to be missing</b><br><br> Rapid Photo "
 "Downloader uses libmediainfo to get the date and time a video was shot. The "
 "program will run  without it, but installing it is recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1417
+#: ../raphodo/rapid.py:1448
 msgid "Download failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1419
+#: ../raphodo/rapid.py:1450
 msgid ""
 "Sorry, the download of the new version of Rapid Photo Downloader failed."
 msgstr ""
 
-#: ../raphodo/rapid.py:1425
+#: ../raphodo/rapid.py:1457
 msgid ""
 "The new version was successfully downloaded. Do you want to close Rapid "
 "Photo Downloader and install it now?"
 msgstr ""
 
-#: ../raphodo/rapid.py:1428
+#: ../raphodo/rapid.py:1461
 msgid "Update Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:1432
+#: ../raphodo/rapid.py:1465
 msgid "Install"
 msgstr ""
 
-#: ../raphodo/rapid.py:1450
+#: ../raphodo/rapid.py:1483
 msgid "New version saved"
 msgstr ""
 
-#: ../raphodo/rapid.py:1451
+#: ../raphodo/rapid.py:1485
 #, python-format
 msgid ""
 "The tar file and installer script are saved at:\n"
@@ -2690,163 +3290,163 @@ msgid ""
 " %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:1468
+#: ../raphodo/rapid.py:1502
 msgid "Upgrade failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1469
+#: ../raphodo/rapid.py:1505
 msgid ""
 "Sorry, upgrading Rapid Photo Downloader failed because there was an error "
 "opening the installer."
 msgstr ""
 
-#: ../raphodo/rapid.py:1667 ../raphodo/rapid.py:2331
+#: ../raphodo/rapid.py:1709 ../raphodo/rapid.py:2425
 msgid "Download"
 msgstr "Сцягнуць"
 
-#: ../raphodo/rapid.py:1671
+#: ../raphodo/rapid.py:1713
 msgid "&Refresh..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1675
+#: ../raphodo/rapid.py:1717
 msgid "&Preferences"
 msgstr ""
 
-#: ../raphodo/rapid.py:1679
+#: ../raphodo/rapid.py:1721
 msgid "&Quit"
 msgstr ""
 
-#: ../raphodo/rapid.py:1683
+#: ../raphodo/rapid.py:1725
 msgid "Error &Reports"
 msgstr ""
 
-#: ../raphodo/rapid.py:1687
+#: ../raphodo/rapid.py:1729
 msgid "Clear Completed Downloads"
 msgstr ""
 
-#: ../raphodo/rapid.py:1691
+#: ../raphodo/rapid.py:1733
 msgid "Get Help Online..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1695
+#: ../raphodo/rapid.py:1737
 msgid "&Tip of the Day..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1699
+#: ../raphodo/rapid.py:1741
 msgid "Report a Problem..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1703
+#: ../raphodo/rapid.py:1745
 msgid "Make a Donation..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1707
+#: ../raphodo/rapid.py:1749
 msgid "Translate this Application..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1711
+#: ../raphodo/rapid.py:1753
 msgid "&About..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1715
+#: ../raphodo/rapid.py:1757
 msgid "Check for Updates..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1797
+#: ../raphodo/rapid.py:1840
 msgid "Timeline"
 msgstr ""
 
-#: ../raphodo/rapid.py:1807
+#: ../raphodo/rapid.py:1850
 msgid "Destination"
 msgstr ""
 
-#: ../raphodo/rapid.py:1808
+#: ../raphodo/rapid.py:1851
 msgid "Rename"
 msgstr ""
 
-#: ../raphodo/rapid.py:1810
+#: ../raphodo/rapid.py:1853
 msgid "Back Up"
 msgstr ""
 
 #. Devices Header and View
-#: ../raphodo/rapid.py:1926
+#: ../raphodo/rapid.py:1977
 msgid ""
 "Turn on or off the use of devices attached to this computer as download "
 "sources"
 msgstr ""
 
 #. This Computer Header and View
-#: ../raphodo/rapid.py:1940
+#: ../raphodo/rapid.py:1994
 msgid ""
 "Turn on or off the use of a folder on this computer as a download source"
 msgstr ""
 
-#: ../raphodo/rapid.py:1941
+#: ../raphodo/rapid.py:1996
 msgid "This Computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:1952
+#: ../raphodo/rapid.py:2009
 msgid "Select a source folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:1975
+#: ../raphodo/rapid.py:2038
 msgid "Projected Storage Use"
 msgstr ""
 
-#: ../raphodo/rapid.py:1989 ../raphodo/rapid.py:1997
+#: ../raphodo/rapid.py:2056 ../raphodo/rapid.py:2068
 msgid "Select a destination folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:2045
+#: ../raphodo/rapid.py:2117
 msgid "All"
 msgstr ""
 
-#: ../raphodo/rapid.py:2046
+#: ../raphodo/rapid.py:2118
 msgid "New"
 msgstr ""
 
-#: ../raphodo/rapid.py:2048
+#: ../raphodo/rapid.py:2120
 msgid "Show:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2051
+#: ../raphodo/rapid.py:2123
 msgid "Modification Time"
 msgstr ""
 
-#: ../raphodo/rapid.py:2052
+#: ../raphodo/rapid.py:2124
 msgid "Checked State"
 msgstr ""
 
-#: ../raphodo/rapid.py:2055
+#: ../raphodo/rapid.py:2127
 msgid "File Type"
 msgstr ""
 
-#: ../raphodo/rapid.py:2056
+#: ../raphodo/rapid.py:2128
 msgid "Device"
 msgstr "Прылада"
 
-#: ../raphodo/rapid.py:2058
+#: ../raphodo/rapid.py:2130
 msgid "Sort:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2069
+#: ../raphodo/rapid.py:2141
 msgid "Select All:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2311
+#: ../raphodo/rapid.py:2405
 #, python-format
 msgid "Download %(files)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2327
+#: ../raphodo/rapid.py:2421
 msgid "Resume Download"
 msgstr ""
 
-#: ../raphodo/rapid.py:2329
+#: ../raphodo/rapid.py:2423
 msgid "Pause"
 msgstr "Прыпыніць"
 
-#: ../raphodo/rapid.py:2417
+#: ../raphodo/rapid.py:2511
 #, python-brace-format
 msgid ""
 "Please report the problem at <a href=\"{website}\">{website}</a>.<br><br>\n"
@@ -2855,11 +3455,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/rapid.py:2431
+#: ../raphodo/rapid.py:2525
 msgid "Thank you for reporting a problem in Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:2529
+#: ../raphodo/rapid.py:2624
 #, python-format
 msgid ""
 "<b>Changing This Computer source path</b><br><br>Do you really want to "
@@ -2868,30 +3468,29 @@ msgid ""
 "from This Computer will be cancelled."
 msgstr ""
 
-#: ../raphodo/rapid.py:2595
+#: ../raphodo/rapid.py:2694
 msgid "You cannot change the download destination while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:2604
+#: ../raphodo/rapid.py:2704
 #, python-format
 msgid ""
 "<b>Confirm Download Destination</b><br><br>Are you sure you want to set the "
 "%(file_type)s download destination to %(path)s?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2682
+#: ../raphodo/rapid.py:2785
 msgid ""
+"\n"
 "<b>Downloading all files</b><br><br>\n"
-"                    A download always includes all files that are checked "
-"for download,\n"
-"                    including those that are not currently displayed because "
-"the Timeline\n"
-"                    is being used or because only new files are being shown."
-"<br><br>\n"
-"                    Do you want to proceed with the download?"
+"A download always includes all files that are checked for download,\n"
+"including those that are not currently displayed because the Timeline\n"
+"is being used or because only new files are being shown.<br><br>\n"
+"Do you want to proceed with the download?\n"
+"                        "
 msgstr ""
 
-#: ../raphodo/rapid.py:2820
+#: ../raphodo/rapid.py:2937
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -2899,206 +3498,200 @@ msgid ""
 "%(folder2)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2824
+#: ../raphodo/rapid.py:2940
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
 "%s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2827
+#: ../raphodo/rapid.py:2943
 msgid "Download Failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:2828
+#: ../raphodo/rapid.py:2944
 msgid "The download cannot proceed."
 msgstr ""
 
-#: ../raphodo/rapid.py:2842
+#: ../raphodo/rapid.py:2962
 msgid ""
 "Photos and videos will not be backed up because there is nowhere to back "
 "them up. Do you still want to start the download?"
 msgstr ""
 
-#. Translators: filetype will be replaced with 'photos' or 'videos'
-#: ../raphodo/rapid.py:2847 ../raphodo/rapid.py:2854
+#: ../raphodo/rapid.py:2969 ../raphodo/rapid.py:2979
 #, python-format
 msgid ""
 "No backup device exists for backing up %(filetype)s. Do you still want to "
 "start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2848 ../raphodo/rpdfile.py:228
+#: ../raphodo/rapid.py:2971 ../raphodo/rpdfile.py:228
 msgid "photos"
 msgstr "здымкі"
 
-#: ../raphodo/rapid.py:2855 ../raphodo/rpdfile.py:223
+#: ../raphodo/rapid.py:2981 ../raphodo/rpdfile.py:223
 msgid "videos"
 msgstr "відэа"
 
-#: ../raphodo/rapid.py:2861
+#: ../raphodo/rapid.py:2989
 msgid ""
 "<b>The photo and video backup destinations do not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2869 ../raphodo/rapid.py:2876
+#: ../raphodo/rapid.py:2999 ../raphodo/rapid.py:3008
 #, python-format
 msgid ""
 "<b>The %(filetype)s backup destination does not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2871 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:818
+#: ../raphodo/rapid.py:3001 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:843
 msgid "photo"
 msgstr "здымкі"
 
-#: ../raphodo/rapid.py:2878 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:858
+#: ../raphodo/rapid.py:3010 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:883
 msgid "video"
 msgstr "відэа"
 
-#: ../raphodo/rapid.py:2886
+#: ../raphodo/rapid.py:3018
 msgid "Backup problem"
 msgstr ""
 
-#. Translators - in the middle is a unicode em dash - please retain it
-#. This string is displayed in the status bar when the download is running
-#: ../raphodo/rapid.py:3571
+#: ../raphodo/rapid.py:3756
 #, python-format
 msgid "%(downloading_from)s — %(time_left)s left (%(speed)s)"
 msgstr ""
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3640
+#: ../raphodo/rapid.py:3828
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s сцягнуты"
 
-#. Translators: e.g. 2 videos failed to download
-#: ../raphodo/rapid.py:3645
+#: ../raphodo/rapid.py:3836
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "%(noFiles)s %(filetypes)s не атрымалася сцягнуць"
 
-#: ../raphodo/rapid.py:3650 ../raphodo/rapid.py:3723
+#: ../raphodo/rapid.py:3842 ../raphodo/rapid.py:3927
 msgid "warnings"
 msgstr "папярэджанні"
 
-#: ../raphodo/rapid.py:3679
+#: ../raphodo/rapid.py:3873
 msgid "All downloads complete"
 msgstr "Усе сцягванні скончаны"
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3686 ../raphodo/rapid.py:3695 ../raphodo/rapid.py:3704
-#: ../raphodo/rapid.py:3713 ../raphodo/rapid.py:3721
+#: ../raphodo/rapid.py:3881 ../raphodo/rapid.py:3892 ../raphodo/rapid.py:3903
+#: ../raphodo/rapid.py:3914 ../raphodo/rapid.py:3924
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: ../raphodo/rapid.py:3688 ../raphodo/rapid.py:3706
+#: ../raphodo/rapid.py:3884 ../raphodo/rapid.py:3906
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s сцягнуты"
 
-#: ../raphodo/rapid.py:3697 ../raphodo/rapid.py:3715
+#: ../raphodo/rapid.py:3895 ../raphodo/rapid.py:3917
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "%(filetype)s не атрымалася сцягнуць"
 
-#: ../raphodo/rapid.py:3742
+#: ../raphodo/rapid.py:3950
 msgid "1 failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:3744
+#: ../raphodo/rapid.py:3952
 #, python-format
 msgid "%d failures"
 msgstr ""
 
-#: ../raphodo/rapid.py:3749
+#: ../raphodo/rapid.py:3957
 msgid "1 warning"
 msgstr ""
 
-#: ../raphodo/rapid.py:3751
+#: ../raphodo/rapid.py:3959
 #, python-format
 msgid "%d warnings"
 msgstr ""
 
-#: ../raphodo/rapid.py:3771
+#: ../raphodo/rapid.py:3981
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3774
+#: ../raphodo/rapid.py:3985
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3779
+#: ../raphodo/rapid.py:3989
 #, python-format
 msgid "No files downloaded — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3781
+#: ../raphodo/rapid.py:3991
 msgid "No files downloaded"
 msgstr ""
 
-#: ../raphodo/rapid.py:3805
+#: ../raphodo/rapid.py:4021
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3809
+#: ../raphodo/rapid.py:4026
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3812
+#: ../raphodo/rapid.py:4031
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3820
+#: ../raphodo/rapid.py:4039
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3833
+#: ../raphodo/rapid.py:4052
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3837
+#: ../raphodo/rapid.py:4056
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3841
+#: ../raphodo/rapid.py:4060
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices"
 msgstr ""
 
-#: ../raphodo/rapid.py:3867
+#: ../raphodo/rapid.py:4087
 msgid "The Destination subfolders and Timeline have been rebuilt"
 msgstr ""
 
-#: ../raphodo/rapid.py:3922
+#: ../raphodo/rapid.py:4144
 msgid "Program preferences are invalid"
 msgstr ""
 
-#: ../raphodo/rapid.py:3999
+#: ../raphodo/rapid.py:4228
 #, python-format
 msgid ""
 "<b>All files on the %(camera)s are inaccessible</b>.<br><br>It may be locked "
@@ -3108,179 +3701,205 @@ msgid ""
 "ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4008
+#: ../raphodo/rapid.py:4239
 #, python-format
 msgid ""
-"<b>The %(camera)s appears to be in use by another application.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again.<br><br>Alternatively, you can ignore this "
-"device."
+"<b>The %(camera)s appears to be in use by another "
+"application.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again.<br><br>Alternatively, you "
+"can ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4019
+#: ../raphodo/rapid.py:4250
 msgid "&Try Again"
 msgstr ""
 
-#: ../raphodo/rapid.py:4020
+#: ../raphodo/rapid.py:4251
 msgid "&Ignore This Device"
 msgstr ""
 
-#: ../raphodo/rapid.py:4086
+#: ../raphodo/rapid.py:4323
 #, python-format
 msgid "Sorry, an unexpected problem occurred while scanning %s."
 msgstr ""
 
-#: ../raphodo/rapid.py:4087
+#: ../raphodo/rapid.py:4324
 msgid "Unfortunately you cannot download from this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4091
+#: ../raphodo/rapid.py:4328
 msgid ""
 "A possible workaround for the problem might be downloading from the camera's "
 "memory card using a card reader."
 msgstr ""
 
-#: ../raphodo/rapid.py:4096
+#: ../raphodo/rapid.py:4333
 msgid "Device scan failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:4472
+#: ../raphodo/rapid.py:4720
 #, python-format
 msgid ""
-"<b>The %(camera)s cannot be scanned because it cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again."
+"<b>The %(camera)s cannot be scanned because it cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again."
 msgstr ""
 
-#: ../raphodo/rapid.py:4496
+#: ../raphodo/rapid.py:4745
 #, python-format
 msgid ""
-"<b>The download cannot start because the %(camera)s cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again, and choose which files you want to "
-"download from it."
+"<b>The download cannot start because the %(camera)s cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again, and choose which files "
+"you want to download from it."
 msgstr ""
 
-#: ../raphodo/rapid.py:4635
+#: ../raphodo/rapid.py:4842
+msgid "Completed Downloads Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4844
+#, python-format
+msgid "%s whose download have completed are displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4846
+msgid "Do you want to clear the completed downloads?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4848
+msgid "Completed Download Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4850
+#, python-format
+msgid "%s whose download has completed is displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4852
+msgid "Do you want to clear the completed download?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4933
 #, python-format
 msgid ""
 "Do you want to download photos and videos from the device <i>%(device)s</i>?"
 msgstr ""
 
-#: ../raphodo/rapid.py:4877
+#: ../raphodo/rapid.py:5183
 #, python-format
 msgid "<b>Do you want to ignore the %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4879
+#: ../raphodo/rapid.py:5186
 msgid ""
 "All cameras, phones and tablets with the same model name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:4883
+#: ../raphodo/rapid.py:5190
 #, python-format
 msgid ""
 "<b>Do you want to ignore the device %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4885
+#: ../raphodo/rapid.py:5192
 msgid "Any device with the same name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:5178
+#: ../raphodo/rapid.py:5492
 #, python-format
 msgid "Downloading from %(location)s on This Computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5180
+#: ../raphodo/rapid.py:5496
 msgid ""
 "Do you really want to download from here?<br><br>On some systems, scanning "
 "this location can take a very long time."
 msgstr ""
 
-#: ../raphodo/rapid.py:5224
+#: ../raphodo/rapid.py:5537
 #, python-format
 msgid "Generating thumbnails for %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5227
+#: ../raphodo/rapid.py:5540
 #, python-format
 msgid "Scanning %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5237
+#: ../raphodo/rapid.py:5551
 #, python-format
 msgid ""
 "%(number)s of %(available files)s checked for download (%(hidden)s hidden)"
 msgstr ""
 
-#: ../raphodo/rapid.py:5243
+#: ../raphodo/rapid.py:5559
 #, python-format
 msgid "%(number)s of %(available files)s checked for download"
 msgstr ""
 
-#: ../raphodo/rapid.py:5494
+#: ../raphodo/rapid.py:5764
 msgid "Display program information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5496
+#: ../raphodo/rapid.py:5766
 msgid "Display debugging information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5499
+#: ../raphodo/rapid.py:5769
 msgid "List photo and video file extensions the program recognizes and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5502
+#: ../raphodo/rapid.py:5772
 msgid "Turn on or off the the renaming of photos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5504
+#: ../raphodo/rapid.py:5774
 msgid "turn on or off the the renaming of videos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5506
+#: ../raphodo/rapid.py:5776
 msgid ""
 "Turn on or off the automatic detection of devices from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5510
+#: ../raphodo/rapid.py:5780
 msgid "Turn on or off downloading from this computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5512 ../raphodo/rapid.py:5515 ../raphodo/rapid.py:5518
-#: ../raphodo/rapid.py:5539 ../raphodo/rapid.py:5543
+#: ../raphodo/rapid.py:5782 ../raphodo/rapid.py:5785 ../raphodo/rapid.py:5788
+#: ../raphodo/rapid.py:5809 ../raphodo/rapid.py:5813
 msgid "PATH"
 msgstr ""
 
-#: ../raphodo/rapid.py:5513
+#: ../raphodo/rapid.py:5783
 msgid "The PATH on this computer from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5516
+#: ../raphodo/rapid.py:5786
 msgid "The PATH where photos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5519
+#: ../raphodo/rapid.py:5789
 msgid "The PATH where videos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5521
+#: ../raphodo/rapid.py:5791
 msgid "Turn on or off the backing up of photos and videos while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:5525
+#: ../raphodo/rapid.py:5795
 msgid "Turn on or off the automatic detection of backup devices."
 msgstr ""
 
-#: ../raphodo/rapid.py:5527 ../raphodo/rapid.py:5533
+#: ../raphodo/rapid.py:5797 ../raphodo/rapid.py:5803
 msgid "FOLDER"
 msgstr ""
 
-#: ../raphodo/rapid.py:5528
+#: ../raphodo/rapid.py:5798
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected photo "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3288,7 +3907,7 @@ msgid ""
 "photos up to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5534
+#: ../raphodo/rapid.py:5804
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected video "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3296,115 +3915,124 @@ msgid ""
 "up videos to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5540
+#: ../raphodo/rapid.py:5810
 msgid ""
 "The PATH where photos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5544
+#: ../raphodo/rapid.py:5814
 msgid ""
 "The PATH where videos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5547
+#: ../raphodo/rapid.py:5817
 #, python-format
 msgid "Ignore photos with the following extensions: %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5551
-msgid "Turn on or off starting downloads as soon as the program itself starts."
+#: ../raphodo/rapid.py:5821
+msgid ""
+"Turn on or off starting downloads as soon as the program itself starts."
 msgstr ""
 
-#: ../raphodo/rapid.py:5554
+#: ../raphodo/rapid.py:5824
 msgid "Turn on or off starting downloads as soon as a device is inserted."
 msgstr ""
 
-#: ../raphodo/rapid.py:5557
+#: ../raphodo/rapid.py:5827
 msgid ""
 "Turn on or off use of the Rapid Photo Downloader Thumbnail Cache. Turning it "
 "off does not delete existing cache contents."
 msgstr ""
 
-#: ../raphodo/rapid.py:5561
+#: ../raphodo/rapid.py:5831
 msgid ""
 "Delete all thumbnails in the Rapid Photo Downloader Thumbnail Cache, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5565
+#: ../raphodo/rapid.py:5835
 msgid "Forget which files have been previously downloaded, and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5568
+#: ../raphodo/rapid.py:5838
 msgid ""
 "Import preferences from an old program version and exit. Requires the "
 "command line program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5571
+#: ../raphodo/rapid.py:5841
 msgid ""
 "Reset all program settings to their default values, delete all thumbnails in "
 "the Thumbnail cache, forget which files have been previously downloaded, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5575
+#: ../raphodo/rapid.py:5845
 msgid "Include gphoto2 debugging information in log files."
 msgstr ""
 
-#: ../raphodo/rapid.py:5579
+#: ../raphodo/rapid.py:5849
 msgid "Print information to the terminal about attached cameras and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5640
+#: ../raphodo/rapid.py:5911
 msgid ""
 "To import preferences from the old version of Rapid Photo Downloader, you "
 "must install the program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5649
+#: ../raphodo/rapid.py:5920
 msgid "No prior program preferences detected: exiting"
 msgstr ""
 
-#: ../raphodo/rapid.py:5652
+#: ../raphodo/rapid.py:5923
 #, python-format
 msgid "Importing preferences from Rapid Photo Downloader %(version)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5714
+#: ../raphodo/rapid.py:5989
 #, python-format
-msgid "Do you want to copy the stored sequence number, which has the value %d?"
+msgid ""
+"Do you want to copy the stored sequence number, which has the value %d?"
 msgstr ""
 
-#: ../raphodo/rapid.py:5726
+#: ../raphodo/rapid.py:6000
 msgid "Program aborting."
 msgstr ""
 
-#: ../raphodo/rapid.py:5736
+#: ../raphodo/rapid.py:6010
 msgid "Never run this program as the sudo / root user."
 msgstr ""
 
-#: ../raphodo/rapid.py:5740
+#: ../raphodo/rapid.py:6014
 msgid "You must install ExifTool to run Rapid Photo Downloader."
 msgstr ""
 
-#: ../raphodo/rapid.py:5794
+#: ../raphodo/rapid.py:6026
+msgid ""
+"Rapid Photo Downloader is installed in multiple locations.\n"
+"\n"
+"Uninstall all copies except the version you want to run."
+msgstr ""
+
+#: ../raphodo/rapid.py:6083
 msgid ""
 "When specifying a path on the command line, do not also specify an\n"
 "option for device auto detection or a path on \"This Computer\"."
 msgstr ""
 
-#: ../raphodo/rapid.py:5950
+#: ../raphodo/rapid.py:6243
 msgid "All settings and caches have been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5958
+#: ../raphodo/rapid.py:6251
 msgid "Thumbnail Cache has been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5964
+#: ../raphodo/rapid.py:6257
 msgid "Remembered files have been forgotten"
 msgstr ""
 
@@ -3420,15 +4048,15 @@ msgstr ""
 msgid "&Don't warn me again about missing or broken program libraries"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:546
+#: ../raphodo/renameandmovefile.py:554
 msgid "subfolder and filename"
 msgstr "падпапка і назва файла"
 
-#: ../raphodo/renameandmovefile.py:548
+#: ../raphodo/renameandmovefile.py:556
 msgid "filename"
 msgstr "назва файла"
 
-#: ../raphodo/renameandmovefile.py:550
+#: ../raphodo/renameandmovefile.py:558
 msgid "subfolder"
 msgstr "падпапка"
 
@@ -3508,160 +4136,237 @@ msgstr "здымкі і відэа"
 msgid "photos or videos"
 msgstr "здымкі або відэа"
 
-#: ../raphodo/rpdfile.py:306
+#: ../raphodo/rpdfile.py:315
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: ../raphodo/rpdfile.py:318
+#. translators: natural language expression signifying a single video
+#: ../raphodo/rpdfile.py:337
+msgid "a video"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:339
 msgid "1 Video"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:323
+#. translators: natural language expression signifying a single photo
+#: ../raphodo/rpdfile.py:346
+msgid "a photo"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:348
 msgid "1 Photo"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:803
+#: ../raphodo/rpdfile.py:828
 #, python-format
 msgid "%(path)s on %(camera)s"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:819
+#: ../raphodo/rpdfile.py:844
 msgid "Photo"
 msgstr "Здымак"
 
-#: ../raphodo/rpdfile.py:859
+#: ../raphodo/rpdfile.py:884
 msgid "Video"
 msgstr "Відэа"
 
-#: ../raphodo/storage.py:138
+#: ../raphodo/storage.py:141
 msgid "File system root"
 msgstr ""
 
 #. translators: the name of the Pictures folder
-#: ../raphodo/storage.py:433
+#: ../raphodo/storage.py:437
 msgid "Pictures"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:426
+#: ../raphodo/thumbnaildisplay.py:432
 #, python-format
 msgid "Taken on %(date_time)s (%(human_readable)s)"
 msgstr "Зроблена а %(date_time)s (%(human_readable)s)"
 
-#: ../raphodo/thumbnaildisplay.py:431
+#: ../raphodo/thumbnaildisplay.py:439
 #, python-format
 msgid "Modified on %(date_time)s (%(human_readable)s)"
 msgstr "Зменена а %(date_time)s (%(human_readable)s)"
 
-#: ../raphodo/thumbnaildisplay.py:437 ../raphodo/thumbnaildisplay.py:466
+#: ../raphodo/thumbnaildisplay.py:447 ../raphodo/thumbnaildisplay.py:481
 #, python-format
 msgid "%(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:451
+#: ../raphodo/thumbnaildisplay.py:464
 #, python-format
 msgid "Memory cards: %s"
 msgstr "Карты памяці: %s"
 
-#: ../raphodo/thumbnaildisplay.py:457
+#: ../raphodo/thumbnaildisplay.py:468
+#, python-format
+msgid "Memory card: %s"
+msgstr ""
+
+#: ../raphodo/thumbnaildisplay.py:473
 msgid "Downloaded as:"
 msgstr "Загружана як:"
 
-#: ../raphodo/thumbnaildisplay.py:472
+#: ../raphodo/thumbnaildisplay.py:489
 #, python-format
 msgid "<br><br>Previous download:<br>%(filename)s<br>%(path)s<br>%(date)s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:1603
+#: ../raphodo/thumbnaildisplay.py:1645
 msgid "Copy Path"
 msgstr "Скапіяваць пуць"
 
+#. Translators: these values are file size suffixes like B representing bytes, KB representing
+#. kilobytes, etc.
+#: ../raphodo/utilities.py:170
+msgid "B"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "KB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "MB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "GB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "TB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "PB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "EB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "ZB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "YB"
+msgstr ""
+
 #. two things in a list e.g. "device1 and device2"
-#: ../raphodo/utilities.py:391
+#: ../raphodo/utilities.py:394
 #, python-format
 msgid "%(first_item)s and %(last_item)s"
 msgstr "%(first_item)s і %(last_item)s"
 
-#: ../raphodo/utilities.py:464
+#: ../raphodo/utilities.py:468
 msgid "one"
 msgstr "адзін"
 
-#: ../raphodo/utilities.py:465
+#: ../raphodo/utilities.py:469
 msgid "two"
 msgstr "два"
 
-#: ../raphodo/utilities.py:466
+#: ../raphodo/utilities.py:470
 msgid "three"
 msgstr "тры"
 
-#: ../raphodo/utilities.py:467
+#: ../raphodo/utilities.py:471
 msgid "four"
 msgstr "чатыры"
 
-#: ../raphodo/utilities.py:468
+#: ../raphodo/utilities.py:472
 msgid "five"
 msgstr "пяць"
 
-#: ../raphodo/utilities.py:469
+#: ../raphodo/utilities.py:473
 msgid "six"
 msgstr "шэсць"
 
-#: ../raphodo/utilities.py:470
+#: ../raphodo/utilities.py:474
 msgid "seven"
 msgstr "сем"
 
-#: ../raphodo/utilities.py:471
+#: ../raphodo/utilities.py:475
 msgid "eight"
 msgstr "восем"
 
-#: ../raphodo/utilities.py:472
+#: ../raphodo/utilities.py:476
 msgid "nine"
 msgstr "дзевяць"
 
-#: ../raphodo/utilities.py:473
+#: ../raphodo/utilities.py:477
 msgid "ten"
 msgstr "дзесяць"
 
-#: ../raphodo/utilities.py:474
+#: ../raphodo/utilities.py:478
 msgid "eleven"
 msgstr "адзінаццаць"
 
-#: ../raphodo/utilities.py:475
+#: ../raphodo/utilities.py:479
 msgid "twelve"
 msgstr "дванаццаць"
 
-#: ../raphodo/utilities.py:476
+#: ../raphodo/utilities.py:480
 msgid "thirteen"
 msgstr "трынаццаць"
 
-#: ../raphodo/utilities.py:477
+#: ../raphodo/utilities.py:481
 msgid "fourteen"
 msgstr "чатырнаццаць"
 
-#: ../raphodo/utilities.py:478
+#: ../raphodo/utilities.py:482
 msgid "fifteen"
 msgstr "пятнаццаць"
 
-#: ../raphodo/utilities.py:479
+#: ../raphodo/utilities.py:483
 msgid "sixteen"
 msgstr "шаснаццаць"
 
-#: ../raphodo/utilities.py:480
+#: ../raphodo/utilities.py:484
 msgid "seventeen"
 msgstr "сямнаццаць"
 
-#: ../raphodo/utilities.py:481
+#: ../raphodo/utilities.py:485
 msgid "eighteen"
 msgstr "васямнаццаць"
 
-#: ../raphodo/utilities.py:482
+#: ../raphodo/utilities.py:486
 msgid "ninenteen"
 msgstr "дзевятнаццаць"
 
-#: ../raphodo/utilities.py:483
+#: ../raphodo/utilities.py:487
 msgid "twenty"
 msgstr "дваццаць"
 
+#: ../raphodo/viewutils.py:240
+msgid "&OK"
+msgstr ""
+
+#: ../raphodo/viewutils.py:243
+msgid "&Save"
+msgstr ""
+
+#: ../raphodo/viewutils.py:244
+msgid "&Help"
+msgstr ""
+
+#: ../raphodo/viewutils.py:245
+msgid "Restore Defaults"
+msgstr ""
+
+#: ../raphodo/viewutils.py:246
+msgid "&Yes"
+msgstr ""
+
+#: ../raphodo/viewutils.py:247
+msgid "&No"
+msgstr ""
+
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:1
 msgid ""
 "Rapid Photo Downloader imports photos and videos from cameras, phones, "
@@ -3715,8 +4420,8 @@ msgstr ""
 #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:5
 msgid ""
-"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;"
-"memory;card;"
+"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;memory"
+";card;"
 msgstr ""
 
 #: ../data/kde/net.damonlynch.rapid-photo-downloader.desktop.in.h:1
@@ -3735,6 +4440,7 @@ msgstr ""
 #~ msgid "scanning..."
 #~ msgstr "пошук..."
 
+#, python-format
 #~ msgid "About %i seconds remaining"
 #~ msgstr "Засталося каля %i секунд"
 
@@ -3748,15 +4454,17 @@ msgstr ""
 #~ "Do you really want to download from here? On some systems, scanning this "
 #~ "location can take a very long time."
 #~ msgstr ""
-#~ "Вы сапраўды хочаце сцягнуць адсюда? На некаторых сістэмах пошук можа "
-#~ "доўга цягнуцца."
+#~ "Вы сапраўды хочаце сцягнуць адсюда? На некаторых сістэмах пошук можа доўга "
+#~ "цягнуцца."
 
+#, python-format
 #~ msgid "Downloading from %(location)s."
 #~ msgstr "Сцягванне з %(location)s."
 
 #~ msgid "Download cannot proceed"
 #~ msgstr "Немагчыма сцянуць"
 
+#, python-format
 #~ msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 #~ msgstr "Засталося каля %(minutes)i:%(seconds)i"
 
@@ -3769,12 +4477,15 @@ msgstr ""
 #~ msgid "Auto Detect"
 #~ msgstr "Аўта вызначэнне"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 #~ msgstr "%(number)s з %(total)s %(filetypes)s (%(remaining)s засталося)"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s"
 #~ msgstr "%(number)s з %(total)s %(filetypes)s"
 
+#, python-format
 #~ msgid "%(device)s did not unmount"
 #~ msgstr "%(device)s не адмантаваны"
 
@@ -3796,9 +4507,11 @@ msgstr ""
 #~ msgid "All settings and preferences have been reset"
 #~ msgstr "Усе наладкі былі скінуты"
 
+#, python-format
 #~ msgid "and %s"
 #~ msgstr "і %s"
 
+#, python-format
 #~ msgid ""
 #~ "%(problem)s\n"
 #~ "File: %(file)s"
@@ -3812,12 +4525,14 @@ msgstr ""
 #~ msgid "Device Detected"
 #~ msgstr "Знойдзена прылада"
 
+#, python-format
 #~ msgid "Error: %(inst)s"
 #~ msgstr "Памылка: %(inst)s"
 
 #~ msgid "Name + extension"
 #~ msgstr "Назва + пашырэнне"
 
+#, python-format
 #~ msgid "Select a folder containing %(file_types)s"
 #~ msgstr "Выбраць папку з %(file_types)s"
 
@@ -3827,6 +4542,7 @@ msgstr ""
 #~ msgid "Select a folder to download photos to"
 #~ msgstr "Выбярыце папку, куды сцягнуць здымкі"
 
+#, python-format
 #~ msgid "Folder: %s"
 #~ msgstr "Папкі: %s"
 
@@ -3851,6 +4567,7 @@ msgstr ""
 #~ msgid "New York"
 #~ msgstr "Нью-Ёрк"
 
+#, python-format
 #~ msgid "<i>Example: %s</i>"
 #~ msgstr "<i>Прыклад: %s</i>"
 
@@ -3905,18 +4622,23 @@ msgstr ""
 #~ msgid "Warsaw"
 #~ msgstr "Варшава"
 
+#, python-format
 #~ msgid "%(filetype)s already exists"
 #~ msgstr "%(filetype)s ужо існуе"
 
+#, python-format
 #~ msgid "An error occurred when copying the %(filetype)s"
 #~ msgstr "Памылка капіявання %(filetype)s"
 
+#, python-format
 #~ msgid "%(filetype)s was already downloaded"
 #~ msgstr "%(filetype)s ужо сцягнуты"
 
+#, python-format
 #~ msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
 #~ msgstr "Існуючы %(filetype)s быў зменены %(date)s а %(time)s."
 
+#, python-format
 #~ msgid "Error: %(errorno)s %(strerror)s"
 #~ msgstr "Памылка: %(errorno)s %(strerror)s"
 
@@ -3925,49 +4647,60 @@ msgstr ""
 #~ "downloaded."
 #~ msgstr "Назва файла, пашырэнне і EXIF сведчаць, што здымак ужо сцягнуты."
 
+#, python-format
 #~ msgid "%s, "
 #~ msgstr "%s, "
 
+#, python-format
 #~ msgid "%(volumes)s and %(final_volume)s."
 #~ msgstr "%(volumes)s і %(final_volume)s."
 
+#, python-format
 #~ msgid "%(volume)s, "
 #~ msgstr "%(volume)s, "
 
+#, python-format
 #~ msgid "%(volume)s (%(inst)s), "
 #~ msgstr "%(volume)s (%(inst)s), "
 
+#, python-format
 #~ msgid "%(volumes)s and %(volume)s."
 #~ msgstr "%(volumes)s і %(volume)s."
 
+#, python-format
 #~ msgid "%(volumes)s and %(volume)s (%(inst)s)."
 #~ msgstr "%(volumes)s і %(volume)s (%(inst)s)."
 
+#, python-format
 #~ msgid ""
 #~ "Photos detected with the same filenames, but taken at different times: "
 #~ "%(details)s"
-#~ msgstr ""
-#~ "Знойдзены здымкі з той жа назвай, але знятыя ў розны час %(details)s"
+#~ msgstr "Знойдзены здымкі з той жа назвай, але знятыя ў розны час %(details)s"
 
+#, python-format
 #~ msgid "An error occurred when creating directories on %(volume)s: %(inst)s."
 #~ msgstr "Памылка стварэння папкі на %(volume)s: %(inst)s."
 
+#, python-format
 #~ msgid "Problem in %s generation"
 #~ msgstr "Праблема пры стварэнні %s"
 
+#, python-format
 #~ msgid "Problems in %s generation"
 #~ msgstr "Праблемы пры стварэнні %s"
 
-#~ msgid ""
-#~ "Photos detected with the same filenames, but taken at different times"
+#~ msgid "Photos detected with the same filenames, but taken at different times"
 #~ msgstr "Знойдзены здымкі з аднолькавай назвай, але знятыя ў розны час"
 
+#, python-format
 #~ msgid "Source: %(source)s"
 #~ msgstr "Крыніца: %(source)s"
 
+#, python-format
 #~ msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
+#, python-format
 #~ msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
 #~ msgstr "пошук (знойдзена %(photos)s здымкаў і %(videos)s відэа)..."
 
diff --git a/po/bg.po b/po/bg.po
index c59e2a1..1f731b0 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,129 +7,489 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: damonlynch@gmail.com\n"
-"POT-Creation-Date: 2017-07-08 19:16-0500\n"
-"PO-Revision-Date: 2017-07-04 11:06+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2017-09-12 17:01-0400\n"
+"PO-Revision-Date: 2017-09-13 18:45+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
-"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-07-05 23:04+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-09-26 22:04+0000\n"
+"X-Generator: Launchpad (build 18463)\n"
+"Language: bg\n"
+
+#: ../install.py:65
+msgid "Rapid Photo Downloader installer"
+msgstr ""
+
+#: ../install.py:66
+msgid "Download and install latest version of Rapid Photo Downloader."
+msgstr ""
+
+#: ../install.py:236 ../install.py:1732
+msgid "Installer not found:"
+msgstr ""
+
+#. Translators: do not translate the term tar.gz
+#: ../install.py:240 ../install.py:1736
+msgid "Installer not in tar.gz format:"
+msgstr ""
+
+#: ../install.py:465
+msgid ""
+"Incorrect folder ownership detected. Changing ownership of and resetting "
+"permissions for"
+msgstr ""
+
+#: ../install.py:540
+msgid "The following command will be run:"
+msgstr ""
+
+#: ../install.py:543 ../install.py:1479 ../install.py:1484
+msgid "sudo may prompt you for the sudo password."
+msgstr ""
+
+#: ../install.py:547
+msgid "Would you like to run the command now?"
+msgstr ""
+
+#: ../install.py:549
+msgid "Answer is not yes, exiting."
+msgstr ""
+
+#: ../install.py:559 ../install.py:751 ../install.py:966
+msgid "Command failed"
+msgstr ""
+
+#: ../install.py:561 ../install.py:752 ../install.py:967
+msgid "Exiting"
+msgstr ""
+
+#: ../install.py:582
+msgid "The Universe repository must be enabled."
+msgstr ""
+
+#: ../install.py:606
+msgid ""
+"Do you want to to uninstall the previous version of Rapid Photo Downloader:"
+msgstr ""
+
+#: ../install.py:715 ../install.py:740
+msgid ""
+"Querying package system to see if an older version of Rapid Photo Downloader "
+"is installed (this may take a while)..."
+msgstr ""
+
+#: ../install.py:726
+msgid ""
+"Unable to query package system. Please check your Internet connection and "
+"try again"
+msgstr ""
+
+#: ../install.py:756
+msgid "Checking if previous version installed with pip..."
+msgstr ""
+
+#: ../install.py:850
+msgid "The following package is unknown on your system: {}\n"
+msgstr ""
+
+#: ../install.py:857 ../install.py:929 ../install.py:974
+msgid ""
+"To continue, some packages required to run the application will be installed."
+msgstr ""
+
+#: ../install.py:886
+msgid "Querying installed and available packages (this may take a while)"
+msgstr ""
+
+#: ../install.py:958
+msgid ""
+"Querying zypper to see if any required packages are already installed (this "
+"may take a while)... "
+msgstr ""
+
+#: ../install.py:1004
+msgid "Query to confirm action at each step."
+msgstr ""
+
+#: ../install.py:1011
+msgid ""
+"When downloading the latest version, install the development version if it "
+"is newer than the stable version."
+msgstr ""
+
+#: ../install.py:1020
+msgid ""
+"Optional tar.gz Rapid Photo Downloader installer archive. If not specified, "
+"the latest version is downloaded from the Internet."
+msgstr ""
+
+#: ../install.py:1043
+msgid ""
+"Do not run the installer in the tar.gz Rapid Photo Downloader installer "
+"archive if it is newer than this version ({}). The default is to run "
+"whichever installer is newer."
+msgstr ""
+
+#: ../install.py:1050
+msgid ""
+"Uninstall Rapid Photo Downloader that was installed with pip, keeping its "
+"dependencies."
+msgstr ""
+
+#: ../install.py:1054
+msgid ""
+"Uninstall the dependencies installed by pip during Rapid Photo Downloader's "
+"installation, and Rapid Photo Downloader itself, then exit."
+msgstr ""
+
+#: ../install.py:1059
+msgid ""
+"Note: this will not uninstall any version of Rapid Photo Downloader "
+"installed by your Linux distribution's package manager."
+msgstr ""
+
+#: ../install.py:1066
+msgid ""
+"Dependencies will only be removed if they are not required by other programs."
+msgstr ""
+
+#: ../install.py:1072
+msgid ""
+"Note: this option will remove the dependencies regardless of whether they "
+"are required by another program pip has installed. Upgrade to pip 9.0 or "
+"above if you want to avoid this behavior. You can do so using the command "
+"'python3 -m pip install pip -U --user'. Also note that any version of Rapid "
+"Photo Downloader installed by your Linux distribution's package manager will "
+"not be uninstalled."
+msgstr ""
+
+#: ../install.py:1122
+msgid "Failed to download versions file"
+msgstr ""
+
+#: ../install.py:1126
+msgid "Got error code {} while accessing versions file"
+msgstr ""
+
+#: ../install.py:1234
+msgid ""
+"Sorry, could not locate installer. Please check your Internet connection and "
+"verify if you can reach https://www.damonlynch.net\n"
+"\n"
+"Exiting.\n"
+msgstr ""
+
+#: ../install.py:1408
+msgid "Installing application requirements..."
+msgstr ""
+
+#: ../install.py:1424
+msgid "Received error code"
+msgstr ""
+
+#: ../install.py:1425
+msgid "Failed to install application requirements: exiting"
+msgstr ""
+
+#: ../install.py:1428
+msgid "Installing application..."
+msgstr ""
+
+#: ../install.py:1441
+msgid "Failed to install application: exiting..."
+msgstr ""
+
+#: ../install.py:1465
+msgid ""
+"You may have to restart the computer to be able to run the program from the "
+"commmand line or application launcher."
+msgstr ""
+
+#: ../install.py:1476
+msgid "Do you want to install the application's man pages?"
+msgstr ""
+
+#: ../install.py:1477
+msgid "They will be installed into {}"
+msgstr ""
+
+#: ../install.py:1478 ../install.py:1483
+msgid "If you uninstall the application, remove these manpages yourself."
+msgstr ""
+
+#: ../install.py:1480
+msgid "Do want to install the man pages?"
+msgstr ""
+
+#: ../install.py:1482
+msgid "Installing man pages into {}"
+msgstr ""
+
+#: ../install.py:1499
+msgid "Failed to create man page directory: exiting"
+msgstr ""
+
+#: ../install.py:1511
+msgid "Failed to copy man page."
+msgstr ""
+
+#: ../install.py:1521
+msgid "(If a segmentation fault occurs at exit, you can ignore it...)"
+msgstr ""
+
+#: ../install.py:1534
+msgid ""
+"The python3 tool pip is required to uninstall a version of Rapid Photo "
+"Downloader that was installed with pip.\n"
+"Cannot continue. Exiting."
+msgstr ""
+
+#: ../install.py:1575
+msgid ""
+"Do not run this installer script as sudo / root user.\n"
+"Run it using the user who will run the program.\n"
+msgstr ""
+
+#: ../install.py:1585 ../install.py:1599
+msgid "Do not include any other command line arguments when specifying"
+msgstr ""
+
+#: ../install.py:1614
+msgid ""
+"Sorry, this installer does not support a custom python installation.\n"
+"Exiting..."
+msgstr ""
+
+#: ../install.py:1620
+msgid "Restarting script using system python..."
+msgstr ""
+
+#: ../install.py:1651
+msgid "Exiting..."
+msgstr ""
+
+#. Translators: do not translate the term python3-apt
+#: ../install.py:1670
+msgid "To continue, the package python3-apt must be installed."
+msgstr ""
 
-#. type: QPushButton
-#: ../raphodo/aboutdialog.py:217
+#: ../install.py:1689
+msgid ""
+"Install the following packages using your Linux distribution's standard "
+"package manager, and then rerun this installer"
+msgstr ""
+
+#: ../install.py:1698
+msgid ""
+"To run this program, programs to assist Python 3 and its package management "
+"must be installed."
+msgstr ""
+
+#. Translators: do not translate the terms Python 3, pip and setuptools
+#: ../install.py:1713
+msgid "Python 3's pip and setuptools must be upgraded for your user."
+msgstr ""
+
+#. Translators: do not translate the term python or requests
+#: ../install.py:1726
+msgid "Installing python requests"
+msgstr ""
+
+#: ../upgrade.py:79
+msgid "Upgrade Rapid Photo Downloader"
+msgstr ""
+
+#: ../upgrade.py:401 ../raphodo/viewutils.py:242
+msgid "&Cancel"
+msgstr ""
+
+#: ../upgrade.py:405
+msgid "&Upgrade"
+msgstr ""
+
+#: ../upgrade.py:410
+#, python-format
+msgid "Click the Upgrade button to upgrade to version %s."
+msgstr ""
+
+#: ../upgrade.py:413
+msgid "Click the Upgrade button to start the upgrade."
+msgstr ""
+
+#: ../upgrade.py:416 ../upgrade.py:422 ../raphodo/viewutils.py:241
+msgid "&Close"
+msgstr ""
+
+#: ../upgrade.py:417
+msgid "&Run"
+msgstr ""
+
+#: ../upgrade.py:447
+msgid "Close Rapid Photo Downloader before running this upgrade"
+msgstr ""
+
+#: ../upgrade.py:450
+msgid "Upgrade running..."
+msgstr ""
+
+#: ../upgrade.py:486
+#, python-format
+msgid ""
+"Successfully upgraded to %s. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:491
+msgid ""
+"Upgrade finished successfully. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:495
+msgid "Upgrade failed. Click Close to exit."
+msgstr ""
+
+#: ../upgrade.py:6967
+#, python-format
+msgid "Upgrading %s..."
+msgstr ""
+
+#: ../upgrade.py:6969
+msgid "Press any key to continue..."
+msgstr ""
+
+#: ../upgrade.py:6982
+msgid "Rapid Photo Downloader upgrade failed"
+msgstr ""
+
+#: ../upgrade.py:6984
+#, python-format
+msgid ""
+"The python package %s could not be updated. The upgrade cannot continue."
+msgstr ""
+
+#: ../raphodo/aboutdialog.py:225
 msgid "Credits"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:239
+#: ../raphodo/backuppanel.py:240
 msgid "Backups are not configured"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:241
+#: ../raphodo/backuppanel.py:242
 msgid "No backup devices detected"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:243
+#: ../raphodo/backuppanel.py:244
 msgid "Valid backup locations not yet specified"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:401
+#: ../raphodo/backuppanel.py:404
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
 msgstr ""
 
-#: ../raphodo/backuppanel.py:407
+#: ../raphodo/backuppanel.py:412
 msgid "Back up photos and videos when downloading"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:413
+#: ../raphodo/backuppanel.py:418
 msgid "Automatically detect backup devices"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:417
+#: ../raphodo/backuppanel.py:424
 msgid ""
-"Specify the folder in which backups are stored on the device."
-"<br><br><i>Note: the presence of a folder with this name is used to "
+"Specify the folder in which backups are stored on the "
+"device.<br><br><i>Note: the presence of a folder with this name is used to "
 "determine if 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 folder names. By "
 "adding both folders, the same device can be used to back up both photos and "
 "videos.</i>"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:428
+#: ../raphodo/backuppanel.py:439
 msgid "Photo folder name:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:433
+#: ../raphodo/backuppanel.py:444
 msgid "Video folder name:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:438 ../raphodo/nameeditor.py:883
+#: ../raphodo/backuppanel.py:449 ../raphodo/nameeditor.py:890
 #: ../raphodo/renamepanel.py:123
 msgid "Example:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:448
-msgid "If you disable automatic detection, choose the exact backup locations."
+#: ../raphodo/backuppanel.py:460
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
 
-#: ../raphodo/backuppanel.py:452
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:468
 msgid "Photo backup location:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:454
+#: ../raphodo/backuppanel.py:474
 msgid "Select Photo Backup Location"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:460
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:485
 msgid "Video backup location:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:462
+#: ../raphodo/backuppanel.py:491
 msgid "Select Video Backup Location"
 msgstr ""
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:564
+#: ../raphodo/backuppanel.py:595
 msgid "drive1"
 msgstr ""
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:567
+#: ../raphodo/backuppanel.py:598
 msgid "drive2"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:628
+#: ../raphodo/backuppanel.py:663
 msgid "Projected Backup Storage Use"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:632
+#: ../raphodo/backuppanel.py:669
 msgid "Backup Options"
 msgstr ""
 
 #. translators: refers to the video thumbnail file that some
 #. cameras generate -- it has a .THM file extension
-#: ../raphodo/copyfiles.py:476
+#: ../raphodo/copyfiles.py:491
 msgid "video THM"
 msgstr ""
 
-#: ../raphodo/copyfiles.py:482
+#: ../raphodo/copyfiles.py:497
 msgid "audio"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:78 ../raphodo/devicedisplay.py:1079
-#: ../raphodo/rpdfile.py:321
+#: ../raphodo/rpdfile.py:342
 #, python-format
 msgid "%(no_photos)s Photos"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:82 ../raphodo/devicedisplay.py:1081
-#: ../raphodo/rpdfile.py:316
+#: ../raphodo/rpdfile.py:333
 #, python-format
 msgid "%(no_videos)s Videos"
 msgstr ""
@@ -157,15 +517,15 @@ msgid "%(size_free)s free of %(size_total)s"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:190 ../raphodo/devicedisplay.py:993
-#: ../raphodo/rapid.py:1964 ../raphodo/rapid.py:2079 ../raphodo/rapid.py:5753
-#: ../raphodo/rpdfile.py:905
+#: ../raphodo/rapid.py:2023 ../raphodo/rapid.py:2151 ../raphodo/rapid.py:6043
+#: ../raphodo/rpdfile.py:930
 msgid "Photos"
 msgstr ""
 
 #. translators: the name of the Videos folder
 #: ../raphodo/destinationdisplay.py:191 ../raphodo/devicedisplay.py:994
-#: ../raphodo/rapid.py:1967 ../raphodo/rapid.py:2080 ../raphodo/rapid.py:5754
-#: ../raphodo/rpdfile.py:933 ../raphodo/storage.py:445
+#: ../raphodo/rapid.py:2028 ../raphodo/rapid.py:2152 ../raphodo/rapid.py:6044
+#: ../raphodo/rpdfile.py:958 ../raphodo/storage.py:449
 msgid "Videos"
 msgstr ""
 
@@ -173,7 +533,7 @@ msgstr ""
 msgid "Projected storage use after download"
 msgstr ""
 
-#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:516
+#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:521
 msgid "Custom..."
 msgstr ""
 
@@ -211,57 +571,58 @@ msgstr ""
 msgid "%s full"
 msgstr ""
 
-#: ../raphodo/devices.py:459
+#: ../raphodo/devices.py:463
 msgid "Cameras"
 msgstr ""
 
-#: ../raphodo/devices.py:460 ../raphodo/devices.py:920
-#: ../raphodo/preferencedialog.py:85 ../raphodo/rapid.py:1927
+#: ../raphodo/devices.py:464 ../raphodo/devices.py:927
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/rapid.py:1979
 msgid "Devices"
 msgstr ""
 
-#: ../raphodo/devices.py:720
+#: ../raphodo/devices.py:724
 #, python-format
 msgid "Downloading from %(device_names)s"
 msgstr ""
 
 #. Translators: e.g. Three Devices
-#: ../raphodo/devices.py:780
+#: ../raphodo/devices.py:784
 #, python-format
 msgid "%(no_devices)s %(device_type)s"
 msgstr ""
 
-#: ../raphodo/devices.py:905 ../raphodo/rapid.py:1764
+#: ../raphodo/devices.py:912 ../raphodo/rapid.py:1807
 msgid "Select Source"
 msgstr ""
 
-#: ../raphodo/devices.py:936 ../raphodo/devices.py:947
+#: ../raphodo/devices.py:943 ../raphodo/devices.py:954
 #, python-format
 msgid "%(device1)s + %(device2)s"
 msgstr ""
 
 #. Number of cameras e.g. 3 Cameras
-#: ../raphodo/devices.py:958
+#: ../raphodo/devices.py:965
 #, python-format
 msgid "%(no_cameras)s Cameras"
 msgstr ""
 
-#: ../raphodo/devices.py:963
+#: ../raphodo/devices.py:970
 #, python-format
 msgid "%(no_devices)s Devices"
 msgstr ""
 
 #. Translators: two folder names, separated by a plus sign
-#: ../raphodo/devices.py:1258
+#: ../raphodo/devices.py:1265
 #, python-format
 msgid "%s + %s"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:44
+#: ../raphodo/didyouknow.py:45
 msgid "Click on a file's checkbox to mark or unmark it for download."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:50
+#: ../raphodo/didyouknow.py:51
 msgid ""
 "Files that have already been downloaded are remembered. You can still mark "
 "previously downloaded files to download again, but they are unchecked by "
@@ -269,34 +630,67 @@ msgid ""
 "files that are yet to be downloaded."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:59
+#: ../raphodo/didyouknow.py:60
 msgid ""
 "If more than one file is selected, they'll all take the mark of the file "
 "whose checkbox was clicked, regardless of whether they previously had a "
 "checkmark or not."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:67
+#: ../raphodo/didyouknow.py:68
 msgid ""
 "Click on a device's checkbox to quickly mark or unmark all its files for "
 "downloading."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:74
+#: ../raphodo/didyouknow.py:75
+msgid ""
+"After a download finishes, an icon replaces the thumbnail's checkbox. The "
+"icon's color indicates whether the download was successful (green), had file "
+"renaming problems (yellow/orange), or failed (red)."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:83
+msgid ""
+"\n"
+"            In case of any problems, a red icon will appear at the bottom of "
+"the window\n"
+"            indicating how many error reports there are. Clicking on it "
+"opens the Error Report \n"
+"            window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:91
+msgid ""
+"\n"
+"            The Error Report window lists any problems encountered before, "
+"during or after the \n"
+"            download. An orange triangle represents a warning, a red circle "
+"indicates a failure, \n"
+"            and a black circle indicates more serious failures. You can "
+"click on the hyperlinks to \n"
+"            open its file or device in a file manager. You can also search "
+"the reports using the \n"
+"            search box in the lower left of the Error Report window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:103
 msgid ""
 "You can simultaneously download from multiple cameras, smartphones, memory "
 "cards, and hard drives&mdash;as many devices as your computer can handle at "
 "one time."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:81
+#: ../raphodo/didyouknow.py:110
 msgid ""
 "The <b>Timeline</b> groups photos and videos based on how much time elapsed "
 "between consecutive shots. Use it to identify photos and videos taken at "
 "different periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:88
+#: ../raphodo/didyouknow.py:117
 msgid ""
 "\n"
 "<p>In the illustration above, the first row of the Timeline is black because "
@@ -308,7 +702,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:99
+#: ../raphodo/didyouknow.py:128
 msgid ""
 "To view photos and videos for a particular time range, use the mouse "
 "(optionally in combination with the <tt>Shift</tt> or <tt>Ctrl</tt> keys) to "
@@ -316,20 +710,20 @@ msgid ""
 "the left side of the main window will be highlighted."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:106
+#: ../raphodo/didyouknow.py:135
 msgid ""
 "A download always includes all files that are checked for download, "
 "including those that are not currently displayed because the Timeline is "
 "being used."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:113
+#: ../raphodo/didyouknow.py:142
 msgid ""
 "You can hide or display the download sources by clicking on the name of the "
 "device you're downloading from at the top left of the program window."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:120
+#: ../raphodo/didyouknow.py:149
 msgid ""
 "\n"
 "          Thumbnails can be sorted using a variety of criteria:\n"
@@ -348,33 +742,33 @@ msgid ""
 "</ol> "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:137
+#: ../raphodo/didyouknow.py:166
 msgid ""
 "One of Rapid Photo Downloader's most useful features is its ability to "
 "automatically generate download subfolders and rename files as it downloads, "
 "using a scheme of your choosing."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:143
+#: ../raphodo/didyouknow.py:172
 msgid ""
 "To specify where you want your files downloaded and how you want them named, "
 "open the appropriate panel on the right-side of the application window: "
 "<b>Destination</b>, <b>Rename</b>, or <b>Job Code</b>."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:150
+#: ../raphodo/didyouknow.py:179
 msgid ""
 "\n"
 "When thinking about your download directory structure, keep in mind two "
 "different types\n"
 "of directory:\n"
 "<ol>\n"
-"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, &quot;"
-"Photos&quot;, or\n"
+"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, "
+"&quot;Photos&quot;, or\n"
 "&quot;Videos&quot;. This directory should already exist on your computer. In "
 "the illustration \n"
-"below, the destination folders are &quot;Pictures&quot; and &quot;"
-"Videos&quot;. The\n"
+"below, the destination folders are &quot;Pictures&quot; and "
+"&quot;Videos&quot;. The\n"
 "name of the destination folder is displayed in the grey bar directly above "
 "the folder tree, \n"
 "with a folder icon to its left and a gear icon to its far right.</li>\n"
@@ -387,7 +781,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:167
+#: ../raphodo/didyouknow.py:196
 msgid ""
 "\n"
 "You can download photos and videos to the same destination folder, or "
@@ -400,14 +794,14 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:177
+#: ../raphodo/didyouknow.py:206
 msgid ""
 "Automatically generated download subfolders can contain further "
 "automatically generated subfolders if need be. A common scheme is to create "
 "a year subfolder and then a series of year-month-day subfolders within it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:186
+#: ../raphodo/didyouknow.py:215
 msgid ""
 "\n"
 "Whenever possible, the program previews the download subfolders of photos "
@@ -425,7 +819,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:201
+#: ../raphodo/didyouknow.py:230
 msgid ""
 "\n"
 "Download subfolder names are typically generated using some or all of the "
@@ -449,7 +843,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:219
+#: ../raphodo/didyouknow.py:248
 msgid ""
 "\n"
 "To automatically create download subfolders as you download, \n"
@@ -459,7 +853,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:227
+#: ../raphodo/didyouknow.py:256
 msgid ""
 "\n"
 "Using the drop-down menu, select a built-in preset or click on <b>Custom</b> "
@@ -469,20 +863,20 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:237
+#: ../raphodo/didyouknow.py:266
 msgid ""
 "It's easy to download raw images into one folder, and jpeg images into "
 "another. Simply use the <b>Filename Extension</b> as part of your download "
 "subfolder generation scheme:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:242
+#: ../raphodo/didyouknow.py:271
 msgid ""
 "This illustration shows a saved custom preset named &quot;My custom "
 "preset&quot;."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:246
+#: ../raphodo/didyouknow.py:275
 msgid ""
 "\n"
 "You do not have to create nested download subfolders. This illustration "
@@ -493,7 +887,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:256
+#: ../raphodo/didyouknow.py:285
 msgid ""
 "\n"
 "Although there are many built-in date/time naming options, you may find that "
@@ -507,7 +901,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:265
+#: ../raphodo/didyouknow.py:294
 msgid ""
 "\n"
 "Read more about all the ways you can generate download subfolder names and "
@@ -517,7 +911,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:273
+#: ../raphodo/didyouknow.py:302
 msgid ""
 "\n"
 "<b>Job Codes</b> let you easily enter text that describes sets of photos and "
@@ -529,7 +923,7 @@ msgid ""
 "&quot;Green Bazaar&quot;: \n"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:282
+#: ../raphodo/didyouknow.py:311
 msgid ""
 "\n"
 "You can apply new or existing Job Codes before you start a download. If "
@@ -540,36 +934,36 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:291
+#: ../raphodo/didyouknow.py:320
 msgid "Look for hints to guide you when working with Job Codes:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:295
+#: ../raphodo/didyouknow.py:324
 msgid ""
 "Hints will vary depending on the context, such as when the mouse is hovering "
 "over a button."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:301
+#: ../raphodo/didyouknow.py:330
 msgid ""
 "\n"
 "When you give your photos and videos unique filenames, you'll never be "
 "confused as to \n"
 "which file is which. Using <b>sequence numbers</b> to make filenames unique "
 "is highly \n"
-"recommended!.\n"
+"recommended!\n"
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:309
+#: ../raphodo/didyouknow.py:338
 msgid ""
 "\n"
 "<p>Four types of sequence values are available to help you assign unique "
 "names to your photos and \n"
 "videos:\n"
 "<ol>\n"
-"<li><b>Downloads today</b>: tracks downloads completed during that day.</"
-"li>\n"
+"<li><b>Downloads today</b>: tracks downloads completed during that "
+"day.</li>\n"
 "<li><b>Stored number</b>: similar to Downloads today, but it is remembered "
 "from the last time the  \n"
 "program was run.</li>\n"
@@ -583,7 +977,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:327
+#: ../raphodo/didyouknow.py:356
 msgid ""
 "\n"
 "The <b>Rename</b> panel allows you to configure file renaming. To rename "
@@ -592,7 +986,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:334
+#: ../raphodo/didyouknow.py:363
 msgid ""
 "\n"
 "<p>The <b>Synchronize RAW + JPEG</b> option is useful if you use the RAW + "
@@ -611,7 +1005,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:348
+#: ../raphodo/didyouknow.py:377
 msgid ""
 "\n"
 "You can have your photos and videos backed up to multiple locations as they "
@@ -622,13 +1016,13 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:356
+#: ../raphodo/didyouknow.py:385
 msgid ""
 "In this example, the drive <b>photobackup</b> does not contain a folder "
 "named <tt>Videos</tt>, so videos will not be backed up to it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:362
+#: ../raphodo/didyouknow.py:391
 msgid ""
 "\n"
 "Several of the program's preferences can be set from the command line, "
@@ -639,7 +1033,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:372
+#: ../raphodo/didyouknow.py:396
+msgid "You can also import program preferences from the older 0.4 version."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:401
 msgid ""
 "\n"
 "Rapid Photo Downloader deals with three types of cache:\n"
@@ -649,8 +1047,8 @@ msgid ""
 "memory cards, and other devices.</li>\n"
 "<li>A <b>temporary cache</b> of files downloaded from a camera, one for "
 "photos and another for \n"
-"videos. They are located in temporary subfolders in the download destination."
-"</li>\n"
+"videos. They are located in temporary subfolders in the download "
+"destination.</li>\n"
 "<li>The <b>desktop's thumbnail cache</b>, in which Rapid Photo Downloader "
 "stores thumbnails of \n"
 "RAW and TIFF photos once they have been downloaded. File browsers like Gnome "
@@ -665,23 +1063,23 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:431
+#: ../raphodo/didyouknow.py:460
 msgid "Tip of the Day"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:439
+#: ../raphodo/didyouknow.py:468
 msgid "Did you know...?"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:466
+#: ../raphodo/didyouknow.py:495
 msgid "Show tips on startup"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:470
+#: ../raphodo/didyouknow.py:499
 msgid "&Next"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:471
+#: ../raphodo/didyouknow.py:500
 msgid "&Previous"
 msgstr ""
 
@@ -788,68 +1186,68 @@ msgstr ""
 msgid "%(days)d days, %(hours)d hours"
 msgstr ""
 
-#: ../raphodo/errorlog.py:65
+#: ../raphodo/errorlog.py:66
 msgid "Find"
 msgstr ""
 
-#: ../raphodo/errorlog.py:135
+#: ../raphodo/errorlog.py:136
 msgid "Error Reports - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/errorlog.py:170
+#: ../raphodo/errorlog.py:171
 msgid "Find in reports"
 msgstr ""
 
-#: ../raphodo/errorlog.py:187
+#: ../raphodo/errorlog.py:188
 msgid "Find the previous occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:192
+#: ../raphodo/errorlog.py:193
 msgid "Find the next occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:194
+#: ../raphodo/errorlog.py:195
 msgid "&Highlight All"
 msgstr ""
 
-#: ../raphodo/errorlog.py:195
+#: ../raphodo/errorlog.py:196
 msgid "Highlight all occurrences of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:196
+#: ../raphodo/errorlog.py:197
 msgid "&Match Case"
 msgstr ""
 
-#: ../raphodo/errorlog.py:197
+#: ../raphodo/errorlog.py:198
 msgid "Search with case sensitivity"
 msgstr ""
 
-#: ../raphodo/errorlog.py:198
+#: ../raphodo/errorlog.py:199
 msgid "&Whole Words"
 msgstr ""
 
-#: ../raphodo/errorlog.py:199
+#: ../raphodo/errorlog.py:200
 msgid "Search whole words only"
 msgstr ""
 
-#: ../raphodo/errorlog.py:209 ../raphodo/errorlog.py:341
+#: ../raphodo/errorlog.py:210 ../raphodo/errorlog.py:345
 #, python-format
 msgid "%s of %s matches"
 msgstr ""
 
-#: ../raphodo/errorlog.py:228
+#: ../raphodo/errorlog.py:232
 msgid "Clear"
 msgstr ""
 
-#: ../raphodo/errorlog.py:328
+#: ../raphodo/errorlog.py:332
 msgid "Phrase not found"
 msgstr ""
 
-#: ../raphodo/errorlog.py:487
+#: ../raphodo/errorlog.py:491
 msgid "Search pending..."
 msgstr ""
 
-#: ../raphodo/errorlog.py:535
+#: ../raphodo/errorlog.py:539
 msgid ""
 "The number of new entries added to the Error Report since it was last open. "
 "Click to open the Error Report."
@@ -863,8 +1261,8 @@ msgstr ""
 #, python-brace-format
 msgid ""
 "<b>A problem occurred in Rapid Photo Downloader</b><br><br>\n"
-"    Please report the problem at <a href=\"{website}\">{website}</a>."
-"<br><br>\n"
+"    Please report the problem at <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
 "    Attach the log file <i>{log_file}</i> to your bug report (click\n"
 "    <a href=\"{log_path}\">here</a> to open the log directory).<br><br>If "
 "the same problem occurs\n"
@@ -885,7 +1283,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1601
+#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1643
 msgid "Open in File Browser..."
 msgstr ""
 
@@ -903,531 +1301,531 @@ msgstr ""
 msgid "%s (location does not exist)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:186
+#: ../raphodo/generatenameconfig.py:190
 msgid "Date time"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:187
+#: ../raphodo/generatenameconfig.py:191
 msgid "Text"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:188 ../raphodo/rapid.py:2053
+#: ../raphodo/generatenameconfig.py:192 ../raphodo/rapid.py:2125
 msgid "Filename"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:189 ../raphodo/preferencedialog.py:488
+#: ../raphodo/generatenameconfig.py:193 ../raphodo/preferencedialog.py:724
 msgid "Metadata"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:190
+#: ../raphodo/generatenameconfig.py:194
 msgid "Sequences"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: ../raphodo/generatenameconfig.py:193
+#: ../raphodo/generatenameconfig.py:197
 msgid "Job code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:194
+#: ../raphodo/generatenameconfig.py:198
 msgid "Image date"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:195
+#: ../raphodo/generatenameconfig.py:199
 msgid "Video date"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:196
+#: ../raphodo/generatenameconfig.py:200
 msgid "Today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:197
+#: ../raphodo/generatenameconfig.py:201
 msgid "Yesterday"
 msgstr ""
 
 #. Translators: Download time is the time and date that the download started (when the
 #. user clicked the Download button)
-#: ../raphodo/generatenameconfig.py:200
+#: ../raphodo/generatenameconfig.py:204
 msgid "Download time"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:203
+#: ../raphodo/generatenameconfig.py:207
 msgid "Name"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:206 ../raphodo/rapid.py:2054
+#: ../raphodo/generatenameconfig.py:210 ../raphodo/rapid.py:2126
 msgid "Extension"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:209
+#: ../raphodo/generatenameconfig.py:213
 msgid "Image number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:210
+#: ../raphodo/generatenameconfig.py:214
 msgid "Video number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:213
+#: ../raphodo/generatenameconfig.py:217
 msgid "Aperture"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:216
+#: ../raphodo/generatenameconfig.py:220
 msgid "ISO"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:219
+#: ../raphodo/generatenameconfig.py:223
 msgid "Exposure time"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:222
+#: ../raphodo/generatenameconfig.py:226
 msgid "Focal length"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:225
+#: ../raphodo/generatenameconfig.py:229
 msgid "Camera make"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:228
+#: ../raphodo/generatenameconfig.py:232
 msgid "Camera model"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:231
+#: ../raphodo/generatenameconfig.py:235
 msgid "Short camera model"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:234
+#: ../raphodo/generatenameconfig.py:238
 msgid "Hyphenated short camera model"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:237
+#: ../raphodo/generatenameconfig.py:241
 msgid "Serial number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:240
+#: ../raphodo/generatenameconfig.py:244
 msgid "Shutter count"
 msgstr ""
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: ../raphodo/generatenameconfig.py:242
+#: ../raphodo/generatenameconfig.py:246
 msgid "File number"
 msgstr ""
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:244
+#: ../raphodo/generatenameconfig.py:248
 msgid "Folder only"
 msgstr ""
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:246
+#: ../raphodo/generatenameconfig.py:250
 msgid "Folder and file"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:249
+#: ../raphodo/generatenameconfig.py:253
 msgid "Owner name"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:250
+#: ../raphodo/generatenameconfig.py:254
 msgid "Codec"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:251
+#: ../raphodo/generatenameconfig.py:255
 msgid "Width"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:252
+#: ../raphodo/generatenameconfig.py:256
 msgid "Height"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:253
+#: ../raphodo/generatenameconfig.py:257
 msgid "Length"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:254
+#: ../raphodo/generatenameconfig.py:258
 msgid "Frames Per Second"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:255
+#: ../raphodo/generatenameconfig.py:259
 msgid "Artist"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:256
+#: ../raphodo/generatenameconfig.py:260
 msgid "Copyright"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:259
+#: ../raphodo/generatenameconfig.py:263
 msgid "Downloads today"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:262
+#: ../raphodo/generatenameconfig.py:266
 msgid "Session number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:265
+#: ../raphodo/generatenameconfig.py:269
 msgid "Subfolder number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:268
+#: ../raphodo/generatenameconfig.py:272
 msgid "Stored number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: ../raphodo/generatenameconfig.py:271
+#: ../raphodo/generatenameconfig.py:275
 msgid "Sequence letter"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:274
+#: ../raphodo/generatenameconfig.py:278
 msgid "All digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:277
+#: ../raphodo/generatenameconfig.py:281
 msgid "Last digit"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:280
+#: ../raphodo/generatenameconfig.py:284
 msgid "Last 2 digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:283
+#: ../raphodo/generatenameconfig.py:287
 msgid "Last 3 digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:286
+#: ../raphodo/generatenameconfig.py:290
 msgid "Last 4 digits"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:289
+#: ../raphodo/generatenameconfig.py:293
 msgid "Original Case"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:292
+#: ../raphodo/generatenameconfig.py:296
 msgid "UPPERCASE"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:295
+#: ../raphodo/generatenameconfig.py:299
 msgid "lowercase"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:296
+#: ../raphodo/generatenameconfig.py:300
 msgid "One digit"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:297
+#: ../raphodo/generatenameconfig.py:301
 msgid "Two digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:298
+#: ../raphodo/generatenameconfig.py:302
 msgid "Three digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:299
+#: ../raphodo/generatenameconfig.py:303
 msgid "Four digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:300
+#: ../raphodo/generatenameconfig.py:304
 msgid "Five digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:301
+#: ../raphodo/generatenameconfig.py:305
 msgid "Six digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:302
+#: ../raphodo/generatenameconfig.py:306
 msgid "Seven digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:305
+#: ../raphodo/generatenameconfig.py:309
 msgid "Subseconds"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:308 ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:312 ../raphodo/generatenameconfig.py:393
 msgid "YYYYMMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:311 ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:315 ../raphodo/generatenameconfig.py:394
 msgid "YYYY-MM-DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:314 ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:318 ../raphodo/generatenameconfig.py:395
 msgid "YYYY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:317
+#: ../raphodo/generatenameconfig.py:321
 msgid "YYMMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:320
+#: ../raphodo/generatenameconfig.py:324
 msgid "YY-MM-DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:323
+#: ../raphodo/generatenameconfig.py:327
 msgid "YY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:326
+#: ../raphodo/generatenameconfig.py:330
 msgid "MMDDYYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:329
+#: ../raphodo/generatenameconfig.py:333
 msgid "MMDDYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:332
+#: ../raphodo/generatenameconfig.py:336
 msgid "MMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:335
+#: ../raphodo/generatenameconfig.py:339
 msgid "DDMMYYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:338
+#: ../raphodo/generatenameconfig.py:342
 msgid "DDMMYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:341 ../raphodo/generatenameconfig.py:389
-#: ../raphodo/generatenameconfig.py:390 ../raphodo/generatenameconfig.py:391
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:345 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:394 ../raphodo/generatenameconfig.py:395
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:397
 msgid "YYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:344
+#: ../raphodo/generatenameconfig.py:348
 msgid "YY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:347
+#: ../raphodo/generatenameconfig.py:351
 msgid "MM"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:350
+#: ../raphodo/generatenameconfig.py:354
 msgid "DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:353
+#: ../raphodo/generatenameconfig.py:357
 msgid "Month (full)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:356
+#: ../raphodo/generatenameconfig.py:360
 msgid "Month (abbreviated)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:359
+#: ../raphodo/generatenameconfig.py:363
 msgid "HHMMSS"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:362
+#: ../raphodo/generatenameconfig.py:366
 msgid "HHMM"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:365
+#: ../raphodo/generatenameconfig.py:369
 msgid "HH-MM-SS"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:368
+#: ../raphodo/generatenameconfig.py:372
 msgid "HH-MM"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:371
+#: ../raphodo/generatenameconfig.py:375
 msgid "HH"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:374
+#: ../raphodo/generatenameconfig.py:378
 msgid "MM (minutes)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:377
+#: ../raphodo/generatenameconfig.py:381
 msgid "SS"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:393
 msgid "Date"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:394
 msgid "Date (hyphens)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:395
 msgid "Date (underscores)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:438
-#: ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:442
+#: ../raphodo/generatenameconfig.py:537
 msgid "Date and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392
+#: ../raphodo/generatenameconfig.py:396
 msgid "YYYYMM_Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "Date and Job Code Subfolder"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "YYYYMM"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393 ../raphodo/jobcodepanel.py:198
-#: ../raphodo/nameeditor.py:827 ../raphodo/rapid.py:1809
+#: ../raphodo/generatenameconfig.py:397 ../raphodo/jobcodepanel.py:199
+#: ../raphodo/nameeditor.py:833 ../raphodo/rapid.py:1852
 #: ../raphodo/renamepanel.py:83 ../raphodo/renamepanel.py:241
 msgid "Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:433 ../raphodo/generatenameconfig.py:512
+#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:532
 msgid "Original Filename"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "Date-Time and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "YYYYMMDD-HHMM-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "Date and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "YYYYMMDD-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "Date-Time and Image number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "YYYYMMDD-1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "Date-Time and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "YYYYMMDD-HHMM-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:442 ../raphodo/generatenameconfig.py:537
 msgid "YYYYMMDD-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "Date-Time and Video number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "YYYYMMDD_1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "Resolution"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "YYYYMMDD-HHMM-1-1920x1080"
 msgstr ""
 
@@ -1486,76 +1884,77 @@ msgstr ""
 msgid "&Remember this choice"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:185
+#: ../raphodo/jobcodepanel.py:186
 msgid ""
 "Select photos and videos to be able to apply a new or existing Job Code to "
 "them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:186
-msgid "The new Job Code will be applied to all selected photos and/or videos."
+#: ../raphodo/jobcodepanel.py:187
+msgid ""
+"The new Job Code will be applied to all selected photos and/or videos."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:187
+#: ../raphodo/jobcodepanel.py:188
 msgid ""
 "Click the Apply button to apply the current Job Code to all selected photos "
 "and/or videos. You can also simply double click the Job Code."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:189
+#: ../raphodo/jobcodepanel.py:190
 msgid ""
 "Removing a Job Code removes it only from the list of saved Job Codes, not "
 "from any photos or videos that it may have been applied to."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:191
+#: ../raphodo/jobcodepanel.py:192
 msgid ""
 "If you want to use Job Codes, configure file renaming or destination "
 "subfolder names to use them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:197
+#: ../raphodo/jobcodepanel.py:198
 msgid "Last Used"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:202
+#: ../raphodo/jobcodepanel.py:203
 msgid "Job Code Sort:"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:205 ../raphodo/rapid.py:2061
+#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2133
 msgid "Ascending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2062
+#: ../raphodo/jobcodepanel.py:207 ../raphodo/rapid.py:2134
 msgid "Descending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:216
+#: ../raphodo/jobcodepanel.py:217
 msgid "&New..."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:220
+#: ../raphodo/jobcodepanel.py:221
 msgid "&Apply"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:224
+#: ../raphodo/jobcodepanel.py:225
 msgid "&Remove"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:228 ../raphodo/preferencedialog.py:125
-#: ../raphodo/preferencedialog.py:154 ../raphodo/preferencedialog.py:433
+#: ../raphodo/jobcodepanel.py:229 ../raphodo/preferencedialog.py:200
+#: ../raphodo/preferencedialog.py:229 ../raphodo/preferencedialog.py:531
 msgid "Remove All"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:427
+#: ../raphodo/jobcodepanel.py:428
 msgid "Do you really want to remove all the Job Codes?"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:429
+#: ../raphodo/jobcodepanel.py:430
 msgid "Remove all Job Codes"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:492
+#: ../raphodo/jobcodepanel.py:493
 msgid "Job Codes"
 msgstr ""
 
@@ -1566,42 +1965,58 @@ msgstr ""
 msgid "<i><b>Hint:</b> %(message)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:418 ../raphodo/nameeditor.py:432
+#: ../raphodo/nameeditor.py:423 ../raphodo/nameeditor.py:437
 #, python-format
 msgid "%(description)s - %(elements)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:512
+#: ../raphodo/nameeditor.py:517
 msgid "Save New Custom Preset..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:513
+#: ../raphodo/nameeditor.py:518
 msgid "Remove All Custom Presets..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:559
+#: ../raphodo/nameeditor.py:564
 msgid "(New Custom Preset)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:576
+#: ../raphodo/nameeditor.py:581
 #, python-format
 msgid "%s (edited)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:579 ../raphodo/nameeditor.py:1370
+#: ../raphodo/nameeditor.py:584 ../raphodo/nameeditor.py:1379
 #, python-format
 msgid "Update Custom Preset \"%s\""
 msgstr ""
 
-#: ../raphodo/nameeditor.py:667
+#: ../raphodo/nameeditor.py:672
 msgid "Save New Custom Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:675
+#: ../raphodo/nameeditor.py:680
 msgid "Preset Name:"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:836
+#: ../raphodo/nameeditor.py:799
+msgid "Photo Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:805
+msgid "Video Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:811
+msgid "Photo Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:817
+msgid "Video Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:842
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>There is insufficient data to "
 "fully generate the name. Please use other renaming options.</i>"
@@ -1610,7 +2025,7 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees.
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:846
+#: ../raphodo/nameeditor.py:853
 #, python-format
 msgid "The character</i> %(separator)s <i>creates a new subfolder level."
 msgstr ""
@@ -1618,50 +2033,50 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:851
+#: ../raphodo/nameeditor.py:858
 #, python-format
 msgid ""
 "There is no need start or end with the folder separator </i> "
 "%(separator)s<i>, because it is added automatically."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:859
+#: ../raphodo/nameeditor.py:866
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>Unique filenames may not be "
 "generated. Make filenames unique by using Sequence values.</i>"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:882 ../raphodo/renamepanel.py:121
+#: ../raphodo/nameeditor.py:889 ../raphodo/renamepanel.py:121
 msgid "Preset:"
 msgstr ""
 
 #. Translators: appears in a combobox, e.g. Image Date (YYYY)
-#: ../raphodo/nameeditor.py:959 ../raphodo/nameeditor.py:980
+#: ../raphodo/nameeditor.py:966 ../raphodo/nameeditor.py:987
 #, python-brace-format
 msgid "{choice} ({variant})"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1005 ../raphodo/preferencedialog.py:530
+#: ../raphodo/nameeditor.py:1012 ../raphodo/preferencedialog.py:783
 msgid "Get help online..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1025
+#: ../raphodo/nameeditor.py:1034
 msgid "Insert"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1351
+#: ../raphodo/nameeditor.py:1360
 msgid "Save Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1356
+#: ../raphodo/nameeditor.py:1365
 msgid ""
-"<b>Do you want to save the changes in a new custom preset?</"
-"b><br><br>Creating a custom preset is not required, but can help you keep "
-"organized.<br><br>The changes to the preferences will still be applied "
-"regardless of whether you create a new custom preset or not."
+"<b>Do you want to save the changes in a new custom "
+"preset?</b><br><br>Creating a custom preset is not required, but can help "
+"you keep organized.<br><br>The changes to the preferences will still be "
+"applied regardless of whether you create a new custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1365
+#: ../raphodo/nameeditor.py:1374
 msgid ""
 "<b>Do you want to save the changes in a custom preset?</b><br><br>If you "
 "like, you can create a new custom preset or update the existing custom "
@@ -1669,136 +2084,167 @@ msgid ""
 "regardless of whether you save a custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1372
+#: ../raphodo/nameeditor.py:1381
 msgid "Save New Custom Preset"
 msgstr ""
 
-#: ../raphodo/newversion.py:306
+#: ../raphodo/newversion.py:312
 msgid "Checking for new version..."
 msgstr ""
 
-#: ../raphodo/newversion.py:307
+#: ../raphodo/newversion.py:313
 msgid "You are running the latest version."
 msgstr ""
 
-#: ../raphodo/newversion.py:308
+#: ../raphodo/newversion.py:314
 msgid "Failed to contact the update server."
 msgstr ""
 
-#: ../raphodo/newversion.py:310
+#: ../raphodo/newversion.py:316
 #, python-format
 msgid "A new version of Rapid Photo Downloader (%s) is available."
 msgstr ""
 
-#: ../raphodo/newversion.py:312
+#: ../raphodo/newversion.py:318
 msgid "Do you want to download the new version?"
 msgstr ""
 
-#: ../raphodo/newversion.py:313
+#: ../raphodo/newversion.py:319
 #, python-format
 msgid "Changes in the new release can be viewed <a href=\"%s\">here</a>."
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the s key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:340 ../raphodo/newversion.py:353
+#: ../raphodo/newversion.py:348 ../raphodo/newversion.py:363
 msgid "&Skip this release"
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the o key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:356
+#: ../raphodo/newversion.py:366
 msgid "&Open Download Page"
 msgstr ""
 
-#: ../raphodo/newversion.py:376
+#: ../raphodo/newversion.py:386
 msgid "Rapid Photo Downloader updates"
 msgstr ""
 
 #. Translators: shows how much of a file has been downloaded e.g  123 KB of 1.3 MB
-#: ../raphodo/newversion.py:478
+#: ../raphodo/newversion.py:488
 #, python-format
 msgid "%(downloaded)s of %(total)s"
 msgstr ""
 
-#: ../raphodo/newversion.py:495
+#: ../raphodo/newversion.py:507
 msgid "Downloading..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:76
+#: ../raphodo/preferencedialog.py:86
 msgid "Preferences"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Automation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85 ../raphodo/preferencedialog.py:343
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/preferencedialog.py:428
 msgid "Error Handling"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:109
+msgid "Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:109 ../raphodo/preferencedialog.py:119
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:94
+#: ../raphodo/preferencedialog.py:147
 msgid "Device Scanning"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:96
+#: ../raphodo/preferencedialog.py:148
 msgid "Scan only external devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:98
+#: ../raphodo/preferencedialog.py:150
 msgid ""
 "Scan for photos and videos only on devices that are external to the "
 "computer,\n"
 "including cameras, memory cards, external hard drives, and USB flash drives."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:102
-msgid "Scan non-camera devices lacking a DCIM folder"
+#: ../raphodo/preferencedialog.py:153
+msgid "Scan only specific folders on devices"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:155
+msgid ""
+"Scan for photos and videos only in the folders specified below (except "
+"paths\n"
+"specified in Ignored Paths).\n"
+"\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:161
+msgid "Folders to scan:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:164
+msgid ""
+"Folders at the base level of device file systems that will be scanned\n"
+"for photos and videos."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:167 ../raphodo/preferencedialog.py:219
+msgid "Add..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:104
+#: ../raphodo/preferencedialog.py:169
 msgid ""
-"Scan the entirety of a device for photos and videos, irrespective of whether "
-"it contains a DCIM folder,\n"
-"as opposed to only scanning within a DCIM folder.\n"
+"Add a folder to the list of folders to scan for photos and videos.\n"
 "\n"
-"Changing this setting causes all devices to be scanned again.\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:172 ../raphodo/preferencedialog.py:198
+#: ../raphodo/preferencedialog.py:224 ../raphodo/preferencedialog.py:529
+msgid "Remove"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:174
+msgid ""
+"Remove a folder from the list of folders to scan for photos and videos.\n"
 "\n"
-"Note: With cameras, only the DCIM folder is scanned."
+"Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:116
+#: ../raphodo/preferencedialog.py:191
 msgid "Devices that have been set to automatically ignore or download from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:117
+#: ../raphodo/preferencedialog.py:192
 msgid "Remembered Devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:121
+#: ../raphodo/preferencedialog.py:196
 msgid ""
 "Remove a device from the list of devices to automatically ignore or download "
 "from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:123 ../raphodo/preferencedialog.py:149
-#: ../raphodo/preferencedialog.py:431
-msgid "Remove"
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:127
+#: ../raphodo/preferencedialog.py:202
 msgid ""
 "Clear the list of devices from which to automatically ignore or download "
 "from.\n"
@@ -1806,315 +2252,436 @@ msgid ""
 "Note: Changes take effect when the computer is next scanned for devices."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:140
+#: ../raphodo/preferencedialog.py:215
 msgid "Ignored Paths"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:141
+#: ../raphodo/preferencedialog.py:216
 msgid ""
 "The end part of a path that should never be scanned for photos or videos."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:144
-msgid "Add..."
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:146
+#: ../raphodo/preferencedialog.py:221
 msgid ""
 "Add a path to the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:151
+#: ../raphodo/preferencedialog.py:226
 msgid ""
 "Remove a path from the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:156
+#: ../raphodo/preferencedialog.py:231
 msgid ""
 "Clear the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:164
+#: ../raphodo/preferencedialog.py:239
 msgid ""
-"Use python-style <a href=\"http://damonlynch.net/rapid/documentation/"
-"#regularexpressions\">regular expressions</a>"
+"Use python-style <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">regula"
+"r expressions</a>"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:168
+#: ../raphodo/preferencedialog.py:243
 msgid ""
 "Use regular expressions in the list of ignored paths.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:208
+#: ../raphodo/preferencedialog.py:283
 msgid "Program Automation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:209
+#: ../raphodo/preferencedialog.py:284
 msgid "Start downloading at program startup"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:210
+#: ../raphodo/preferencedialog.py:285
 msgid "Start downloading upon device insertion"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:211
+#: ../raphodo/preferencedialog.py:286
 msgid "Unmount (eject) device upon download completion"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:212
+#: ../raphodo/preferencedialog.py:287
 msgid "Exit program when download completes"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:213
+#: ../raphodo/preferencedialog.py:288
 msgid "Exit program even if download had warnings or errors"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:240
+#: ../raphodo/preferencedialog.py:315
 msgid "Thumbnail Generation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:241
+#: ../raphodo/preferencedialog.py:316
 msgid "Generate thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:242
+#: ../raphodo/preferencedialog.py:318
 msgid "Generate thumbnails to show in the main program window"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:244
+#: ../raphodo/preferencedialog.py:320
 msgid "Cache thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:245
+#: ../raphodo/preferencedialog.py:323
 msgid ""
 "Save thumbnails shown in the main program window in a thumbnail cache unique "
 "to Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:247
+#: ../raphodo/preferencedialog.py:327
 msgid "Generate system thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:248
+#: ../raphodo/preferencedialog.py:330
 msgid ""
 "While downloading, save thumbnails that can be used by desktop file managers "
 "and other programs"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:255
+#: ../raphodo/preferencedialog.py:339
 msgid "Number of CPU cores used to generate thumbnails."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:256
+#: ../raphodo/preferencedialog.py:340
 msgid "CPU cores:"
 msgstr ""
 
 #. Translators: the * acts as an asterisk to denote a reference to an annotation
 #. such as '* Takes effect upon program restart'
-#: ../raphodo/preferencedialog.py:271 ../raphodo/preferencedialog.py:317
+#: ../raphodo/preferencedialog.py:355 ../raphodo/preferencedialog.py:401
 msgid "*"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:294
+#: ../raphodo/preferencedialog.py:378
 msgid "Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:296
+#: ../raphodo/preferencedialog.py:380
 msgid "Calculating..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:302
+#: ../raphodo/preferencedialog.py:386
 msgid "days"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:303
+#: ../raphodo/preferencedialog.py:387
 msgid "forever"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:308
+#: ../raphodo/preferencedialog.py:392
 msgid "Cache size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:310
+#: ../raphodo/preferencedialog.py:394
 msgid "Number of thumbnails:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:312
+#: ../raphodo/preferencedialog.py:396
 msgid "Database size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:314
+#: ../raphodo/preferencedialog.py:398
 msgid "Cache unaccessed thumbnails for:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:322
+#: ../raphodo/preferencedialog.py:406
 msgid "Purge Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:323
+#: ../raphodo/preferencedialog.py:408
 msgid "Optimize Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:336
+#: ../raphodo/preferencedialog.py:421
 msgid "* Takes effect upon program restart"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:346
+#: ../raphodo/preferencedialog.py:431
 msgid "Skip download"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:347
+#: ../raphodo/preferencedialog.py:432
 msgid "Don't download the file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:348
+#: ../raphodo/preferencedialog.py:433
 msgid "Add unique identifier"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:349
+#: ../raphodo/preferencedialog.py:436
 msgid ""
 "Add an identifier like _1 or _2 to the end of the filename, immediately "
 "before the file's extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:355
+#: ../raphodo/preferencedialog.py:444
 msgid "Overwrite"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:356
+#: ../raphodo/preferencedialog.py:445
 msgid "Overwrite the previously backed up file"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:357
+#: ../raphodo/preferencedialog.py:446
 msgid "Skip"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:358
+#: ../raphodo/preferencedialog.py:448
 msgid "Don't overwrite the backup file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:364
+#: ../raphodo/preferencedialog.py:455
 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 identifier:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:378
+#: ../raphodo/preferencedialog.py:464
+msgid ""
+"Using sequence numbers to automatically generate unique filenames is "
+"strongly recommended. Configure file renaming in the Rename panel in the "
+"main window."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:473
 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 ""
 
-#: ../raphodo/preferencedialog.py:398
+#: ../raphodo/preferencedialog.py:494
 msgid "Program Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:399
+#: ../raphodo/preferencedialog.py:495
 msgid "Show a warning when:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:402
+#: ../raphodo/preferencedialog.py:498
 msgid "Downloading files currently not displayed"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:403
+#: ../raphodo/preferencedialog.py:499
 msgid ""
 "Warn when about to download files that are not displayed in the main window."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:405
+#: ../raphodo/preferencedialog.py:501
 msgid "Backup destinations are missing"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:406
-msgid "Warn before starting a download if it is not possible to back up files."
+#: ../raphodo/preferencedialog.py:502
+msgid ""
+"Warn before starting a download if it is not possible to back up files."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:408
+#: ../raphodo/preferencedialog.py:504
 msgid "Program libraries are missing or broken"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:409
+#: ../raphodo/preferencedialog.py:505
 msgid ""
 "Warn if a software library used by Rapid Photo Downloader is missing or not "
 "functioning."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:412
+#: ../raphodo/preferencedialog.py:508
 msgid "Filesystem metadata cannot be set"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:413
+#: ../raphodo/preferencedialog.py:509
 msgid ""
 "Warn if there is an error setting a file's filesystem metadata, such as its "
 "modification time."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:416
+#: ../raphodo/preferencedialog.py:512
 msgid "Encountering unhandled files"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:417
+#: ../raphodo/preferencedialog.py:513
 msgid ""
 "Warn after scanning a device or this computer if there are unrecognized "
 "files that will not be included in the download."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:420
+#: ../raphodo/preferencedialog.py:517
 msgid "Do not warn about unhandled files with extensions:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:424
+#: ../raphodo/preferencedialog.py:522
 msgid ""
 "File extensions are case insensitive and do not need to include the leading "
 "dot."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:427
+#: ../raphodo/preferencedialog.py:525
 msgid "Add"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:428
+#: ../raphodo/preferencedialog.py:526
 msgid ""
 "Add a file extension to the list of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:430
+#: ../raphodo/preferencedialog.py:528
 msgid ""
 "Remove a file extension from the list of unhandled file types to not warn "
 "about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:434
+#: ../raphodo/preferencedialog.py:532
 msgid ""
 "Clear the list of file extensions of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:469
+#: ../raphodo/preferencedialog.py:568
+msgid "Photo and Video Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:571
+msgid "Consolidate files across devices and downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:574
+msgid ""
+"Analyze the results of device scans looking for duplicate files and matching "
+"RAW and JPEG pairs,\n"
+"comparing them across multiple devices and download sessions."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:580
+msgid "Treat matching RAW and JPEG files as:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:581
+msgid "One photo"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:582
+msgid "Two photos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:584
+msgid ""
+"Display matching pairs of RAW and JPEG photos as one photo, and if marked, "
+"download both."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:589
+msgid ""
+"Display matching pairs of RAW and JPEG photos as two different photos. You "
+"can still synchronize their sequence numbers."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:598
+msgid "With matching RAW and JPEG photos:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:600
+msgid "Do not mark JPEG for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:601
+msgid "Do not mark RAW for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:602
+msgid "Mark both for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:609
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"JPEG for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:614
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"RAW for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:619
+msgid ""
+"When matching RAW and JPEG photos are found, automatically mark both for "
+"download."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:625
+msgid ""
+"If you disable file consolidation, choose what to do when a download device "
+"is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:631
+msgid ""
+"When a download device is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:642
+msgid "Clear completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:643
+msgid "Keep displaying completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:644
+msgid "Prompt for what to do"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:649
+msgid ""
+"Automatically clear the display of completed downloads whenever a new "
+"download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:654
+msgid ""
+"Keep displaying completed downloads whenever a new download device is "
+"inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:658
+msgid ""
+"Prompt whether to keep displaying completed downloads or clear them whenever "
+"a new download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:702
 msgid "Version Check"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:470
+#: ../raphodo/preferencedialog.py:703
 msgid "Check for new version at startup"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:471
+#: ../raphodo/preferencedialog.py:705
 msgid "Check for a new version of the program each time the program starts."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:473
+#: ../raphodo/preferencedialog.py:707
 msgid "Include development releases"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:474
+#: ../raphodo/preferencedialog.py:709
 msgid ""
 "Include alpha, beta and other development releases when checking for a new "
 "version of the program.\n"
@@ -2123,11 +2690,11 @@ msgid ""
 "occur."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:489
+#: ../raphodo/preferencedialog.py:725
 msgid "Ignore DNG date/time metadata on MTP devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:490
+#: ../raphodo/preferencedialog.py:727
 msgid ""
 "Ignore date/time metadata in DNG files located on MTP devices, and use the "
 "file's modification time instead.\n"
@@ -2136,70 +2703,86 @@ msgid ""
 "metadata."
 msgstr ""
 
+#: ../raphodo/preferencedialog.py:741
+msgid "Completed Downloads"
+msgstr ""
+
 #. Translators: substituted value is a description for the set of preferences
 #. shown in the preference dialog window, e.g. Devices, Automation, etc.
 #. This string is shown in a tooltip for the "Restore Defaults" button
-#: ../raphodo/preferencedialog.py:710
+#: ../raphodo/preferencedialog.py:1067
 #, python-format
 msgid "Restores default %s preference values"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:832
+#: ../raphodo/preferencedialog.py:1208
 msgid ""
 "Do you want to purge the thumbnail cache? The cache will be purged when the "
 "program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:835
+#: ../raphodo/preferencedialog.py:1212
 msgid "Purge Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:847
+#: ../raphodo/preferencedialog.py:1225
 msgid ""
 "Do you want to optimize the thumbnail cache? The cache will be optimized "
 "when the program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:850
+#: ../raphodo/preferencedialog.py:1229
 msgid "Optimize Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1045
+#: ../raphodo/preferencedialog.py:1481
+msgid "Enter a Folder to Scan"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1482
+msgid "Specify a folder that will be scanned for photos and videos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1483
+msgid "Folder:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1497
 msgid "Enter a Path to Ignore"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1046
+#: ../raphodo/preferencedialog.py:1498
 msgid "Specify a path that will never be scanned for photos or videos"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1047
+#: ../raphodo/preferencedialog.py:1499
 msgid "Path:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1061
+#: ../raphodo/preferencedialog.py:1513
 msgid "Enter a File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1062
+#: ../raphodo/preferencedialog.py:1514
 msgid "Specify a file extension (without the leading dot)"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1063 ../raphodo/renamepanel.py:122
+#: ../raphodo/preferencedialog.py:1515 ../raphodo/renamepanel.py:122
 msgid "Extension:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1078
+#: ../raphodo/preferencedialog.py:1530
 msgid "Invalid File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1079
+#: ../raphodo/preferencedialog.py:1531
 #, python-format
 msgid ""
 "The file extension <b>%s</b> is recognized by Rapid Photo Downloader, so it "
 "makes no sense to warn about its presence."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1081
+#: ../raphodo/preferencedialog.py:1533
 #, python-format
 msgid ""
 "Recognized file types:\n"
@@ -2225,104 +2808,103 @@ msgstr ""
 msgid "Birthday"
 msgstr ""
 
-#: ../raphodo/preferences.py:614
+#: ../raphodo/preferences.py:624
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr ""
 
-#: ../raphodo/preferences.py:617
+#: ../raphodo/preferences.py:627
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr ""
 
-#: ../raphodo/preferences.py:622
+#: ../raphodo/preferences.py:632
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
 
-#. self.setFlat(True)
 #: ../raphodo/primarybutton.py:72
 msgid "Download 8 Photos and 10 Videos"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:86 ../raphodo/problemnotification.py:208
+#: ../raphodo/problemnotification.py:87 ../raphodo/problemnotification.py:209
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:89
+#: ../raphodo/problemnotification.py:90
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:116
+#: ../raphodo/problemnotification.py:117
 #, python-format
 msgid "GPhoto2 Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:124
+#: ../raphodo/problemnotification.py:125
 msgid ""
 "Unable to initialize the camera, probably because another program is using "
 "it. No files were copied from it."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:134
+#: ../raphodo/problemnotification.py:135
 #, python-format
 msgid "Unable to read directory %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:140
+#: ../raphodo/problemnotification.py:141
 #, python-format
 msgid "Unable to access modification time or size from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:146
+#: ../raphodo/problemnotification.py:147
 #, python-format
 msgid "Unable to read file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:152
+#: ../raphodo/problemnotification.py:153
 #, python-format
 msgid "Unable to write file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:158
+#: ../raphodo/problemnotification.py:159
 #, python-format
 msgid "Unable to move file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:164
+#: ../raphodo/problemnotification.py:165
 #, python-format
 msgid "Unable to remove file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:170
+#: ../raphodo/problemnotification.py:171
 #, python-format
 msgid "Unable to copy file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:176
+#: ../raphodo/problemnotification.py:177
 #, python-format
 msgid "Zero length file %s will not be downloaded"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:182
+#: ../raphodo/problemnotification.py:183
 #, python-format
 msgid "Could not determine filesystem modification time for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:188
+#: ../raphodo/problemnotification.py:189
 #, python-format
 msgid "Unable to load metadata from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:194
+#: ../raphodo/problemnotification.py:195
 #, python-format
 msgid ""
 "Unable to load metadata from %(name)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:202
+#: ../raphodo/problemnotification.py:203
 #, python-format
 msgid ""
 "An error occurred setting a file's filesystem metadata on the filesystem %s. "
@@ -2330,212 +2912,212 @@ msgid ""
 "again."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:216
+#: ../raphodo/problemnotification.py:217
 #, python-format
 msgid "Encountered unhandled file %s. It will not be downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:223
+#: ../raphodo/problemnotification.py:224
 #, python-format
 msgid "%(filetype)s %(destination)s already exists."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:234 ../raphodo/problemnotification.py:262
+#: ../raphodo/problemnotification.py:235 ../raphodo/problemnotification.py:263
 #, python-format
 msgid ""
 "The existing %(filetype)s %(destination)s was last modified on %(date)s at "
 "%(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:245
+#: ../raphodo/problemnotification.py:246
 #, python-format
 msgid "The %(filetype)s %(source)s was not downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:273
+#: ../raphodo/problemnotification.py:274
 #, python-format
 msgid "The %(filetype)s %(source)s was downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:282
+#: ../raphodo/problemnotification.py:283
 #, python-format
 msgid "The unique identifier '%s' was added to the filename."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:298
+#: ../raphodo/problemnotification.py:299
 #, python-format
 msgid ""
 "The existing backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:309
+#: ../raphodo/problemnotification.py:310
 #, python-format
 msgid "The %(filetype)s %(source)s was not backed up from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:326
+#: ../raphodo/problemnotification.py:327
 #, python-format
 msgid ""
 "The previous backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:337
+#: ../raphodo/problemnotification.py:338
 #, python-format
 msgid ""
 "The %(filetype)s %(source)s from %(device)s was backed up, overwriting the "
 "previous backup %(filetype)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:356
+#: ../raphodo/problemnotification.py:357
 #, python-format
 msgid ""
 "When synchronizing RAW + JPEG sequence values, a duplicate %(filetype)s "
 "%(file)s was encountered, and was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:366
+#: ../raphodo/problemnotification.py:367
 msgid ""
 "When synchronizing RAW + JPEG sequence values, photos were detected with the "
 "same filenames, but taken at different times:"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:373
+#: ../raphodo/problemnotification.py:374
 #, 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 ""
 
-#: ../raphodo/problemnotification.py:389
+#: ../raphodo/problemnotification.py:390
 #, python-format
 msgid "Unable to finalize the filename for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:424
+#: ../raphodo/problemnotification.py:425
 #, python-format
 msgid ""
 "The filename %(destination)s was not fully generated for %(filetype)s "
 "%(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:433
+#: ../raphodo/problemnotification.py:434
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:439
+#: ../raphodo/problemnotification.py:440
 #, python-format
 msgid "The following metadata is missing: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:445
+#: ../raphodo/problemnotification.py:446
 #, python-format
 msgid "Date/time conversion failed: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:451
+#: ../raphodo/problemnotification.py:452
 msgid ""
 "Could not extract valid date/time metadata or determine the file "
 "modification time."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:457
+#: ../raphodo/problemnotification.py:458
 msgid "Filename does not have an extension."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:460
+#: ../raphodo/problemnotification.py:461
 msgid "Filename does not have a number component."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:464
+#: ../raphodo/problemnotification.py:465
 #, python-format
 msgid "Error generating component %(component)s. Error: %(error)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:477
+#: ../raphodo/problemnotification.py:478
 #, python-format
 msgid ""
 "The download subfolders %(folder)s were only partially generated for "
 "%(filetype)s %(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:486
+#: ../raphodo/problemnotification.py:487
 #, python-format
 msgid ""
 "There is no data with which to generate the %(subfolder_file)s for "
 "%(filename)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:499
+#: ../raphodo/problemnotification.py:500
 #, python-format
 msgid ""
 "Unable to create the %(filetype)s %(destination)s in %(folder)s. The "
 "download file was %(source)s in %(device)s. It was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:514
+#: ../raphodo/problemnotification.py:515
 #, python-format
 msgid "Unable to create the download subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:526
+#: ../raphodo/problemnotification.py:527
 #, python-format
 msgid "Unable to create the backup subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:577
+#: ../raphodo/problemnotification.py:578
 #, python-format
 msgid "Problems scanning %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:584
+#: ../raphodo/problemnotification.py:585
 #, python-format
 msgid "Problems copying from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:591
+#: ../raphodo/problemnotification.py:592
 msgid "Problems while finalizing filenames and generating subfolders"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:598
+#: ../raphodo/problemnotification.py:599
 #, python-format
 msgid "Problems backing up to %s"
 msgstr ""
 
-#. Translators: for example Nov 3 or Dec 31
-#. The start and end dates are on a different day
-#. Translators: for example Nov 3 or Dec 31
-#: ../raphodo/proximity.py:105 ../raphodo/proximity.py:221
-#: ../raphodo/proximity.py:224 ../raphodo/proximity.py:828
+#. Translators: for example Nov 3 2015, 11:25 AM
+#. Translators: for example, Nov 3, 12:15 PM
+#: ../raphodo/proximity.py:188 ../raphodo/proximity.py:213
+#: ../raphodo/proximity.py:236 ../raphodo/proximity.py:239
 #, python-format
-msgid "%(month)s %(numeric_day)s"
+msgid "%(date)s, %(time)s"
 msgstr ""
 
-#. Translators: for example Nov 15 2015
-#. Translators: for example Nov 3 2015
-#: ../raphodo/proximity.py:109 ../raphodo/proximity.py:230
-#: ../raphodo/proximity.py:231 ../raphodo/proximity.py:831
+#: ../raphodo/proximity.py:204
 #, python-format
-msgid "%(date)s %(year)s"
+msgid "%(starttime)s - %(endtime)s"
 msgstr ""
 
-#. Translators: for example Nov 3 2015, 11:25 AM
-#. Translators: for example, Nov 3, 12:15 PM
-#: ../raphodo/proximity.py:197 ../raphodo/proximity.py:215
-#: ../raphodo/proximity.py:234 ../raphodo/proximity.py:236
+#. The start and end dates are on a different day
+#. Translators: for example Nov 3 or Dec 31
+#: ../raphodo/proximity.py:221 ../raphodo/proximity.py:225
+#: ../raphodo/proximity.py:980 ../raphodo/timeutils.py:105
 #, python-format
-msgid "%(date)s, %(time)s"
+msgid "%(month)s %(numeric_day)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:209
+#. Translators: for example Nov 3 2015
+#. Translators: for example Nov 2 2015
+#. Translators: for example Nov 15 2015
+#: ../raphodo/proximity.py:232 ../raphodo/proximity.py:233
+#: ../raphodo/proximity.py:985 ../raphodo/timeutils.py:110
 #, python-format
-msgid "%(starttime)s - %(endtime)s"
+msgid "%(date)s %(year)s"
 msgstr ""
 
 #. Translators: for example, Nov 3, 12:15 PM - Nov 4, 1:00 AM
-#: ../raphodo/proximity.py:241
+#: ../raphodo/proximity.py:245
 #, python-format
 msgid "%(earlier_time)s - %(later_time)s"
 msgstr ""
@@ -2544,25 +3126,25 @@ msgstr ""
 #. Nov 3 2012, 12:15 PM -
 #. Nov 4 2012, 1:00 AM
 #. (please keep the line break signified by \n)
-#: ../raphodo/proximity.py:248
+#: ../raphodo/proximity.py:253
 #, python-format
 msgid ""
 "%(earlier_time)s -\n"
 "%(later_time)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:359
+#: ../raphodo/proximity.py:382
 #, python-format
 msgid "%(month)s  %(year)s"
 msgstr ""
 
 #. Translators: for example Nov 2015
-#: ../raphodo/proximity.py:833
+#: ../raphodo/proximity.py:987
 #, python-format
 msgid "%(month)s %(year)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:1344
+#: ../raphodo/proximity.py:1595
 msgid ""
 "The time elapsed between consecutive photos and videos that is used to build "
 "the Timeline"
@@ -2572,47 +3154,47 @@ msgstr ""
 #. Replace the very last character (after the d) with the correct
 #. localized value, keeping everything else. In other words, change
 #. only the m character.
-#: ../raphodo/proximity.py:1406
+#: ../raphodo/proximity.py:1652
 #, python-format
 msgid "%(minutes)dm"
 msgstr ""
 
 #. Translators: i.e. "1.5h", which is short for 1.5 hours.
 #. Replace the entire string with the correct localized value
-#: ../raphodo/proximity.py:1410
+#: ../raphodo/proximity.py:1656
 msgid "1.5h"
 msgstr ""
 
 #. Translators: e.g. "5h", which is short for 5 hours.
 #. Replace the very last character (after the d) with the correct localized value,
 #. keeping everything else. In other words, change only the h character.
-#: ../raphodo/proximity.py:1415
+#: ../raphodo/proximity.py:1661
 #, python-format
 msgid "%(hours)dh"
 msgstr ""
 
-#: ../raphodo/proximity.py:1461
+#: ../raphodo/proximity.py:1710
 msgid ""
 "The Timeline groups photos and videos based on how much time elapsed between "
 "consecutive shots. Use it to identify photos and videos taken at different "
 "periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/proximity.py:1464
+#: ../raphodo/proximity.py:1715
 msgid ""
 "Use the slider (below) to adjust the time elapsed between consecutive shots "
 "that is used to build the Timeline."
 msgstr ""
 
-#: ../raphodo/proximity.py:1466
+#: ../raphodo/proximity.py:1718
 msgid "Timeline build pending..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1467
+#: ../raphodo/proximity.py:1719
 msgid "Timeline is building..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1468
+#: ../raphodo/proximity.py:1721
 msgid ""
 "The Timeline needs to be rebuilt because the file modification time does not "
 "match the time a shot was taken for one or more shots.<br><br>The Timeline "
@@ -2624,61 +3206,61 @@ msgid ""
 "downloading, which is when the metadata is read."
 msgstr ""
 
-#: ../raphodo/rapid.py:485 ../raphodo/rapid.py:2461 ../raphodo/rapid.py:3728
-#: ../raphodo/rapid.py:3846 ../raphodo/rapid.py:3850 ../raphodo/rapid.py:3870
-#: ../raphodo/rapid.py:3874 ../raphodo/rapid.py:3998 ../raphodo/rapid.py:4007
-#: ../raphodo/rapid.py:4495 ../raphodo/rapid.py:4888 ../raphodo/rapid.py:5722
-#: ../raphodo/rememberthisdialog.py:97
+#: ../raphodo/rapid.py:493 ../raphodo/rapid.py:2555 ../raphodo/rapid.py:3934
+#: ../raphodo/rapid.py:4065 ../raphodo/rapid.py:4069 ../raphodo/rapid.py:4092
+#: ../raphodo/rapid.py:4096 ../raphodo/rapid.py:4226 ../raphodo/rapid.py:4237
+#: ../raphodo/rapid.py:4743 ../raphodo/rapid.py:5195 ../raphodo/rapid.py:5997
+#: ../raphodo/rememberthisdialog.py:99
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:3
 msgid "Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:1100
+#: ../raphodo/rapid.py:1131
 msgid ""
 "<b>ExifTool has a problem</b><br><br> Rapid Photo Downloader uses ExifTool "
 "to get metadata from videos and photos. The program will run without it, but "
 "installing it is <b>highly</b> recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1110 ../raphodo/rapid.py:1130
+#: ../raphodo/rapid.py:1141 ../raphodo/rapid.py:1161
 msgid "Problem with libmediainfo"
 msgstr ""
 
-#: ../raphodo/rapid.py:1119
+#: ../raphodo/rapid.py:1150
 msgid ""
 "<b>The library libmediainfo appears to be missing</b><br><br> Rapid Photo "
 "Downloader uses libmediainfo to get the date and time a video was shot. The "
 "program will run  without it, but installing it is recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1417
+#: ../raphodo/rapid.py:1448
 msgid "Download failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1419
+#: ../raphodo/rapid.py:1450
 msgid ""
 "Sorry, the download of the new version of Rapid Photo Downloader failed."
 msgstr ""
 
-#: ../raphodo/rapid.py:1425
+#: ../raphodo/rapid.py:1457
 msgid ""
 "The new version was successfully downloaded. Do you want to close Rapid "
 "Photo Downloader and install it now?"
 msgstr ""
 
-#: ../raphodo/rapid.py:1428
+#: ../raphodo/rapid.py:1461
 msgid "Update Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:1432
+#: ../raphodo/rapid.py:1465
 msgid "Install"
 msgstr ""
 
-#: ../raphodo/rapid.py:1450
+#: ../raphodo/rapid.py:1483
 msgid "New version saved"
 msgstr ""
 
-#: ../raphodo/rapid.py:1451
+#: ../raphodo/rapid.py:1485
 #, python-format
 msgid ""
 "The tar file and installer script are saved at:\n"
@@ -2686,163 +3268,163 @@ msgid ""
 " %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:1468
+#: ../raphodo/rapid.py:1502
 msgid "Upgrade failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1469
+#: ../raphodo/rapid.py:1505
 msgid ""
 "Sorry, upgrading Rapid Photo Downloader failed because there was an error "
 "opening the installer."
 msgstr ""
 
-#: ../raphodo/rapid.py:1667 ../raphodo/rapid.py:2331
+#: ../raphodo/rapid.py:1709 ../raphodo/rapid.py:2425
 msgid "Download"
 msgstr ""
 
-#: ../raphodo/rapid.py:1671
+#: ../raphodo/rapid.py:1713
 msgid "&Refresh..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1675
+#: ../raphodo/rapid.py:1717
 msgid "&Preferences"
 msgstr ""
 
-#: ../raphodo/rapid.py:1679
+#: ../raphodo/rapid.py:1721
 msgid "&Quit"
 msgstr ""
 
-#: ../raphodo/rapid.py:1683
+#: ../raphodo/rapid.py:1725
 msgid "Error &Reports"
 msgstr ""
 
-#: ../raphodo/rapid.py:1687
+#: ../raphodo/rapid.py:1729
 msgid "Clear Completed Downloads"
 msgstr ""
 
-#: ../raphodo/rapid.py:1691
+#: ../raphodo/rapid.py:1733
 msgid "Get Help Online..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1695
+#: ../raphodo/rapid.py:1737
 msgid "&Tip of the Day..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1699
+#: ../raphodo/rapid.py:1741
 msgid "Report a Problem..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1703
+#: ../raphodo/rapid.py:1745
 msgid "Make a Donation..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1707
+#: ../raphodo/rapid.py:1749
 msgid "Translate this Application..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1711
+#: ../raphodo/rapid.py:1753
 msgid "&About..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1715
+#: ../raphodo/rapid.py:1757
 msgid "Check for Updates..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1797
+#: ../raphodo/rapid.py:1840
 msgid "Timeline"
 msgstr ""
 
-#: ../raphodo/rapid.py:1807
+#: ../raphodo/rapid.py:1850
 msgid "Destination"
 msgstr ""
 
-#: ../raphodo/rapid.py:1808
+#: ../raphodo/rapid.py:1851
 msgid "Rename"
 msgstr ""
 
-#: ../raphodo/rapid.py:1810
+#: ../raphodo/rapid.py:1853
 msgid "Back Up"
 msgstr ""
 
 #. Devices Header and View
-#: ../raphodo/rapid.py:1926
+#: ../raphodo/rapid.py:1977
 msgid ""
 "Turn on or off the use of devices attached to this computer as download "
 "sources"
 msgstr ""
 
 #. This Computer Header and View
-#: ../raphodo/rapid.py:1940
+#: ../raphodo/rapid.py:1994
 msgid ""
 "Turn on or off the use of a folder on this computer as a download source"
 msgstr ""
 
-#: ../raphodo/rapid.py:1941
+#: ../raphodo/rapid.py:1996
 msgid "This Computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:1952
+#: ../raphodo/rapid.py:2009
 msgid "Select a source folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:1975
+#: ../raphodo/rapid.py:2038
 msgid "Projected Storage Use"
 msgstr ""
 
-#: ../raphodo/rapid.py:1989 ../raphodo/rapid.py:1997
+#: ../raphodo/rapid.py:2056 ../raphodo/rapid.py:2068
 msgid "Select a destination folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:2045
+#: ../raphodo/rapid.py:2117
 msgid "All"
 msgstr ""
 
-#: ../raphodo/rapid.py:2046
+#: ../raphodo/rapid.py:2118
 msgid "New"
 msgstr ""
 
-#: ../raphodo/rapid.py:2048
+#: ../raphodo/rapid.py:2120
 msgid "Show:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2051
+#: ../raphodo/rapid.py:2123
 msgid "Modification Time"
 msgstr ""
 
-#: ../raphodo/rapid.py:2052
+#: ../raphodo/rapid.py:2124
 msgid "Checked State"
 msgstr ""
 
-#: ../raphodo/rapid.py:2055
+#: ../raphodo/rapid.py:2127
 msgid "File Type"
 msgstr ""
 
-#: ../raphodo/rapid.py:2056
+#: ../raphodo/rapid.py:2128
 msgid "Device"
 msgstr "Устройство"
 
-#: ../raphodo/rapid.py:2058
+#: ../raphodo/rapid.py:2130
 msgid "Sort:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2069
+#: ../raphodo/rapid.py:2141
 msgid "Select All:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2311
+#: ../raphodo/rapid.py:2405
 #, python-format
 msgid "Download %(files)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2327
+#: ../raphodo/rapid.py:2421
 msgid "Resume Download"
 msgstr ""
 
-#: ../raphodo/rapid.py:2329
+#: ../raphodo/rapid.py:2423
 msgid "Pause"
 msgstr ""
 
-#: ../raphodo/rapid.py:2417
+#: ../raphodo/rapid.py:2511
 #, python-brace-format
 msgid ""
 "Please report the problem at <a href=\"{website}\">{website}</a>.<br><br>\n"
@@ -2851,11 +3433,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/rapid.py:2431
+#: ../raphodo/rapid.py:2525
 msgid "Thank you for reporting a problem in Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:2529
+#: ../raphodo/rapid.py:2624
 #, python-format
 msgid ""
 "<b>Changing This Computer source path</b><br><br>Do you really want to "
@@ -2864,30 +3446,29 @@ msgid ""
 "from This Computer will be cancelled."
 msgstr ""
 
-#: ../raphodo/rapid.py:2595
+#: ../raphodo/rapid.py:2694
 msgid "You cannot change the download destination while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:2604
+#: ../raphodo/rapid.py:2704
 #, python-format
 msgid ""
 "<b>Confirm Download Destination</b><br><br>Are you sure you want to set the "
 "%(file_type)s download destination to %(path)s?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2682
+#: ../raphodo/rapid.py:2785
 msgid ""
+"\n"
 "<b>Downloading all files</b><br><br>\n"
-"                    A download always includes all files that are checked "
-"for download,\n"
-"                    including those that are not currently displayed because "
-"the Timeline\n"
-"                    is being used or because only new files are being shown."
-"<br><br>\n"
-"                    Do you want to proceed with the download?"
+"A download always includes all files that are checked for download,\n"
+"including those that are not currently displayed because the Timeline\n"
+"is being used or because only new files are being shown.<br><br>\n"
+"Do you want to proceed with the download?\n"
+"                        "
 msgstr ""
 
-#: ../raphodo/rapid.py:2820
+#: ../raphodo/rapid.py:2937
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -2895,206 +3476,200 @@ msgid ""
 "%(folder2)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2824
+#: ../raphodo/rapid.py:2940
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
 "%s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2827
+#: ../raphodo/rapid.py:2943
 msgid "Download Failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:2828
+#: ../raphodo/rapid.py:2944
 msgid "The download cannot proceed."
 msgstr ""
 
-#: ../raphodo/rapid.py:2842
+#: ../raphodo/rapid.py:2962
 msgid ""
 "Photos and videos will not be backed up because there is nowhere to back "
 "them up. Do you still want to start the download?"
 msgstr ""
 
-#. Translators: filetype will be replaced with 'photos' or 'videos'
-#: ../raphodo/rapid.py:2847 ../raphodo/rapid.py:2854
+#: ../raphodo/rapid.py:2969 ../raphodo/rapid.py:2979
 #, python-format
 msgid ""
 "No backup device exists for backing up %(filetype)s. Do you still want to "
 "start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2848 ../raphodo/rpdfile.py:228
+#: ../raphodo/rapid.py:2971 ../raphodo/rpdfile.py:228
 msgid "photos"
 msgstr ""
 
-#: ../raphodo/rapid.py:2855 ../raphodo/rpdfile.py:223
+#: ../raphodo/rapid.py:2981 ../raphodo/rpdfile.py:223
 msgid "videos"
 msgstr ""
 
-#: ../raphodo/rapid.py:2861
+#: ../raphodo/rapid.py:2989
 msgid ""
 "<b>The photo and video backup destinations do not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2869 ../raphodo/rapid.py:2876
+#: ../raphodo/rapid.py:2999 ../raphodo/rapid.py:3008
 #, python-format
 msgid ""
 "<b>The %(filetype)s backup destination does not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2871 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:818
+#: ../raphodo/rapid.py:3001 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:843
 msgid "photo"
 msgstr ""
 
-#: ../raphodo/rapid.py:2878 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:858
+#: ../raphodo/rapid.py:3010 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:883
 msgid "video"
 msgstr ""
 
-#: ../raphodo/rapid.py:2886
+#: ../raphodo/rapid.py:3018
 msgid "Backup problem"
 msgstr ""
 
-#. Translators - in the middle is a unicode em dash - please retain it
-#. This string is displayed in the status bar when the download is running
-#: ../raphodo/rapid.py:3571
+#: ../raphodo/rapid.py:3756
 #, python-format
 msgid "%(downloading_from)s — %(time_left)s left (%(speed)s)"
 msgstr ""
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3640
+#: ../raphodo/rapid.py:3828
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr ""
 
-#. Translators: e.g. 2 videos failed to download
-#: ../raphodo/rapid.py:3645
+#: ../raphodo/rapid.py:3836
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr ""
 
-#: ../raphodo/rapid.py:3650 ../raphodo/rapid.py:3723
+#: ../raphodo/rapid.py:3842 ../raphodo/rapid.py:3927
 msgid "warnings"
 msgstr "предупреждения"
 
-#: ../raphodo/rapid.py:3679
+#: ../raphodo/rapid.py:3873
 msgid "All downloads complete"
 msgstr ""
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3686 ../raphodo/rapid.py:3695 ../raphodo/rapid.py:3704
-#: ../raphodo/rapid.py:3713 ../raphodo/rapid.py:3721
+#: ../raphodo/rapid.py:3881 ../raphodo/rapid.py:3892 ../raphodo/rapid.py:3903
+#: ../raphodo/rapid.py:3914 ../raphodo/rapid.py:3924
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3688 ../raphodo/rapid.py:3706
+#: ../raphodo/rapid.py:3884 ../raphodo/rapid.py:3906
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr ""
 
-#: ../raphodo/rapid.py:3697 ../raphodo/rapid.py:3715
+#: ../raphodo/rapid.py:3895 ../raphodo/rapid.py:3917
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr ""
 
-#: ../raphodo/rapid.py:3742
+#: ../raphodo/rapid.py:3950
 msgid "1 failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:3744
+#: ../raphodo/rapid.py:3952
 #, python-format
 msgid "%d failures"
 msgstr ""
 
-#: ../raphodo/rapid.py:3749
+#: ../raphodo/rapid.py:3957
 msgid "1 warning"
 msgstr ""
 
-#: ../raphodo/rapid.py:3751
+#: ../raphodo/rapid.py:3959
 #, python-format
 msgid "%d warnings"
 msgstr ""
 
-#: ../raphodo/rapid.py:3771
+#: ../raphodo/rapid.py:3981
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3774
+#: ../raphodo/rapid.py:3985
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3779
+#: ../raphodo/rapid.py:3989
 #, python-format
 msgid "No files downloaded — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3781
+#: ../raphodo/rapid.py:3991
 msgid "No files downloaded"
 msgstr ""
 
-#: ../raphodo/rapid.py:3805
+#: ../raphodo/rapid.py:4021
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3809
+#: ../raphodo/rapid.py:4026
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3812
+#: ../raphodo/rapid.py:4031
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3820
+#: ../raphodo/rapid.py:4039
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3833
+#: ../raphodo/rapid.py:4052
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3837
+#: ../raphodo/rapid.py:4056
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3841
+#: ../raphodo/rapid.py:4060
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices"
 msgstr ""
 
-#: ../raphodo/rapid.py:3867
+#: ../raphodo/rapid.py:4087
 msgid "The Destination subfolders and Timeline have been rebuilt"
 msgstr ""
 
-#: ../raphodo/rapid.py:3922
+#: ../raphodo/rapid.py:4144
 msgid "Program preferences are invalid"
 msgstr ""
 
-#: ../raphodo/rapid.py:3999
+#: ../raphodo/rapid.py:4228
 #, python-format
 msgid ""
 "<b>All files on the %(camera)s are inaccessible</b>.<br><br>It may be locked "
@@ -3104,179 +3679,205 @@ msgid ""
 "ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4008
+#: ../raphodo/rapid.py:4239
 #, python-format
 msgid ""
-"<b>The %(camera)s appears to be in use by another application.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again.<br><br>Alternatively, you can ignore this "
-"device."
+"<b>The %(camera)s appears to be in use by another "
+"application.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again.<br><br>Alternatively, you "
+"can ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4019
+#: ../raphodo/rapid.py:4250
 msgid "&Try Again"
 msgstr ""
 
-#: ../raphodo/rapid.py:4020
+#: ../raphodo/rapid.py:4251
 msgid "&Ignore This Device"
 msgstr ""
 
-#: ../raphodo/rapid.py:4086
+#: ../raphodo/rapid.py:4323
 #, python-format
 msgid "Sorry, an unexpected problem occurred while scanning %s."
 msgstr ""
 
-#: ../raphodo/rapid.py:4087
+#: ../raphodo/rapid.py:4324
 msgid "Unfortunately you cannot download from this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4091
+#: ../raphodo/rapid.py:4328
 msgid ""
 "A possible workaround for the problem might be downloading from the camera's "
 "memory card using a card reader."
 msgstr ""
 
-#: ../raphodo/rapid.py:4096
+#: ../raphodo/rapid.py:4333
 msgid "Device scan failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:4472
+#: ../raphodo/rapid.py:4720
 #, python-format
 msgid ""
-"<b>The %(camera)s cannot be scanned because it cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again."
+"<b>The %(camera)s cannot be scanned because it cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again."
 msgstr ""
 
-#: ../raphodo/rapid.py:4496
+#: ../raphodo/rapid.py:4745
 #, python-format
 msgid ""
-"<b>The download cannot start because the %(camera)s cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again, and choose which files you want to "
-"download from it."
+"<b>The download cannot start because the %(camera)s cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again, and choose which files "
+"you want to download from it."
+msgstr ""
+
+#: ../raphodo/rapid.py:4842
+msgid "Completed Downloads Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4844
+#, python-format
+msgid "%s whose download have completed are displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4846
+msgid "Do you want to clear the completed downloads?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4848
+msgid "Completed Download Present"
 msgstr ""
 
-#: ../raphodo/rapid.py:4635
+#: ../raphodo/rapid.py:4850
+#, python-format
+msgid "%s whose download has completed is displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4852
+msgid "Do you want to clear the completed download?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4933
 #, python-format
 msgid ""
 "Do you want to download photos and videos from the device <i>%(device)s</i>?"
 msgstr ""
 
-#: ../raphodo/rapid.py:4877
+#: ../raphodo/rapid.py:5183
 #, python-format
 msgid "<b>Do you want to ignore the %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4879
+#: ../raphodo/rapid.py:5186
 msgid ""
 "All cameras, phones and tablets with the same model name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:4883
+#: ../raphodo/rapid.py:5190
 #, python-format
 msgid ""
 "<b>Do you want to ignore the device %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4885
+#: ../raphodo/rapid.py:5192
 msgid "Any device with the same name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:5178
+#: ../raphodo/rapid.py:5492
 #, python-format
 msgid "Downloading from %(location)s on This Computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5180
+#: ../raphodo/rapid.py:5496
 msgid ""
 "Do you really want to download from here?<br><br>On some systems, scanning "
 "this location can take a very long time."
 msgstr ""
 
-#: ../raphodo/rapid.py:5224
+#: ../raphodo/rapid.py:5537
 #, python-format
 msgid "Generating thumbnails for %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5227
+#: ../raphodo/rapid.py:5540
 #, python-format
 msgid "Scanning %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5237
+#: ../raphodo/rapid.py:5551
 #, python-format
 msgid ""
 "%(number)s of %(available files)s checked for download (%(hidden)s hidden)"
 msgstr ""
 
-#: ../raphodo/rapid.py:5243
+#: ../raphodo/rapid.py:5559
 #, python-format
 msgid "%(number)s of %(available files)s checked for download"
 msgstr ""
 
-#: ../raphodo/rapid.py:5494
+#: ../raphodo/rapid.py:5764
 msgid "Display program information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5496
+#: ../raphodo/rapid.py:5766
 msgid "Display debugging information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5499
+#: ../raphodo/rapid.py:5769
 msgid "List photo and video file extensions the program recognizes and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5502
+#: ../raphodo/rapid.py:5772
 msgid "Turn on or off the the renaming of photos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5504
+#: ../raphodo/rapid.py:5774
 msgid "turn on or off the the renaming of videos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5506
+#: ../raphodo/rapid.py:5776
 msgid ""
 "Turn on or off the automatic detection of devices from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5510
+#: ../raphodo/rapid.py:5780
 msgid "Turn on or off downloading from this computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5512 ../raphodo/rapid.py:5515 ../raphodo/rapid.py:5518
-#: ../raphodo/rapid.py:5539 ../raphodo/rapid.py:5543
+#: ../raphodo/rapid.py:5782 ../raphodo/rapid.py:5785 ../raphodo/rapid.py:5788
+#: ../raphodo/rapid.py:5809 ../raphodo/rapid.py:5813
 msgid "PATH"
 msgstr ""
 
-#: ../raphodo/rapid.py:5513
+#: ../raphodo/rapid.py:5783
 msgid "The PATH on this computer from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5516
+#: ../raphodo/rapid.py:5786
 msgid "The PATH where photos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5519
+#: ../raphodo/rapid.py:5789
 msgid "The PATH where videos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5521
+#: ../raphodo/rapid.py:5791
 msgid "Turn on or off the backing up of photos and videos while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:5525
+#: ../raphodo/rapid.py:5795
 msgid "Turn on or off the automatic detection of backup devices."
 msgstr ""
 
-#: ../raphodo/rapid.py:5527 ../raphodo/rapid.py:5533
+#: ../raphodo/rapid.py:5797 ../raphodo/rapid.py:5803
 msgid "FOLDER"
 msgstr ""
 
-#: ../raphodo/rapid.py:5528
+#: ../raphodo/rapid.py:5798
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected photo "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3284,7 +3885,7 @@ msgid ""
 "photos up to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5534
+#: ../raphodo/rapid.py:5804
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected video "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3292,115 +3893,124 @@ msgid ""
 "up videos to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5540
+#: ../raphodo/rapid.py:5810
 msgid ""
 "The PATH where photos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5544
+#: ../raphodo/rapid.py:5814
 msgid ""
 "The PATH where videos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5547
+#: ../raphodo/rapid.py:5817
 #, python-format
 msgid "Ignore photos with the following extensions: %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5551
-msgid "Turn on or off starting downloads as soon as the program itself starts."
+#: ../raphodo/rapid.py:5821
+msgid ""
+"Turn on or off starting downloads as soon as the program itself starts."
 msgstr ""
 
-#: ../raphodo/rapid.py:5554
+#: ../raphodo/rapid.py:5824
 msgid "Turn on or off starting downloads as soon as a device is inserted."
 msgstr ""
 
-#: ../raphodo/rapid.py:5557
+#: ../raphodo/rapid.py:5827
 msgid ""
 "Turn on or off use of the Rapid Photo Downloader Thumbnail Cache. Turning it "
 "off does not delete existing cache contents."
 msgstr ""
 
-#: ../raphodo/rapid.py:5561
+#: ../raphodo/rapid.py:5831
 msgid ""
 "Delete all thumbnails in the Rapid Photo Downloader Thumbnail Cache, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5565
+#: ../raphodo/rapid.py:5835
 msgid "Forget which files have been previously downloaded, and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5568
+#: ../raphodo/rapid.py:5838
 msgid ""
 "Import preferences from an old program version and exit. Requires the "
 "command line program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5571
+#: ../raphodo/rapid.py:5841
 msgid ""
 "Reset all program settings to their default values, delete all thumbnails in "
 "the Thumbnail cache, forget which files have been previously downloaded, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5575
+#: ../raphodo/rapid.py:5845
 msgid "Include gphoto2 debugging information in log files."
 msgstr ""
 
-#: ../raphodo/rapid.py:5579
+#: ../raphodo/rapid.py:5849
 msgid "Print information to the terminal about attached cameras and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5640
+#: ../raphodo/rapid.py:5911
 msgid ""
 "To import preferences from the old version of Rapid Photo Downloader, you "
 "must install the program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5649
+#: ../raphodo/rapid.py:5920
 msgid "No prior program preferences detected: exiting"
 msgstr ""
 
-#: ../raphodo/rapid.py:5652
+#: ../raphodo/rapid.py:5923
 #, python-format
 msgid "Importing preferences from Rapid Photo Downloader %(version)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5714
+#: ../raphodo/rapid.py:5989
 #, python-format
-msgid "Do you want to copy the stored sequence number, which has the value %d?"
+msgid ""
+"Do you want to copy the stored sequence number, which has the value %d?"
 msgstr ""
 
-#: ../raphodo/rapid.py:5726
+#: ../raphodo/rapid.py:6000
 msgid "Program aborting."
 msgstr ""
 
-#: ../raphodo/rapid.py:5736
+#: ../raphodo/rapid.py:6010
 msgid "Never run this program as the sudo / root user."
 msgstr ""
 
-#: ../raphodo/rapid.py:5740
+#: ../raphodo/rapid.py:6014
 msgid "You must install ExifTool to run Rapid Photo Downloader."
 msgstr ""
 
-#: ../raphodo/rapid.py:5794
+#: ../raphodo/rapid.py:6026
+msgid ""
+"Rapid Photo Downloader is installed in multiple locations.\n"
+"\n"
+"Uninstall all copies except the version you want to run."
+msgstr ""
+
+#: ../raphodo/rapid.py:6083
 msgid ""
 "When specifying a path on the command line, do not also specify an\n"
 "option for device auto detection or a path on \"This Computer\"."
 msgstr ""
 
-#: ../raphodo/rapid.py:5950
+#: ../raphodo/rapid.py:6243
 msgid "All settings and caches have been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5958
+#: ../raphodo/rapid.py:6251
 msgid "Thumbnail Cache has been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5964
+#: ../raphodo/rapid.py:6257
 msgid "Remembered files have been forgotten"
 msgstr ""
 
@@ -3416,15 +4026,15 @@ msgstr ""
 msgid "&Don't warn me again about missing or broken program libraries"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:546
+#: ../raphodo/renameandmovefile.py:554
 msgid "subfolder and filename"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:548
+#: ../raphodo/renameandmovefile.py:556
 msgid "filename"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:550
+#: ../raphodo/renameandmovefile.py:558
 msgid "subfolder"
 msgstr ""
 
@@ -3504,160 +4114,237 @@ msgstr ""
 msgid "photos or videos"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:306
+#: ../raphodo/rpdfile.py:315
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:318
+#. translators: natural language expression signifying a single video
+#: ../raphodo/rpdfile.py:337
+msgid "a video"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:339
 msgid "1 Video"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:323
+#. translators: natural language expression signifying a single photo
+#: ../raphodo/rpdfile.py:346
+msgid "a photo"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:348
 msgid "1 Photo"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:803
+#: ../raphodo/rpdfile.py:828
 #, python-format
 msgid "%(path)s on %(camera)s"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:819
+#: ../raphodo/rpdfile.py:844
 msgid "Photo"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:859
+#: ../raphodo/rpdfile.py:884
 msgid "Video"
 msgstr ""
 
-#: ../raphodo/storage.py:138
+#: ../raphodo/storage.py:141
 msgid "File system root"
 msgstr ""
 
 #. translators: the name of the Pictures folder
-#: ../raphodo/storage.py:433
+#: ../raphodo/storage.py:437
 msgid "Pictures"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:426
+#: ../raphodo/thumbnaildisplay.py:432
 #, python-format
 msgid "Taken on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:431
+#: ../raphodo/thumbnaildisplay.py:439
 #, python-format
 msgid "Modified on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:437 ../raphodo/thumbnaildisplay.py:466
+#: ../raphodo/thumbnaildisplay.py:447 ../raphodo/thumbnaildisplay.py:481
 #, python-format
 msgid "%(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:451
+#: ../raphodo/thumbnaildisplay.py:464
 #, python-format
 msgid "Memory cards: %s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:457
+#: ../raphodo/thumbnaildisplay.py:468
+#, python-format
+msgid "Memory card: %s"
+msgstr ""
+
+#: ../raphodo/thumbnaildisplay.py:473
 msgid "Downloaded as:"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:472
+#: ../raphodo/thumbnaildisplay.py:489
 #, python-format
 msgid "<br><br>Previous download:<br>%(filename)s<br>%(path)s<br>%(date)s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:1603
+#: ../raphodo/thumbnaildisplay.py:1645
 msgid "Copy Path"
 msgstr ""
 
+#. Translators: these values are file size suffixes like B representing bytes, KB representing
+#. kilobytes, etc.
+#: ../raphodo/utilities.py:170
+msgid "B"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "KB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "MB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "GB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "TB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "PB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "EB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "ZB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "YB"
+msgstr ""
+
 #. two things in a list e.g. "device1 and device2"
-#: ../raphodo/utilities.py:391
+#: ../raphodo/utilities.py:394
 #, python-format
 msgid "%(first_item)s and %(last_item)s"
 msgstr ""
 
-#: ../raphodo/utilities.py:464
+#: ../raphodo/utilities.py:468
 msgid "one"
 msgstr ""
 
-#: ../raphodo/utilities.py:465
+#: ../raphodo/utilities.py:469
 msgid "two"
 msgstr ""
 
-#: ../raphodo/utilities.py:466
+#: ../raphodo/utilities.py:470
 msgid "three"
 msgstr ""
 
-#: ../raphodo/utilities.py:467
+#: ../raphodo/utilities.py:471
 msgid "four"
 msgstr ""
 
-#: ../raphodo/utilities.py:468
+#: ../raphodo/utilities.py:472
 msgid "five"
 msgstr ""
 
-#: ../raphodo/utilities.py:469
+#: ../raphodo/utilities.py:473
 msgid "six"
 msgstr ""
 
-#: ../raphodo/utilities.py:470
+#: ../raphodo/utilities.py:474
 msgid "seven"
 msgstr ""
 
-#: ../raphodo/utilities.py:471
+#: ../raphodo/utilities.py:475
 msgid "eight"
 msgstr ""
 
-#: ../raphodo/utilities.py:472
+#: ../raphodo/utilities.py:476
 msgid "nine"
 msgstr ""
 
-#: ../raphodo/utilities.py:473
+#: ../raphodo/utilities.py:477
 msgid "ten"
 msgstr ""
 
-#: ../raphodo/utilities.py:474
+#: ../raphodo/utilities.py:478
 msgid "eleven"
 msgstr ""
 
-#: ../raphodo/utilities.py:475
+#: ../raphodo/utilities.py:479
 msgid "twelve"
 msgstr ""
 
-#: ../raphodo/utilities.py:476
+#: ../raphodo/utilities.py:480
 msgid "thirteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:477
+#: ../raphodo/utilities.py:481
 msgid "fourteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:478
+#: ../raphodo/utilities.py:482
 msgid "fifteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:479
+#: ../raphodo/utilities.py:483
 msgid "sixteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:480
+#: ../raphodo/utilities.py:484
 msgid "seventeen"
 msgstr ""
 
-#: ../raphodo/utilities.py:481
+#: ../raphodo/utilities.py:485
 msgid "eighteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:482
+#: ../raphodo/utilities.py:486
 msgid "ninenteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:483
+#: ../raphodo/utilities.py:487
 msgid "twenty"
 msgstr ""
 
+#: ../raphodo/viewutils.py:240
+msgid "&OK"
+msgstr ""
+
+#: ../raphodo/viewutils.py:243
+msgid "&Save"
+msgstr ""
+
+#: ../raphodo/viewutils.py:244
+msgid "&Help"
+msgstr ""
+
+#: ../raphodo/viewutils.py:245
+msgid "Restore Defaults"
+msgstr ""
+
+#: ../raphodo/viewutils.py:246
+msgid "&Yes"
+msgstr ""
+
+#: ../raphodo/viewutils.py:247
+msgid "&No"
+msgstr ""
+
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:1
 msgid ""
 "Rapid Photo Downloader imports photos and videos from cameras, phones, "
@@ -3711,8 +4398,8 @@ msgstr ""
 #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:5
 msgid ""
-"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;"
-"memory;card;"
+"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;memory"
+";card;"
 msgstr ""
 
 #: ../data/kde/net.damonlynch.rapid-photo-downloader.desktop.in.h:1
@@ -3779,6 +4466,7 @@ msgstr ""
 #~ msgid "scanning..."
 #~ msgstr "сканиране ..."
 
+#, python-format
 #~ msgid "<i>Example: %s</i>"
 #~ msgstr "<i>Пример: %s</i>"
 
@@ -3797,5 +4485,6 @@ msgstr ""
 #~ msgid " "
 #~ msgstr " "
 
+#, python-format
 #~ msgid "%(device)s did not unmount"
 #~ msgstr "%(device)s did not unmount"
diff --git a/po/ca.po b/po/ca.po
index 629bab8..929e730 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,137 +7,498 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: damonlynch@gmail.com\n"
-"POT-Creation-Date: 2017-07-08 19:16-0500\n"
-"PO-Revision-Date: 2017-07-04 11:06+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2017-09-12 17:01-0400\n"
+"PO-Revision-Date: 2017-09-13 18:35+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: Catalan <ca@li.org>\n"
-"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-07-05 23:04+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-09-26 22:04+0000\n"
+"X-Generator: Launchpad (build 18463)\n"
+"Language: ca\n"
+
+#: ../install.py:65
+msgid "Rapid Photo Downloader installer"
+msgstr "Instal·lador del Rapid Photo Downloader"
+
+#: ../install.py:66
+msgid "Download and install latest version of Rapid Photo Downloader."
+msgstr "Baixeu i instal·leu la versió més recent del Rapid Photo Downloader."
+
+#: ../install.py:236 ../install.py:1732
+msgid "Installer not found:"
+msgstr "No s’ha trobat l’instal·lador:"
+
+#. Translators: do not translate the term tar.gz
+#: ../install.py:240 ../install.py:1736
+msgid "Installer not in tar.gz format:"
+msgstr ""
+
+#: ../install.py:465
+msgid ""
+"Incorrect folder ownership detected. Changing ownership of and resetting "
+"permissions for"
+msgstr ""
+
+#: ../install.py:540
+msgid "The following command will be run:"
+msgstr "S’executarà l’ordre següent:"
+
+#: ../install.py:543 ../install.py:1479 ../install.py:1484
+msgid "sudo may prompt you for the sudo password."
+msgstr ""
+
+#: ../install.py:547
+msgid "Would you like to run the command now?"
+msgstr "Voleu executar l’ordre ara?"
+
+#: ../install.py:549
+msgid "Answer is not yes, exiting."
+msgstr ""
+
+#: ../install.py:559 ../install.py:751 ../install.py:966
+msgid "Command failed"
+msgstr "Ha fallat l’ordre"
+
+#: ../install.py:561 ../install.py:752 ../install.py:967
+msgid "Exiting"
+msgstr ""
+
+#: ../install.py:582
+msgid "The Universe repository must be enabled."
+msgstr "Heu d’habilitar el repositori Universe."
+
+#: ../install.py:606
+msgid ""
+"Do you want to to uninstall the previous version of Rapid Photo Downloader:"
+msgstr "Voleu desinstal·lar la versió anterior del Rapid Photo Downloader?:"
+
+#: ../install.py:715 ../install.py:740
+msgid ""
+"Querying package system to see if an older version of Rapid Photo Downloader "
+"is installed (this may take a while)..."
+msgstr ""
+
+#: ../install.py:726
+msgid ""
+"Unable to query package system. Please check your Internet connection and "
+"try again"
+msgstr ""
+
+#: ../install.py:756
+msgid "Checking if previous version installed with pip..."
+msgstr ""
+
+#: ../install.py:850
+msgid "The following package is unknown on your system: {}\n"
+msgstr ""
+
+#: ../install.py:857 ../install.py:929 ../install.py:974
+msgid ""
+"To continue, some packages required to run the application will be installed."
+msgstr ""
+
+#: ../install.py:886
+msgid "Querying installed and available packages (this may take a while)"
+msgstr ""
+
+#: ../install.py:958
+msgid ""
+"Querying zypper to see if any required packages are already installed (this "
+"may take a while)... "
+msgstr ""
+
+#: ../install.py:1004
+msgid "Query to confirm action at each step."
+msgstr ""
+
+#: ../install.py:1011
+msgid ""
+"When downloading the latest version, install the development version if it "
+"is newer than the stable version."
+msgstr ""
+
+#: ../install.py:1020
+msgid ""
+"Optional tar.gz Rapid Photo Downloader installer archive. If not specified, "
+"the latest version is downloaded from the Internet."
+msgstr ""
+
+#: ../install.py:1043
+msgid ""
+"Do not run the installer in the tar.gz Rapid Photo Downloader installer "
+"archive if it is newer than this version ({}). The default is to run "
+"whichever installer is newer."
+msgstr ""
+
+#: ../install.py:1050
+msgid ""
+"Uninstall Rapid Photo Downloader that was installed with pip, keeping its "
+"dependencies."
+msgstr ""
+
+#: ../install.py:1054
+msgid ""
+"Uninstall the dependencies installed by pip during Rapid Photo Downloader's "
+"installation, and Rapid Photo Downloader itself, then exit."
+msgstr ""
+
+#: ../install.py:1059
+msgid ""
+"Note: this will not uninstall any version of Rapid Photo Downloader "
+"installed by your Linux distribution's package manager."
+msgstr ""
+
+#: ../install.py:1066
+msgid ""
+"Dependencies will only be removed if they are not required by other programs."
+msgstr ""
+
+#: ../install.py:1072
+msgid ""
+"Note: this option will remove the dependencies regardless of whether they "
+"are required by another program pip has installed. Upgrade to pip 9.0 or "
+"above if you want to avoid this behavior. You can do so using the command "
+"'python3 -m pip install pip -U --user'. Also note that any version of Rapid "
+"Photo Downloader installed by your Linux distribution's package manager will "
+"not be uninstalled."
+msgstr ""
+
+#: ../install.py:1122
+msgid "Failed to download versions file"
+msgstr "Ha fallat la baixada del fitxer de versions"
+
+#: ../install.py:1126
+msgid "Got error code {} while accessing versions file"
+msgstr ""
+
+#: ../install.py:1234
+msgid ""
+"Sorry, could not locate installer. Please check your Internet connection and "
+"verify if you can reach https://www.damonlynch.net\n"
+"\n"
+"Exiting.\n"
+msgstr ""
+
+#: ../install.py:1408
+msgid "Installing application requirements..."
+msgstr ""
+
+#: ../install.py:1424
+msgid "Received error code"
+msgstr ""
+
+#: ../install.py:1425
+msgid "Failed to install application requirements: exiting"
+msgstr ""
+
+#: ../install.py:1428
+msgid "Installing application..."
+msgstr "S’està instal·lant l’aplicació…"
+
+#: ../install.py:1441
+msgid "Failed to install application: exiting..."
+msgstr ""
+
+#: ../install.py:1465
+msgid ""
+"You may have to restart the computer to be able to run the program from the "
+"commmand line or application launcher."
+msgstr ""
+
+#: ../install.py:1476
+msgid "Do you want to install the application's man pages?"
+msgstr ""
+
+#: ../install.py:1477
+msgid "They will be installed into {}"
+msgstr ""
+
+#: ../install.py:1478 ../install.py:1483
+msgid "If you uninstall the application, remove these manpages yourself."
+msgstr ""
+
+#: ../install.py:1480
+msgid "Do want to install the man pages?"
+msgstr ""
+
+#: ../install.py:1482
+msgid "Installing man pages into {}"
+msgstr ""
+
+#: ../install.py:1499
+msgid "Failed to create man page directory: exiting"
+msgstr ""
+
+#: ../install.py:1511
+msgid "Failed to copy man page."
+msgstr ""
+
+#: ../install.py:1521
+msgid "(If a segmentation fault occurs at exit, you can ignore it...)"
+msgstr ""
+
+#: ../install.py:1534
+msgid ""
+"The python3 tool pip is required to uninstall a version of Rapid Photo "
+"Downloader that was installed with pip.\n"
+"Cannot continue. Exiting."
+msgstr ""
+
+#: ../install.py:1575
+msgid ""
+"Do not run this installer script as sudo / root user.\n"
+"Run it using the user who will run the program.\n"
+msgstr ""
+
+#: ../install.py:1585 ../install.py:1599
+msgid "Do not include any other command line arguments when specifying"
+msgstr ""
+
+#: ../install.py:1614
+msgid ""
+"Sorry, this installer does not support a custom python installation.\n"
+"Exiting..."
+msgstr ""
+
+#: ../install.py:1620
+msgid "Restarting script using system python..."
+msgstr ""
+
+#: ../install.py:1651
+msgid "Exiting..."
+msgstr ""
+
+#. Translators: do not translate the term python3-apt
+#: ../install.py:1670
+msgid "To continue, the package python3-apt must be installed."
+msgstr "Abans de continuar, heu d’instal·lar el paquet «python3-apt»."
+
+#: ../install.py:1689
+msgid ""
+"Install the following packages using your Linux distribution's standard "
+"package manager, and then rerun this installer"
+msgstr ""
+
+#: ../install.py:1698
+msgid ""
+"To run this program, programs to assist Python 3 and its package management "
+"must be installed."
+msgstr ""
+
+#. Translators: do not translate the terms Python 3, pip and setuptools
+#: ../install.py:1713
+msgid "Python 3's pip and setuptools must be upgraded for your user."
+msgstr ""
+
+#. Translators: do not translate the term python or requests
+#: ../install.py:1726
+msgid "Installing python requests"
+msgstr ""
+
+#: ../upgrade.py:79
+msgid "Upgrade Rapid Photo Downloader"
+msgstr ""
+
+#: ../upgrade.py:401 ../raphodo/viewutils.py:242
+msgid "&Cancel"
+msgstr "&Cancel·la"
+
+#: ../upgrade.py:405
+msgid "&Upgrade"
+msgstr "&Actualitza"
+
+#: ../upgrade.py:410
+#, python-format
+msgid "Click the Upgrade button to upgrade to version %s."
+msgstr ""
+
+#: ../upgrade.py:413
+msgid "Click the Upgrade button to start the upgrade."
+msgstr ""
+
+#: ../upgrade.py:416 ../upgrade.py:422 ../raphodo/viewutils.py:241
+msgid "&Close"
+msgstr "&Tanca"
+
+#: ../upgrade.py:417
+msgid "&Run"
+msgstr "&Executa"
+
+#: ../upgrade.py:447
+msgid "Close Rapid Photo Downloader before running this upgrade"
+msgstr ""
+"Tanqueu el Rapid Photo Downloader abans d’executar aquesta actualització"
+
+#: ../upgrade.py:450
+msgid "Upgrade running..."
+msgstr ""
+
+#: ../upgrade.py:486
+#, python-format
+msgid ""
+"Successfully upgraded to %s. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:491
+msgid ""
+"Upgrade finished successfully. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
 
-#. type: QPushButton
-#: ../raphodo/aboutdialog.py:217
+#: ../upgrade.py:495
+msgid "Upgrade failed. Click Close to exit."
+msgstr "Ha fallat l’actualització. Feu clic a Tanca per a sortir."
+
+#: ../upgrade.py:6967
+#, python-format
+msgid "Upgrading %s..."
+msgstr ""
+
+#: ../upgrade.py:6969
+msgid "Press any key to continue..."
+msgstr ""
+
+#: ../upgrade.py:6982
+msgid "Rapid Photo Downloader upgrade failed"
+msgstr ""
+
+#: ../upgrade.py:6984
+#, python-format
+msgid ""
+"The python package %s could not be updated. The upgrade cannot continue."
+msgstr ""
+
+#: ../raphodo/aboutdialog.py:225
 msgid "Credits"
 msgstr "Crèdits"
 
-#: ../raphodo/backuppanel.py:239
+#: ../raphodo/backuppanel.py:240
 msgid "Backups are not configured"
 msgstr "No s’han configurat les còpies de seguretat"
 
-#: ../raphodo/backuppanel.py:241
+#: ../raphodo/backuppanel.py:242
 msgid "No backup devices detected"
 msgstr "No s’ha detectat cap dispositiu de còpia"
 
-#: ../raphodo/backuppanel.py:243
+#: ../raphodo/backuppanel.py:244
 msgid "Valid backup locations not yet specified"
 msgstr ""
 "Encara no s’han especificat ubicacions vàlides per a la còpia de seguretat"
 
-#: ../raphodo/backuppanel.py:401
+#: ../raphodo/backuppanel.py:404
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
 msgstr ""
 
-#: ../raphodo/backuppanel.py:407
+#: ../raphodo/backuppanel.py:412
 msgid "Back up photos and videos when downloading"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:413
+#: ../raphodo/backuppanel.py:418
 msgid "Automatically detect backup devices"
 msgstr "Detecta automàticament els dispositius de còpies de seguretat"
 
-#: ../raphodo/backuppanel.py:417
+#: ../raphodo/backuppanel.py:424
 msgid ""
-"Specify the folder in which backups are stored on the device."
-"<br><br><i>Note: the presence of a folder with this name is used to "
+"Specify the folder in which backups are stored on the "
+"device.<br><br><i>Note: the presence of a folder with this name is used to "
 "determine if 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 folder names. By "
 "adding both folders, the same device can be used to back up both photos and "
 "videos.</i>"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:428
+#: ../raphodo/backuppanel.py:439
 msgid "Photo folder name:"
 msgstr "Nom de la carpeta de fotos:"
 
-#: ../raphodo/backuppanel.py:433
+#: ../raphodo/backuppanel.py:444
 msgid "Video folder name:"
 msgstr "Nom de la carpeta de vídeos:"
 
-#: ../raphodo/backuppanel.py:438 ../raphodo/nameeditor.py:883
+#: ../raphodo/backuppanel.py:449 ../raphodo/nameeditor.py:890
 #: ../raphodo/renamepanel.py:123
 msgid "Example:"
 msgstr "Exemple:"
 
-#: ../raphodo/backuppanel.py:448
-msgid "If you disable automatic detection, choose the exact backup locations."
+#: ../raphodo/backuppanel.py:460
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
 
-#: ../raphodo/backuppanel.py:452
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:468
 msgid "Photo backup location:"
 msgstr "Ubicació de la còpia de les fotos:"
 
-#: ../raphodo/backuppanel.py:454
+#: ../raphodo/backuppanel.py:474
 msgid "Select Photo Backup Location"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:460
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:485
 msgid "Video backup location:"
 msgstr "Ubicació de la còpia dels vídeos:"
 
-#: ../raphodo/backuppanel.py:462
+#: ../raphodo/backuppanel.py:491
 msgid "Select Video Backup Location"
 msgstr ""
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:564
+#: ../raphodo/backuppanel.py:595
 msgid "drive1"
 msgstr "unitat1"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:567
+#: ../raphodo/backuppanel.py:598
 msgid "drive2"
 msgstr "unitat2"
 
-#: ../raphodo/backuppanel.py:628
+#: ../raphodo/backuppanel.py:663
 msgid "Projected Backup Storage Use"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:632
+#: ../raphodo/backuppanel.py:669
 msgid "Backup Options"
 msgstr "Opcions de còpia de seguretat"
 
 #. translators: refers to the video thumbnail file that some
 #. cameras generate -- it has a .THM file extension
-#: ../raphodo/copyfiles.py:476
+#: ../raphodo/copyfiles.py:491
 msgid "video THM"
 msgstr ""
 
-#: ../raphodo/copyfiles.py:482
+#: ../raphodo/copyfiles.py:497
 msgid "audio"
 msgstr "àudio"
 
 #: ../raphodo/destinationdisplay.py:78 ../raphodo/devicedisplay.py:1079
-#: ../raphodo/rpdfile.py:321
+#: ../raphodo/rpdfile.py:342
 #, python-format
 msgid "%(no_photos)s Photos"
 msgstr "%(no_photos)s fotos"
 
 #: ../raphodo/destinationdisplay.py:82 ../raphodo/devicedisplay.py:1081
-#: ../raphodo/rpdfile.py:316
+#: ../raphodo/rpdfile.py:333
 #, python-format
 msgid "%(no_videos)s Videos"
 msgstr "%(no_videos)s vídeos"
 
 #: ../raphodo/destinationdisplay.py:92
 msgid "Used"
-msgstr ""
+msgstr "En ús"
 
 #: ../raphodo/destinationdisplay.py:93
 msgid "Excess"
@@ -145,7 +506,7 @@ msgstr ""
 
 #: ../raphodo/destinationdisplay.py:102
 msgid "Device size unknown"
-msgstr ""
+msgstr "Mida del dispositiu desconeguda"
 
 #: ../raphodo/destinationdisplay.py:112
 #, python-format
@@ -158,15 +519,15 @@ msgid "%(size_free)s free of %(size_total)s"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:190 ../raphodo/devicedisplay.py:993
-#: ../raphodo/rapid.py:1964 ../raphodo/rapid.py:2079 ../raphodo/rapid.py:5753
-#: ../raphodo/rpdfile.py:905
+#: ../raphodo/rapid.py:2023 ../raphodo/rapid.py:2151 ../raphodo/rapid.py:6043
+#: ../raphodo/rpdfile.py:930
 msgid "Photos"
 msgstr "Fotos"
 
 #. translators: the name of the Videos folder
 #: ../raphodo/destinationdisplay.py:191 ../raphodo/devicedisplay.py:994
-#: ../raphodo/rapid.py:1967 ../raphodo/rapid.py:2080 ../raphodo/rapid.py:5754
-#: ../raphodo/rpdfile.py:933 ../raphodo/storage.py:445
+#: ../raphodo/rapid.py:2028 ../raphodo/rapid.py:2152 ../raphodo/rapid.py:6044
+#: ../raphodo/rpdfile.py:958 ../raphodo/storage.py:449
 msgid "Videos"
 msgstr "Vídeos"
 
@@ -174,7 +535,7 @@ msgstr "Vídeos"
 msgid "Projected storage use after download"
 msgstr ""
 
-#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:516
+#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:521
 msgid "Custom..."
 msgstr ""
 
@@ -212,57 +573,58 @@ msgstr ""
 msgid "%s full"
 msgstr ""
 
-#: ../raphodo/devices.py:459
+#: ../raphodo/devices.py:463
 msgid "Cameras"
 msgstr "Càmeres"
 
-#: ../raphodo/devices.py:460 ../raphodo/devices.py:920
-#: ../raphodo/preferencedialog.py:85 ../raphodo/rapid.py:1927
+#: ../raphodo/devices.py:464 ../raphodo/devices.py:927
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/rapid.py:1979
 msgid "Devices"
 msgstr "Dispositius"
 
-#: ../raphodo/devices.py:720
+#: ../raphodo/devices.py:724
 #, python-format
 msgid "Downloading from %(device_names)s"
-msgstr "S’est baixant des de %(device_names)s"
+msgstr "S’està baixant des de %(device_names)s"
 
 #. Translators: e.g. Three Devices
-#: ../raphodo/devices.py:780
+#: ../raphodo/devices.py:784
 #, python-format
 msgid "%(no_devices)s %(device_type)s"
 msgstr ""
 
-#: ../raphodo/devices.py:905 ../raphodo/rapid.py:1764
+#: ../raphodo/devices.py:912 ../raphodo/rapid.py:1807
 msgid "Select Source"
 msgstr ""
 
-#: ../raphodo/devices.py:936 ../raphodo/devices.py:947
+#: ../raphodo/devices.py:943 ../raphodo/devices.py:954
 #, python-format
 msgid "%(device1)s + %(device2)s"
 msgstr ""
 
 #. Number of cameras e.g. 3 Cameras
-#: ../raphodo/devices.py:958
+#: ../raphodo/devices.py:965
 #, python-format
 msgid "%(no_cameras)s Cameras"
 msgstr "%(no_cameras)s càmeres"
 
-#: ../raphodo/devices.py:963
+#: ../raphodo/devices.py:970
 #, python-format
 msgid "%(no_devices)s Devices"
 msgstr "%(no_devices)s dispositius"
 
 #. Translators: two folder names, separated by a plus sign
-#: ../raphodo/devices.py:1258
+#: ../raphodo/devices.py:1265
 #, python-format
 msgid "%s + %s"
 msgstr "%s + %s"
 
-#: ../raphodo/didyouknow.py:44
+#: ../raphodo/didyouknow.py:45
 msgid "Click on a file's checkbox to mark or unmark it for download."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:50
+#: ../raphodo/didyouknow.py:51
 msgid ""
 "Files that have already been downloaded are remembered. You can still mark "
 "previously downloaded files to download again, but they are unchecked by "
@@ -270,34 +632,67 @@ msgid ""
 "files that are yet to be downloaded."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:59
+#: ../raphodo/didyouknow.py:60
 msgid ""
 "If more than one file is selected, they'll all take the mark of the file "
 "whose checkbox was clicked, regardless of whether they previously had a "
 "checkmark or not."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:67
+#: ../raphodo/didyouknow.py:68
 msgid ""
 "Click on a device's checkbox to quickly mark or unmark all its files for "
 "downloading."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:74
+#: ../raphodo/didyouknow.py:75
+msgid ""
+"After a download finishes, an icon replaces the thumbnail's checkbox. The "
+"icon's color indicates whether the download was successful (green), had file "
+"renaming problems (yellow/orange), or failed (red)."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:83
+msgid ""
+"\n"
+"            In case of any problems, a red icon will appear at the bottom of "
+"the window\n"
+"            indicating how many error reports there are. Clicking on it "
+"opens the Error Report \n"
+"            window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:91
+msgid ""
+"\n"
+"            The Error Report window lists any problems encountered before, "
+"during or after the \n"
+"            download. An orange triangle represents a warning, a red circle "
+"indicates a failure, \n"
+"            and a black circle indicates more serious failures. You can "
+"click on the hyperlinks to \n"
+"            open its file or device in a file manager. You can also search "
+"the reports using the \n"
+"            search box in the lower left of the Error Report window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:103
 msgid ""
 "You can simultaneously download from multiple cameras, smartphones, memory "
 "cards, and hard drives&mdash;as many devices as your computer can handle at "
 "one time."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:81
+#: ../raphodo/didyouknow.py:110
 msgid ""
 "The <b>Timeline</b> groups photos and videos based on how much time elapsed "
 "between consecutive shots. Use it to identify photos and videos taken at "
 "different periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:88
+#: ../raphodo/didyouknow.py:117
 msgid ""
 "\n"
 "<p>In the illustration above, the first row of the Timeline is black because "
@@ -309,7 +704,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:99
+#: ../raphodo/didyouknow.py:128
 msgid ""
 "To view photos and videos for a particular time range, use the mouse "
 "(optionally in combination with the <tt>Shift</tt> or <tt>Ctrl</tt> keys) to "
@@ -317,20 +712,20 @@ msgid ""
 "the left side of the main window will be highlighted."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:106
+#: ../raphodo/didyouknow.py:135
 msgid ""
 "A download always includes all files that are checked for download, "
 "including those that are not currently displayed because the Timeline is "
 "being used."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:113
+#: ../raphodo/didyouknow.py:142
 msgid ""
 "You can hide or display the download sources by clicking on the name of the "
 "device you're downloading from at the top left of the program window."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:120
+#: ../raphodo/didyouknow.py:149
 msgid ""
 "\n"
 "          Thumbnails can be sorted using a variety of criteria:\n"
@@ -349,7 +744,7 @@ msgid ""
 "</ol> "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:137
+#: ../raphodo/didyouknow.py:166
 msgid ""
 "One of Rapid Photo Downloader's most useful features is its ability to "
 "automatically generate download subfolders and rename files as it downloads, "
@@ -359,26 +754,26 @@ msgstr ""
 "capacitat de generar automàticament subcarpetes de baixada i canviar el nom "
 "dels fitxers a mesura que es baixen, segons el esquema que vulgueu."
 
-#: ../raphodo/didyouknow.py:143
+#: ../raphodo/didyouknow.py:172
 msgid ""
 "To specify where you want your files downloaded and how you want them named, "
 "open the appropriate panel on the right-side of the application window: "
 "<b>Destination</b>, <b>Rename</b>, or <b>Job Code</b>."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:150
+#: ../raphodo/didyouknow.py:179
 msgid ""
 "\n"
 "When thinking about your download directory structure, keep in mind two "
 "different types\n"
 "of directory:\n"
 "<ol>\n"
-"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, &quot;"
-"Photos&quot;, or\n"
+"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, "
+"&quot;Photos&quot;, or\n"
 "&quot;Videos&quot;. This directory should already exist on your computer. In "
 "the illustration \n"
-"below, the destination folders are &quot;Pictures&quot; and &quot;"
-"Videos&quot;. The\n"
+"below, the destination folders are &quot;Pictures&quot; and "
+"&quot;Videos&quot;. The\n"
 "name of the destination folder is displayed in the grey bar directly above "
 "the folder tree, \n"
 "with a folder icon to its left and a gear icon to its far right.</li>\n"
@@ -391,7 +786,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:167
+#: ../raphodo/didyouknow.py:196
 msgid ""
 "\n"
 "You can download photos and videos to the same destination folder, or "
@@ -404,14 +799,14 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:177
+#: ../raphodo/didyouknow.py:206
 msgid ""
 "Automatically generated download subfolders can contain further "
 "automatically generated subfolders if need be. A common scheme is to create "
 "a year subfolder and then a series of year-month-day subfolders within it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:186
+#: ../raphodo/didyouknow.py:215
 msgid ""
 "\n"
 "Whenever possible, the program previews the download subfolders of photos "
@@ -429,7 +824,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:201
+#: ../raphodo/didyouknow.py:230
 msgid ""
 "\n"
 "Download subfolder names are typically generated using some or all of the "
@@ -453,7 +848,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:219
+#: ../raphodo/didyouknow.py:248
 msgid ""
 "\n"
 "To automatically create download subfolders as you download, \n"
@@ -463,7 +858,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:227
+#: ../raphodo/didyouknow.py:256
 msgid ""
 "\n"
 "Using the drop-down menu, select a built-in preset or click on <b>Custom</b> "
@@ -473,20 +868,20 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:237
+#: ../raphodo/didyouknow.py:266
 msgid ""
 "It's easy to download raw images into one folder, and jpeg images into "
 "another. Simply use the <b>Filename Extension</b> as part of your download "
 "subfolder generation scheme:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:242
+#: ../raphodo/didyouknow.py:271
 msgid ""
 "This illustration shows a saved custom preset named &quot;My custom "
 "preset&quot;."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:246
+#: ../raphodo/didyouknow.py:275
 msgid ""
 "\n"
 "You do not have to create nested download subfolders. This illustration "
@@ -497,7 +892,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:256
+#: ../raphodo/didyouknow.py:285
 msgid ""
 "\n"
 "Although there are many built-in date/time naming options, you may find that "
@@ -511,7 +906,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:265
+#: ../raphodo/didyouknow.py:294
 msgid ""
 "\n"
 "Read more about all the ways you can generate download subfolder names and "
@@ -521,7 +916,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:273
+#: ../raphodo/didyouknow.py:302
 msgid ""
 "\n"
 "<b>Job Codes</b> let you easily enter text that describes sets of photos and "
@@ -533,7 +928,7 @@ msgid ""
 "&quot;Green Bazaar&quot;: \n"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:282
+#: ../raphodo/didyouknow.py:311
 msgid ""
 "\n"
 "You can apply new or existing Job Codes before you start a download. If "
@@ -544,36 +939,36 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:291
+#: ../raphodo/didyouknow.py:320
 msgid "Look for hints to guide you when working with Job Codes:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:295
+#: ../raphodo/didyouknow.py:324
 msgid ""
 "Hints will vary depending on the context, such as when the mouse is hovering "
 "over a button."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:301
+#: ../raphodo/didyouknow.py:330
 msgid ""
 "\n"
 "When you give your photos and videos unique filenames, you'll never be "
 "confused as to \n"
 "which file is which. Using <b>sequence numbers</b> to make filenames unique "
 "is highly \n"
-"recommended!.\n"
+"recommended!\n"
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:309
+#: ../raphodo/didyouknow.py:338
 msgid ""
 "\n"
 "<p>Four types of sequence values are available to help you assign unique "
 "names to your photos and \n"
 "videos:\n"
 "<ol>\n"
-"<li><b>Downloads today</b>: tracks downloads completed during that day.</"
-"li>\n"
+"<li><b>Downloads today</b>: tracks downloads completed during that "
+"day.</li>\n"
 "<li><b>Stored number</b>: similar to Downloads today, but it is remembered "
 "from the last time the  \n"
 "program was run.</li>\n"
@@ -587,7 +982,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:327
+#: ../raphodo/didyouknow.py:356
 msgid ""
 "\n"
 "The <b>Rename</b> panel allows you to configure file renaming. To rename "
@@ -596,7 +991,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:334
+#: ../raphodo/didyouknow.py:363
 msgid ""
 "\n"
 "<p>The <b>Synchronize RAW + JPEG</b> option is useful if you use the RAW + "
@@ -615,7 +1010,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:348
+#: ../raphodo/didyouknow.py:377
 msgid ""
 "\n"
 "You can have your photos and videos backed up to multiple locations as they "
@@ -626,13 +1021,13 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:356
+#: ../raphodo/didyouknow.py:385
 msgid ""
 "In this example, the drive <b>photobackup</b> does not contain a folder "
 "named <tt>Videos</tt>, so videos will not be backed up to it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:362
+#: ../raphodo/didyouknow.py:391
 msgid ""
 "\n"
 "Several of the program's preferences can be set from the command line, "
@@ -643,7 +1038,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:372
+#: ../raphodo/didyouknow.py:396
+msgid "You can also import program preferences from the older 0.4 version."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:401
 msgid ""
 "\n"
 "Rapid Photo Downloader deals with three types of cache:\n"
@@ -653,8 +1052,8 @@ msgid ""
 "memory cards, and other devices.</li>\n"
 "<li>A <b>temporary cache</b> of files downloaded from a camera, one for "
 "photos and another for \n"
-"videos. They are located in temporary subfolders in the download destination."
-"</li>\n"
+"videos. They are located in temporary subfolders in the download "
+"destination.</li>\n"
 "<li>The <b>desktop's thumbnail cache</b>, in which Rapid Photo Downloader "
 "stores thumbnails of \n"
 "RAW and TIFF photos once they have been downloaded. File browsers like Gnome "
@@ -669,23 +1068,23 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:431
+#: ../raphodo/didyouknow.py:460
 msgid "Tip of the Day"
 msgstr "Consell del dia"
 
-#: ../raphodo/didyouknow.py:439
+#: ../raphodo/didyouknow.py:468
 msgid "Did you know...?"
 msgstr "Sabíeu que…?"
 
-#: ../raphodo/didyouknow.py:466
+#: ../raphodo/didyouknow.py:495
 msgid "Show tips on startup"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:470
+#: ../raphodo/didyouknow.py:499
 msgid "&Next"
 msgstr "&Següent"
 
-#: ../raphodo/didyouknow.py:471
+#: ../raphodo/didyouknow.py:500
 msgid "&Previous"
 msgstr "&Anterior"
 
@@ -792,68 +1191,68 @@ msgstr "%d dies i 1 hora"
 msgid "%(days)d days, %(hours)d hours"
 msgstr "%(days)d dies i  %(hours)d hores"
 
-#: ../raphodo/errorlog.py:65
+#: ../raphodo/errorlog.py:66
 msgid "Find"
 msgstr ""
 
-#: ../raphodo/errorlog.py:135
+#: ../raphodo/errorlog.py:136
 msgid "Error Reports - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/errorlog.py:170
+#: ../raphodo/errorlog.py:171
 msgid "Find in reports"
 msgstr ""
 
-#: ../raphodo/errorlog.py:187
+#: ../raphodo/errorlog.py:188
 msgid "Find the previous occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:192
+#: ../raphodo/errorlog.py:193
 msgid "Find the next occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:194
+#: ../raphodo/errorlog.py:195
 msgid "&Highlight All"
 msgstr "Resalta-&ho tot"
 
-#: ../raphodo/errorlog.py:195
+#: ../raphodo/errorlog.py:196
 msgid "Highlight all occurrences of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:196
+#: ../raphodo/errorlog.py:197
 msgid "&Match Case"
 msgstr ""
 
-#: ../raphodo/errorlog.py:197
+#: ../raphodo/errorlog.py:198
 msgid "Search with case sensitivity"
 msgstr ""
 
-#: ../raphodo/errorlog.py:198
+#: ../raphodo/errorlog.py:199
 msgid "&Whole Words"
 msgstr ""
 
-#: ../raphodo/errorlog.py:199
+#: ../raphodo/errorlog.py:200
 msgid "Search whole words only"
 msgstr ""
 
-#: ../raphodo/errorlog.py:209 ../raphodo/errorlog.py:341
+#: ../raphodo/errorlog.py:210 ../raphodo/errorlog.py:345
 #, python-format
 msgid "%s of %s matches"
 msgstr ""
 
-#: ../raphodo/errorlog.py:228
+#: ../raphodo/errorlog.py:232
 msgid "Clear"
 msgstr "Neteja"
 
-#: ../raphodo/errorlog.py:328
+#: ../raphodo/errorlog.py:332
 msgid "Phrase not found"
 msgstr "No s’ha trobat la frase"
 
-#: ../raphodo/errorlog.py:487
+#: ../raphodo/errorlog.py:491
 msgid "Search pending..."
 msgstr "Cerca pendent…"
 
-#: ../raphodo/errorlog.py:535
+#: ../raphodo/errorlog.py:539
 msgid ""
 "The number of new entries added to the Error Report since it was last open. "
 "Click to open the Error Report."
@@ -867,8 +1266,8 @@ msgstr ""
 #, python-brace-format
 msgid ""
 "<b>A problem occurred in Rapid Photo Downloader</b><br><br>\n"
-"    Please report the problem at <a href=\"{website}\">{website}</a>."
-"<br><br>\n"
+"    Please report the problem at <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
 "    Attach the log file <i>{log_file}</i> to your bug report (click\n"
 "    <a href=\"{log_path}\">here</a> to open the log directory).<br><br>If "
 "the same problem occurs\n"
@@ -889,7 +1288,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1601
+#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1643
 msgid "Open in File Browser..."
 msgstr ""
 
@@ -907,531 +1306,531 @@ msgstr ""
 msgid "%s (location does not exist)"
 msgstr "%s (la ubicació no existeix)"
 
-#: ../raphodo/generatenameconfig.py:186
+#: ../raphodo/generatenameconfig.py:190
 msgid "Date time"
 msgstr "Data i hora"
 
-#: ../raphodo/generatenameconfig.py:187
+#: ../raphodo/generatenameconfig.py:191
 msgid "Text"
 msgstr "Text"
 
-#: ../raphodo/generatenameconfig.py:188 ../raphodo/rapid.py:2053
+#: ../raphodo/generatenameconfig.py:192 ../raphodo/rapid.py:2125
 msgid "Filename"
 msgstr "Nom del fitxer"
 
-#: ../raphodo/generatenameconfig.py:189 ../raphodo/preferencedialog.py:488
+#: ../raphodo/generatenameconfig.py:193 ../raphodo/preferencedialog.py:724
 msgid "Metadata"
 msgstr "Metadades"
 
-#: ../raphodo/generatenameconfig.py:190
+#: ../raphodo/generatenameconfig.py:194
 msgid "Sequences"
 msgstr "Seqüències"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: ../raphodo/generatenameconfig.py:193
+#: ../raphodo/generatenameconfig.py:197
 msgid "Job code"
 msgstr "Codi de tasca"
 
-#: ../raphodo/generatenameconfig.py:194
+#: ../raphodo/generatenameconfig.py:198
 msgid "Image date"
 msgstr "Data de la imatge"
 
-#: ../raphodo/generatenameconfig.py:195
+#: ../raphodo/generatenameconfig.py:199
 msgid "Video date"
 msgstr "Data del vídeo"
 
-#: ../raphodo/generatenameconfig.py:196
+#: ../raphodo/generatenameconfig.py:200
 msgid "Today"
 msgstr "Avui"
 
-#: ../raphodo/generatenameconfig.py:197
+#: ../raphodo/generatenameconfig.py:201
 msgid "Yesterday"
 msgstr "Ahir"
 
 #. Translators: Download time is the time and date that the download started (when the
 #. user clicked the Download button)
-#: ../raphodo/generatenameconfig.py:200
+#: ../raphodo/generatenameconfig.py:204
 msgid "Download time"
 msgstr "Temps de baixada"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:203
+#: ../raphodo/generatenameconfig.py:207
 msgid "Name"
 msgstr "Nom"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:206 ../raphodo/rapid.py:2054
+#: ../raphodo/generatenameconfig.py:210 ../raphodo/rapid.py:2126
 msgid "Extension"
 msgstr "Extensió"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:209
+#: ../raphodo/generatenameconfig.py:213
 msgid "Image number"
 msgstr "Número d’imatge"
 
-#: ../raphodo/generatenameconfig.py:210
+#: ../raphodo/generatenameconfig.py:214
 msgid "Video number"
 msgstr "Número de vídeo"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:213
+#: ../raphodo/generatenameconfig.py:217
 msgid "Aperture"
 msgstr "Obertura"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:216
+#: ../raphodo/generatenameconfig.py:220
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:219
+#: ../raphodo/generatenameconfig.py:223
 msgid "Exposure time"
 msgstr "Temps d’exposició"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:222
+#: ../raphodo/generatenameconfig.py:226
 msgid "Focal length"
 msgstr "Distància focal"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:225
+#: ../raphodo/generatenameconfig.py:229
 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
-#: ../raphodo/generatenameconfig.py:228
+#: ../raphodo/generatenameconfig.py:232
 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
-#: ../raphodo/generatenameconfig.py:231
+#: ../raphodo/generatenameconfig.py:235
 msgid "Short camera model"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:234
+#: ../raphodo/generatenameconfig.py:238
 msgid "Hyphenated short camera model"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:237
+#: ../raphodo/generatenameconfig.py:241
 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
-#: ../raphodo/generatenameconfig.py:240
+#: ../raphodo/generatenameconfig.py:244
 msgid "Shutter count"
 msgstr ""
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: ../raphodo/generatenameconfig.py:242
+#: ../raphodo/generatenameconfig.py:246
 msgid "File number"
 msgstr "Número del fitxer"
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:244
+#: ../raphodo/generatenameconfig.py:248
 msgid "Folder only"
 msgstr "Només la carpeta"
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:246
+#: ../raphodo/generatenameconfig.py:250
 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
-#: ../raphodo/generatenameconfig.py:249
+#: ../raphodo/generatenameconfig.py:253
 msgid "Owner name"
 msgstr "Nom del propietari"
 
-#: ../raphodo/generatenameconfig.py:250
+#: ../raphodo/generatenameconfig.py:254
 msgid "Codec"
 msgstr "Còdec"
 
-#: ../raphodo/generatenameconfig.py:251
+#: ../raphodo/generatenameconfig.py:255
 msgid "Width"
 msgstr "Amplada"
 
-#: ../raphodo/generatenameconfig.py:252
+#: ../raphodo/generatenameconfig.py:256
 msgid "Height"
 msgstr "Alçada"
 
-#: ../raphodo/generatenameconfig.py:253
+#: ../raphodo/generatenameconfig.py:257
 msgid "Length"
 msgstr "Durada"
 
-#: ../raphodo/generatenameconfig.py:254
+#: ../raphodo/generatenameconfig.py:258
 msgid "Frames Per Second"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:255
+#: ../raphodo/generatenameconfig.py:259
 msgid "Artist"
 msgstr "Artista"
 
-#: ../raphodo/generatenameconfig.py:256
+#: ../raphodo/generatenameconfig.py:260
 msgid "Copyright"
 msgstr "Drets d’autor"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:259
+#: ../raphodo/generatenameconfig.py:263
 msgid "Downloads today"
 msgstr "Baixades avui"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:262
+#: ../raphodo/generatenameconfig.py:266
 msgid "Session number"
 msgstr "Número de sessió"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:265
+#: ../raphodo/generatenameconfig.py:269
 msgid "Subfolder number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:268
+#: ../raphodo/generatenameconfig.py:272
 msgid "Stored number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: ../raphodo/generatenameconfig.py:271
+#: ../raphodo/generatenameconfig.py:275
 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
-#: ../raphodo/generatenameconfig.py:274
+#: ../raphodo/generatenameconfig.py:278
 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
-#: ../raphodo/generatenameconfig.py:277
+#: ../raphodo/generatenameconfig.py:281
 msgid "Last digit"
 msgstr "Últim dígit"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:280
+#: ../raphodo/generatenameconfig.py:284
 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
-#: ../raphodo/generatenameconfig.py:283
+#: ../raphodo/generatenameconfig.py:287
 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
-#: ../raphodo/generatenameconfig.py:286
+#: ../raphodo/generatenameconfig.py:290
 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
-#: ../raphodo/generatenameconfig.py:289
+#: ../raphodo/generatenameconfig.py:293
 msgid "Original Case"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:292
+#: ../raphodo/generatenameconfig.py:296
 msgid "UPPERCASE"
 msgstr "MAJÚSCULES"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:295
+#: ../raphodo/generatenameconfig.py:299
 msgid "lowercase"
 msgstr "minúscules"
 
-#: ../raphodo/generatenameconfig.py:296
+#: ../raphodo/generatenameconfig.py:300
 msgid "One digit"
 msgstr "Un dígit"
 
-#: ../raphodo/generatenameconfig.py:297
+#: ../raphodo/generatenameconfig.py:301
 msgid "Two digits"
 msgstr "Dos dígits"
 
-#: ../raphodo/generatenameconfig.py:298
+#: ../raphodo/generatenameconfig.py:302
 msgid "Three digits"
 msgstr "Tres dígits"
 
-#: ../raphodo/generatenameconfig.py:299
+#: ../raphodo/generatenameconfig.py:303
 msgid "Four digits"
 msgstr "Quatre dígits"
 
-#: ../raphodo/generatenameconfig.py:300
+#: ../raphodo/generatenameconfig.py:304
 msgid "Five digits"
 msgstr "Cinc dígits"
 
-#: ../raphodo/generatenameconfig.py:301
+#: ../raphodo/generatenameconfig.py:305
 msgid "Six digits"
 msgstr "Sis dígits"
 
-#: ../raphodo/generatenameconfig.py:302
+#: ../raphodo/generatenameconfig.py:306
 msgid "Seven digits"
 msgstr "Set dígits"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:305
+#: ../raphodo/generatenameconfig.py:309
 msgid "Subseconds"
 msgstr "Subsegons"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:308 ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:312 ../raphodo/generatenameconfig.py:393
 msgid "YYYYMMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:311 ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:315 ../raphodo/generatenameconfig.py:394
 msgid "YYYY-MM-DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:314 ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:318 ../raphodo/generatenameconfig.py:395
 msgid "YYYY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:317
+#: ../raphodo/generatenameconfig.py:321
 msgid "YYMMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:320
+#: ../raphodo/generatenameconfig.py:324
 msgid "YY-MM-DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:323
+#: ../raphodo/generatenameconfig.py:327
 msgid "YY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:326
+#: ../raphodo/generatenameconfig.py:330
 msgid "MMDDYYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:329
+#: ../raphodo/generatenameconfig.py:333
 msgid "MMDDYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:332
+#: ../raphodo/generatenameconfig.py:336
 msgid "MMDD"
 msgstr "MMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:335
+#: ../raphodo/generatenameconfig.py:339
 msgid "DDMMYYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:338
+#: ../raphodo/generatenameconfig.py:342
 msgid "DDMMYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:341 ../raphodo/generatenameconfig.py:389
-#: ../raphodo/generatenameconfig.py:390 ../raphodo/generatenameconfig.py:391
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:345 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:394 ../raphodo/generatenameconfig.py:395
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:397
 msgid "YYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:344
+#: ../raphodo/generatenameconfig.py:348
 msgid "YY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:347
+#: ../raphodo/generatenameconfig.py:351
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:350
+#: ../raphodo/generatenameconfig.py:354
 msgid "DD"
 msgstr "DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:353
+#: ../raphodo/generatenameconfig.py:357
 msgid "Month (full)"
 msgstr "Mes (sencer)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:356
+#: ../raphodo/generatenameconfig.py:360
 msgid "Month (abbreviated)"
 msgstr "Mes (abreujat)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:359
+#: ../raphodo/generatenameconfig.py:363
 msgid "HHMMSS"
 msgstr "HHMMSS"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:362
+#: ../raphodo/generatenameconfig.py:366
 msgid "HHMM"
 msgstr "HHMM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:365
+#: ../raphodo/generatenameconfig.py:369
 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
-#: ../raphodo/generatenameconfig.py:368
+#: ../raphodo/generatenameconfig.py:372
 msgid "HH-MM"
 msgstr "HH-MM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:371
+#: ../raphodo/generatenameconfig.py:375
 msgid "HH"
 msgstr "HH"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:374
+#: ../raphodo/generatenameconfig.py:378
 msgid "MM (minutes)"
 msgstr "MM (minuts)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:377
+#: ../raphodo/generatenameconfig.py:381
 msgid "SS"
 msgstr "SS"
 
-#: ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:393
 msgid "Date"
 msgstr "Data"
 
-#: ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:394
 msgid "Date (hyphens)"
 msgstr "Data (guionets)"
 
-#: ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:395
 msgid "Date (underscores)"
 msgstr "Data (guions baixos)"
 
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:438
-#: ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:442
+#: ../raphodo/generatenameconfig.py:537
 msgid "Date and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392
+#: ../raphodo/generatenameconfig.py:396
 msgid "YYYYMM_Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "Date and Job Code Subfolder"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "YYYYMM"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393 ../raphodo/jobcodepanel.py:198
-#: ../raphodo/nameeditor.py:827 ../raphodo/rapid.py:1809
+#: ../raphodo/generatenameconfig.py:397 ../raphodo/jobcodepanel.py:199
+#: ../raphodo/nameeditor.py:833 ../raphodo/rapid.py:1852
 #: ../raphodo/renamepanel.py:83 ../raphodo/renamepanel.py:241
 msgid "Job Code"
 msgstr "Codi de tasca"
 
-#: ../raphodo/generatenameconfig.py:433 ../raphodo/generatenameconfig.py:512
+#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:532
 msgid "Original Filename"
 msgstr "Nom de fitxer original"
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "Date-Time and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "YYYYMMDD-HHMM-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "Date and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "YYYYMMDD-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "Date-Time and Image number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "YYYYMMDD-1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "Date-Time and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "YYYYMMDD-HHMM-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:442 ../raphodo/generatenameconfig.py:537
 msgid "YYYYMMDD-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "Date-Time and Video number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "YYYYMMDD_1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "Resolution"
 msgstr "Resolució"
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "YYYYMMDD-HHMM-1-1920x1080"
 msgstr ""
 
@@ -1490,76 +1889,77 @@ msgstr ""
 msgid "&Remember this choice"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:185
+#: ../raphodo/jobcodepanel.py:186
 msgid ""
 "Select photos and videos to be able to apply a new or existing Job Code to "
 "them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:186
-msgid "The new Job Code will be applied to all selected photos and/or videos."
+#: ../raphodo/jobcodepanel.py:187
+msgid ""
+"The new Job Code will be applied to all selected photos and/or videos."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:187
+#: ../raphodo/jobcodepanel.py:188
 msgid ""
 "Click the Apply button to apply the current Job Code to all selected photos "
 "and/or videos. You can also simply double click the Job Code."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:189
+#: ../raphodo/jobcodepanel.py:190
 msgid ""
 "Removing a Job Code removes it only from the list of saved Job Codes, not "
 "from any photos or videos that it may have been applied to."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:191
+#: ../raphodo/jobcodepanel.py:192
 msgid ""
 "If you want to use Job Codes, configure file renaming or destination "
 "subfolder names to use them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:197
+#: ../raphodo/jobcodepanel.py:198
 msgid "Last Used"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:202
+#: ../raphodo/jobcodepanel.py:203
 msgid "Job Code Sort:"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:205 ../raphodo/rapid.py:2061
+#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2133
 msgid "Ascending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2062
+#: ../raphodo/jobcodepanel.py:207 ../raphodo/rapid.py:2134
 msgid "Descending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:216
+#: ../raphodo/jobcodepanel.py:217
 msgid "&New..."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:220
+#: ../raphodo/jobcodepanel.py:221
 msgid "&Apply"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:224
+#: ../raphodo/jobcodepanel.py:225
 msgid "&Remove"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:228 ../raphodo/preferencedialog.py:125
-#: ../raphodo/preferencedialog.py:154 ../raphodo/preferencedialog.py:433
+#: ../raphodo/jobcodepanel.py:229 ../raphodo/preferencedialog.py:200
+#: ../raphodo/preferencedialog.py:229 ../raphodo/preferencedialog.py:531
 msgid "Remove All"
-msgstr ""
+msgstr "Elimina-ho tot"
 
-#: ../raphodo/jobcodepanel.py:427
+#: ../raphodo/jobcodepanel.py:428
 msgid "Do you really want to remove all the Job Codes?"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:429
+#: ../raphodo/jobcodepanel.py:430
 msgid "Remove all Job Codes"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:492
+#: ../raphodo/jobcodepanel.py:493
 msgid "Job Codes"
 msgstr ""
 
@@ -1570,42 +1970,58 @@ msgstr ""
 msgid "<i><b>Hint:</b> %(message)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:418 ../raphodo/nameeditor.py:432
+#: ../raphodo/nameeditor.py:423 ../raphodo/nameeditor.py:437
 #, python-format
 msgid "%(description)s - %(elements)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:512
+#: ../raphodo/nameeditor.py:517
 msgid "Save New Custom Preset..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:513
+#: ../raphodo/nameeditor.py:518
 msgid "Remove All Custom Presets..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:559
+#: ../raphodo/nameeditor.py:564
 msgid "(New Custom Preset)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:576
+#: ../raphodo/nameeditor.py:581
 #, python-format
 msgid "%s (edited)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:579 ../raphodo/nameeditor.py:1370
+#: ../raphodo/nameeditor.py:584 ../raphodo/nameeditor.py:1379
 #, python-format
 msgid "Update Custom Preset \"%s\""
 msgstr ""
 
-#: ../raphodo/nameeditor.py:667
+#: ../raphodo/nameeditor.py:672
 msgid "Save New Custom Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:675
+#: ../raphodo/nameeditor.py:680
 msgid "Preset Name:"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:836
+#: ../raphodo/nameeditor.py:799
+msgid "Photo Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:805
+msgid "Video Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:811
+msgid "Photo Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:817
+msgid "Video Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:842
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>There is insufficient data to "
 "fully generate the name. Please use other renaming options.</i>"
@@ -1614,7 +2030,7 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees.
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:846
+#: ../raphodo/nameeditor.py:853
 #, python-format
 msgid "The character</i> %(separator)s <i>creates a new subfolder level."
 msgstr ""
@@ -1622,50 +2038,50 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:851
+#: ../raphodo/nameeditor.py:858
 #, python-format
 msgid ""
 "There is no need start or end with the folder separator </i> "
 "%(separator)s<i>, because it is added automatically."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:859
+#: ../raphodo/nameeditor.py:866
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>Unique filenames may not be "
 "generated. Make filenames unique by using Sequence values.</i>"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:882 ../raphodo/renamepanel.py:121
+#: ../raphodo/nameeditor.py:889 ../raphodo/renamepanel.py:121
 msgid "Preset:"
 msgstr ""
 
 #. Translators: appears in a combobox, e.g. Image Date (YYYY)
-#: ../raphodo/nameeditor.py:959 ../raphodo/nameeditor.py:980
+#: ../raphodo/nameeditor.py:966 ../raphodo/nameeditor.py:987
 #, python-brace-format
 msgid "{choice} ({variant})"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1005 ../raphodo/preferencedialog.py:530
+#: ../raphodo/nameeditor.py:1012 ../raphodo/preferencedialog.py:783
 msgid "Get help online..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1025
+#: ../raphodo/nameeditor.py:1034
 msgid "Insert"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1351
+#: ../raphodo/nameeditor.py:1360
 msgid "Save Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1356
+#: ../raphodo/nameeditor.py:1365
 msgid ""
-"<b>Do you want to save the changes in a new custom preset?</"
-"b><br><br>Creating a custom preset is not required, but can help you keep "
-"organized.<br><br>The changes to the preferences will still be applied "
-"regardless of whether you create a new custom preset or not."
+"<b>Do you want to save the changes in a new custom "
+"preset?</b><br><br>Creating a custom preset is not required, but can help "
+"you keep organized.<br><br>The changes to the preferences will still be "
+"applied regardless of whether you create a new custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1365
+#: ../raphodo/nameeditor.py:1374
 msgid ""
 "<b>Do you want to save the changes in a custom preset?</b><br><br>If you "
 "like, you can create a new custom preset or update the existing custom "
@@ -1673,136 +2089,167 @@ msgid ""
 "regardless of whether you save a custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1372
+#: ../raphodo/nameeditor.py:1381
 msgid "Save New Custom Preset"
 msgstr ""
 
-#: ../raphodo/newversion.py:306
+#: ../raphodo/newversion.py:312
 msgid "Checking for new version..."
 msgstr ""
 
-#: ../raphodo/newversion.py:307
+#: ../raphodo/newversion.py:313
 msgid "You are running the latest version."
 msgstr ""
 
-#: ../raphodo/newversion.py:308
+#: ../raphodo/newversion.py:314
 msgid "Failed to contact the update server."
 msgstr ""
 
-#: ../raphodo/newversion.py:310
+#: ../raphodo/newversion.py:316
 #, python-format
 msgid "A new version of Rapid Photo Downloader (%s) is available."
 msgstr ""
 
-#: ../raphodo/newversion.py:312
+#: ../raphodo/newversion.py:318
 msgid "Do you want to download the new version?"
 msgstr ""
 
-#: ../raphodo/newversion.py:313
+#: ../raphodo/newversion.py:319
 #, python-format
 msgid "Changes in the new release can be viewed <a href=\"%s\">here</a>."
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the s key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:340 ../raphodo/newversion.py:353
+#: ../raphodo/newversion.py:348 ../raphodo/newversion.py:363
 msgid "&Skip this release"
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the o key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:356
+#: ../raphodo/newversion.py:366
 msgid "&Open Download Page"
 msgstr ""
 
-#: ../raphodo/newversion.py:376
+#: ../raphodo/newversion.py:386
 msgid "Rapid Photo Downloader updates"
 msgstr ""
 
 #. Translators: shows how much of a file has been downloaded e.g  123 KB of 1.3 MB
-#: ../raphodo/newversion.py:478
+#: ../raphodo/newversion.py:488
 #, python-format
 msgid "%(downloaded)s of %(total)s"
 msgstr ""
 
-#: ../raphodo/newversion.py:495
+#: ../raphodo/newversion.py:507
 msgid "Downloading..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:76
+#: ../raphodo/preferencedialog.py:86
 msgid "Preferences"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Automation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Thumbnails"
 msgstr "Miniatures"
 
-#: ../raphodo/preferencedialog.py:85 ../raphodo/preferencedialog.py:343
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/preferencedialog.py:428
 msgid "Error Handling"
 msgstr "Gestió d’errors"
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:109
+msgid "Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:109 ../raphodo/preferencedialog.py:119
 msgid "Miscellaneous"
 msgstr "Miscel·lània"
 
-#: ../raphodo/preferencedialog.py:94
+#: ../raphodo/preferencedialog.py:147
 msgid "Device Scanning"
-msgstr ""
+msgstr "Exploració de dispositius"
 
-#: ../raphodo/preferencedialog.py:96
+#: ../raphodo/preferencedialog.py:148
 msgid "Scan only external devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:98
+#: ../raphodo/preferencedialog.py:150
 msgid ""
 "Scan for photos and videos only on devices that are external to the "
 "computer,\n"
 "including cameras, memory cards, external hard drives, and USB flash drives."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:102
-msgid "Scan non-camera devices lacking a DCIM folder"
+#: ../raphodo/preferencedialog.py:153
+msgid "Scan only specific folders on devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:104
+#: ../raphodo/preferencedialog.py:155
 msgid ""
-"Scan the entirety of a device for photos and videos, irrespective of whether "
-"it contains a DCIM folder,\n"
-"as opposed to only scanning within a DCIM folder.\n"
+"Scan for photos and videos only in the folders specified below (except "
+"paths\n"
+"specified in Ignored Paths).\n"
 "\n"
-"Changing this setting causes all devices to be scanned again.\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:161
+msgid "Folders to scan:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:164
+msgid ""
+"Folders at the base level of device file systems that will be scanned\n"
+"for photos and videos."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:167 ../raphodo/preferencedialog.py:219
+msgid "Add..."
+msgstr "Afegeix…"
+
+#: ../raphodo/preferencedialog.py:169
+msgid ""
+"Add a folder to the list of folders to scan for photos and videos.\n"
 "\n"
-"Note: With cameras, only the DCIM folder is scanned."
+"Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:116
+#: ../raphodo/preferencedialog.py:172 ../raphodo/preferencedialog.py:198
+#: ../raphodo/preferencedialog.py:224 ../raphodo/preferencedialog.py:529
+msgid "Remove"
+msgstr "Elimina"
+
+#: ../raphodo/preferencedialog.py:174
+msgid ""
+"Remove a folder from the list of folders to scan for photos and videos.\n"
+"\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:191
 msgid "Devices that have been set to automatically ignore or download from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:117
+#: ../raphodo/preferencedialog.py:192
 msgid "Remembered Devices"
-msgstr ""
+msgstr "Dispositius recordats"
 
-#: ../raphodo/preferencedialog.py:121
+#: ../raphodo/preferencedialog.py:196
 msgid ""
 "Remove a device from the list of devices to automatically ignore or download "
 "from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:123 ../raphodo/preferencedialog.py:149
-#: ../raphodo/preferencedialog.py:431
-msgid "Remove"
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:127
+#: ../raphodo/preferencedialog.py:202
 msgid ""
 "Clear the list of devices from which to automatically ignore or download "
 "from.\n"
@@ -1810,315 +2257,439 @@ msgid ""
 "Note: Changes take effect when the computer is next scanned for devices."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:140
+#: ../raphodo/preferencedialog.py:215
 msgid "Ignored Paths"
-msgstr ""
+msgstr "Camins ignorats"
 
-#: ../raphodo/preferencedialog.py:141
+#: ../raphodo/preferencedialog.py:216
 msgid ""
 "The end part of a path that should never be scanned for photos or videos."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:144
-msgid "Add..."
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:146
+#: ../raphodo/preferencedialog.py:221
 msgid ""
 "Add a path to the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:151
+#: ../raphodo/preferencedialog.py:226
 msgid ""
 "Remove a path from the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:156
+#: ../raphodo/preferencedialog.py:231
 msgid ""
 "Clear the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:164
+#: ../raphodo/preferencedialog.py:239
 msgid ""
-"Use python-style <a href=\"http://damonlynch.net/rapid/documentation/"
-"#regularexpressions\">regular expressions</a>"
+"Use python-style <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">regula"
+"r expressions</a>"
 msgstr ""
+"Utilitza <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">expres"
+"sions regulars</a> a l’estil del Python"
 
-#: ../raphodo/preferencedialog.py:168
+#: ../raphodo/preferencedialog.py:243
 msgid ""
 "Use regular expressions in the list of ignored paths.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:208
+#: ../raphodo/preferencedialog.py:283
 msgid "Program Automation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:209
+#: ../raphodo/preferencedialog.py:284
 msgid "Start downloading at program startup"
 msgstr "Comença la baixada en engegar el programa"
 
-#: ../raphodo/preferencedialog.py:210
+#: ../raphodo/preferencedialog.py:285
 msgid "Start downloading upon device insertion"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:211
+#: ../raphodo/preferencedialog.py:286
 msgid "Unmount (eject) device upon download completion"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:212
+#: ../raphodo/preferencedialog.py:287
 msgid "Exit program when download completes"
 msgstr "Tanca el programa quan finalitzi la baixada"
 
-#: ../raphodo/preferencedialog.py:213
+#: ../raphodo/preferencedialog.py:288
 msgid "Exit program even if download had warnings or errors"
 msgstr "Tanca el programa fins i tot quan hi hagi errors o avisos"
 
-#: ../raphodo/preferencedialog.py:240
+#: ../raphodo/preferencedialog.py:315
 msgid "Thumbnail Generation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:241
+#: ../raphodo/preferencedialog.py:316
 msgid "Generate thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:242
+#: ../raphodo/preferencedialog.py:318
 msgid "Generate thumbnails to show in the main program window"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:244
+#: ../raphodo/preferencedialog.py:320
 msgid "Cache thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:245
+#: ../raphodo/preferencedialog.py:323
 msgid ""
 "Save thumbnails shown in the main program window in a thumbnail cache unique "
 "to Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:247
+#: ../raphodo/preferencedialog.py:327
 msgid "Generate system thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:248
+#: ../raphodo/preferencedialog.py:330
 msgid ""
 "While downloading, save thumbnails that can be used by desktop file managers "
 "and other programs"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:255
+#: ../raphodo/preferencedialog.py:339
 msgid "Number of CPU cores used to generate thumbnails."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:256
+#: ../raphodo/preferencedialog.py:340
 msgid "CPU cores:"
 msgstr ""
 
 #. Translators: the * acts as an asterisk to denote a reference to an annotation
 #. such as '* Takes effect upon program restart'
-#: ../raphodo/preferencedialog.py:271 ../raphodo/preferencedialog.py:317
+#: ../raphodo/preferencedialog.py:355 ../raphodo/preferencedialog.py:401
 msgid "*"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:294
+#: ../raphodo/preferencedialog.py:378
 msgid "Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:296
+#: ../raphodo/preferencedialog.py:380
 msgid "Calculating..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:302
+#: ../raphodo/preferencedialog.py:386
 msgid "days"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:303
+#: ../raphodo/preferencedialog.py:387
 msgid "forever"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:308
+#: ../raphodo/preferencedialog.py:392
 msgid "Cache size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:310
+#: ../raphodo/preferencedialog.py:394
 msgid "Number of thumbnails:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:312
+#: ../raphodo/preferencedialog.py:396
 msgid "Database size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:314
+#: ../raphodo/preferencedialog.py:398
 msgid "Cache unaccessed thumbnails for:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:322
+#: ../raphodo/preferencedialog.py:406
 msgid "Purge Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:323
+#: ../raphodo/preferencedialog.py:408
 msgid "Optimize Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:336
+#: ../raphodo/preferencedialog.py:421
 msgid "* Takes effect upon program restart"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:346
+#: ../raphodo/preferencedialog.py:431
 msgid "Skip download"
 msgstr "Ignora la baixada"
 
-#: ../raphodo/preferencedialog.py:347
+#: ../raphodo/preferencedialog.py:432
 msgid "Don't download the file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:348
+#: ../raphodo/preferencedialog.py:433
 msgid "Add unique identifier"
 msgstr "Afegeix un identificador únic"
 
-#: ../raphodo/preferencedialog.py:349
+#: ../raphodo/preferencedialog.py:436
 msgid ""
 "Add an identifier like _1 or _2 to the end of the filename, immediately "
 "before the file's extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:355
+#: ../raphodo/preferencedialog.py:444
 msgid "Overwrite"
 msgstr "Sobreescriu"
 
-#: ../raphodo/preferencedialog.py:356
+#: ../raphodo/preferencedialog.py:445
 msgid "Overwrite the previously backed up file"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:357
+#: ../raphodo/preferencedialog.py:446
 msgid "Skip"
 msgstr "Omet"
 
-#: ../raphodo/preferencedialog.py:358
+#: ../raphodo/preferencedialog.py:448
 msgid "Don't overwrite the backup file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:364
+#: ../raphodo/preferencedialog.py:455
 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 identifier:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:378
+#: ../raphodo/preferencedialog.py:464
+msgid ""
+"Using sequence numbers to automatically generate unique filenames is "
+"strongly recommended. Configure file renaming in the Rename panel in the "
+"main window."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:473
 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 ""
 
-#: ../raphodo/preferencedialog.py:398
+#: ../raphodo/preferencedialog.py:494
 msgid "Program Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:399
+#: ../raphodo/preferencedialog.py:495
 msgid "Show a warning when:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:402
+#: ../raphodo/preferencedialog.py:498
 msgid "Downloading files currently not displayed"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:403
+#: ../raphodo/preferencedialog.py:499
 msgid ""
 "Warn when about to download files that are not displayed in the main window."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:405
+#: ../raphodo/preferencedialog.py:501
 msgid "Backup destinations are missing"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:406
-msgid "Warn before starting a download if it is not possible to back up files."
+#: ../raphodo/preferencedialog.py:502
+msgid ""
+"Warn before starting a download if it is not possible to back up files."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:408
+#: ../raphodo/preferencedialog.py:504
 msgid "Program libraries are missing or broken"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:409
+#: ../raphodo/preferencedialog.py:505
 msgid ""
 "Warn if a software library used by Rapid Photo Downloader is missing or not "
 "functioning."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:412
+#: ../raphodo/preferencedialog.py:508
 msgid "Filesystem metadata cannot be set"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:413
+#: ../raphodo/preferencedialog.py:509
 msgid ""
 "Warn if there is an error setting a file's filesystem metadata, such as its "
 "modification time."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:416
+#: ../raphodo/preferencedialog.py:512
 msgid "Encountering unhandled files"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:417
+#: ../raphodo/preferencedialog.py:513
 msgid ""
 "Warn after scanning a device or this computer if there are unrecognized "
 "files that will not be included in the download."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:420
+#: ../raphodo/preferencedialog.py:517
 msgid "Do not warn about unhandled files with extensions:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:424
+#: ../raphodo/preferencedialog.py:522
 msgid ""
 "File extensions are case insensitive and do not need to include the leading "
 "dot."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:427
+#: ../raphodo/preferencedialog.py:525
 msgid "Add"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:428
+#: ../raphodo/preferencedialog.py:526
 msgid ""
 "Add a file extension to the list of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:430
+#: ../raphodo/preferencedialog.py:528
 msgid ""
 "Remove a file extension from the list of unhandled file types to not warn "
 "about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:434
+#: ../raphodo/preferencedialog.py:532
 msgid ""
 "Clear the list of file extensions of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:469
+#: ../raphodo/preferencedialog.py:568
+msgid "Photo and Video Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:571
+msgid "Consolidate files across devices and downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:574
+msgid ""
+"Analyze the results of device scans looking for duplicate files and matching "
+"RAW and JPEG pairs,\n"
+"comparing them across multiple devices and download sessions."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:580
+msgid "Treat matching RAW and JPEG files as:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:581
+msgid "One photo"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:582
+msgid "Two photos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:584
+msgid ""
+"Display matching pairs of RAW and JPEG photos as one photo, and if marked, "
+"download both."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:589
+msgid ""
+"Display matching pairs of RAW and JPEG photos as two different photos. You "
+"can still synchronize their sequence numbers."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:598
+msgid "With matching RAW and JPEG photos:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:600
+msgid "Do not mark JPEG for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:601
+msgid "Do not mark RAW for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:602
+msgid "Mark both for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:609
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"JPEG for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:614
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"RAW for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:619
+msgid ""
+"When matching RAW and JPEG photos are found, automatically mark both for "
+"download."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:625
+msgid ""
+"If you disable file consolidation, choose what to do when a download device "
+"is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:631
+msgid ""
+"When a download device is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:642
+msgid "Clear completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:643
+msgid "Keep displaying completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:644
+msgid "Prompt for what to do"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:649
+msgid ""
+"Automatically clear the display of completed downloads whenever a new "
+"download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:654
+msgid ""
+"Keep displaying completed downloads whenever a new download device is "
+"inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:658
+msgid ""
+"Prompt whether to keep displaying completed downloads or clear them whenever "
+"a new download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:702
 msgid "Version Check"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:470
+#: ../raphodo/preferencedialog.py:703
 msgid "Check for new version at startup"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:471
+#: ../raphodo/preferencedialog.py:705
 msgid "Check for a new version of the program each time the program starts."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:473
+#: ../raphodo/preferencedialog.py:707
 msgid "Include development releases"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:474
+#: ../raphodo/preferencedialog.py:709
 msgid ""
 "Include alpha, beta and other development releases when checking for a new "
 "version of the program.\n"
@@ -2127,11 +2698,11 @@ msgid ""
 "occur."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:489
+#: ../raphodo/preferencedialog.py:725
 msgid "Ignore DNG date/time metadata on MTP devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:490
+#: ../raphodo/preferencedialog.py:727
 msgid ""
 "Ignore date/time metadata in DNG files located on MTP devices, and use the "
 "file's modification time instead.\n"
@@ -2140,70 +2711,86 @@ msgid ""
 "metadata."
 msgstr ""
 
+#: ../raphodo/preferencedialog.py:741
+msgid "Completed Downloads"
+msgstr ""
+
 #. Translators: substituted value is a description for the set of preferences
 #. shown in the preference dialog window, e.g. Devices, Automation, etc.
 #. This string is shown in a tooltip for the "Restore Defaults" button
-#: ../raphodo/preferencedialog.py:710
+#: ../raphodo/preferencedialog.py:1067
 #, python-format
 msgid "Restores default %s preference values"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:832
+#: ../raphodo/preferencedialog.py:1208
 msgid ""
 "Do you want to purge the thumbnail cache? The cache will be purged when the "
 "program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:835
+#: ../raphodo/preferencedialog.py:1212
 msgid "Purge Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:847
+#: ../raphodo/preferencedialog.py:1225
 msgid ""
 "Do you want to optimize the thumbnail cache? The cache will be optimized "
 "when the program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:850
+#: ../raphodo/preferencedialog.py:1229
 msgid "Optimize Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1045
+#: ../raphodo/preferencedialog.py:1481
+msgid "Enter a Folder to Scan"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1482
+msgid "Specify a folder that will be scanned for photos and videos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1483
+msgid "Folder:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1497
 msgid "Enter a Path to Ignore"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1046
+#: ../raphodo/preferencedialog.py:1498
 msgid "Specify a path that will never be scanned for photos or videos"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1047
+#: ../raphodo/preferencedialog.py:1499
 msgid "Path:"
 msgstr "Camí:"
 
-#: ../raphodo/preferencedialog.py:1061
+#: ../raphodo/preferencedialog.py:1513
 msgid "Enter a File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1062
+#: ../raphodo/preferencedialog.py:1514
 msgid "Specify a file extension (without the leading dot)"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1063 ../raphodo/renamepanel.py:122
+#: ../raphodo/preferencedialog.py:1515 ../raphodo/renamepanel.py:122
 msgid "Extension:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1078
+#: ../raphodo/preferencedialog.py:1530
 msgid "Invalid File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1079
+#: ../raphodo/preferencedialog.py:1531
 #, python-format
 msgid ""
 "The file extension <b>%s</b> is recognized by Rapid Photo Downloader, so it "
 "makes no sense to warn about its presence."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1081
+#: ../raphodo/preferencedialog.py:1533
 #, python-format
 msgid ""
 "Recognized file types:\n"
@@ -2229,104 +2816,103 @@ msgstr ""
 msgid "Birthday"
 msgstr ""
 
-#: ../raphodo/preferences.py:614
+#: ../raphodo/preferences.py:624
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr ""
 
-#: ../raphodo/preferences.py:617
+#: ../raphodo/preferences.py:627
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr ""
 
-#: ../raphodo/preferences.py:622
+#: ../raphodo/preferences.py:632
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
 
-#. self.setFlat(True)
 #: ../raphodo/primarybutton.py:72
 msgid "Download 8 Photos and 10 Videos"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:86 ../raphodo/problemnotification.py:208
+#: ../raphodo/problemnotification.py:87 ../raphodo/problemnotification.py:209
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:89
+#: ../raphodo/problemnotification.py:90
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:116
+#: ../raphodo/problemnotification.py:117
 #, python-format
 msgid "GPhoto2 Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:124
+#: ../raphodo/problemnotification.py:125
 msgid ""
 "Unable to initialize the camera, probably because another program is using "
 "it. No files were copied from it."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:134
+#: ../raphodo/problemnotification.py:135
 #, python-format
 msgid "Unable to read directory %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:140
+#: ../raphodo/problemnotification.py:141
 #, python-format
 msgid "Unable to access modification time or size from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:146
+#: ../raphodo/problemnotification.py:147
 #, python-format
 msgid "Unable to read file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:152
+#: ../raphodo/problemnotification.py:153
 #, python-format
 msgid "Unable to write file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:158
+#: ../raphodo/problemnotification.py:159
 #, python-format
 msgid "Unable to move file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:164
+#: ../raphodo/problemnotification.py:165
 #, python-format
 msgid "Unable to remove file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:170
+#: ../raphodo/problemnotification.py:171
 #, python-format
 msgid "Unable to copy file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:176
+#: ../raphodo/problemnotification.py:177
 #, python-format
 msgid "Zero length file %s will not be downloaded"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:182
+#: ../raphodo/problemnotification.py:183
 #, python-format
 msgid "Could not determine filesystem modification time for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:188
+#: ../raphodo/problemnotification.py:189
 #, python-format
 msgid "Unable to load metadata from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:194
+#: ../raphodo/problemnotification.py:195
 #, python-format
 msgid ""
 "Unable to load metadata from %(name)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:202
+#: ../raphodo/problemnotification.py:203
 #, python-format
 msgid ""
 "An error occurred setting a file's filesystem metadata on the filesystem %s. "
@@ -2334,212 +2920,212 @@ msgid ""
 "again."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:216
+#: ../raphodo/problemnotification.py:217
 #, python-format
 msgid "Encountered unhandled file %s. It will not be downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:223
+#: ../raphodo/problemnotification.py:224
 #, python-format
 msgid "%(filetype)s %(destination)s already exists."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:234 ../raphodo/problemnotification.py:262
+#: ../raphodo/problemnotification.py:235 ../raphodo/problemnotification.py:263
 #, python-format
 msgid ""
 "The existing %(filetype)s %(destination)s was last modified on %(date)s at "
 "%(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:245
+#: ../raphodo/problemnotification.py:246
 #, python-format
 msgid "The %(filetype)s %(source)s was not downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:273
+#: ../raphodo/problemnotification.py:274
 #, python-format
 msgid "The %(filetype)s %(source)s was downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:282
+#: ../raphodo/problemnotification.py:283
 #, python-format
 msgid "The unique identifier '%s' was added to the filename."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:298
+#: ../raphodo/problemnotification.py:299
 #, python-format
 msgid ""
 "The existing backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:309
+#: ../raphodo/problemnotification.py:310
 #, python-format
 msgid "The %(filetype)s %(source)s was not backed up from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:326
+#: ../raphodo/problemnotification.py:327
 #, python-format
 msgid ""
 "The previous backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:337
+#: ../raphodo/problemnotification.py:338
 #, python-format
 msgid ""
 "The %(filetype)s %(source)s from %(device)s was backed up, overwriting the "
 "previous backup %(filetype)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:356
+#: ../raphodo/problemnotification.py:357
 #, python-format
 msgid ""
 "When synchronizing RAW + JPEG sequence values, a duplicate %(filetype)s "
 "%(file)s was encountered, and was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:366
+#: ../raphodo/problemnotification.py:367
 msgid ""
 "When synchronizing RAW + JPEG sequence values, photos were detected with the "
 "same filenames, but taken at different times:"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:373
+#: ../raphodo/problemnotification.py:374
 #, 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 ""
 
-#: ../raphodo/problemnotification.py:389
+#: ../raphodo/problemnotification.py:390
 #, python-format
 msgid "Unable to finalize the filename for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:424
+#: ../raphodo/problemnotification.py:425
 #, python-format
 msgid ""
 "The filename %(destination)s was not fully generated for %(filetype)s "
 "%(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:433
+#: ../raphodo/problemnotification.py:434
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr "Falten les metadades de tipus %(type)s."
 
-#: ../raphodo/problemnotification.py:439
+#: ../raphodo/problemnotification.py:440
 #, python-format
 msgid "The following metadata is missing: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:445
+#: ../raphodo/problemnotification.py:446
 #, python-format
 msgid "Date/time conversion failed: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:451
+#: ../raphodo/problemnotification.py:452
 msgid ""
 "Could not extract valid date/time metadata or determine the file "
 "modification time."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:457
+#: ../raphodo/problemnotification.py:458
 msgid "Filename does not have an extension."
 msgstr "El nom del fitxer no hi té cap extensió."
 
-#: ../raphodo/problemnotification.py:460
+#: ../raphodo/problemnotification.py:461
 msgid "Filename does not have a number component."
 msgstr "El nom del fitxer no hi té el component numèric."
 
-#: ../raphodo/problemnotification.py:464
+#: ../raphodo/problemnotification.py:465
 #, python-format
 msgid "Error generating component %(component)s. Error: %(error)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:477
+#: ../raphodo/problemnotification.py:478
 #, python-format
 msgid ""
 "The download subfolders %(folder)s were only partially generated for "
 "%(filetype)s %(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:486
+#: ../raphodo/problemnotification.py:487
 #, python-format
 msgid ""
 "There is no data with which to generate the %(subfolder_file)s for "
 "%(filename)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:499
+#: ../raphodo/problemnotification.py:500
 #, python-format
 msgid ""
 "Unable to create the %(filetype)s %(destination)s in %(folder)s. The "
 "download file was %(source)s in %(device)s. It was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:514
+#: ../raphodo/problemnotification.py:515
 #, python-format
 msgid "Unable to create the download subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:526
+#: ../raphodo/problemnotification.py:527
 #, python-format
 msgid "Unable to create the backup subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:577
+#: ../raphodo/problemnotification.py:578
 #, python-format
 msgid "Problems scanning %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:584
+#: ../raphodo/problemnotification.py:585
 #, python-format
 msgid "Problems copying from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:591
+#: ../raphodo/problemnotification.py:592
 msgid "Problems while finalizing filenames and generating subfolders"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:598
+#: ../raphodo/problemnotification.py:599
 #, python-format
 msgid "Problems backing up to %s"
 msgstr ""
 
-#. Translators: for example Nov 3 or Dec 31
-#. The start and end dates are on a different day
-#. Translators: for example Nov 3 or Dec 31
-#: ../raphodo/proximity.py:105 ../raphodo/proximity.py:221
-#: ../raphodo/proximity.py:224 ../raphodo/proximity.py:828
+#. Translators: for example Nov 3 2015, 11:25 AM
+#. Translators: for example, Nov 3, 12:15 PM
+#: ../raphodo/proximity.py:188 ../raphodo/proximity.py:213
+#: ../raphodo/proximity.py:236 ../raphodo/proximity.py:239
 #, python-format
-msgid "%(month)s %(numeric_day)s"
+msgid "%(date)s, %(time)s"
 msgstr ""
 
-#. Translators: for example Nov 15 2015
-#. Translators: for example Nov 3 2015
-#: ../raphodo/proximity.py:109 ../raphodo/proximity.py:230
-#: ../raphodo/proximity.py:231 ../raphodo/proximity.py:831
+#: ../raphodo/proximity.py:204
 #, python-format
-msgid "%(date)s %(year)s"
+msgid "%(starttime)s - %(endtime)s"
 msgstr ""
 
-#. Translators: for example Nov 3 2015, 11:25 AM
-#. Translators: for example, Nov 3, 12:15 PM
-#: ../raphodo/proximity.py:197 ../raphodo/proximity.py:215
-#: ../raphodo/proximity.py:234 ../raphodo/proximity.py:236
+#. The start and end dates are on a different day
+#. Translators: for example Nov 3 or Dec 31
+#: ../raphodo/proximity.py:221 ../raphodo/proximity.py:225
+#: ../raphodo/proximity.py:980 ../raphodo/timeutils.py:105
 #, python-format
-msgid "%(date)s, %(time)s"
+msgid "%(month)s %(numeric_day)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:209
+#. Translators: for example Nov 3 2015
+#. Translators: for example Nov 2 2015
+#. Translators: for example Nov 15 2015
+#: ../raphodo/proximity.py:232 ../raphodo/proximity.py:233
+#: ../raphodo/proximity.py:985 ../raphodo/timeutils.py:110
 #, python-format
-msgid "%(starttime)s - %(endtime)s"
+msgid "%(date)s %(year)s"
 msgstr ""
 
 #. Translators: for example, Nov 3, 12:15 PM - Nov 4, 1:00 AM
-#: ../raphodo/proximity.py:241
+#: ../raphodo/proximity.py:245
 #, python-format
 msgid "%(earlier_time)s - %(later_time)s"
 msgstr ""
@@ -2548,25 +3134,25 @@ msgstr ""
 #. Nov 3 2012, 12:15 PM -
 #. Nov 4 2012, 1:00 AM
 #. (please keep the line break signified by \n)
-#: ../raphodo/proximity.py:248
+#: ../raphodo/proximity.py:253
 #, python-format
 msgid ""
 "%(earlier_time)s -\n"
 "%(later_time)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:359
+#: ../raphodo/proximity.py:382
 #, python-format
 msgid "%(month)s  %(year)s"
 msgstr ""
 
 #. Translators: for example Nov 2015
-#: ../raphodo/proximity.py:833
+#: ../raphodo/proximity.py:987
 #, python-format
 msgid "%(month)s %(year)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:1344
+#: ../raphodo/proximity.py:1595
 msgid ""
 "The time elapsed between consecutive photos and videos that is used to build "
 "the Timeline"
@@ -2576,47 +3162,47 @@ msgstr ""
 #. Replace the very last character (after the d) with the correct
 #. localized value, keeping everything else. In other words, change
 #. only the m character.
-#: ../raphodo/proximity.py:1406
+#: ../raphodo/proximity.py:1652
 #, python-format
 msgid "%(minutes)dm"
 msgstr ""
 
 #. Translators: i.e. "1.5h", which is short for 1.5 hours.
 #. Replace the entire string with the correct localized value
-#: ../raphodo/proximity.py:1410
+#: ../raphodo/proximity.py:1656
 msgid "1.5h"
 msgstr ""
 
 #. Translators: e.g. "5h", which is short for 5 hours.
 #. Replace the very last character (after the d) with the correct localized value,
 #. keeping everything else. In other words, change only the h character.
-#: ../raphodo/proximity.py:1415
+#: ../raphodo/proximity.py:1661
 #, python-format
 msgid "%(hours)dh"
 msgstr ""
 
-#: ../raphodo/proximity.py:1461
+#: ../raphodo/proximity.py:1710
 msgid ""
 "The Timeline groups photos and videos based on how much time elapsed between "
 "consecutive shots. Use it to identify photos and videos taken at different "
 "periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/proximity.py:1464
+#: ../raphodo/proximity.py:1715
 msgid ""
 "Use the slider (below) to adjust the time elapsed between consecutive shots "
 "that is used to build the Timeline."
 msgstr ""
 
-#: ../raphodo/proximity.py:1466
+#: ../raphodo/proximity.py:1718
 msgid "Timeline build pending..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1467
+#: ../raphodo/proximity.py:1719
 msgid "Timeline is building..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1468
+#: ../raphodo/proximity.py:1721
 msgid ""
 "The Timeline needs to be rebuilt because the file modification time does not "
 "match the time a shot was taken for one or more shots.<br><br>The Timeline "
@@ -2628,61 +3214,61 @@ msgid ""
 "downloading, which is when the metadata is read."
 msgstr ""
 
-#: ../raphodo/rapid.py:485 ../raphodo/rapid.py:2461 ../raphodo/rapid.py:3728
-#: ../raphodo/rapid.py:3846 ../raphodo/rapid.py:3850 ../raphodo/rapid.py:3870
-#: ../raphodo/rapid.py:3874 ../raphodo/rapid.py:3998 ../raphodo/rapid.py:4007
-#: ../raphodo/rapid.py:4495 ../raphodo/rapid.py:4888 ../raphodo/rapid.py:5722
-#: ../raphodo/rememberthisdialog.py:97
+#: ../raphodo/rapid.py:493 ../raphodo/rapid.py:2555 ../raphodo/rapid.py:3934
+#: ../raphodo/rapid.py:4065 ../raphodo/rapid.py:4069 ../raphodo/rapid.py:4092
+#: ../raphodo/rapid.py:4096 ../raphodo/rapid.py:4226 ../raphodo/rapid.py:4237
+#: ../raphodo/rapid.py:4743 ../raphodo/rapid.py:5195 ../raphodo/rapid.py:5997
+#: ../raphodo/rememberthisdialog.py:99
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:3
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: ../raphodo/rapid.py:1100
+#: ../raphodo/rapid.py:1131
 msgid ""
 "<b>ExifTool has a problem</b><br><br> Rapid Photo Downloader uses ExifTool "
 "to get metadata from videos and photos. The program will run without it, but "
 "installing it is <b>highly</b> recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1110 ../raphodo/rapid.py:1130
+#: ../raphodo/rapid.py:1141 ../raphodo/rapid.py:1161
 msgid "Problem with libmediainfo"
 msgstr ""
 
-#: ../raphodo/rapid.py:1119
+#: ../raphodo/rapid.py:1150
 msgid ""
 "<b>The library libmediainfo appears to be missing</b><br><br> Rapid Photo "
 "Downloader uses libmediainfo to get the date and time a video was shot. The "
 "program will run  without it, but installing it is recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1417
+#: ../raphodo/rapid.py:1448
 msgid "Download failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1419
+#: ../raphodo/rapid.py:1450
 msgid ""
 "Sorry, the download of the new version of Rapid Photo Downloader failed."
 msgstr ""
 
-#: ../raphodo/rapid.py:1425
+#: ../raphodo/rapid.py:1457
 msgid ""
 "The new version was successfully downloaded. Do you want to close Rapid "
 "Photo Downloader and install it now?"
 msgstr ""
 
-#: ../raphodo/rapid.py:1428
+#: ../raphodo/rapid.py:1461
 msgid "Update Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:1432
+#: ../raphodo/rapid.py:1465
 msgid "Install"
 msgstr ""
 
-#: ../raphodo/rapid.py:1450
+#: ../raphodo/rapid.py:1483
 msgid "New version saved"
 msgstr ""
 
-#: ../raphodo/rapid.py:1451
+#: ../raphodo/rapid.py:1485
 #, python-format
 msgid ""
 "The tar file and installer script are saved at:\n"
@@ -2690,163 +3276,163 @@ msgid ""
 " %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:1468
+#: ../raphodo/rapid.py:1502
 msgid "Upgrade failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1469
+#: ../raphodo/rapid.py:1505
 msgid ""
 "Sorry, upgrading Rapid Photo Downloader failed because there was an error "
 "opening the installer."
 msgstr ""
 
-#: ../raphodo/rapid.py:1667 ../raphodo/rapid.py:2331
+#: ../raphodo/rapid.py:1709 ../raphodo/rapid.py:2425
 msgid "Download"
 msgstr "Baixa"
 
-#: ../raphodo/rapid.py:1671
+#: ../raphodo/rapid.py:1713
 msgid "&Refresh..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1675
+#: ../raphodo/rapid.py:1717
 msgid "&Preferences"
 msgstr ""
 
-#: ../raphodo/rapid.py:1679
+#: ../raphodo/rapid.py:1721
 msgid "&Quit"
 msgstr ""
 
-#: ../raphodo/rapid.py:1683
+#: ../raphodo/rapid.py:1725
 msgid "Error &Reports"
 msgstr ""
 
-#: ../raphodo/rapid.py:1687
+#: ../raphodo/rapid.py:1729
 msgid "Clear Completed Downloads"
 msgstr ""
 
-#: ../raphodo/rapid.py:1691
+#: ../raphodo/rapid.py:1733
 msgid "Get Help Online..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1695
+#: ../raphodo/rapid.py:1737
 msgid "&Tip of the Day..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1699
+#: ../raphodo/rapid.py:1741
 msgid "Report a Problem..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1703
+#: ../raphodo/rapid.py:1745
 msgid "Make a Donation..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1707
+#: ../raphodo/rapid.py:1749
 msgid "Translate this Application..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1711
+#: ../raphodo/rapid.py:1753
 msgid "&About..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1715
+#: ../raphodo/rapid.py:1757
 msgid "Check for Updates..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1797
+#: ../raphodo/rapid.py:1840
 msgid "Timeline"
 msgstr ""
 
-#: ../raphodo/rapid.py:1807
+#: ../raphodo/rapid.py:1850
 msgid "Destination"
 msgstr ""
 
-#: ../raphodo/rapid.py:1808
+#: ../raphodo/rapid.py:1851
 msgid "Rename"
 msgstr ""
 
-#: ../raphodo/rapid.py:1810
+#: ../raphodo/rapid.py:1853
 msgid "Back Up"
 msgstr ""
 
 #. Devices Header and View
-#: ../raphodo/rapid.py:1926
+#: ../raphodo/rapid.py:1977
 msgid ""
 "Turn on or off the use of devices attached to this computer as download "
 "sources"
 msgstr ""
 
 #. This Computer Header and View
-#: ../raphodo/rapid.py:1940
+#: ../raphodo/rapid.py:1994
 msgid ""
 "Turn on or off the use of a folder on this computer as a download source"
 msgstr ""
 
-#: ../raphodo/rapid.py:1941
+#: ../raphodo/rapid.py:1996
 msgid "This Computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:1952
+#: ../raphodo/rapid.py:2009
 msgid "Select a source folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:1975
+#: ../raphodo/rapid.py:2038
 msgid "Projected Storage Use"
 msgstr ""
 
-#: ../raphodo/rapid.py:1989 ../raphodo/rapid.py:1997
+#: ../raphodo/rapid.py:2056 ../raphodo/rapid.py:2068
 msgid "Select a destination folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:2045
+#: ../raphodo/rapid.py:2117
 msgid "All"
 msgstr ""
 
-#: ../raphodo/rapid.py:2046
+#: ../raphodo/rapid.py:2118
 msgid "New"
 msgstr ""
 
-#: ../raphodo/rapid.py:2048
+#: ../raphodo/rapid.py:2120
 msgid "Show:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2051
+#: ../raphodo/rapid.py:2123
 msgid "Modification Time"
 msgstr ""
 
-#: ../raphodo/rapid.py:2052
+#: ../raphodo/rapid.py:2124
 msgid "Checked State"
 msgstr ""
 
-#: ../raphodo/rapid.py:2055
+#: ../raphodo/rapid.py:2127
 msgid "File Type"
 msgstr ""
 
-#: ../raphodo/rapid.py:2056
+#: ../raphodo/rapid.py:2128
 msgid "Device"
 msgstr "Dispositiu"
 
-#: ../raphodo/rapid.py:2058
+#: ../raphodo/rapid.py:2130
 msgid "Sort:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2069
+#: ../raphodo/rapid.py:2141
 msgid "Select All:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2311
+#: ../raphodo/rapid.py:2405
 #, python-format
 msgid "Download %(files)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2327
+#: ../raphodo/rapid.py:2421
 msgid "Resume Download"
 msgstr ""
 
-#: ../raphodo/rapid.py:2329
+#: ../raphodo/rapid.py:2423
 msgid "Pause"
 msgstr "Atura"
 
-#: ../raphodo/rapid.py:2417
+#: ../raphodo/rapid.py:2511
 #, python-brace-format
 msgid ""
 "Please report the problem at <a href=\"{website}\">{website}</a>.<br><br>\n"
@@ -2855,11 +3441,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/rapid.py:2431
+#: ../raphodo/rapid.py:2525
 msgid "Thank you for reporting a problem in Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:2529
+#: ../raphodo/rapid.py:2624
 #, python-format
 msgid ""
 "<b>Changing This Computer source path</b><br><br>Do you really want to "
@@ -2868,30 +3454,29 @@ msgid ""
 "from This Computer will be cancelled."
 msgstr ""
 
-#: ../raphodo/rapid.py:2595
+#: ../raphodo/rapid.py:2694
 msgid "You cannot change the download destination while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:2604
+#: ../raphodo/rapid.py:2704
 #, python-format
 msgid ""
 "<b>Confirm Download Destination</b><br><br>Are you sure you want to set the "
 "%(file_type)s download destination to %(path)s?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2682
+#: ../raphodo/rapid.py:2785
 msgid ""
+"\n"
 "<b>Downloading all files</b><br><br>\n"
-"                    A download always includes all files that are checked "
-"for download,\n"
-"                    including those that are not currently displayed because "
-"the Timeline\n"
-"                    is being used or because only new files are being shown."
-"<br><br>\n"
-"                    Do you want to proceed with the download?"
+"A download always includes all files that are checked for download,\n"
+"including those that are not currently displayed because the Timeline\n"
+"is being used or because only new files are being shown.<br><br>\n"
+"Do you want to proceed with the download?\n"
+"                        "
 msgstr ""
 
-#: ../raphodo/rapid.py:2820
+#: ../raphodo/rapid.py:2937
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -2902,7 +3487,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: ../raphodo/rapid.py:2824
+#: ../raphodo/rapid.py:2940
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -2911,199 +3496,193 @@ msgstr ""
 "Aquesta carpeta de baixada no és vàlida:\n"
 "%s"
 
-#: ../raphodo/rapid.py:2827
+#: ../raphodo/rapid.py:2943
 msgid "Download Failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:2828
+#: ../raphodo/rapid.py:2944
 msgid "The download cannot proceed."
 msgstr ""
 
-#: ../raphodo/rapid.py:2842
+#: ../raphodo/rapid.py:2962
 msgid ""
 "Photos and videos will not be backed up because there is nowhere to back "
 "them up. Do you still want to start the download?"
 msgstr ""
 
-#. Translators: filetype will be replaced with 'photos' or 'videos'
-#: ../raphodo/rapid.py:2847 ../raphodo/rapid.py:2854
+#: ../raphodo/rapid.py:2969 ../raphodo/rapid.py:2979
 #, python-format
 msgid ""
 "No backup device exists for backing up %(filetype)s. Do you still want to "
 "start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2848 ../raphodo/rpdfile.py:228
+#: ../raphodo/rapid.py:2971 ../raphodo/rpdfile.py:228
 msgid "photos"
 msgstr "fotos"
 
-#: ../raphodo/rapid.py:2855 ../raphodo/rpdfile.py:223
+#: ../raphodo/rapid.py:2981 ../raphodo/rpdfile.py:223
 msgid "videos"
 msgstr "vídeos"
 
-#: ../raphodo/rapid.py:2861
+#: ../raphodo/rapid.py:2989
 msgid ""
 "<b>The photo and video backup destinations do not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2869 ../raphodo/rapid.py:2876
+#: ../raphodo/rapid.py:2999 ../raphodo/rapid.py:3008
 #, python-format
 msgid ""
 "<b>The %(filetype)s backup destination does not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2871 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:818
+#: ../raphodo/rapid.py:3001 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:843
 msgid "photo"
 msgstr "foto"
 
-#: ../raphodo/rapid.py:2878 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:858
+#: ../raphodo/rapid.py:3010 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:883
 msgid "video"
 msgstr "vídeo"
 
-#: ../raphodo/rapid.py:2886
+#: ../raphodo/rapid.py:3018
 msgid "Backup problem"
 msgstr "Problema en fer còpia de seguretat"
 
-#. Translators - in the middle is a unicode em dash - please retain it
-#. This string is displayed in the status bar when the download is running
-#: ../raphodo/rapid.py:3571
+#: ../raphodo/rapid.py:3756
 #, python-format
 msgid "%(downloading_from)s — %(time_left)s left (%(speed)s)"
 msgstr ""
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3640
+#: ../raphodo/rapid.py:3828
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s baixats"
 
-#. Translators: e.g. 2 videos failed to download
-#: ../raphodo/rapid.py:3645
+#: ../raphodo/rapid.py:3836
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "No s’han pogut baixar %(noFiles)s %(filetypes)s"
 
-#: ../raphodo/rapid.py:3650 ../raphodo/rapid.py:3723
+#: ../raphodo/rapid.py:3842 ../raphodo/rapid.py:3927
 msgid "warnings"
 msgstr "avisos"
 
-#: ../raphodo/rapid.py:3679
+#: ../raphodo/rapid.py:3873
 msgid "All downloads complete"
 msgstr "S’han completat totes les baixades"
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3686 ../raphodo/rapid.py:3695 ../raphodo/rapid.py:3704
-#: ../raphodo/rapid.py:3713 ../raphodo/rapid.py:3721
+#: ../raphodo/rapid.py:3881 ../raphodo/rapid.py:3892 ../raphodo/rapid.py:3903
+#: ../raphodo/rapid.py:3914 ../raphodo/rapid.py:3924
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: ../raphodo/rapid.py:3688 ../raphodo/rapid.py:3706
+#: ../raphodo/rapid.py:3884 ../raphodo/rapid.py:3906
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s baixats"
 
-#: ../raphodo/rapid.py:3697 ../raphodo/rapid.py:3715
+#: ../raphodo/rapid.py:3895 ../raphodo/rapid.py:3917
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "No s’ha pogut baixar %(filetype)s"
 
-#: ../raphodo/rapid.py:3742
+#: ../raphodo/rapid.py:3950
 msgid "1 failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:3744
+#: ../raphodo/rapid.py:3952
 #, python-format
 msgid "%d failures"
 msgstr ""
 
-#: ../raphodo/rapid.py:3749
+#: ../raphodo/rapid.py:3957
 msgid "1 warning"
 msgstr ""
 
-#: ../raphodo/rapid.py:3751
+#: ../raphodo/rapid.py:3959
 #, python-format
 msgid "%d warnings"
 msgstr ""
 
-#: ../raphodo/rapid.py:3771
+#: ../raphodo/rapid.py:3981
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3774
+#: ../raphodo/rapid.py:3985
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3779
+#: ../raphodo/rapid.py:3989
 #, python-format
 msgid "No files downloaded — %(failures)s"
 msgstr "No s’ha baixat cap fitxer — %(failures)s"
 
-#: ../raphodo/rapid.py:3781
+#: ../raphodo/rapid.py:3991
 msgid "No files downloaded"
 msgstr "No s’ha baixat cap fitxer"
 
-#: ../raphodo/rapid.py:3805
+#: ../raphodo/rapid.py:4021
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3809
+#: ../raphodo/rapid.py:4026
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3812
+#: ../raphodo/rapid.py:4031
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3820
+#: ../raphodo/rapid.py:4039
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3833
+#: ../raphodo/rapid.py:4052
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3837
+#: ../raphodo/rapid.py:4056
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3841
+#: ../raphodo/rapid.py:4060
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices"
 msgstr ""
 
-#: ../raphodo/rapid.py:3867
+#: ../raphodo/rapid.py:4087
 msgid "The Destination subfolders and Timeline have been rebuilt"
 msgstr ""
 
-#: ../raphodo/rapid.py:3922
+#: ../raphodo/rapid.py:4144
 msgid "Program preferences are invalid"
 msgstr "Els paràmetres del programa no són vàlids"
 
-#: ../raphodo/rapid.py:3999
+#: ../raphodo/rapid.py:4228
 #, python-format
 msgid ""
 "<b>All files on the %(camera)s are inaccessible</b>.<br><br>It may be locked "
@@ -3113,179 +3692,205 @@ msgid ""
 "ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4008
+#: ../raphodo/rapid.py:4239
 #, python-format
 msgid ""
-"<b>The %(camera)s appears to be in use by another application.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again.<br><br>Alternatively, you can ignore this "
-"device."
+"<b>The %(camera)s appears to be in use by another "
+"application.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again.<br><br>Alternatively, you "
+"can ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4019
+#: ../raphodo/rapid.py:4250
 msgid "&Try Again"
 msgstr "&Torna a intentar-ho"
 
-#: ../raphodo/rapid.py:4020
+#: ../raphodo/rapid.py:4251
 msgid "&Ignore This Device"
 msgstr ""
 
-#: ../raphodo/rapid.py:4086
+#: ../raphodo/rapid.py:4323
 #, python-format
 msgid "Sorry, an unexpected problem occurred while scanning %s."
 msgstr ""
 
-#: ../raphodo/rapid.py:4087
+#: ../raphodo/rapid.py:4324
 msgid "Unfortunately you cannot download from this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4091
+#: ../raphodo/rapid.py:4328
 msgid ""
 "A possible workaround for the problem might be downloading from the camera's "
 "memory card using a card reader."
 msgstr ""
 
-#: ../raphodo/rapid.py:4096
+#: ../raphodo/rapid.py:4333
 msgid "Device scan failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:4472
+#: ../raphodo/rapid.py:4720
 #, python-format
 msgid ""
-"<b>The %(camera)s cannot be scanned because it cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again."
+"<b>The %(camera)s cannot be scanned because it cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again."
 msgstr ""
 
-#: ../raphodo/rapid.py:4496
+#: ../raphodo/rapid.py:4745
 #, python-format
 msgid ""
-"<b>The download cannot start because the %(camera)s cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again, and choose which files you want to "
-"download from it."
+"<b>The download cannot start because the %(camera)s cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again, and choose which files "
+"you want to download from it."
+msgstr ""
+
+#: ../raphodo/rapid.py:4842
+msgid "Completed Downloads Present"
 msgstr ""
 
-#: ../raphodo/rapid.py:4635
+#: ../raphodo/rapid.py:4844
+#, python-format
+msgid "%s whose download have completed are displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4846
+msgid "Do you want to clear the completed downloads?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4848
+msgid "Completed Download Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4850
+#, python-format
+msgid "%s whose download has completed is displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4852
+msgid "Do you want to clear the completed download?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4933
 #, python-format
 msgid ""
 "Do you want to download photos and videos from the device <i>%(device)s</i>?"
 msgstr ""
 
-#: ../raphodo/rapid.py:4877
+#: ../raphodo/rapid.py:5183
 #, python-format
 msgid "<b>Do you want to ignore the %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4879
+#: ../raphodo/rapid.py:5186
 msgid ""
 "All cameras, phones and tablets with the same model name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:4883
+#: ../raphodo/rapid.py:5190
 #, python-format
 msgid ""
 "<b>Do you want to ignore the device %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4885
+#: ../raphodo/rapid.py:5192
 msgid "Any device with the same name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:5178
+#: ../raphodo/rapid.py:5492
 #, python-format
 msgid "Downloading from %(location)s on This Computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5180
+#: ../raphodo/rapid.py:5496
 msgid ""
 "Do you really want to download from here?<br><br>On some systems, scanning "
 "this location can take a very long time."
 msgstr ""
 
-#: ../raphodo/rapid.py:5224
+#: ../raphodo/rapid.py:5537
 #, python-format
 msgid "Generating thumbnails for %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5227
+#: ../raphodo/rapid.py:5540
 #, python-format
 msgid "Scanning %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5237
+#: ../raphodo/rapid.py:5551
 #, python-format
 msgid ""
 "%(number)s of %(available files)s checked for download (%(hidden)s hidden)"
 msgstr ""
 
-#: ../raphodo/rapid.py:5243
+#: ../raphodo/rapid.py:5559
 #, python-format
 msgid "%(number)s of %(available files)s checked for download"
 msgstr ""
 
-#: ../raphodo/rapid.py:5494
+#: ../raphodo/rapid.py:5764
 msgid "Display program information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5496
+#: ../raphodo/rapid.py:5766
 msgid "Display debugging information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5499
+#: ../raphodo/rapid.py:5769
 msgid "List photo and video file extensions the program recognizes and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5502
+#: ../raphodo/rapid.py:5772
 msgid "Turn on or off the the renaming of photos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5504
+#: ../raphodo/rapid.py:5774
 msgid "turn on or off the the renaming of videos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5506
+#: ../raphodo/rapid.py:5776
 msgid ""
 "Turn on or off the automatic detection of devices from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5510
+#: ../raphodo/rapid.py:5780
 msgid "Turn on or off downloading from this computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5512 ../raphodo/rapid.py:5515 ../raphodo/rapid.py:5518
-#: ../raphodo/rapid.py:5539 ../raphodo/rapid.py:5543
+#: ../raphodo/rapid.py:5782 ../raphodo/rapid.py:5785 ../raphodo/rapid.py:5788
+#: ../raphodo/rapid.py:5809 ../raphodo/rapid.py:5813
 msgid "PATH"
 msgstr "CAMÍ"
 
-#: ../raphodo/rapid.py:5513
+#: ../raphodo/rapid.py:5783
 msgid "The PATH on this computer from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5516
+#: ../raphodo/rapid.py:5786
 msgid "The PATH where photos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5519
+#: ../raphodo/rapid.py:5789
 msgid "The PATH where videos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5521
+#: ../raphodo/rapid.py:5791
 msgid "Turn on or off the backing up of photos and videos while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:5525
+#: ../raphodo/rapid.py:5795
 msgid "Turn on or off the automatic detection of backup devices."
 msgstr ""
 
-#: ../raphodo/rapid.py:5527 ../raphodo/rapid.py:5533
+#: ../raphodo/rapid.py:5797 ../raphodo/rapid.py:5803
 msgid "FOLDER"
 msgstr "CARPETA"
 
-#: ../raphodo/rapid.py:5528
+#: ../raphodo/rapid.py:5798
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected photo "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3293,7 +3898,7 @@ msgid ""
 "photos up to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5534
+#: ../raphodo/rapid.py:5804
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected video "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3301,69 +3906,70 @@ msgid ""
 "up videos to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5540
+#: ../raphodo/rapid.py:5810
 msgid ""
 "The PATH where photos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5544
+#: ../raphodo/rapid.py:5814
 msgid ""
 "The PATH where videos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5547
+#: ../raphodo/rapid.py:5817
 #, python-format
 msgid "Ignore photos with the following extensions: %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5551
-msgid "Turn on or off starting downloads as soon as the program itself starts."
+#: ../raphodo/rapid.py:5821
+msgid ""
+"Turn on or off starting downloads as soon as the program itself starts."
 msgstr ""
 
-#: ../raphodo/rapid.py:5554
+#: ../raphodo/rapid.py:5824
 msgid "Turn on or off starting downloads as soon as a device is inserted."
 msgstr ""
 
-#: ../raphodo/rapid.py:5557
+#: ../raphodo/rapid.py:5827
 msgid ""
 "Turn on or off use of the Rapid Photo Downloader Thumbnail Cache. Turning it "
 "off does not delete existing cache contents."
 msgstr ""
 
-#: ../raphodo/rapid.py:5561
+#: ../raphodo/rapid.py:5831
 msgid ""
 "Delete all thumbnails in the Rapid Photo Downloader Thumbnail Cache, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5565
+#: ../raphodo/rapid.py:5835
 msgid "Forget which files have been previously downloaded, and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5568
+#: ../raphodo/rapid.py:5838
 msgid ""
 "Import preferences from an old program version and exit. Requires the "
 "command line program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5571
+#: ../raphodo/rapid.py:5841
 msgid ""
 "Reset all program settings to their default values, delete all thumbnails in "
 "the Thumbnail cache, forget which files have been previously downloaded, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5575
+#: ../raphodo/rapid.py:5845
 msgid "Include gphoto2 debugging information in log files."
 msgstr ""
 
-#: ../raphodo/rapid.py:5579
+#: ../raphodo/rapid.py:5849
 msgid "Print information to the terminal about attached cameras and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5640
+#: ../raphodo/rapid.py:5911
 msgid ""
 "To import preferences from the old version of Rapid Photo Downloader, you "
 "must install the program gconftool-2."
@@ -3371,47 +3977,57 @@ msgstr ""
 "Per a importar les preferències d’una versió antiga del Rapid Photo "
 "Downloader, heu d’instal·lar el programa gconftool-2."
 
-#: ../raphodo/rapid.py:5649
+#: ../raphodo/rapid.py:5920
 msgid "No prior program preferences detected: exiting"
 msgstr ""
 
-#: ../raphodo/rapid.py:5652
+#: ../raphodo/rapid.py:5923
 #, python-format
 msgid "Importing preferences from Rapid Photo Downloader %(version)s"
 msgstr ""
+"S’estan important les preferències del Rapid Photo Downloader %(version)s"
 
-#: ../raphodo/rapid.py:5714
+#: ../raphodo/rapid.py:5989
 #, python-format
-msgid "Do you want to copy the stored sequence number, which has the value %d?"
+msgid ""
+"Do you want to copy the stored sequence number, which has the value %d?"
 msgstr ""
 
-#: ../raphodo/rapid.py:5726
+#: ../raphodo/rapid.py:6000
 msgid "Program aborting."
 msgstr ""
 
-#: ../raphodo/rapid.py:5736
+#: ../raphodo/rapid.py:6010
 msgid "Never run this program as the sudo / root user."
 msgstr ""
 
-#: ../raphodo/rapid.py:5740
+#: ../raphodo/rapid.py:6014
 msgid "You must install ExifTool to run Rapid Photo Downloader."
 msgstr ""
+"Heu d’instal·lar l’ExifTool per a executar el Rapid Photo Downloader."
+
+#: ../raphodo/rapid.py:6026
+msgid ""
+"Rapid Photo Downloader is installed in multiple locations.\n"
+"\n"
+"Uninstall all copies except the version you want to run."
+msgstr ""
 
-#: ../raphodo/rapid.py:5794
+#: ../raphodo/rapid.py:6083
 msgid ""
 "When specifying a path on the command line, do not also specify an\n"
 "option for device auto detection or a path on \"This Computer\"."
 msgstr ""
 
-#: ../raphodo/rapid.py:5950
+#: ../raphodo/rapid.py:6243
 msgid "All settings and caches have been reset"
-msgstr ""
+msgstr "S’han reinicialitzat els paràmetres i les memòries cau"
 
-#: ../raphodo/rapid.py:5958
+#: ../raphodo/rapid.py:6251
 msgid "Thumbnail Cache has been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5964
+#: ../raphodo/rapid.py:6257
 msgid "Remembered files have been forgotten"
 msgstr ""
 
@@ -3427,15 +4043,15 @@ msgstr ""
 msgid "&Don't warn me again about missing or broken program libraries"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:546
+#: ../raphodo/renameandmovefile.py:554
 msgid "subfolder and filename"
 msgstr "Subcarpeta i nom del fitxer"
 
-#: ../raphodo/renameandmovefile.py:548
+#: ../raphodo/renameandmovefile.py:556
 msgid "filename"
 msgstr "nom de fitxer"
 
-#: ../raphodo/renameandmovefile.py:550
+#: ../raphodo/renameandmovefile.py:558
 msgid "subfolder"
 msgstr "subcarpeta"
 
@@ -3515,160 +4131,237 @@ msgstr "fotos i vídeos"
 msgid "photos or videos"
 msgstr "fotos o vídeos"
 
-#: ../raphodo/rpdfile.py:306
+#: ../raphodo/rpdfile.py:315
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: ../raphodo/rpdfile.py:318
+#. translators: natural language expression signifying a single video
+#: ../raphodo/rpdfile.py:337
+msgid "a video"
+msgstr "un vídeo"
+
+#: ../raphodo/rpdfile.py:339
 msgid "1 Video"
 msgstr "1 vídeo"
 
-#: ../raphodo/rpdfile.py:323
+#. translators: natural language expression signifying a single photo
+#: ../raphodo/rpdfile.py:346
+msgid "a photo"
+msgstr "una foto"
+
+#: ../raphodo/rpdfile.py:348
 msgid "1 Photo"
 msgstr "1 foto"
 
-#: ../raphodo/rpdfile.py:803
+#: ../raphodo/rpdfile.py:828
 #, python-format
 msgid "%(path)s on %(camera)s"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:819
+#: ../raphodo/rpdfile.py:844
 msgid "Photo"
 msgstr "Foto"
 
-#: ../raphodo/rpdfile.py:859
+#: ../raphodo/rpdfile.py:884
 msgid "Video"
 msgstr "Vídeo"
 
-#: ../raphodo/storage.py:138
+#: ../raphodo/storage.py:141
 msgid "File system root"
 msgstr "Arrel del sistema de fitxers"
 
 #. translators: the name of the Pictures folder
-#: ../raphodo/storage.py:433
+#: ../raphodo/storage.py:437
 msgid "Pictures"
 msgstr "Imatges"
 
-#: ../raphodo/thumbnaildisplay.py:426
+#: ../raphodo/thumbnaildisplay.py:432
 #, python-format
 msgid "Taken on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:431
+#: ../raphodo/thumbnaildisplay.py:439
 #, python-format
 msgid "Modified on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:437 ../raphodo/thumbnaildisplay.py:466
+#: ../raphodo/thumbnaildisplay.py:447 ../raphodo/thumbnaildisplay.py:481
 #, python-format
 msgid "%(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:451
+#: ../raphodo/thumbnaildisplay.py:464
 #, python-format
 msgid "Memory cards: %s"
 msgstr "Targetes de memòria: %s"
 
-#: ../raphodo/thumbnaildisplay.py:457
+#: ../raphodo/thumbnaildisplay.py:468
+#, python-format
+msgid "Memory card: %s"
+msgstr "Targeta de memòria: %s"
+
+#: ../raphodo/thumbnaildisplay.py:473
 msgid "Downloaded as:"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:472
+#: ../raphodo/thumbnaildisplay.py:489
 #, python-format
 msgid "<br><br>Previous download:<br>%(filename)s<br>%(path)s<br>%(date)s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:1603
+#: ../raphodo/thumbnaildisplay.py:1645
 msgid "Copy Path"
 msgstr "Copia el camí d’accés"
 
+#. Translators: these values are file size suffixes like B representing bytes, KB representing
+#. kilobytes, etc.
+#: ../raphodo/utilities.py:170
+msgid "B"
+msgstr "B"
+
+#: ../raphodo/utilities.py:170
+msgid "KB"
+msgstr "kB"
+
+#: ../raphodo/utilities.py:170
+msgid "MB"
+msgstr "MB"
+
+#: ../raphodo/utilities.py:170
+msgid "GB"
+msgstr "GB"
+
+#: ../raphodo/utilities.py:170
+msgid "TB"
+msgstr "TB"
+
+#: ../raphodo/utilities.py:170
+msgid "PB"
+msgstr "PB"
+
+#: ../raphodo/utilities.py:170
+msgid "EB"
+msgstr "EB"
+
+#: ../raphodo/utilities.py:170
+msgid "ZB"
+msgstr "ZB"
+
+#: ../raphodo/utilities.py:170
+msgid "YB"
+msgstr "YB"
+
 #. two things in a list e.g. "device1 and device2"
-#: ../raphodo/utilities.py:391
+#: ../raphodo/utilities.py:394
 #, python-format
 msgid "%(first_item)s and %(last_item)s"
 msgstr "%(first_item)s i %(last_item)s"
 
-#: ../raphodo/utilities.py:464
+#: ../raphodo/utilities.py:468
 msgid "one"
 msgstr "u"
 
-#: ../raphodo/utilities.py:465
+#: ../raphodo/utilities.py:469
 msgid "two"
 msgstr "dos"
 
-#: ../raphodo/utilities.py:466
+#: ../raphodo/utilities.py:470
 msgid "three"
 msgstr "tres"
 
-#: ../raphodo/utilities.py:467
+#: ../raphodo/utilities.py:471
 msgid "four"
 msgstr "quatre"
 
-#: ../raphodo/utilities.py:468
+#: ../raphodo/utilities.py:472
 msgid "five"
 msgstr "cinc"
 
-#: ../raphodo/utilities.py:469
+#: ../raphodo/utilities.py:473
 msgid "six"
 msgstr "sis"
 
-#: ../raphodo/utilities.py:470
+#: ../raphodo/utilities.py:474
 msgid "seven"
 msgstr "set"
 
-#: ../raphodo/utilities.py:471
+#: ../raphodo/utilities.py:475
 msgid "eight"
 msgstr "vuit"
 
-#: ../raphodo/utilities.py:472
+#: ../raphodo/utilities.py:476
 msgid "nine"
 msgstr "nou"
 
-#: ../raphodo/utilities.py:473
+#: ../raphodo/utilities.py:477
 msgid "ten"
 msgstr "deu"
 
-#: ../raphodo/utilities.py:474
+#: ../raphodo/utilities.py:478
 msgid "eleven"
 msgstr "onze"
 
-#: ../raphodo/utilities.py:475
+#: ../raphodo/utilities.py:479
 msgid "twelve"
 msgstr "dotze"
 
-#: ../raphodo/utilities.py:476
+#: ../raphodo/utilities.py:480
 msgid "thirteen"
 msgstr "tretze"
 
-#: ../raphodo/utilities.py:477
+#: ../raphodo/utilities.py:481
 msgid "fourteen"
 msgstr "catorze"
 
-#: ../raphodo/utilities.py:478
+#: ../raphodo/utilities.py:482
 msgid "fifteen"
 msgstr "quinze"
 
-#: ../raphodo/utilities.py:479
+#: ../raphodo/utilities.py:483
 msgid "sixteen"
 msgstr "setze"
 
-#: ../raphodo/utilities.py:480
+#: ../raphodo/utilities.py:484
 msgid "seventeen"
 msgstr "disset"
 
-#: ../raphodo/utilities.py:481
+#: ../raphodo/utilities.py:485
 msgid "eighteen"
 msgstr "divuit"
 
-#: ../raphodo/utilities.py:482
+#: ../raphodo/utilities.py:486
 msgid "ninenteen"
 msgstr "dinou"
 
-#: ../raphodo/utilities.py:483
+#: ../raphodo/utilities.py:487
 msgid "twenty"
 msgstr "vint"
 
+#: ../raphodo/viewutils.py:240
+msgid "&OK"
+msgstr "&D’acord"
+
+#: ../raphodo/viewutils.py:243
+msgid "&Save"
+msgstr "De&sa"
+
+#: ../raphodo/viewutils.py:244
+msgid "&Help"
+msgstr "&Ajuda"
+
+#: ../raphodo/viewutils.py:245
+msgid "Restore Defaults"
+msgstr ""
+
+#: ../raphodo/viewutils.py:246
+msgid "&Yes"
+msgstr "&Sí"
+
+#: ../raphodo/viewutils.py:247
+msgid "&No"
+msgstr "&No"
+
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:1
 msgid ""
 "Rapid Photo Downloader imports photos and videos from cameras, phones, "
@@ -3696,7 +4389,7 @@ msgstr ""
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:4
 msgid "The main window"
-msgstr ""
+msgstr "La finestra principal"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:5
 msgid "Downloading"
@@ -3722,17 +4415,21 @@ msgstr ""
 #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:5
 msgid ""
-"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;"
-"memory;card;"
+"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;memory"
+";card;"
 msgstr ""
+"fotos;baixada;fotografia;importació;vídeo;RAW;càmera;telèfon;transferència;cò"
+"pia de seguretat;memòria;targeta;"
 
 #: ../data/kde/net.damonlynch.rapid-photo-downloader.desktop.in.h:1
 msgid "Download Photos and Videos with Rapid Photo Downloader"
-msgstr ""
+msgstr "Transferiu fotos i vídeos amb el Rapid Photo Downloader"
 
+#, python-format
 #~ msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
+#, python-format
 #~ msgid ""
 #~ "%(date)s\n"
 #~ "%(time)s"
@@ -3740,6 +4437,7 @@ msgstr ""
 #~ "%(date)s\n"
 #~ "%(time)s"
 
+#, python-format
 #~ msgid "%(date)s %(time)s"
 #~ msgstr "%(date)s %(time)s"
 
@@ -3752,9 +4450,11 @@ msgstr ""
 #~ msgid "Auto Detect"
 #~ msgstr "Detecció automàtica"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s"
 #~ msgstr "%(number)s de %(total)s %(filetypes)s"
 
+#, python-format
 #~ msgid "(%(file_type)s)"
 #~ msgstr "(%(file_type)s)"
 
@@ -3770,12 +4470,15 @@ msgstr ""
 #~ msgid "."
 #~ msgstr "."
 
+#, python-format
 #~ msgid "Folder: %s"
 #~ msgstr "Carpeta: %s"
 
+#, python-format
 #~ msgid "Error: %(inst)s"
 #~ msgstr "S’ha produït un error: %(inst)s"
 
+#, python-format
 #~ msgid ""
 #~ "%(problem)s\n"
 #~ "File: %(file)s"
@@ -3831,15 +4534,19 @@ msgstr ""
 #~ msgid "Warsaw"
 #~ msgstr "Varsòvia"
 
+#, python-format
 #~ msgid "%(volumes)s and %(final_volume)s."
 #~ msgstr "%(volumes)s i %(final_volume)s."
 
+#, 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."
 
+#, python-format
 #~ msgid "%(volumes)s and %(volume)s."
 #~ msgstr "%(volumes)s i %(volume)s."
 
+#, python-format
 #~ msgid "%(volumes)s and %(volume)s (%(inst)s)."
 #~ msgstr "%(volumes)s i %(volume)s (%(inst)s)."
 
@@ -3853,8 +4560,8 @@ msgstr ""
 #~ "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."
+#~ "Realment voleu baixar des d’aquí? En alguns sistemes, l’escaneig d’aquesta "
+#~ "ubicació pot trigar massa."
 
 #~ msgid "the root of the file system"
 #~ msgstr "l’arrel del sistema de fitxers"
@@ -3862,29 +4569,35 @@ msgstr ""
 #~ msgid "Download cannot proceed"
 #~ msgstr "No es pot continuar amb la baixada"
 
+#, python-format
 #~ msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 #~ msgstr "Queden %(minutes)i:%(seconds)02i minuts"
 
 #~ msgid "About 1 minute remaining"
 #~ msgstr "Queda prop d’un minut"
 
+#, python-format
 #~ msgid "About %i seconds remaining"
 #~ msgstr "Queden prop de %i segons"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 #~ msgstr "%(number)s de %(total)s %(filetypes)s (queden %(remaining)s)"
 
+#, python-format
 #~ msgid "Downloading from %(location)s."
 #~ msgstr "Baixada des de %(location)s."
 
+#, 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"
+#~ "No hi ha cap dispositiu que contingui una carpeta vàlida per fer la còpia de "
+#~ "seguretat de %(filetype)s"
 
 #~ msgid "From"
 #~ msgstr "Des de"
 
+#, python-format
 #~ msgid "Select a folder containing %(file_types)s"
 #~ msgstr "Trieu una carpeta que contingui %(file_types)s"
 
@@ -3894,30 +4607,37 @@ msgstr ""
 #~ msgid "; "
 #~ msgstr "; "
 
+#, python-format
 #~ msgid "%(free)s %(file_type)s"
 #~ msgstr "%(free)s %(file_type)s"
 
+#, python-format
 #~ msgid "%(freespace)s. %(backuppaths)s."
 #~ msgstr "%(freespace)s. %(backuppaths)s."
 
+#, 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"
 
+#, python-format
 #~ msgid "%(file_type)s download folder is invalid"
 #~ msgstr "La carpeta de baixada per %(file_type)s és incorrecta"
 
+#, python-format
 #~ msgid "%(file_type)s download folder does not exist"
 #~ msgstr "La carpeta de baixada per %(file_type)s no hi existeix"
 
 #~ msgid "All settings and preferences have been reset"
 #~ msgstr "S’han restablit tots els paràmetres i preferències"
 
+#, python-format
 #~ msgid "and %s"
 #~ msgstr "i %s"
 
 #~ msgid "Backing up error"
 #~ msgstr "S’ha produït un error en fer la còpia de seguretat"
 
+#, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
 #~ "Destination: %(destination)s"
@@ -3965,33 +4685,41 @@ msgstr ""
 #~ msgid "Delhi"
 #~ msgstr "Delhi"
 
+#, python-format
 #~ msgid "<i>Example: %s</i>"
 #~ msgstr "<i>Exemple: %s</i>"
 
 #~ msgid "Jakarta"
 #~ msgstr "Jakarta"
 
+#, python-format
 #~ msgid "%(volume)s, "
 #~ msgstr "%(volume)s, "
 
+#, python-format
 #~ msgid "%(volume)s (%(inst)s), "
 #~ msgstr "%(volume)s (%(inst)s), "
 
+#, python-format
 #~ msgid "%s, "
 #~ msgstr "%s, "
 
 #~ msgid "The following metadata is missing: "
 #~ msgstr "Falten les metadades següents: "
 
+#, python-format
 #~ msgid "%(previousproblem)s, and %(backinguperror)s"
 #~ msgstr "%(previousproblem)s i %(backinguperror)s"
 
+#, python-format
 #~ msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
+#, python-format
 #~ msgid "Source: %(source)s"
 #~ msgstr "Origen: %(source)s"
 
+#, python-format
 #~ msgid "Path: %s"
 #~ msgstr "Camí: %s"
 
@@ -4010,6 +4738,7 @@ msgstr ""
 #~ msgid "Free space:"
 #~ msgstr "Espai lliure:"
 
+#, python-format
 #~ msgid "%(free)s free"
 #~ msgstr "%(free)s lliure"
 
@@ -4036,12 +4765,11 @@ msgstr ""
 #~ "dispositiu amb el mateix nom o ometre-ho."
 
 #~ 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."
+#~ "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."
+#~ "Quan ja s’ha baixat una foto o vídeo amb el mateix nom, trieu entre ometre "
+#~ "el fitxer o afegir un identificador únic."
 
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
 #~ msgstr "<span weight=\"bold\" size=\"x-large\">Miscel·lània</span>"
@@ -4049,6 +4777,7 @@ msgstr ""
 #~ msgid "<i>/media/externaldrive/Photos</i>"
 #~ msgstr "<i>/suports/unitatexterna/Fotos</i>"
 
+#, python-format
 #~ msgid "%(device)s did not unmount"
 #~ msgstr "No es va desmuntar el %(device)s"
 
@@ -4061,6 +4790,7 @@ msgstr ""
 #~ msgid "reset all program settings and preferences and exit"
 #~ msgstr "restableix tots els paràmetres del programa i surt"
 
+#, 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"
 
@@ -4073,38 +4803,45 @@ msgstr ""
 #~ msgid "Move"
 #~ msgstr "Desplaça"
 
+#, python-format
 #~ msgid "Backing up to %(path)s"
 #~ msgstr "S’està copiant en %(path)s"
 
 #~ msgid "Device Detected"
 #~ msgstr "S’ha detectat un dispositiu"
 
+#, python-format
 #~ msgid "Error generating component %s."
 #~ msgstr "S’ha produït un error en generar el component %s."
 
+#, python-format
 #~ msgid "Backing up photos to %(path)s and videos to %(path2)s"
 #~ msgstr "S’estan copiant les fotos en %(path)s i els vídeos en %(path2)s"
 
+#, python-format
 #~ msgid "%(filetype)s metadata cannot be read"
 #~ msgstr "No s’han pogut llegir els metadades de «%(filetype)s»"
 
+#, python-format
 #~ msgid ""
-#~ "This regular expression is invalid, and will be removed unless you "
-#~ "correct it:\n"
+#~ "This regular expression is invalid, and will be removed unless you correct "
+#~ "it:\n"
 #~ " %s"
 #~ msgstr ""
 #~ "Aquesta expressió regular no és vàlida i es treurà si no la corregiu:\n"
 #~ " %s"
 
+#, python-format
 #~ msgid ""
 #~ "The following regular expressions are invalid, and will be removed unless "
 #~ "you correct them:\n"
 #~ " %s"
 #~ msgstr ""
-#~ "Les expressions regulars següents no són vàlides i se suprimiran si no "
-#~ "les corregiu:\n"
+#~ "Les expressions regulars següents no són vàlides i se suprimiran si no les "
+#~ "corregiu:\n"
 #~ " %s"
 
+#, python-format
 #~ msgid "%(filetype)s was already downloaded"
 #~ msgstr "%(filetype)s ja s’havia baixat"
 
diff --git a/po/cs.po b/po/cs.po
index 78f5c86..0822baa 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,35 +7,456 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: damonlynch@gmail.com\n"
-"POT-Creation-Date: 2017-07-08 19:16-0500\n"
-"PO-Revision-Date: 2017-07-05 14:00+0000\n"
-"Last-Translator: Pavel Borecki <Unknown>\n"
+"POT-Creation-Date: 2017-09-12 17:01-0400\n"
+"PO-Revision-Date: 2017-09-13 18:33+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: Czech <cs@li.org>\n"
-"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-07-05 23:04+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-09-26 22:04+0000\n"
+"X-Generator: Launchpad (build 18463)\n"
+"Language: cs\n"
+
+#: ../install.py:65
+msgid "Rapid Photo Downloader installer"
+msgstr "Instalátor aplikace Rapid Photo Downloader"
+
+#: ../install.py:66
+msgid "Download and install latest version of Rapid Photo Downloader."
+msgstr ""
+"Stáhnout a nainstalovat nejnovější verzi aplikace Rapid Photo Downloader."
+
+#: ../install.py:236 ../install.py:1732
+msgid "Installer not found:"
+msgstr "Instalátor nenalezen:"
+
+#. Translators: do not translate the term tar.gz
+#: ../install.py:240 ../install.py:1736
+msgid "Installer not in tar.gz format:"
+msgstr "Instalátor není ve formátu tar.gz:"
+
+#: ../install.py:465
+msgid ""
+"Incorrect folder ownership detected. Changing ownership of and resetting "
+"permissions for"
+msgstr ""
+"Zjištěno nesprávné vlastnictví složky. Vlastnictví bude změněno a přístupová "
+"práva resetována pro"
+
+#: ../install.py:540
+msgid "The following command will be run:"
+msgstr "Bude spuštěn následující příkaz:"
+
+#: ../install.py:543 ../install.py:1479 ../install.py:1484
+msgid "sudo may prompt you for the sudo password."
+msgstr ""
+"sudo vás může vyzvat k zadání hesla k účtu, oprávněného k jeho použití."
+
+#: ../install.py:547
+msgid "Would you like to run the command now?"
+msgstr "Chcete spustit příkaz nyní?"
+
+#: ../install.py:549
+msgid "Answer is not yes, exiting."
+msgstr "Odpověď není ano – ukončuje se."
+
+#: ../install.py:559 ../install.py:751 ../install.py:966
+msgid "Command failed"
+msgstr "Vykonávání příkazu se nezdařilo"
+
+#: ../install.py:561 ../install.py:752 ../install.py:967
+msgid "Exiting"
+msgstr "Ukončování"
+
+#: ../install.py:582
+msgid "The Universe repository must be enabled."
+msgstr "Je třeba zapnout používání repozitáře Universe."
+
+#: ../install.py:606
+msgid ""
+"Do you want to to uninstall the previous version of Rapid Photo Downloader:"
+msgstr "Chcete odinstalovat předchozí verzi Rapid Photo Downloader:"
+
+#: ../install.py:715 ../install.py:740
+msgid ""
+"Querying package system to see if an older version of Rapid Photo Downloader "
+"is installed (this may take a while)..."
+msgstr ""
+"Dotazování systému správy balíčků zda je nainstalovaná starší verze Rapid "
+"Photo Downloader (může to chvíli trvat)…"
+
+#: ../install.py:726
+msgid ""
+"Unable to query package system. Please check your Internet connection and "
+"try again"
+msgstr ""
+"Nedaří se dotázat systému správy balíčků. Zkontrolujte připojení k Internetu "
+"a zkuste to znovu"
+
+#: ../install.py:756
+msgid "Checking if previous version installed with pip..."
+msgstr ""
+"Zjišťování zda předchozí verze byla nainstalovaná pomocí nástroje pip…"
+
+#: ../install.py:850
+msgid "The following package is unknown on your system: {}\n"
+msgstr "Následující balíček je systému neznámý: {}\n"
+
+#: ../install.py:857 ../install.py:929 ../install.py:974
+msgid ""
+"To continue, some packages required to run the application will be installed."
+msgstr ""
+"Aby bylo možné pokračovat, budou nainstalovány balíčky potřebné pro provoz "
+"aplikace."
+
+#: ../install.py:886
+msgid "Querying installed and available packages (this may take a while)"
+msgstr "Zjišťování nainstalovaných a dostupných balíčků (může chvíli trvat)"
+
+#: ../install.py:958
+msgid ""
+"Querying zypper to see if any required packages are already installed (this "
+"may take a while)... "
+msgstr ""
+"Dotazování správce balíčků zypper zda a případně které potřebné balíčky už "
+"jsou nainstalované (může chvíli trvat)… "
+
+#: ../install.py:1004
+msgid "Query to confirm action at each step."
+msgstr "Dotázat se na potvrzení při každém z kroků."
+
+#: ../install.py:1011
+msgid ""
+"When downloading the latest version, install the development version if it "
+"is newer than the stable version."
+msgstr ""
+"Při stahování nejnovější verze, nainstalovat vývojovou verzi pokud je "
+"novější, než ta stabilní."
+
+#: ../install.py:1020
+msgid ""
+"Optional tar.gz Rapid Photo Downloader installer archive. If not specified, "
+"the latest version is downloaded from the Internet."
+msgstr ""
+"Volitelný tar.gz archiv instalátoru Rapid Photo Downloader. Pokud není "
+"zadán, bude z Internetu stažena nejnovější verze."
+
+#: ../install.py:1043
+msgid ""
+"Do not run the installer in the tar.gz Rapid Photo Downloader installer "
+"archive if it is newer than this version ({}). The default is to run "
+"whichever installer is newer."
+msgstr ""
+"Nespouštět instalátor z tar.gz instalačního archivu Rapid Photo Downloader "
+"pokud je novější než tato verze ({}). Výchozím chováním je spustit kterýkoli "
+"novější instalátor."
+
+#: ../install.py:1050
+msgid ""
+"Uninstall Rapid Photo Downloader that was installed with pip, keeping its "
+"dependencies."
+msgstr ""
+"Odinstalovat Rapid Photo Downloader který byl nainstalován pomocí pip s tím, "
+"že zůstanou zachované ostatní součásti, na kterých aplikace závisela."
+
+#: ../install.py:1054
+msgid ""
+"Uninstall the dependencies installed by pip during Rapid Photo Downloader's "
+"installation, and Rapid Photo Downloader itself, then exit."
+msgstr ""
+"Odinstalovat ostatní součásti, na kterých aplikace závisela (nainstalované "
+"pomocí pip), následně aplikaci samotnou a pak skončit."
+
+#: ../install.py:1059
+msgid ""
+"Note: this will not uninstall any version of Rapid Photo Downloader "
+"installed by your Linux distribution's package manager."
+msgstr ""
+"Pozn.: toto nikdy neodebere instalaci Rapid Photo Downloader nainstalovanou "
+"prostřednictvím správy balíčků vámi používané Linuxové distribuce."
+
+#: ../install.py:1066
+msgid ""
+"Dependencies will only be removed if they are not required by other programs."
+msgstr ""
+"Součásti, na kterých aplikace závisela budou odebrány pouze tehdy, pokud "
+"nejsou potřebné pro žádné další programy."
+
+#: ../install.py:1072
+msgid ""
+"Note: this option will remove the dependencies regardless of whether they "
+"are required by another program pip has installed. Upgrade to pip 9.0 or "
+"above if you want to avoid this behavior. You can do so using the command "
+"'python3 -m pip install pip -U --user'. Also note that any version of Rapid "
+"Photo Downloader installed by your Linux distribution's package manager will "
+"not be uninstalled."
+msgstr ""
+"Pozn.: tato předvolba odebere součásti, na kterých aplikace závisela bez "
+"ohledu na to zda jsou potřebné pro další programy které byly nainstalované "
+"pomocí pip. Pokud chcete tomuto chování zamezit, přejděte na verzi pip 9.0 a "
+"novější. Můžete to provést příkazem „python3 -m pip install pip -U --user“. "
+"Také poznamenejme, že nikdy neodebere instalaci Rapid Photo Downloader "
+"nainstalovanou prostřednictvím správy balíčků vámi používané Linuxové "
+"distribuce."
+
+#: ../install.py:1122
+msgid "Failed to download versions file"
+msgstr "Nepodařilo se stáhnout soubor s verzemi"
+
+#: ../install.py:1126
+msgid "Got error code {} while accessing versions file"
+msgstr "Při přístupu k souboru s verzemi obdržen chybový kód {}"
+
+#: ../install.py:1234
+msgid ""
+"Sorry, could not locate installer. Please check your Internet connection and "
+"verify if you can reach https://www.damonlynch.net\n"
+"\n"
+"Exiting.\n"
+msgstr ""
+"Je nám líto, nepodařilo se najít instalátor. Zkontrolujte připojení k "
+"Internetu a ověřte, že je dosažitelný web https://www.damonlynch.net\n"
+"\n"
+"Ukončuje se.\n"
+
+#: ../install.py:1408
+msgid "Installing application requirements..."
+msgstr "Instalace ostatních součástí potřebných pro aplikaci…"
+
+#: ../install.py:1424
+msgid "Received error code"
+msgstr "Obdržen chybový kód"
+
+#: ../install.py:1425
+msgid "Failed to install application requirements: exiting"
+msgstr ""
+"Nepodařilo se nainstalovat ostatní součásti, které aplikace potřebuje: "
+"ukončuje se"
+
+#: ../install.py:1428
+msgid "Installing application..."
+msgstr "Instalace aplikace…"
+
+#: ../install.py:1441
+msgid "Failed to install application: exiting..."
+msgstr "Aplikaci se nepodařilo nainstalovat: ukončování…"
+
+#: ../install.py:1465
+msgid ""
+"You may have to restart the computer to be able to run the program from the "
+"commmand line or application launcher."
+msgstr ""
+"Aby bylo možné aplikaci spustit (z příkazového řádku nebo kliknutím na "
+"zástupce), může být třeba restartovat počítač."
+
+#: ../install.py:1476
+msgid "Do you want to install the application's man pages?"
+msgstr "Přejete si nainstalovat manuálové stránky aplikace?"
+
+#: ../install.py:1477
+msgid "They will be installed into {}"
+msgstr "Budou nainstalovány do {}"
+
+#: ../install.py:1478 ../install.py:1483
+msgid "If you uninstall the application, remove these manpages yourself."
+msgstr "Pokud aplikaci odinstalujete, tyto manuálové stránky potom odeberte."
+
+#: ../install.py:1480
+msgid "Do want to install the man pages?"
+msgstr "Chcete nainstalovat manuálové stránky?"
+
+#: ../install.py:1482
+msgid "Installing man pages into {}"
+msgstr "Instalace manuálových stránek do {}"
+
+#: ../install.py:1499
+msgid "Failed to create man page directory: exiting"
+msgstr "Nepodařilo se vytvořit složku pro manuálovou stránku: ukončuje se"
+
+#: ../install.py:1511
+msgid "Failed to copy man page."
+msgstr "Nepodařilo se zkopírovat manuálovou stránku."
+
+#: ../install.py:1521
+msgid "(If a segmentation fault occurs at exit, you can ignore it...)"
+msgstr ""
+"(Pokud při ukončování dojde k Porušení ochrany paměti (segmentation fault), "
+"nemusíte tomu věnovat pozornost…)"
+
+#: ../install.py:1534
+msgid ""
+"The python3 tool pip is required to uninstall a version of Rapid Photo "
+"Downloader that was installed with pip.\n"
+"Cannot continue. Exiting."
+msgstr ""
+"Pro odebrání instalace Rapid Photo Downloader provedené prostřednictvím "
+"python3 nástroje pip je třeba,\n"
+"aby tento nástroj byl přítomen. Protože tomu tak není, nelze pokračovat a "
+"ukončuje se."
+
+#: ../install.py:1575
+msgid ""
+"Do not run this installer script as sudo / root user.\n"
+"Run it using the user who will run the program.\n"
+msgstr ""
+"Nespouštějte tento instalační skript s právy správy systému (sudo/root).\n"
+"Spusťte ho jako uživatel který bude aplikaci používat.\n"
+
+#: ../install.py:1585 ../install.py:1599
+msgid "Do not include any other command line arguments when specifying"
+msgstr ""
+"Pokud použijete tento, nezadávejte už žádné další argumenty příkazového řádku"
+
+#: ../install.py:1614
+msgid ""
+"Sorry, this installer does not support a custom python installation.\n"
+"Exiting..."
+msgstr ""
+"Je nám líto, ale tento instalátor nepodporuje vlastní instalace python.\n"
+"Ukončuje se…"
+
+#: ../install.py:1620
+msgid "Restarting script using system python..."
+msgstr "Restartování skriptu pomocí systémové instance interpreteru python…"
+
+#: ../install.py:1651
+msgid "Exiting..."
+msgstr "Ukončování..."
+
+#. Translators: do not translate the term python3-apt
+#: ../install.py:1670
+msgid "To continue, the package python3-apt must be installed."
+msgstr ""
+"Aby bylo možné pokračovat, je třeba, aby byl nainstalovaný balíček python3-"
+"apt."
+
+#: ../install.py:1689
+msgid ""
+"Install the following packages using your Linux distribution's standard "
+"package manager, and then rerun this installer"
+msgstr ""
+"Prostřednictvím správy balíčků vámi používané Linuxové distribuce "
+"nainstalujte následující balíčky a spusťte tento instalátor znovu"
+
+#: ../install.py:1698
+msgid ""
+"To run this program, programs to assist Python 3 and its package management "
+"must be installed."
+msgstr ""
+"Pro spuštění této aplikace je třeba, aby byly nainstalované programy které "
+"asistují Python 3 a jeho správa balíčků."
+
+#. Translators: do not translate the terms Python 3, pip and setuptools
+#: ../install.py:1713
+msgid "Python 3's pip and setuptools must be upgraded for your user."
+msgstr ""
+"U jejich instalací pro tohoto uživatele je třeba přejít na novější verze "
+"nástrojů Python 3 pip a setuptools."
+
+#. Translators: do not translate the term python or requests
+#: ../install.py:1726
+msgid "Installing python requests"
+msgstr "Instalace python requests"
+
+#: ../upgrade.py:79
+msgid "Upgrade Rapid Photo Downloader"
+msgstr "Přejít na novější verzi Rapid Photo Downloader"
+
+#: ../upgrade.py:401 ../raphodo/viewutils.py:242
+msgid "&Cancel"
+msgstr "&Storno"
+
+#: ../upgrade.py:405
+msgid "&Upgrade"
+msgstr "&Přejít na novější verzi"
+
+#: ../upgrade.py:410
+#, python-format
+msgid "Click the Upgrade button to upgrade to version %s."
+msgstr "Kliknutím na „Přejít na novější verzi“ přejdete na verzi %s."
+
+#: ../upgrade.py:413
+msgid "Click the Upgrade button to start the upgrade."
+msgstr ""
+"Přechod na novější verzi zahájíte kliknutím na stejnojmenné tlačítko."
+
+#: ../upgrade.py:416 ../upgrade.py:422 ../raphodo/viewutils.py:241
+msgid "&Close"
+msgstr "&Zavřít"
+
+#: ../upgrade.py:417
+msgid "&Run"
+msgstr "&Spustit"
+
+#: ../upgrade.py:447
+msgid "Close Rapid Photo Downloader before running this upgrade"
+msgstr ""
+"Před zahájením přechodu na novější verzi Rapid Photo Downloader ukončete"
+
+#: ../upgrade.py:450
+msgid "Upgrade running..."
+msgstr "Probíhá přechod na novější verzi…"
+
+#: ../upgrade.py:486
+#, python-format
+msgid ""
+"Successfully upgraded to %s. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+"Úspěšně povýšeno na %s. Kliknutím na Zavřít ukončete nebo Spustit aplikaci "
+"spusťte."
+
+#: ../upgrade.py:491
+msgid ""
+"Upgrade finished successfully. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+"Přechod na novější verzi úspěšně dokončen. Kliknutím na Zavřít ukončete nebo "
+"Spustit aplikaci spusťte."
+
+#: ../upgrade.py:495
+msgid "Upgrade failed. Click Close to exit."
+msgstr "Přechod na novější verzi se nezdařil. Kliknutím na Zavřít ukončete."
 
-#. type: QPushButton
-#: ../raphodo/aboutdialog.py:217
+#: ../upgrade.py:6967
+#, python-format
+msgid "Upgrading %s..."
+msgstr "Přechod na novější verzi %s…"
+
+#: ../upgrade.py:6969
+msgid "Press any key to continue..."
+msgstr "Pokračujte stiskem libovolné klávesy…"
+
+#: ../upgrade.py:6982
+msgid "Rapid Photo Downloader upgrade failed"
+msgstr "Přechod na novější verzi Rapid Photo Downloader se nezdařil"
+
+#: ../upgrade.py:6984
+#, python-format
+msgid ""
+"The python package %s could not be updated. The upgrade cannot continue."
+msgstr ""
+"Python balíček %s nebylo možné aktualizovat. Nelze pokračovat v přechodu na "
+"novější verzi."
+
+#: ../raphodo/aboutdialog.py:225
 msgid "Credits"
 msgstr "Poděkování"
 
-#: ../raphodo/backuppanel.py:239
+#: ../raphodo/backuppanel.py:240
 msgid "Backups are not configured"
 msgstr "Zálohy nejsou nastavené"
 
-#: ../raphodo/backuppanel.py:241
+#: ../raphodo/backuppanel.py:242
 msgid "No backup devices detected"
 msgstr "Nebyla zjištěna žádná zálohovací zařízení"
 
-#: ../raphodo/backuppanel.py:243
+#: ../raphodo/backuppanel.py:244
 msgid "Valid backup locations not yet specified"
 msgstr "Doposud jste nezadali platná umístění záloh"
 
-#: ../raphodo/backuppanel.py:401
+#: ../raphodo/backuppanel.py:404
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
@@ -43,18 +464,18 @@ msgstr ""
 "Souběžně s jejich stahováním, fotografie a videa mohou být zálohovány do "
 "vícero umístění naráz – např. na externí pevné disky."
 
-#: ../raphodo/backuppanel.py:407
+#: ../raphodo/backuppanel.py:412
 msgid "Back up photos and videos when downloading"
 msgstr "Stahované fotografie a videa hned zálohovat"
 
-#: ../raphodo/backuppanel.py:413
+#: ../raphodo/backuppanel.py:418
 msgid "Automatically detect backup devices"
 msgstr "Automaticky zjišťovat zálohovací zařízení"
 
-#: ../raphodo/backuppanel.py:417
+#: ../raphodo/backuppanel.py:424
 msgid ""
-"Specify the folder in which backups are stored on the device."
-"<br><br><i>Note: the presence of a folder with this name is used to "
+"Specify the folder in which backups are stored on the "
+"device.<br><br><i>Note: the presence of a folder with this name is used to "
 "determine if 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 folder names. By "
 "adding both folders, the same device can be used to back up both photos and "
@@ -66,77 +487,86 @@ msgstr ""
 "složku s jedním z těchto názvů. Pokud budu přítomny obě složky, zařízení "
 "bude sloužit pro zálohování jak fotografií, tak videí.</i>"
 
-#: ../raphodo/backuppanel.py:428
+#: ../raphodo/backuppanel.py:439
 msgid "Photo folder name:"
 msgstr "Název složky pro fotografie:"
 
-#: ../raphodo/backuppanel.py:433
+#: ../raphodo/backuppanel.py:444
 msgid "Video folder name:"
 msgstr "Název složky pro videa:"
 
-#: ../raphodo/backuppanel.py:438 ../raphodo/nameeditor.py:883
+#: ../raphodo/backuppanel.py:449 ../raphodo/nameeditor.py:890
 #: ../raphodo/renamepanel.py:123
 msgid "Example:"
 msgstr "Příklad:"
 
-#: ../raphodo/backuppanel.py:448
-msgid "If you disable automatic detection, choose the exact backup locations."
+#: ../raphodo/backuppanel.py:460
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr "Pokud vypnete automatické zjišťování, vyberte přesné umístění záloh."
 
-#: ../raphodo/backuppanel.py:452
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:468
 msgid "Photo backup location:"
 msgstr "Umístění záloh fotografií:"
 
-#: ../raphodo/backuppanel.py:454
+#: ../raphodo/backuppanel.py:474
 msgid "Select Photo Backup Location"
 msgstr "Vyberte umístění záloh fotografií"
 
-#: ../raphodo/backuppanel.py:460
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:485
 msgid "Video backup location:"
 msgstr "Umístění záloh videí:"
 
-#: ../raphodo/backuppanel.py:462
+#: ../raphodo/backuppanel.py:491
 msgid "Select Video Backup Location"
 msgstr "Vyberte umístění záloh videí"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:564
+#: ../raphodo/backuppanel.py:595
 msgid "drive1"
 msgstr "úložiště1"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:567
+#: ../raphodo/backuppanel.py:598
 msgid "drive2"
 msgstr "úložiště2"
 
-#: ../raphodo/backuppanel.py:628
+#: ../raphodo/backuppanel.py:663
 msgid "Projected Backup Storage Use"
 msgstr "Předpokládané využití zálohovacího úložiště"
 
-#: ../raphodo/backuppanel.py:632
+#: ../raphodo/backuppanel.py:669
 msgid "Backup Options"
 msgstr "Předvolby zálohování"
 
 #. translators: refers to the video thumbnail file that some
 #. cameras generate -- it has a .THM file extension
-#: ../raphodo/copyfiles.py:476
+#: ../raphodo/copyfiles.py:491
 msgid "video THM"
 msgstr "náhledové video (.THM)"
 
-#: ../raphodo/copyfiles.py:482
+#: ../raphodo/copyfiles.py:497
 msgid "audio"
 msgstr "zvuk"
 
 #: ../raphodo/destinationdisplay.py:78 ../raphodo/devicedisplay.py:1079
-#: ../raphodo/rpdfile.py:321
+#: ../raphodo/rpdfile.py:342
 #, python-format
 msgid "%(no_photos)s Photos"
 msgstr "%(no_photos)s fotografií"
 
 #: ../raphodo/destinationdisplay.py:82 ../raphodo/devicedisplay.py:1081
-#: ../raphodo/rpdfile.py:316
+#: ../raphodo/rpdfile.py:333
 #, python-format
 msgid "%(no_videos)s Videos"
 msgstr "%(no_videos)s videí"
@@ -164,15 +594,15 @@ msgid "%(size_free)s free of %(size_total)s"
 msgstr "%(size_free)s volných z %(size_total)s"
 
 #: ../raphodo/destinationdisplay.py:190 ../raphodo/devicedisplay.py:993
-#: ../raphodo/rapid.py:1964 ../raphodo/rapid.py:2079 ../raphodo/rapid.py:5753
-#: ../raphodo/rpdfile.py:905
+#: ../raphodo/rapid.py:2023 ../raphodo/rapid.py:2151 ../raphodo/rapid.py:6043
+#: ../raphodo/rpdfile.py:930
 msgid "Photos"
 msgstr "Fotografie"
 
 #. translators: the name of the Videos folder
 #: ../raphodo/destinationdisplay.py:191 ../raphodo/devicedisplay.py:994
-#: ../raphodo/rapid.py:1967 ../raphodo/rapid.py:2080 ../raphodo/rapid.py:5754
-#: ../raphodo/rpdfile.py:933 ../raphodo/storage.py:445
+#: ../raphodo/rapid.py:2028 ../raphodo/rapid.py:2152 ../raphodo/rapid.py:6044
+#: ../raphodo/rpdfile.py:958 ../raphodo/storage.py:449
 msgid "Videos"
 msgstr "Videa"
 
@@ -180,7 +610,7 @@ msgstr "Videa"
 msgid "Projected storage use after download"
 msgstr "Předpokládané využití úložiště po dokončení stahování"
 
-#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:516
+#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:521
 msgid "Custom..."
 msgstr "Vlastní…"
 
@@ -218,58 +648,59 @@ msgstr "Znovu prohledat"
 msgid "%s full"
 msgstr "%s zaplněno"
 
-#: ../raphodo/devices.py:459
+#: ../raphodo/devices.py:463
 msgid "Cameras"
 msgstr "Fotoaparáty"
 
-#: ../raphodo/devices.py:460 ../raphodo/devices.py:920
-#: ../raphodo/preferencedialog.py:85 ../raphodo/rapid.py:1927
+#: ../raphodo/devices.py:464 ../raphodo/devices.py:927
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/rapid.py:1979
 msgid "Devices"
 msgstr "Zařízení"
 
-#: ../raphodo/devices.py:720
+#: ../raphodo/devices.py:724
 #, python-format
 msgid "Downloading from %(device_names)s"
 msgstr "Stahování z %(device_names)s"
 
 #. Translators: e.g. Three Devices
-#: ../raphodo/devices.py:780
+#: ../raphodo/devices.py:784
 #, python-format
 msgid "%(no_devices)s %(device_type)s"
 msgstr "%(no_devices)s %(device_type)s"
 
-#: ../raphodo/devices.py:905 ../raphodo/rapid.py:1764
+#: ../raphodo/devices.py:912 ../raphodo/rapid.py:1807
 msgid "Select Source"
 msgstr "Vyberte zdroj"
 
-#: ../raphodo/devices.py:936 ../raphodo/devices.py:947
+#: ../raphodo/devices.py:943 ../raphodo/devices.py:954
 #, python-format
 msgid "%(device1)s + %(device2)s"
 msgstr "%(device1)s + %(device2)s"
 
 #. Number of cameras e.g. 3 Cameras
-#: ../raphodo/devices.py:958
+#: ../raphodo/devices.py:965
 #, python-format
 msgid "%(no_cameras)s Cameras"
 msgstr "%(no_cameras)s fotoaparáty"
 
-#: ../raphodo/devices.py:963
+#: ../raphodo/devices.py:970
 #, python-format
 msgid "%(no_devices)s Devices"
 msgstr "%(no_devices)s zařízení"
 
 #. Translators: two folder names, separated by a plus sign
-#: ../raphodo/devices.py:1258
+#: ../raphodo/devices.py:1265
 #, python-format
 msgid "%s + %s"
 msgstr "%s + %s"
 
-#: ../raphodo/didyouknow.py:44
+#: ../raphodo/didyouknow.py:45
 msgid "Click on a file's checkbox to mark or unmark it for download."
 msgstr ""
 "Kliknutím na zaškrtávací kolonku u souboru ho o(d)značíte pro stahování."
 
-#: ../raphodo/didyouknow.py:50
+#: ../raphodo/didyouknow.py:51
 msgid ""
 "Files that have already been downloaded are remembered. You can still mark "
 "previously downloaded files to download again, but they are unchecked by "
@@ -281,7 +712,7 @@ msgstr ""
 "náhledy jsou vybledlé, takže je snadno rozlišíte od souborů, které zbývá "
 "stáhnout."
 
-#: ../raphodo/didyouknow.py:59
+#: ../raphodo/didyouknow.py:60
 msgid ""
 "If more than one file is selected, they'll all take the mark of the file "
 "whose checkbox was clicked, regardless of whether they previously had a "
@@ -291,7 +722,7 @@ msgstr ""
 "souboru, u kterého bylo kliknuto – nezávisle na tom, zda předtím byly nebo "
 "nebyly zaškrtnuté."
 
-#: ../raphodo/didyouknow.py:67
+#: ../raphodo/didyouknow.py:68
 msgid ""
 "Click on a device's checkbox to quickly mark or unmark all its files for "
 "downloading."
@@ -299,7 +730,60 @@ msgstr ""
 "Zaškrtnutím (respektive jeho zrušením) u daného zařízení je možné rychle "
 "o(d)značit veškeré soubory na něm pro stahování."
 
-#: ../raphodo/didyouknow.py:74
+#: ../raphodo/didyouknow.py:75
+msgid ""
+"After a download finishes, an icon replaces the thumbnail's checkbox. The "
+"icon's color indicates whether the download was successful (green), had file "
+"renaming problems (yellow/orange), or failed (red)."
+msgstr ""
+"Po dokončení stahování je zaškrtávací okénko nahrazeno ikonou. Barva ikony "
+"značí zda bylo stahování úspěšné (zelená), vyskytl se problém s "
+"přejmenováním (žlutá/oranžová) nebo se vůbec nezdařilo (červená)."
+
+#: ../raphodo/didyouknow.py:83
+msgid ""
+"\n"
+"            In case of any problems, a red icon will appear at the bottom of "
+"the window\n"
+"            indicating how many error reports there are. Clicking on it "
+"opens the Error Report \n"
+"            window.\n"
+"            "
+msgstr ""
+"\n"
+"            V případě jakýchkoli problémů se v dolní části okna objeví "
+"červená ikona\n"
+"            s označením kolik chybových hlášení se vyskytlo. Kliknutí na ní "
+"otevře okno s hlášeními chyb.\n"
+"            "
+
+#: ../raphodo/didyouknow.py:91
+msgid ""
+"\n"
+"            The Error Report window lists any problems encountered before, "
+"during or after the \n"
+"            download. An orange triangle represents a warning, a red circle "
+"indicates a failure, \n"
+"            and a black circle indicates more serious failures. You can "
+"click on the hyperlinks to \n"
+"            open its file or device in a file manager. You can also search "
+"the reports using the \n"
+"            search box in the lower left of the Error Report window.\n"
+"            "
+msgstr ""
+"\n"
+"            Okno s chybovými hlášeními vypisuje jakékoli problémy které se "
+"vyskytly před, v průběhu nebo po \n"
+"            stahování. Oranžový trojúhelník přestavuje varování, červený "
+"kruh značí nezdar, \n"
+"            a černý kruh značí závažnější nezdar. Je možné kliknou na "
+"hypertextový odkaz a otevřít \n"
+"            tak jeho soubor nebo zařízení ve správci souborů. V hlášeních je "
+"možné také vyhledávat pomocí \n"
+"            příslušné kolonky vlevo dole okna s chybovými hlášeními.\n"
+"            "
+
+#: ../raphodo/didyouknow.py:103
 msgid ""
 "You can simultaneously download from multiple cameras, smartphones, memory "
 "cards, and hard drives&mdash;as many devices as your computer can handle at "
@@ -309,7 +793,7 @@ msgstr ""
 "a ostatních vnějších úložišť – záleží jen na tom, kolik jich váš počítač "
 "dovede obsloužit naráz."
 
-#: ../raphodo/didyouknow.py:81
+#: ../raphodo/didyouknow.py:110
 msgid ""
 "The <b>Timeline</b> groups photos and videos based on how much time elapsed "
 "between consecutive shots. Use it to identify photos and videos taken at "
@@ -319,7 +803,7 @@ msgstr ""
 "mezi po sobě jdoucími snímky. Použijte ji pro identifikaci fotografií a "
 "videí pořízených v různých obdobích jednoho či vícero po sobě jdoucích dnů."
 
-#: ../raphodo/didyouknow.py:88
+#: ../raphodo/didyouknow.py:117
 msgid ""
 "\n"
 "<p>In the illustration above, the first row of the Timeline is black because "
@@ -339,7 +823,7 @@ msgstr ""
 "pro vytváření časové osy:</p>\n"
 "            "
 
-#: ../raphodo/didyouknow.py:99
+#: ../raphodo/didyouknow.py:128
 msgid ""
 "To view photos and videos for a particular time range, use the mouse "
 "(optionally in combination with the <tt>Shift</tt> or <tt>Ctrl</tt> keys) to "
@@ -351,7 +835,7 @@ msgstr ""
 "je zvoleno časové období, tlačítko Časová osa (na levé straně hlavního okna "
 "aplikace) je zvýrazněno."
 
-#: ../raphodo/didyouknow.py:106
+#: ../raphodo/didyouknow.py:135
 msgid ""
 "A download always includes all files that are checked for download, "
 "including those that are not currently displayed because the Timeline is "
@@ -360,7 +844,7 @@ msgstr ""
 "Stahování vždy zahrnuje veškeré soubory, které jsou označené pro stahování – "
 "včetně těch, které nyní nejsou zobrazené kvůli použití časové osy."
 
-#: ../raphodo/didyouknow.py:113
+#: ../raphodo/didyouknow.py:142
 msgid ""
 "You can hide or display the download sources by clicking on the name of the "
 "device you're downloading from at the top left of the program window."
@@ -368,7 +852,7 @@ msgstr ""
 "Zdroje pro stahování je možné skrýt nebo zobrazit kliknutím na název "
 "zařízení ze kterého stahujete (vlevo nahoře v okně aplikace)."
 
-#: ../raphodo/didyouknow.py:120
+#: ../raphodo/didyouknow.py:149
 msgid ""
 "\n"
 "          Thumbnails can be sorted using a variety of criteria:\n"
@@ -387,12 +871,12 @@ msgid ""
 "</ol> "
 msgstr ""
 "\n"
-"          Náhledové obrázky mohou být řazeny dle různých kritérií:\n"
+"          Náhledové obrázky mohou být řazeny podle různých kritérií:\n"
 "<ol>\n"
-"<li><b>Okamžik úpravy:</b> kdy byl soubor naposledy upraven dle údajů z jeho "
-"vnitřních metadat (pokud \n"
-" jsou k dispozici) nebo dle údajů souborového systému (náhradní řešení).</"
-"li>\n"
+"<li><b>Okamžik úpravy:</b> kdy byl soubor naposledy upraven na základě údajů "
+"z jeho vnitřních metadat (pokud \n"
+" jsou k dispozici) nebo podle údajů souborového systému (náhradní "
+"řešení).</li>\n"
 "<li><b>Zaškrtnuto:</b> zda jsou soubory označené ke stahování.</li>\n"
 "<li><b>Název souboru:</b> úplný název souboru (včetně přípony).</li>\n"
 "<li><b>Přípona:</b> přípona souborů. Je možné použít například pro seskupení "
@@ -402,7 +886,7 @@ msgstr ""
 "stahovány.</li>\n"
 "</ol> "
 
-#: ../raphodo/didyouknow.py:137
+#: ../raphodo/didyouknow.py:166
 msgid ""
 "One of Rapid Photo Downloader's most useful features is its ability to "
 "automatically generate download subfolders and rename files as it downloads, "
@@ -412,29 +896,29 @@ msgstr ""
 "schopnost automatického vytváření podsložek pro stahované soubory a "
 "přejmenovávání těchto souborů dle zvolených schématů."
 
-#: ../raphodo/didyouknow.py:143
+#: ../raphodo/didyouknow.py:172
 msgid ""
 "To specify where you want your files downloaded and how you want them named, "
 "open the appropriate panel on the right-side of the application window: "
 "<b>Destination</b>, <b>Rename</b>, or <b>Job Code</b>."
 msgstr ""
 "Umístění do kterého stahovat soubory a jejich pojmenování určíte v "
-"příslušném panelu na pravé straně okna aplikace: <b>Cíl</b>, <b>Přejmenovat</"
-"b> nebo <b>Štítek</b>."
+"příslušném panelu na pravé straně okna aplikace: <b>Cíl</b>, "
+"<b>Přejmenovat</b> nebo <b>Štítek</b>."
 
-#: ../raphodo/didyouknow.py:150
+#: ../raphodo/didyouknow.py:179
 msgid ""
 "\n"
 "When thinking about your download directory structure, keep in mind two "
 "different types\n"
 "of directory:\n"
 "<ol>\n"
-"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, &quot;"
-"Photos&quot;, or\n"
+"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, "
+"&quot;Photos&quot;, or\n"
 "&quot;Videos&quot;. This directory should already exist on your computer. In "
 "the illustration \n"
-"below, the destination folders are &quot;Pictures&quot; and &quot;"
-"Videos&quot;. The\n"
+"below, the destination folders are &quot;Pictures&quot; and "
+"&quot;Videos&quot;. The\n"
 "name of the destination folder is displayed in the grey bar directly above "
 "the folder tree, \n"
 "with a folder icon to its left and a gear icon to its far right.</li>\n"
@@ -465,7 +949,7 @@ msgstr ""
 "</ol>\n"
 "            "
 
-#: ../raphodo/didyouknow.py:167
+#: ../raphodo/didyouknow.py:196
 msgid ""
 "\n"
 "You can download photos and videos to the same destination folder, or "
@@ -484,7 +968,7 @@ msgstr ""
 "každé jiné schéma.            \n"
 "            "
 
-#: ../raphodo/didyouknow.py:177
+#: ../raphodo/didyouknow.py:206
 msgid ""
 "Automatically generated download subfolders can contain further "
 "automatically generated subfolders if need be. A common scheme is to create "
@@ -494,7 +978,7 @@ msgstr ""
 "obsahovat další takové podsložky. Běžným schématem je vytvořit podsložku s "
 "rokem a v ní následně sérii podsložek rok-mesic-den."
 
-#: ../raphodo/didyouknow.py:186
+#: ../raphodo/didyouknow.py:215
 msgid ""
 "\n"
 "Whenever possible, the program previews the download subfolders of photos "
@@ -524,7 +1008,7 @@ msgstr ""
 "</ol>\n"
 "            "
 
-#: ../raphodo/didyouknow.py:201
+#: ../raphodo/didyouknow.py:230
 msgid ""
 "\n"
 "Download subfolder names are typically generated using some or all of the "
@@ -565,7 +1049,7 @@ msgstr ""
 "usnadňuje řazení ve správci souborů a proto je to výchozí předvolba:\n"
 "            "
 
-#: ../raphodo/didyouknow.py:219
+#: ../raphodo/didyouknow.py:248
 msgid ""
 "\n"
 "To automatically create download subfolders as you download, \n"
@@ -578,11 +1062,11 @@ msgstr ""
 "Pro automatické vytváření podsložek v průběhu stahování je možné použít "
 "jednu z přednastavených \n"
 "sad, přítomných už v aplikaci Rapid Photo Downloader, nebo vytvořit svou \n"
-"vlastní. Kliknutím na ikonu ozubeného kola rozbalíte příslušnou "
-"nabídku:            \n"
+"vlastní. Kliknutím na ikonu ozubeného kola rozbalíte příslušnou nabídku:     "
+"       \n"
 "            "
 
-#: ../raphodo/didyouknow.py:227
+#: ../raphodo/didyouknow.py:256
 msgid ""
 "\n"
 "Using the drop-down menu, select a built-in preset or click on <b>Custom</b> "
@@ -598,7 +1082,7 @@ msgstr ""
 "fotografie nebo videa:             \n"
 "            "
 
-#: ../raphodo/didyouknow.py:237
+#: ../raphodo/didyouknow.py:266
 msgid ""
 "It's easy to download raw images into one folder, and jpeg images into "
 "another. Simply use the <b>Filename Extension</b> as part of your download "
@@ -607,7 +1091,7 @@ msgstr ""
 "Je snadné stáhnout raw obrázky do jedné složky a jpeg do jiné. Stačí použít "
 "<b>Příponu souboru</b> ve schématu vytváření podsložek:"
 
-#: ../raphodo/didyouknow.py:242
+#: ../raphodo/didyouknow.py:271
 msgid ""
 "This illustration shows a saved custom preset named &quot;My custom "
 "preset&quot;."
@@ -615,7 +1099,7 @@ msgstr ""
 "Tato ukázka zobrazuje uloženou vlastní sadu nastavení „Moje vlastní "
 "přednastavená sada“."
 
-#: ../raphodo/didyouknow.py:246
+#: ../raphodo/didyouknow.py:275
 msgid ""
 "\n"
 "You do not have to create nested download subfolders. This illustration "
@@ -631,7 +1115,7 @@ msgstr ""
 "které obsahují pouze datum kdy byly fotografie pořízeny a štítek:\n"
 "            "
 
-#: ../raphodo/didyouknow.py:256
+#: ../raphodo/didyouknow.py:285
 msgid ""
 "\n"
 "Although there are many built-in date/time naming options, you may find that "
@@ -645,8 +1129,8 @@ msgid ""
 "            "
 msgstr ""
 "\n"
-"Ačkoli je k dispozici mnoho předpřipravených šablon pojmenování dle data/"
-"času, je možné, že \n"
+"Ačkoli je k dispozici mnoho předpřipravených šablon pojmenování dle "
+"data/času, je možné, že \n"
 "budete potřebovat něco jiného. Není problém vytvořit svojí vlastní. Je možné "
 "kombinovat datum/čas \n"
 "a vytvářet tak nová spojení. Například když chcete formát data, který "
@@ -656,7 +1140,7 @@ msgstr ""
 "kolem spojovníku):\n"
 "            "
 
-#: ../raphodo/didyouknow.py:265
+#: ../raphodo/didyouknow.py:294
 msgid ""
 "\n"
 "Read more about all the ways you can generate download subfolder names and "
@@ -668,11 +1152,11 @@ msgstr ""
 "\n"
 "Více o všech možných způsobech vytváření názvů podsložek a souborů se "
 "dočtete v <a \n"
-"href=\"http://damonlynch.net/rapid/documentation/#renamedateandtime"
-"\">dokumentaci na webu projektu</a>.\n"
+"href=\"http://damonlynch.net/rapid/documentation/#renamedateandtime\">dokumen"
+"taci na webu projektu</a>.\n"
 "            "
 
-#: ../raphodo/didyouknow.py:273
+#: ../raphodo/didyouknow.py:302
 msgid ""
 "\n"
 "<b>Job Codes</b> let you easily enter text that describes sets of photos and "
@@ -690,7 +1174,7 @@ msgstr ""
 "soubory štítek „Ulice“ \n"
 "a označené soubory dostanou štítek „Ovocny_trh“: \n"
 
-#: ../raphodo/didyouknow.py:282
+#: ../raphodo/didyouknow.py:311
 msgid ""
 "\n"
 "You can apply new or existing Job Codes before you start a download. If "
@@ -708,11 +1192,11 @@ msgstr ""
 "k jeho zadání.\n"
 "            "
 
-#: ../raphodo/didyouknow.py:291
+#: ../raphodo/didyouknow.py:320
 msgid "Look for hints to guide you when working with Job Codes:"
 msgstr "Podívejte se na rady, které vás povedou při práci se štítky:"
 
-#: ../raphodo/didyouknow.py:295
+#: ../raphodo/didyouknow.py:324
 msgid ""
 "Hints will vary depending on the context, such as when the mouse is hovering "
 "over a button."
@@ -720,35 +1204,33 @@ msgstr ""
 "Rady se budou měnit v závislosti na kontextu, například když se ukazatel "
 "ocitne nad tlačítkem."
 
-#: ../raphodo/didyouknow.py:301
+#: ../raphodo/didyouknow.py:330
 msgid ""
 "\n"
 "When you give your photos and videos unique filenames, you'll never be "
 "confused as to \n"
 "which file is which. Using <b>sequence numbers</b> to make filenames unique "
 "is highly \n"
-"recommended!.\n"
+"recommended!\n"
 "            "
 msgstr ""
 "\n"
-"Pokud budete dávat souborům se svými fotografiemi a videi neopakující se "
-"názvy, nikdy \n"
-"nebudete  muset řešit, který soubor je který. Pro tyto účely je vřele "
-"doporučováno \n"
-"používat <b>pořadová čísla</b> a vyhnout se tak stejně pojmenovaným "
-"souborům \n"
-"s rozdílným obsahem!\n"
+"Pokud budete souborům s fotografiemi a videi dávat neopakující se názvy, "
+"nikdy se vám \n"
+"nebude plést který soubor je který. Použití <b>pořadových čísel</b> pro "
+"zajištění toho, \n"
+"že jsou názvy souborů neopakující je velmi doporučeno!\n"
 "            "
 
-#: ../raphodo/didyouknow.py:309
+#: ../raphodo/didyouknow.py:338
 msgid ""
 "\n"
 "<p>Four types of sequence values are available to help you assign unique "
 "names to your photos and \n"
 "videos:\n"
 "<ol>\n"
-"<li><b>Downloads today</b>: tracks downloads completed during that day.</"
-"li>\n"
+"<li><b>Downloads today</b>: tracks downloads completed during that "
+"day.</li>\n"
 "<li><b>Stored number</b>: similar to Downloads today, but it is remembered "
 "from the last time the  \n"
 "program was run.</li>\n"
@@ -776,11 +1258,11 @@ msgstr ""
 "</ol></p>\n"
 "<p>\n"
 "Více o pořadových číslech se dočtete v <a \n"
-"href=\"http://damonlynch.net/rapid/documentation/#sequencenumbers"
-"\">dokumentaci na webu projektu</a>.</p>\n"
+"href=\"http://damonlynch.net/rapid/documentation/#sequencenumbers\">dokumenta"
+"ci na webu projektu</a>.</p>\n"
 "            "
 
-#: ../raphodo/didyouknow.py:327
+#: ../raphodo/didyouknow.py:356
 msgid ""
 "\n"
 "The <b>Rename</b> panel allows you to configure file renaming. To rename "
@@ -794,7 +1276,7 @@ msgstr ""
 "nastavení nebo určit svá vlastní.              \n"
 "            "
 
-#: ../raphodo/didyouknow.py:334
+#: ../raphodo/didyouknow.py:363
 msgid ""
 "\n"
 "<p>The <b>Synchronize RAW + JPEG</b> option is useful if you use the RAW + "
@@ -826,7 +1308,7 @@ msgstr ""
 "webu projektu</a>.</p>\n"
 "            "
 
-#: ../raphodo/didyouknow.py:348
+#: ../raphodo/didyouknow.py:377
 msgid ""
 "\n"
 "You can have your photos and videos backed up to multiple locations as they "
@@ -844,7 +1326,7 @@ msgstr ""
 "je možné zadat přesné umístění záloh.\n"
 "            "
 
-#: ../raphodo/didyouknow.py:356
+#: ../raphodo/didyouknow.py:385
 msgid ""
 "In this example, the drive <b>photobackup</b> does not contain a folder "
 "named <tt>Videos</tt>, so videos will not be backed up to it."
@@ -852,7 +1334,7 @@ msgstr ""
 "V této ukázce, úložiště <b>fotozaloha</b> neobsahuje složku nazvanou "
 "<tt>Videa</tt>, takže videa na něj nebudou zálohována."
 
-#: ../raphodo/didyouknow.py:362
+#: ../raphodo/didyouknow.py:391
 msgid ""
 "\n"
 "Several of the program's preferences can be set from the command line, "
@@ -870,7 +1352,11 @@ msgstr ""
 "a vyčistit mezipaměti a zapamatované soubory.            \n"
 "            "
 
-#: ../raphodo/didyouknow.py:372
+#: ../raphodo/didyouknow.py:396
+msgid "You can also import program preferences from the older 0.4 version."
+msgstr "Je také možné importovat předvolby ze starší verze 0.4."
+
+#: ../raphodo/didyouknow.py:401
 msgid ""
 "\n"
 "Rapid Photo Downloader deals with three types of cache:\n"
@@ -880,8 +1366,8 @@ msgid ""
 "memory cards, and other devices.</li>\n"
 "<li>A <b>temporary cache</b> of files downloaded from a camera, one for "
 "photos and another for \n"
-"videos. They are located in temporary subfolders in the download destination."
-"</li>\n"
+"videos. They are located in temporary subfolders in the download "
+"destination.</li>\n"
 "<li>The <b>desktop's thumbnail cache</b>, in which Rapid Photo Downloader "
 "stores thumbnails of \n"
 "RAW and TIFF photos once they have been downloaded. File browsers like Gnome "
@@ -916,23 +1402,23 @@ msgstr ""
 "webu projektu</a>.\n"
 "            "
 
-#: ../raphodo/didyouknow.py:431
+#: ../raphodo/didyouknow.py:460
 msgid "Tip of the Day"
 msgstr "Tip dne"
 
-#: ../raphodo/didyouknow.py:439
+#: ../raphodo/didyouknow.py:468
 msgid "Did you know...?"
 msgstr "Věděli jste…?"
 
-#: ../raphodo/didyouknow.py:466
+#: ../raphodo/didyouknow.py:495
 msgid "Show tips on startup"
 msgstr "Zobrazovat tipy při spuštění aplikace"
 
-#: ../raphodo/didyouknow.py:470
+#: ../raphodo/didyouknow.py:499
 msgid "&Next"
 msgstr "&Další"
 
-#: ../raphodo/didyouknow.py:471
+#: ../raphodo/didyouknow.py:500
 msgid "&Previous"
 msgstr "&Předchozí"
 
@@ -1039,70 +1525,70 @@ msgstr "%d dny, 1 hodina"
 msgid "%(days)d days, %(hours)d hours"
 msgstr "%(days)d dny, %(hours)d hodin"
 
-#: ../raphodo/errorlog.py:65
+#: ../raphodo/errorlog.py:66
 msgid "Find"
 msgstr "Najít"
 
-#: ../raphodo/errorlog.py:135
+#: ../raphodo/errorlog.py:136
 msgid "Error Reports - Rapid Photo Downloader"
 msgstr "Chybová hlášení – Rapid Photo Downloader"
 
-#: ../raphodo/errorlog.py:170
+#: ../raphodo/errorlog.py:171
 msgid "Find in reports"
 msgstr "Hledat v hlášeních"
 
-#: ../raphodo/errorlog.py:187
+#: ../raphodo/errorlog.py:188
 msgid "Find the previous occurrence of the phrase"
 msgstr "Hledat předchozí výskyt fráze"
 
-#: ../raphodo/errorlog.py:192
+#: ../raphodo/errorlog.py:193
 msgid "Find the next occurrence of the phrase"
 msgstr "Hledat následující výskyt fráze"
 
-#: ../raphodo/errorlog.py:194
+#: ../raphodo/errorlog.py:195
 msgid "&Highlight All"
 msgstr "Zvýraznit všec&hny výskyty"
 
-#: ../raphodo/errorlog.py:195
+#: ../raphodo/errorlog.py:196
 msgid "Highlight all occurrences of the phrase"
 msgstr "Zvýraznit všechny výskyty dané fráze"
 
-#: ../raphodo/errorlog.py:196
+#: ../raphodo/errorlog.py:197
 msgid "&Match Case"
 msgstr "Rozlišovat velikost pís&men"
 
-#: ../raphodo/errorlog.py:197
+#: ../raphodo/errorlog.py:198
 msgid "Search with case sensitivity"
 msgstr "Při hledání rozlišovat velikost písmen"
 
-#: ../raphodo/errorlog.py:198
+#: ../raphodo/errorlog.py:199
 msgid "&Whole Words"
 msgstr "Pouze tato celá slova"
 
-#: ../raphodo/errorlog.py:199
+#: ../raphodo/errorlog.py:200
 msgid "Search whole words only"
 msgstr ""
 "Nevyhledávat jako část jiných slov (příklad: „fit“ jako samostatné slovo, "
 "nikoli obsažené třeba ve „fitcentrum“)"
 
-#: ../raphodo/errorlog.py:209 ../raphodo/errorlog.py:341
+#: ../raphodo/errorlog.py:210 ../raphodo/errorlog.py:345
 #, python-format
 msgid "%s of %s matches"
 msgstr "%s z %s shod"
 
-#: ../raphodo/errorlog.py:228
+#: ../raphodo/errorlog.py:232
 msgid "Clear"
 msgstr "Vyčistit"
 
-#: ../raphodo/errorlog.py:328
+#: ../raphodo/errorlog.py:332
 msgid "Phrase not found"
 msgstr "Fráze nenalezena"
 
-#: ../raphodo/errorlog.py:487
+#: ../raphodo/errorlog.py:491
 msgid "Search pending..."
 msgstr "Hledání…"
 
-#: ../raphodo/errorlog.py:535
+#: ../raphodo/errorlog.py:539
 msgid ""
 "The number of new entries added to the Error Report since it was last open. "
 "Click to open the Error Report."
@@ -1118,8 +1604,8 @@ msgstr "Problém v aplikaci Rapid Photo Downloader"
 #, python-brace-format
 msgid ""
 "<b>A problem occurred in Rapid Photo Downloader</b><br><br>\n"
-"    Please report the problem at <a href=\"{website}\">{website}</a>."
-"<br><br>\n"
+"    Please report the problem at <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
 "    Attach the log file <i>{log_file}</i> to your bug report (click\n"
 "    <a href=\"{log_path}\">here</a> to open the log directory).<br><br>If "
 "the same problem occurs\n"
@@ -1153,7 +1639,7 @@ msgstr ""
 "{log_path}\n"
 "\n"
 
-#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1601
+#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1643
 msgid "Open in File Browser..."
 msgstr "Otevřít ve správci souborů…"
 
@@ -1171,531 +1657,531 @@ msgstr "Jiné…"
 msgid "%s (location does not exist)"
 msgstr "%s (umístění neexistuje)"
 
-#: ../raphodo/generatenameconfig.py:186
+#: ../raphodo/generatenameconfig.py:190
 msgid "Date time"
 msgstr "Datum a čas"
 
-#: ../raphodo/generatenameconfig.py:187
+#: ../raphodo/generatenameconfig.py:191
 msgid "Text"
 msgstr "Text"
 
-#: ../raphodo/generatenameconfig.py:188 ../raphodo/rapid.py:2053
+#: ../raphodo/generatenameconfig.py:192 ../raphodo/rapid.py:2125
 msgid "Filename"
 msgstr "Název souboru"
 
-#: ../raphodo/generatenameconfig.py:189 ../raphodo/preferencedialog.py:488
+#: ../raphodo/generatenameconfig.py:193 ../raphodo/preferencedialog.py:724
 msgid "Metadata"
 msgstr "Metadata"
 
-#: ../raphodo/generatenameconfig.py:190
+#: ../raphodo/generatenameconfig.py:194
 msgid "Sequences"
 msgstr "Pořadová čísla"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: ../raphodo/generatenameconfig.py:193
+#: ../raphodo/generatenameconfig.py:197
 msgid "Job code"
 msgstr "Štítek"
 
-#: ../raphodo/generatenameconfig.py:194
+#: ../raphodo/generatenameconfig.py:198
 msgid "Image date"
 msgstr "Datum obrázku"
 
-#: ../raphodo/generatenameconfig.py:195
+#: ../raphodo/generatenameconfig.py:199
 msgid "Video date"
 msgstr "Datum videa"
 
-#: ../raphodo/generatenameconfig.py:196
+#: ../raphodo/generatenameconfig.py:200
 msgid "Today"
 msgstr "Dnes"
 
-#: ../raphodo/generatenameconfig.py:197
+#: ../raphodo/generatenameconfig.py:201
 msgid "Yesterday"
 msgstr "Včera"
 
 #. Translators: Download time is the time and date that the download started (when the
 #. user clicked the Download button)
-#: ../raphodo/generatenameconfig.py:200
+#: ../raphodo/generatenameconfig.py:204
 msgid "Download time"
 msgstr "Okamžik stažení"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:203
+#: ../raphodo/generatenameconfig.py:207
 msgid "Name"
 msgstr "Název souboru"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:206 ../raphodo/rapid.py:2054
+#: ../raphodo/generatenameconfig.py:210 ../raphodo/rapid.py:2126
 msgid "Extension"
 msgstr "Přípona"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:209
+#: ../raphodo/generatenameconfig.py:213
 msgid "Image number"
 msgstr "Číslo obrázku"
 
-#: ../raphodo/generatenameconfig.py:210
+#: ../raphodo/generatenameconfig.py:214
 msgid "Video number"
 msgstr "Číslo videa"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:213
+#: ../raphodo/generatenameconfig.py:217
 msgid "Aperture"
 msgstr "Clona"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:216
+#: ../raphodo/generatenameconfig.py:220
 msgid "ISO"
 msgstr "Citlivost (ISO)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:219
+#: ../raphodo/generatenameconfig.py:223
 msgid "Exposure time"
 msgstr "Expoziční čas"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:222
+#: ../raphodo/generatenameconfig.py:226
 msgid "Focal length"
 msgstr "Ohnisková vzdálenost"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:225
+#: ../raphodo/generatenameconfig.py:229
 msgid "Camera make"
 msgstr "Výrobce fotoaparátu"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:228
+#: ../raphodo/generatenameconfig.py:232
 msgid "Camera model"
 msgstr "Model fotoaparátu"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:231
+#: ../raphodo/generatenameconfig.py:235
 msgid "Short camera model"
 msgstr "Zkrácené označení modelu fotoaparátu"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:234
+#: ../raphodo/generatenameconfig.py:238
 msgid "Hyphenated short camera model"
 msgstr "Zkrácené označení modelu fotoaparátu včetně části před pomlčkou"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:237
+#: ../raphodo/generatenameconfig.py:241
 msgid "Serial number"
 msgstr "Sériové číslo"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:240
+#: ../raphodo/generatenameconfig.py:244
 msgid "Shutter count"
 msgstr "Počet cyklů závěrky"
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: ../raphodo/generatenameconfig.py:242
+#: ../raphodo/generatenameconfig.py:246
 msgid "File number"
 msgstr "Číslo souboru"
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:244
+#: ../raphodo/generatenameconfig.py:248
 msgid "Folder only"
 msgstr "pouze složka"
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:246
+#: ../raphodo/generatenameconfig.py:250
 msgid "Folder and file"
 msgstr "složka a soubor"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:249
+#: ../raphodo/generatenameconfig.py:253
 msgid "Owner name"
 msgstr "Jméno vlastníka"
 
-#: ../raphodo/generatenameconfig.py:250
+#: ../raphodo/generatenameconfig.py:254
 msgid "Codec"
 msgstr "Kodek"
 
-#: ../raphodo/generatenameconfig.py:251
+#: ../raphodo/generatenameconfig.py:255
 msgid "Width"
 msgstr "Šířka"
 
-#: ../raphodo/generatenameconfig.py:252
+#: ../raphodo/generatenameconfig.py:256
 msgid "Height"
 msgstr "Výška"
 
-#: ../raphodo/generatenameconfig.py:253
+#: ../raphodo/generatenameconfig.py:257
 msgid "Length"
 msgstr "Délka"
 
-#: ../raphodo/generatenameconfig.py:254
+#: ../raphodo/generatenameconfig.py:258
 msgid "Frames Per Second"
 msgstr "Snímků za sekundu"
 
-#: ../raphodo/generatenameconfig.py:255
+#: ../raphodo/generatenameconfig.py:259
 msgid "Artist"
 msgstr "Umělec"
 
-#: ../raphodo/generatenameconfig.py:256
+#: ../raphodo/generatenameconfig.py:260
 msgid "Copyright"
 msgstr "Autorská práva"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:259
+#: ../raphodo/generatenameconfig.py:263
 msgid "Downloads today"
 msgstr "Pořadí v dnes stažených"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:262
+#: ../raphodo/generatenameconfig.py:266
 msgid "Session number"
 msgstr "Pořadí ve stažených nyní"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:265
+#: ../raphodo/generatenameconfig.py:269
 msgid "Subfolder number"
 msgstr "Pořadí v podsložce"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:268
+#: ../raphodo/generatenameconfig.py:272
 msgid "Stored number"
 msgstr "Pořadí ve stažených nyní"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: ../raphodo/generatenameconfig.py:271
+#: ../raphodo/generatenameconfig.py:275
 msgid "Sequence letter"
 msgstr "Pořadí písmeny"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:274
+#: ../raphodo/generatenameconfig.py:278
 msgid "All digits"
 msgstr "všechny číslice"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:277
+#: ../raphodo/generatenameconfig.py:281
 msgid "Last digit"
 msgstr "poslední číslice"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:280
+#: ../raphodo/generatenameconfig.py:284
 msgid "Last 2 digits"
 msgstr "poslední 2 číslice"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:283
+#: ../raphodo/generatenameconfig.py:287
 msgid "Last 3 digits"
 msgstr "poslední 3 číslice"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:286
+#: ../raphodo/generatenameconfig.py:290
 msgid "Last 4 digits"
 msgstr "poslední 4 číslice"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:289
+#: ../raphodo/generatenameconfig.py:293
 msgid "Original Case"
 msgstr "zachovat původní velikost písmen"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:292
+#: ../raphodo/generatenameconfig.py:296
 msgid "UPPERCASE"
 msgstr "VELKÁ PÍSMENA"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:295
+#: ../raphodo/generatenameconfig.py:299
 msgid "lowercase"
 msgstr "malá písmena"
 
-#: ../raphodo/generatenameconfig.py:296
+#: ../raphodo/generatenameconfig.py:300
 msgid "One digit"
 msgstr "jedna číslice"
 
-#: ../raphodo/generatenameconfig.py:297
+#: ../raphodo/generatenameconfig.py:301
 msgid "Two digits"
 msgstr "dvě číslice"
 
-#: ../raphodo/generatenameconfig.py:298
+#: ../raphodo/generatenameconfig.py:302
 msgid "Three digits"
 msgstr "tři číslice"
 
-#: ../raphodo/generatenameconfig.py:299
+#: ../raphodo/generatenameconfig.py:303
 msgid "Four digits"
 msgstr "čtyři číslice"
 
-#: ../raphodo/generatenameconfig.py:300
+#: ../raphodo/generatenameconfig.py:304
 msgid "Five digits"
 msgstr "pět číslic"
 
-#: ../raphodo/generatenameconfig.py:301
+#: ../raphodo/generatenameconfig.py:305
 msgid "Six digits"
 msgstr "šest číslic"
 
-#: ../raphodo/generatenameconfig.py:302
+#: ../raphodo/generatenameconfig.py:306
 msgid "Seven digits"
 msgstr "šedm číslic"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:305
+#: ../raphodo/generatenameconfig.py:309
 msgid "Subseconds"
 msgstr "milisekund"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:308 ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:312 ../raphodo/generatenameconfig.py:393
 msgid "YYYYMMDD"
 msgstr "RRRRMMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:311 ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:315 ../raphodo/generatenameconfig.py:394
 msgid "YYYY-MM-DD"
 msgstr "RRRR-MM-DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:314 ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:318 ../raphodo/generatenameconfig.py:395
 msgid "YYYY_MM_DD"
 msgstr "RRRR_MM_DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:317
+#: ../raphodo/generatenameconfig.py:321
 msgid "YYMMDD"
 msgstr "RRMMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:320
+#: ../raphodo/generatenameconfig.py:324
 msgid "YY-MM-DD"
 msgstr "RR-MM-DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:323
+#: ../raphodo/generatenameconfig.py:327
 msgid "YY_MM_DD"
 msgstr "RR_MM_DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:326
+#: ../raphodo/generatenameconfig.py:330
 msgid "MMDDYYYY"
 msgstr "MMDDRRRR"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:329
+#: ../raphodo/generatenameconfig.py:333
 msgid "MMDDYY"
 msgstr "MMDDRR"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:332
+#: ../raphodo/generatenameconfig.py:336
 msgid "MMDD"
 msgstr "MMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:335
+#: ../raphodo/generatenameconfig.py:339
 msgid "DDMMYYYY"
 msgstr "DDMMRRRR"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:338
+#: ../raphodo/generatenameconfig.py:342
 msgid "DDMMYY"
 msgstr "DDMMRR"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:341 ../raphodo/generatenameconfig.py:389
-#: ../raphodo/generatenameconfig.py:390 ../raphodo/generatenameconfig.py:391
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:345 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:394 ../raphodo/generatenameconfig.py:395
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:397
 msgid "YYYY"
 msgstr "RRRR"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:344
+#: ../raphodo/generatenameconfig.py:348
 msgid "YY"
 msgstr "RR"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:347
+#: ../raphodo/generatenameconfig.py:351
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:350
+#: ../raphodo/generatenameconfig.py:354
 msgid "DD"
 msgstr "DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:353
+#: ../raphodo/generatenameconfig.py:357
 msgid "Month (full)"
 msgstr "měsíc – celý název"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:356
+#: ../raphodo/generatenameconfig.py:360
 msgid "Month (abbreviated)"
 msgstr "měsíc – zkratka"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:359
+#: ../raphodo/generatenameconfig.py:363
 msgid "HHMMSS"
 msgstr "HHMMSS"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:362
+#: ../raphodo/generatenameconfig.py:366
 msgid "HHMM"
 msgstr "HHMM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:365
+#: ../raphodo/generatenameconfig.py:369
 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
-#: ../raphodo/generatenameconfig.py:368
+#: ../raphodo/generatenameconfig.py:372
 msgid "HH-MM"
 msgstr "HH-MM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:371
+#: ../raphodo/generatenameconfig.py:375
 msgid "HH"
 msgstr "HH"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:374
+#: ../raphodo/generatenameconfig.py:378
 msgid "MM (minutes)"
 msgstr "MM – minut"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:377
+#: ../raphodo/generatenameconfig.py:381
 msgid "SS"
 msgstr "SS"
 
-#: ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:393
 msgid "Date"
 msgstr "Datum"
 
-#: ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:394
 msgid "Date (hyphens)"
 msgstr "Datum (se spojovníky)"
 
-#: ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:395
 msgid "Date (underscores)"
 msgstr "Datum (s podtržítky)"
 
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:438
-#: ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:442
+#: ../raphodo/generatenameconfig.py:537
 msgid "Date and Job Code"
 msgstr "Datum a štítek"
 
-#: ../raphodo/generatenameconfig.py:392
+#: ../raphodo/generatenameconfig.py:396
 msgid "YYYYMM_Job Code"
 msgstr "RRRRMM_stitek"
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "Date and Job Code Subfolder"
 msgstr "Datum a podsložka se štítkem"
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "YYYYMM"
 msgstr "RRRRMM"
 
-#: ../raphodo/generatenameconfig.py:393 ../raphodo/jobcodepanel.py:198
-#: ../raphodo/nameeditor.py:827 ../raphodo/rapid.py:1809
+#: ../raphodo/generatenameconfig.py:397 ../raphodo/jobcodepanel.py:199
+#: ../raphodo/nameeditor.py:833 ../raphodo/rapid.py:1852
 #: ../raphodo/renamepanel.py:83 ../raphodo/renamepanel.py:241
 msgid "Job Code"
 msgstr "Štítek"
 
-#: ../raphodo/generatenameconfig.py:433 ../raphodo/generatenameconfig.py:512
+#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:532
 msgid "Original Filename"
 msgstr "Původní název souboru"
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "Date-Time and Downloads today"
 msgstr "Datum-čas a pořadí v dnes stažených"
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "YYYYMMDD-HHMM-1"
 msgstr "RRRRMMDD-HHMM-1"
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "Date and Downloads today"
 msgstr "Datum a pořadí v dnes stažených"
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "YYYYMMDD-1"
 msgstr "RRRRMMDD-1"
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "Date-Time and Image number"
 msgstr "Datum-čas a číslo obrázku"
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "YYYYMMDD-1234"
 msgstr "RRRRMMDD-1234"
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "Date-Time and Job Code"
 msgstr "Datum-čas a štítek"
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "YYYYMMDD-HHMM-Job Code-1"
 msgstr "RRRRMMDD-HHMM-stitek-1"
 
-#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:442 ../raphodo/generatenameconfig.py:537
 msgid "YYYYMMDD-Job Code-1"
 msgstr "RRRRMMDD-stitek-1"
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "Date-Time and Video number"
 msgstr "Datum-čas a číslo videa"
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "YYYYMMDD_1234"
 msgstr "RRRRMMDD_1234"
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "Resolution"
 msgstr "Rozlišení"
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "YYYYMMDD-HHMM-1-1920x1080"
 msgstr "RRRRMMDD-HHMM-1-1920x1080"
 
@@ -1754,26 +2240,27 @@ msgstr "Štítek"
 msgid "&Remember this choice"
 msgstr "Zapamatovat si p&ro příště"
 
-#: ../raphodo/jobcodepanel.py:185
+#: ../raphodo/jobcodepanel.py:186
 msgid ""
 "Select photos and videos to be able to apply a new or existing Job Code to "
 "them."
 msgstr ""
 "Vyberte fotografie a videa na které použít nový nebo existující štítek."
 
-#: ../raphodo/jobcodepanel.py:186
-msgid "The new Job Code will be applied to all selected photos and/or videos."
+#: ../raphodo/jobcodepanel.py:187
+msgid ""
+"The new Job Code will be applied to all selected photos and/or videos."
 msgstr "Nový štítek bude použit na všechny označené fotografie a/nebo videa."
 
-#: ../raphodo/jobcodepanel.py:187
+#: ../raphodo/jobcodepanel.py:188
 msgid ""
 "Click the Apply button to apply the current Job Code to all selected photos "
 "and/or videos. You can also simply double click the Job Code."
 msgstr ""
-"Kliknutím na Použít aplikujete stávající štítek na všechny označené fotky a/"
-"nebo videa. Ještě jednodušeji pak dvojklikem na štítek."
+"Kliknutím na Použít aplikujete stávající štítek na všechny označené fotky "
+"a/nebo videa. Ještě jednodušeji pak dvojklikem na štítek."
 
-#: ../raphodo/jobcodepanel.py:189
+#: ../raphodo/jobcodepanel.py:190
 msgid ""
 "Removing a Job Code removes it only from the list of saved Job Codes, not "
 "from any photos or videos that it may have been applied to."
@@ -1781,7 +2268,7 @@ msgstr ""
 "Odebrání štítku ho odebere pouze ze seznamu uložených štítků, nikoli z "
 "fotografií či videí, na které mohl být použit."
 
-#: ../raphodo/jobcodepanel.py:191
+#: ../raphodo/jobcodepanel.py:192
 msgid ""
 "If you want to use Job Codes, configure file renaming or destination "
 "subfolder names to use them."
@@ -1789,48 +2276,48 @@ msgstr ""
 "Pokud chcete používat štítky, nastavte přejmenovávání a/nebo pojmenovávání "
 "cílových podsložek tak, aby je používalo."
 
-#: ../raphodo/jobcodepanel.py:197
+#: ../raphodo/jobcodepanel.py:198
 msgid "Last Used"
 msgstr "Posledně použito"
 
-#: ../raphodo/jobcodepanel.py:202
+#: ../raphodo/jobcodepanel.py:203
 msgid "Job Code Sort:"
 msgstr "Řazení štítků:"
 
-#: ../raphodo/jobcodepanel.py:205 ../raphodo/rapid.py:2061
+#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2133
 msgid "Ascending"
 msgstr "Vzestupně"
 
-#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2062
+#: ../raphodo/jobcodepanel.py:207 ../raphodo/rapid.py:2134
 msgid "Descending"
 msgstr "Sestupně"
 
-#: ../raphodo/jobcodepanel.py:216
+#: ../raphodo/jobcodepanel.py:217
 msgid "&New..."
 msgstr "&Nový…"
 
-#: ../raphodo/jobcodepanel.py:220
+#: ../raphodo/jobcodepanel.py:221
 msgid "&Apply"
 msgstr "Použít"
 
-#: ../raphodo/jobcodepanel.py:224
+#: ../raphodo/jobcodepanel.py:225
 msgid "&Remove"
 msgstr "Odeb&rat"
 
-#: ../raphodo/jobcodepanel.py:228 ../raphodo/preferencedialog.py:125
-#: ../raphodo/preferencedialog.py:154 ../raphodo/preferencedialog.py:433
+#: ../raphodo/jobcodepanel.py:229 ../raphodo/preferencedialog.py:200
+#: ../raphodo/preferencedialog.py:229 ../raphodo/preferencedialog.py:531
 msgid "Remove All"
 msgstr "Odebrat vse"
 
-#: ../raphodo/jobcodepanel.py:427
+#: ../raphodo/jobcodepanel.py:428
 msgid "Do you really want to remove all the Job Codes?"
 msgstr "Opravdu odstranit veškeré štítky?"
 
-#: ../raphodo/jobcodepanel.py:429
+#: ../raphodo/jobcodepanel.py:430
 msgid "Remove all Job Codes"
 msgstr "Odebrat veškeré štítky"
 
-#: ../raphodo/jobcodepanel.py:492
+#: ../raphodo/jobcodepanel.py:493
 msgid "Job Codes"
 msgstr "Štítky"
 
@@ -1841,42 +2328,58 @@ msgstr "Štítky"
 msgid "<i><b>Hint:</b> %(message)s"
 msgstr "<i><b>Rada:</b> %(message)s"
 
-#: ../raphodo/nameeditor.py:418 ../raphodo/nameeditor.py:432
+#: ../raphodo/nameeditor.py:423 ../raphodo/nameeditor.py:437
 #, python-format
 msgid "%(description)s - %(elements)s"
 msgstr "%(description)s - %(elements)s"
 
-#: ../raphodo/nameeditor.py:512
+#: ../raphodo/nameeditor.py:517
 msgid "Save New Custom Preset..."
 msgstr "Uložit jako novou vlastní přednastavenou sadu…"
 
-#: ../raphodo/nameeditor.py:513
+#: ../raphodo/nameeditor.py:518
 msgid "Remove All Custom Presets..."
 msgstr "Odstranit veškeré vlastní přednastavené sady…"
 
-#: ../raphodo/nameeditor.py:559
+#: ../raphodo/nameeditor.py:564
 msgid "(New Custom Preset)"
 msgstr "(nová vlastní přednastavená sada)"
 
-#: ../raphodo/nameeditor.py:576
+#: ../raphodo/nameeditor.py:581
 #, python-format
 msgid "%s (edited)"
 msgstr "%s (upraveno)"
 
-#: ../raphodo/nameeditor.py:579 ../raphodo/nameeditor.py:1370
+#: ../raphodo/nameeditor.py:584 ../raphodo/nameeditor.py:1379
 #, python-format
 msgid "Update Custom Preset \"%s\""
 msgstr "Aktualizovat vlastní přednastavenou sadu „%s“"
 
-#: ../raphodo/nameeditor.py:667
+#: ../raphodo/nameeditor.py:672
 msgid "Save New Custom Preset - Rapid Photo Downloader"
 msgstr "Uložit novou vlastní přednastavenou sadu – Rapid Photo Downloader"
 
-#: ../raphodo/nameeditor.py:675
+#: ../raphodo/nameeditor.py:680
 msgid "Preset Name:"
 msgstr "Název přednastavené sady"
 
-#: ../raphodo/nameeditor.py:836
+#: ../raphodo/nameeditor.py:799
+msgid "Photo Subfolder Generation Editor"
+msgstr "Editor pravidel vytváření podsložek pro fotografie"
+
+#: ../raphodo/nameeditor.py:805
+msgid "Video Subfolder Generation Editor"
+msgstr "Editor pravidel vytváření podsložek pro videa"
+
+#: ../raphodo/nameeditor.py:811
+msgid "Photo Renaming Editor"
+msgstr "Editor pravidel přejmenovávání fotografií"
+
+#: ../raphodo/nameeditor.py:817
+msgid "Video Renaming Editor"
+msgstr "Editor pravidel přejmenovávání videí"
+
+#: ../raphodo/nameeditor.py:842
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>There is insufficient data to "
 "fully generate the name. Please use other renaming options.</i>"
@@ -1887,7 +2390,7 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees.
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:846
+#: ../raphodo/nameeditor.py:853
 #, python-format
 msgid "The character</i> %(separator)s <i>creates a new subfolder level."
 msgstr "Znak</i> %(separator)s <i>vytvoří další podúroveň složek."
@@ -1895,7 +2398,7 @@ msgstr "Znak</i> %(separator)s <i>vytvoří další podúroveň složek."
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:851
+#: ../raphodo/nameeditor.py:858
 #, python-format
 msgid ""
 "There is no need start or end with the folder separator </i> "
@@ -1904,7 +2407,7 @@ msgstr ""
 "Není třeba uvozovat či uzavírat oddělovačem složek </i> %(separator)s<i>, "
 "protože je přidáván automaticky."
 
-#: ../raphodo/nameeditor.py:859
+#: ../raphodo/nameeditor.py:866
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>Unique filenames may not be "
 "generated. Make filenames unique by using Sequence values.</i>"
@@ -1912,40 +2415,40 @@ msgstr ""
 "<b><font color=\"red\">Varování:</font></b> <i>Není zaručeno, že vytvořené "
 "názvy se nebudou opakovat. Nápravu zajistíte použitím pořadových hodnot.</i>"
 
-#: ../raphodo/nameeditor.py:882 ../raphodo/renamepanel.py:121
+#: ../raphodo/nameeditor.py:889 ../raphodo/renamepanel.py:121
 msgid "Preset:"
 msgstr "Přednastavená sada:"
 
 #. Translators: appears in a combobox, e.g. Image Date (YYYY)
-#: ../raphodo/nameeditor.py:959 ../raphodo/nameeditor.py:980
+#: ../raphodo/nameeditor.py:966 ../raphodo/nameeditor.py:987
 #, python-brace-format
 msgid "{choice} ({variant})"
 msgstr "{choice} ({variant})"
 
-#: ../raphodo/nameeditor.py:1005 ../raphodo/preferencedialog.py:530
+#: ../raphodo/nameeditor.py:1012 ../raphodo/preferencedialog.py:783
 msgid "Get help online..."
 msgstr "Získat nápovědu z webu projektu…"
 
-#: ../raphodo/nameeditor.py:1025
+#: ../raphodo/nameeditor.py:1034
 msgid "Insert"
 msgstr "Vložit"
 
-#: ../raphodo/nameeditor.py:1351
+#: ../raphodo/nameeditor.py:1360
 msgid "Save Preset - Rapid Photo Downloader"
 msgstr "Uložit přednastavenou sadu – Rapid Photo Downloader"
 
-#: ../raphodo/nameeditor.py:1356
+#: ../raphodo/nameeditor.py:1365
 msgid ""
-"<b>Do you want to save the changes in a new custom preset?</"
-"b><br><br>Creating a custom preset is not required, but can help you keep "
-"organized.<br><br>The changes to the preferences will still be applied "
-"regardless of whether you create a new custom preset or not."
+"<b>Do you want to save the changes in a new custom "
+"preset?</b><br><br>Creating a custom preset is not required, but can help "
+"you keep organized.<br><br>The changes to the preferences will still be "
+"applied regardless of whether you create a new custom preset or not."
 msgstr ""
 "<b>Uložit změny ve vlastní přednastavené sadě?</b><br><br>Vytváření sady "
 "není vyžadováno, ale napomáhá v udržení pořádku.<br><br>Změny předvoleb "
 "budou nyní použity ať už sadu vytvoříte nebo ne."
 
-#: ../raphodo/nameeditor.py:1365
+#: ../raphodo/nameeditor.py:1374
 msgid ""
 "<b>Do you want to save the changes in a custom preset?</b><br><br>If you "
 "like, you can create a new custom preset or update the existing custom "
@@ -1953,98 +2456,104 @@ msgid ""
 "regardless of whether you save a custom preset or not."
 msgstr ""
 "<b>Uložit změny ve vlastní přednastavené sadě?</b><br><br>Pokud chcete, "
-"můžete vytvořit novou vlastní sadu nebo aktualizovat tu stávající."
-"<br><br>Změny předvoleb budou nyní použity ať už sadu uložíte nebo ne."
+"můžete vytvořit novou vlastní sadu nebo aktualizovat tu "
+"stávající.<br><br>Změny předvoleb budou nyní použity ať už sadu uložíte nebo "
+"ne."
 
-#: ../raphodo/nameeditor.py:1372
+#: ../raphodo/nameeditor.py:1381
 msgid "Save New Custom Preset"
 msgstr "Uložit novou přednastavenou sadu"
 
-#: ../raphodo/newversion.py:306
+#: ../raphodo/newversion.py:312
 msgid "Checking for new version..."
 msgstr "Zjišťování případné nové verze…"
 
-#: ../raphodo/newversion.py:307
+#: ../raphodo/newversion.py:313
 msgid "You are running the latest version."
 msgstr "Provozujete nejnovější verzi."
 
-#: ../raphodo/newversion.py:308
+#: ../raphodo/newversion.py:314
 msgid "Failed to contact the update server."
 msgstr "Nepodařilo se kontaktovat aktualizační server."
 
-#: ../raphodo/newversion.py:310
+#: ../raphodo/newversion.py:316
 #, python-format
 msgid "A new version of Rapid Photo Downloader (%s) is available."
 msgstr "Je k dispozici nová verze aplikace Rapid Photo Downloader (%s)."
 
-#: ../raphodo/newversion.py:312
+#: ../raphodo/newversion.py:318
 msgid "Do you want to download the new version?"
 msgstr "Stáhnout novou verzi?"
 
-#: ../raphodo/newversion.py:313
+#: ../raphodo/newversion.py:319
 #, python-format
 msgid "Changes in the new release can be viewed <a href=\"%s\">here</a>."
 msgstr "Změny v novém vydání je možné zobrazit <a href=\"%s\">zde</a>."
 
 #. Translators: this text appears in a button - the & sets the s key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:340 ../raphodo/newversion.py:353
+#: ../raphodo/newversion.py:348 ../raphodo/newversion.py:363
 msgid "&Skip this release"
 msgstr "Pře&skočit tuto verzi"
 
 #. Translators: this text appears in a button - the & sets the o key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:356
+#: ../raphodo/newversion.py:366
 msgid "&Open Download Page"
 msgstr "&Otevřít stránku stahování"
 
-#: ../raphodo/newversion.py:376
+#: ../raphodo/newversion.py:386
 msgid "Rapid Photo Downloader updates"
 msgstr "Aktualizace aplikace Rapid Photo Downloader"
 
 #. Translators: shows how much of a file has been downloaded e.g  123 KB of 1.3 MB
-#: ../raphodo/newversion.py:478
+#: ../raphodo/newversion.py:488
 #, python-format
 msgid "%(downloaded)s of %(total)s"
 msgstr "%(downloaded)s z %(total)s"
 
-#: ../raphodo/newversion.py:495
+#: ../raphodo/newversion.py:507
 msgid "Downloading..."
 msgstr "Stahování…"
 
-#: ../raphodo/preferencedialog.py:76
+#: ../raphodo/preferencedialog.py:86
 msgid "Preferences"
 msgstr "Předvolby"
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Automation"
 msgstr "Automatizace"
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Thumbnails"
 msgstr "Náhledy"
 
-#: ../raphodo/preferencedialog.py:85 ../raphodo/preferencedialog.py:343
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/preferencedialog.py:428
 msgid "Error Handling"
 msgstr "Reakce na chyby"
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Warnings"
 msgstr "Varování"
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:109
+msgid "Consolidation"
+msgstr "Konsolidace"
+
+#: ../raphodo/preferencedialog.py:109 ../raphodo/preferencedialog.py:119
 msgid "Miscellaneous"
 msgstr "Různé"
 
-#: ../raphodo/preferencedialog.py:94
+#: ../raphodo/preferencedialog.py:147
 msgid "Device Scanning"
 msgstr "Prohledávání zařízení"
 
-#: ../raphodo/preferencedialog.py:96
+#: ../raphodo/preferencedialog.py:148
 msgid "Scan only external devices"
 msgstr "Prohledávat pouze vnější zařízení"
 
-#: ../raphodo/preferencedialog.py:98
+#: ../raphodo/preferencedialog.py:150
 msgid ""
 "Scan for photos and videos only on devices that are external to the "
 "computer,\n"
@@ -2055,39 +2564,77 @@ msgstr ""
 "včetně fotoaparátů, paměťových karet, externích pevných disků a USB flash "
 "klíčenek."
 
-#: ../raphodo/preferencedialog.py:102
-msgid "Scan non-camera devices lacking a DCIM folder"
-msgstr ""
-"Hledat na zařízeních která nejsou fotoaparát a postrádají tak složku DCIM"
+#: ../raphodo/preferencedialog.py:153
+msgid "Scan only specific folders on devices"
+msgstr "Skenovat pouze určité složky na zařízeních"
 
-#: ../raphodo/preferencedialog.py:104
+#: ../raphodo/preferencedialog.py:155
 msgid ""
-"Scan the entirety of a device for photos and videos, irrespective of whether "
-"it contains a DCIM folder,\n"
-"as opposed to only scanning within a DCIM folder.\n"
+"Scan for photos and videos only in the folders specified below (except "
+"paths\n"
+"specified in Ignored Paths).\n"
+"\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+"Skenovat na přítomnost fotografií a videí pouze v níže uvedených složkách "
+"(s\n"
+"výjimkou těch určených v Ignorovaných umístěních).\n"
 "\n"
-"Changing this setting causes all devices to be scanned again.\n"
+"Změna tohoto nastavení způsobí že veškerá zařízení budou znovu proskenována."
+
+#: ../raphodo/preferencedialog.py:161
+msgid "Folders to scan:"
+msgstr "Složky které skenovat:"
+
+#: ../raphodo/preferencedialog.py:164
+msgid ""
+"Folders at the base level of device file systems that will be scanned\n"
+"for photos and videos."
+msgstr ""
+"Složky v nejvyšší úrovni stromu souborových systémů na zařízeních ve\n"
+"kterých bude skenováno na přítomnost fotografií a videí."
+
+#: ../raphodo/preferencedialog.py:167 ../raphodo/preferencedialog.py:219
+msgid "Add..."
+msgstr "Přidat…"
+
+#: ../raphodo/preferencedialog.py:169
+msgid ""
+"Add a folder to the list of folders to scan for photos and videos.\n"
 "\n"
-"Note: With cameras, only the DCIM folder is scanned."
+"Changing this setting causes all devices to be scanned again."
 msgstr ""
-"Hledat fotografie a videa napříč celým zařízení, bez ohledu zda obsahuje "
-"složku nazvanou DCIM,\n"
-"oproti hledání pouze v rámci takové složky.\n"
+"Přidat složku ze seznamu těch ke skenování na přítomnost fotografií a "
+"videí.\n"
+"\n"
+"Změna tohoto nastavení způsobí že veškerá zařízení budou znovu proskenována."
+
+#: ../raphodo/preferencedialog.py:172 ../raphodo/preferencedialog.py:198
+#: ../raphodo/preferencedialog.py:224 ../raphodo/preferencedialog.py:529
+msgid "Remove"
+msgstr "Odebrat"
+
+#: ../raphodo/preferencedialog.py:174
+msgid ""
+"Remove a folder from the list of folders to scan for photos and videos.\n"
 "\n"
-"Změna tohoto nastavení vyvolá opětovné prohledání všech zařízení.\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+"Odebrat složku ze seznamu těch ke skenování na přítomnost fotografií a "
+"videí.\n"
 "\n"
-"Pozn.: V případě fotoaparátů budou prohledávány pouze složky DCIM."
+"Změna tohoto nastavení způsobí že veškerá zařízení budou znovu proskenována."
 
-#: ../raphodo/preferencedialog.py:116
+#: ../raphodo/preferencedialog.py:191
 msgid "Devices that have been set to automatically ignore or download from."
 msgstr ""
 "Zařízení pro které bylo nastaveno automatické ignorování nebo stahování."
 
-#: ../raphodo/preferencedialog.py:117
+#: ../raphodo/preferencedialog.py:192
 msgid "Remembered Devices"
 msgstr "Zapamatovaná zařízení"
 
-#: ../raphodo/preferencedialog.py:121
+#: ../raphodo/preferencedialog.py:196
 msgid ""
 "Remove a device from the list of devices to automatically ignore or download "
 "from."
@@ -2095,12 +2642,7 @@ msgstr ""
 "Odebrat zařízení ze seznamu těch, která automaticky ignorovat / ze kterých "
 "stahovat."
 
-#: ../raphodo/preferencedialog.py:123 ../raphodo/preferencedialog.py:149
-#: ../raphodo/preferencedialog.py:431
-msgid "Remove"
-msgstr "Odebrat"
-
-#: ../raphodo/preferencedialog.py:127
+#: ../raphodo/preferencedialog.py:202
 msgid ""
 "Clear the list of devices from which to automatically ignore or download "
 "from.\n"
@@ -2112,22 +2654,18 @@ msgstr ""
 "Pozn.: Změny se projeví až při příštím vyhledání zařízení, připojených k "
 "počítači."
 
-#: ../raphodo/preferencedialog.py:140
+#: ../raphodo/preferencedialog.py:215
 msgid "Ignored Paths"
 msgstr "Popisy ignorovaných umístění"
 
-#: ../raphodo/preferencedialog.py:141
+#: ../raphodo/preferencedialog.py:216
 msgid ""
 "The end part of a path that should never be scanned for photos or videos."
 msgstr ""
 "Koncová část popisu umístění, ve kterém by nikdy neměly být hledány "
 "fotografie nebo videa."
 
-#: ../raphodo/preferencedialog.py:144
-msgid "Add..."
-msgstr "Přidat…"
-
-#: ../raphodo/preferencedialog.py:146
+#: ../raphodo/preferencedialog.py:221
 msgid ""
 "Add a path to the list of paths to ignore.\n"
 "\n"
@@ -2137,7 +2675,7 @@ msgstr ""
 "\n"
 "Změna tohoto nastavení vyvolá opětovné prohledání všech zařízení."
 
-#: ../raphodo/preferencedialog.py:151
+#: ../raphodo/preferencedialog.py:226
 msgid ""
 "Remove a path from the list of paths to ignore.\n"
 "\n"
@@ -2147,7 +2685,7 @@ msgstr ""
 "\n"
 "Změna tohoto nastavení vyvolá opětovné prohledání všech zařízení."
 
-#: ../raphodo/preferencedialog.py:156
+#: ../raphodo/preferencedialog.py:231
 msgid ""
 "Clear the list of paths to ignore.\n"
 "\n"
@@ -2157,16 +2695,17 @@ msgstr ""
 "\n"
 "Změna tohoto nastavení vyvolá opětovné prohledání všech zařízení."
 
-#: ../raphodo/preferencedialog.py:164
+#: ../raphodo/preferencedialog.py:239
 msgid ""
-"Use python-style <a href=\"http://damonlynch.net/rapid/documentation/"
-"#regularexpressions\">regular expressions</a>"
+"Use python-style <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">regula"
+"r expressions</a>"
 msgstr ""
-"Používat <a href=\"http://damonlynch.net/rapid/documentation/"
-"#regularexpressions\">regulární výrazy</a> ve stylu programovacího jazyka "
-"Python."
+"Používat <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">regulá"
+"rní výrazy</a> ve stylu programovacího jazyka Python."
 
-#: ../raphodo/preferencedialog.py:168
+#: ../raphodo/preferencedialog.py:243
 msgid ""
 "Use regular expressions in the list of ignored paths.\n"
 "\n"
@@ -2176,47 +2715,47 @@ msgstr ""
 "\n"
 "Změna tohoto nastavení vyvolá opětovné prohledání všech zařízení."
 
-#: ../raphodo/preferencedialog.py:208
+#: ../raphodo/preferencedialog.py:283
 msgid "Program Automation"
 msgstr "Automatizace v aplikaci"
 
-#: ../raphodo/preferencedialog.py:209
+#: ../raphodo/preferencedialog.py:284
 msgid "Start downloading at program startup"
 msgstr "Zahájit stahování při spouštění aplikace"
 
-#: ../raphodo/preferencedialog.py:210
+#: ../raphodo/preferencedialog.py:285
 msgid "Start downloading upon device insertion"
 msgstr "Při připojení zařízení zahájit stahování"
 
-#: ../raphodo/preferencedialog.py:211
+#: ../raphodo/preferencedialog.py:286
 msgid "Unmount (eject) device upon download completion"
 msgstr "Po dokončení stahování odpojit (umount) souborový systém zařízení"
 
-#: ../raphodo/preferencedialog.py:212
+#: ../raphodo/preferencedialog.py:287
 msgid "Exit program when download completes"
 msgstr "Po dokončení stahování aplikaci ukončit"
 
-#: ../raphodo/preferencedialog.py:213
+#: ../raphodo/preferencedialog.py:288
 msgid "Exit program even if download had warnings or errors"
 msgstr "Ukončit aplikaci i když stahování skončilo s varováními nebo chybami"
 
-#: ../raphodo/preferencedialog.py:240
+#: ../raphodo/preferencedialog.py:315
 msgid "Thumbnail Generation"
 msgstr "Vytváření náhledových obrázků"
 
-#: ../raphodo/preferencedialog.py:241
+#: ../raphodo/preferencedialog.py:316
 msgid "Generate thumbnails"
 msgstr "Vytvářet náhledové obrázky"
 
-#: ../raphodo/preferencedialog.py:242
+#: ../raphodo/preferencedialog.py:318
 msgid "Generate thumbnails to show in the main program window"
 msgstr "Vytvořit náhledové obrázky pro zobrazování v hlavním okně aplikace"
 
-#: ../raphodo/preferencedialog.py:244
+#: ../raphodo/preferencedialog.py:320
 msgid "Cache thumbnails"
 msgstr "Ukládat náhledové obrázky do mezipaměti"
 
-#: ../raphodo/preferencedialog.py:245
+#: ../raphodo/preferencedialog.py:323
 msgid ""
 "Save thumbnails shown in the main program window in a thumbnail cache unique "
 "to Rapid Photo Downloader"
@@ -2224,11 +2763,11 @@ msgstr ""
 "Uložit náhledové obrázky pro zobrazování v hlavním okně aplikace do "
 "mezipaměti náhledů, určené jen pro aplikaci Rapid Photo Downloader"
 
-#: ../raphodo/preferencedialog.py:247
+#: ../raphodo/preferencedialog.py:327
 msgid "Generate system thumbnails"
 msgstr "Vytvářet náhledové obrázky pro systém"
 
-#: ../raphodo/preferencedialog.py:248
+#: ../raphodo/preferencedialog.py:330
 msgid ""
 "While downloading, save thumbnails that can be used by desktop file managers "
 "and other programs"
@@ -2236,79 +2775,79 @@ msgstr ""
 "Při stahování ukládat náhledové obrázky které mohou být použity správci "
 "souborů a dalšími aplikacemi"
 
-#: ../raphodo/preferencedialog.py:255
+#: ../raphodo/preferencedialog.py:339
 msgid "Number of CPU cores used to generate thumbnails."
 msgstr ""
 "Počet jader procesoru jejichž výpočetní výkon využít pro vytváření "
 "náhledových obrázků."
 
-#: ../raphodo/preferencedialog.py:256
+#: ../raphodo/preferencedialog.py:340
 msgid "CPU cores:"
 msgstr "Jader procesoru:"
 
 #. Translators: the * acts as an asterisk to denote a reference to an annotation
 #. such as '* Takes effect upon program restart'
-#: ../raphodo/preferencedialog.py:271 ../raphodo/preferencedialog.py:317
+#: ../raphodo/preferencedialog.py:355 ../raphodo/preferencedialog.py:401
 msgid "*"
 msgstr "*"
 
-#: ../raphodo/preferencedialog.py:294
+#: ../raphodo/preferencedialog.py:378
 msgid "Thumbnail Cache"
 msgstr "Mezipaměť náhledových obrázků"
 
-#: ../raphodo/preferencedialog.py:296
+#: ../raphodo/preferencedialog.py:380
 msgid "Calculating..."
 msgstr "Výpočet…"
 
-#: ../raphodo/preferencedialog.py:302
+#: ../raphodo/preferencedialog.py:386
 msgid "days"
 msgstr "dnů"
 
-#: ../raphodo/preferencedialog.py:303
+#: ../raphodo/preferencedialog.py:387
 msgid "forever"
 msgstr "napořád"
 
-#: ../raphodo/preferencedialog.py:308
+#: ../raphodo/preferencedialog.py:392
 msgid "Cache size:"
 msgstr "Velikost mezipaměti:"
 
-#: ../raphodo/preferencedialog.py:310
+#: ../raphodo/preferencedialog.py:394
 msgid "Number of thumbnails:"
 msgstr "Počet náhledových obrázků:"
 
-#: ../raphodo/preferencedialog.py:312
+#: ../raphodo/preferencedialog.py:396
 msgid "Database size:"
 msgstr "Velikost databáze:"
 
-#: ../raphodo/preferencedialog.py:314
+#: ../raphodo/preferencedialog.py:398
 msgid "Cache unaccessed thumbnails for:"
 msgstr "Uchovávat nepoužívané náhledové obrázky po dobu:"
 
-#: ../raphodo/preferencedialog.py:322
+#: ../raphodo/preferencedialog.py:406
 msgid "Purge Cache..."
 msgstr "Vyčistit mezipaměť…"
 
-#: ../raphodo/preferencedialog.py:323
+#: ../raphodo/preferencedialog.py:408
 msgid "Optimize Cache..."
 msgstr "Optimalizovat mezipaměť…"
 
-#: ../raphodo/preferencedialog.py:336
+#: ../raphodo/preferencedialog.py:421
 msgid "* Takes effect upon program restart"
 msgstr "* Projeví se až po restartu aplikace"
 
-#: ../raphodo/preferencedialog.py:346
+#: ../raphodo/preferencedialog.py:431
 msgid "Skip download"
 msgstr "Přeskočit stahování"
 
-#: ../raphodo/preferencedialog.py:347
+#: ../raphodo/preferencedialog.py:432
 msgid "Don't download the file, and issue an error message"
 msgstr "Soubor nestahovat a zobrazit chybové hlášení"
 
-#: ../raphodo/preferencedialog.py:348
+#: ../raphodo/preferencedialog.py:433
 msgid "Add unique identifier"
 msgstr "Přidat neopakující se identifikátor"
 
-#: ../raphodo/preferencedialog.py:349
+#: ../raphodo/preferencedialog.py:436
 msgid ""
 "Add an identifier like _1 or _2 to the end of the filename, immediately "
 "before the file's extension"
@@ -2316,23 +2855,23 @@ msgstr ""
 "Přidat identifikátor jako _1 nebo _2 na konec názvu souboru, bezprostředně "
 "před příponu souboru"
 
-#: ../raphodo/preferencedialog.py:355
+#: ../raphodo/preferencedialog.py:444
 msgid "Overwrite"
 msgstr "Přepsat"
 
-#: ../raphodo/preferencedialog.py:356
+#: ../raphodo/preferencedialog.py:445
 msgid "Overwrite the previously backed up file"
 msgstr "Přepsat dříve zazálohovaný soubor"
 
-#: ../raphodo/preferencedialog.py:357
+#: ../raphodo/preferencedialog.py:446
 msgid "Skip"
 msgstr "Přeskočit"
 
-#: ../raphodo/preferencedialog.py:358
+#: ../raphodo/preferencedialog.py:448
 msgid "Don't overwrite the backup file, and issue an error message"
 msgstr "Nepřepisovat soubor v záloze a zobrazit chybové hlášení"
 
-#: ../raphodo/preferencedialog.py:364
+#: ../raphodo/preferencedialog.py:455
 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 identifier:"
@@ -2340,7 +2879,17 @@ msgstr ""
 "Pokud už existuje stažená fotografie nebo video se stejným názvem, zvolte "
 "zda přeskočit stahování souboru nebo přidat neopakující se identifikátor:"
 
-#: ../raphodo/preferencedialog.py:378
+#: ../raphodo/preferencedialog.py:464
+msgid ""
+"Using sequence numbers to automatically generate unique filenames is "
+"strongly recommended. Configure file renaming in the Rename panel in the "
+"main window."
+msgstr ""
+"Aby bylo zajištěno vytváření neopakujících se názvů souborů, je důrazně "
+"doporučeno používat pořadová čísla. Přejmenovávání souborů se nastavuje v "
+"hlavním okně, panelu Přejmenovávání."
+
+#: ../raphodo/preferencedialog.py:473
 msgid ""
 "When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up:"
@@ -2348,39 +2897,41 @@ msgstr ""
 "Při zálohování zvolte zda přepsat stejnojmenný soubor na zálohovacím "
 "zařízení nebo přeskočit jeho zálohování:"
 
-#: ../raphodo/preferencedialog.py:398
+#: ../raphodo/preferencedialog.py:494
 msgid "Program Warnings"
 msgstr "Varování aplikace"
 
-#: ../raphodo/preferencedialog.py:399
+#: ../raphodo/preferencedialog.py:495
 msgid "Show a warning when:"
 msgstr "Zobrazit varování když:"
 
-#: ../raphodo/preferencedialog.py:402
+#: ../raphodo/preferencedialog.py:498
 msgid "Downloading files currently not displayed"
 msgstr "Jsou stahovány soubory které nyní nejsou zobrazeny"
 
-#: ../raphodo/preferencedialog.py:403
+#: ../raphodo/preferencedialog.py:499
 msgid ""
 "Warn when about to download files that are not displayed in the main window."
 msgstr ""
 "Varovat pokud se chystáte stahovat soubory které nejsou zobrazeny v hlavním "
 "okně aplikace."
 
-#: ../raphodo/preferencedialog.py:405
+#: ../raphodo/preferencedialog.py:501
 msgid "Backup destinations are missing"
 msgstr "Chybí zálohovací umístění"
 
-#: ../raphodo/preferencedialog.py:406
-msgid "Warn before starting a download if it is not possible to back up files."
-msgstr "Varovat před zahájením stahování pokud soubory není možné zazálohovat."
+#: ../raphodo/preferencedialog.py:502
+msgid ""
+"Warn before starting a download if it is not possible to back up files."
+msgstr ""
+"Varovat před zahájením stahování pokud soubory není možné zazálohovat."
 
-#: ../raphodo/preferencedialog.py:408
+#: ../raphodo/preferencedialog.py:504
 msgid "Program libraries are missing or broken"
 msgstr ""
 "Softwarové knihovny potřebné pro běh aplikace chybí nebo jsou poškozené"
 
-#: ../raphodo/preferencedialog.py:409
+#: ../raphodo/preferencedialog.py:505
 msgid ""
 "Warn if a software library used by Rapid Photo Downloader is missing or not "
 "functioning."
@@ -2388,11 +2939,11 @@ msgstr ""
 "Varovat pokud softwarové knihovny využívané aplikací Rapid Photo Downloader "
 "chybí nebo nejsou funkční."
 
-#: ../raphodo/preferencedialog.py:412
+#: ../raphodo/preferencedialog.py:508
 msgid "Filesystem metadata cannot be set"
 msgstr "Se nedaří nastavit netadata souborového systému"
 
-#: ../raphodo/preferencedialog.py:413
+#: ../raphodo/preferencedialog.py:509
 msgid ""
 "Warn if there is an error setting a file's filesystem metadata, such as its "
 "modification time."
@@ -2400,11 +2951,11 @@ msgstr ""
 "Varovat při chybě nastavování metadat souborového systému, na kterém se "
 "soubor nachází, jako třeba okamžik úpravy."
 
-#: ../raphodo/preferencedialog.py:416
+#: ../raphodo/preferencedialog.py:512
 msgid "Encountering unhandled files"
 msgstr "Se narazí na neošetřené soubory"
 
-#: ../raphodo/preferencedialog.py:417
+#: ../raphodo/preferencedialog.py:513
 msgid ""
 "Warn after scanning a device or this computer if there are unrecognized "
 "files that will not be included in the download."
@@ -2412,11 +2963,11 @@ msgstr ""
 "Po prohledání zařízení nebo tohoto počítače varovat pokud byly nalezeny "
 "nerozpoznané soubory, které tak nebudou zahrnuty do stažení."
 
-#: ../raphodo/preferencedialog.py:420
+#: ../raphodo/preferencedialog.py:517
 msgid "Do not warn about unhandled files with extensions:"
 msgstr "Nevarovat před neošetřenými soubory s příponami:"
 
-#: ../raphodo/preferencedialog.py:424
+#: ../raphodo/preferencedialog.py:522
 msgid ""
 "File extensions are case insensitive and do not need to include the leading "
 "dot."
@@ -2424,18 +2975,18 @@ msgstr ""
 "U přípon souborů není rozlišována velikost písmen a není třeba uvádět úvodní "
 "tečku."
 
-#: ../raphodo/preferencedialog.py:427
+#: ../raphodo/preferencedialog.py:525
 msgid "Add"
 msgstr "Přidat"
 
-#: ../raphodo/preferencedialog.py:428
+#: ../raphodo/preferencedialog.py:526
 msgid ""
 "Add a file extension to the list of unhandled file types to not warn about."
 msgstr ""
 "Přidat příponu souborů na seznam neošetřovaných typů souborů a nevarovat tak "
 "v jejich případě."
 
-#: ../raphodo/preferencedialog.py:430
+#: ../raphodo/preferencedialog.py:528
 msgid ""
 "Remove a file extension from the list of unhandled file types to not warn "
 "about."
@@ -2443,29 +2994,170 @@ msgstr ""
 "Odebrat příponu souborů ze seznamu neošetřených souborů a varovat tak v "
 "jejich případě."
 
-#: ../raphodo/preferencedialog.py:434
+#: ../raphodo/preferencedialog.py:532
 msgid ""
 "Clear the list of file extensions of unhandled file types to not warn about."
 msgstr "Vyčistit seznam přípon neošetřených souborů a varovat tak u všech."
 
-#: ../raphodo/preferencedialog.py:469
+#: ../raphodo/preferencedialog.py:568
+msgid "Photo and Video Consolidation"
+msgstr "Konsolidace fotografií a videí"
+
+#: ../raphodo/preferencedialog.py:571
+msgid "Consolidate files across devices and downloads"
+msgstr "Konsolidovat soubory napříč zařízeními a stahováními"
+
+#: ../raphodo/preferencedialog.py:574
+msgid ""
+"Analyze the results of device scans looking for duplicate files and matching "
+"RAW and JPEG pairs,\n"
+"comparing them across multiple devices and download sessions."
+msgstr ""
+"Analyzovat výsledky skenů zařízení a hledat duplicitní soubory a "
+"odpovídající si RAW a JPEG dvojice,\n"
+"jejich porovnání napříč vícero zařízeními a stahovacími relacemi."
+
+#: ../raphodo/preferencedialog.py:580
+msgid "Treat matching RAW and JPEG files as:"
+msgstr "Zacházet s odpovídajícími si RAW a JPEG soubory jako:"
+
+#: ../raphodo/preferencedialog.py:581
+msgid "One photo"
+msgstr "Jedna fotografie"
+
+#: ../raphodo/preferencedialog.py:582
+msgid "Two photos"
+msgstr "Dvě fotografie"
+
+#: ../raphodo/preferencedialog.py:584
+msgid ""
+"Display matching pairs of RAW and JPEG photos as one photo, and if marked, "
+"download both."
+msgstr ""
+"Zobrazovat odpovídající si dvojice RAW a JPEG fotografií jako jeden snímek a "
+"pokud je označen, stáhnout obojí."
+
+#: ../raphodo/preferencedialog.py:589
+msgid ""
+"Display matching pairs of RAW and JPEG photos as two different photos. You "
+"can still synchronize their sequence numbers."
+msgstr ""
+"Zobrazovat odpovídající si dvojice RAW a JPEG fotografií jako dva různé "
+"snímky. I tak ale je možné synchronizovat jejich pořadová čísla."
+
+#: ../raphodo/preferencedialog.py:598
+msgid "With matching RAW and JPEG photos:"
+msgstr "S odpovídajícími si RAW a JPEG fotografiemi:"
+
+#: ../raphodo/preferencedialog.py:600
+msgid "Do not mark JPEG for download"
+msgstr "Neoznačovat JPEG ke stažení"
+
+#: ../raphodo/preferencedialog.py:601
+msgid "Do not mark RAW for download"
+msgstr "Neoznačovat RAW ke stažení"
+
+#: ../raphodo/preferencedialog.py:602
+msgid "Mark both for download"
+msgstr "Označit obě pro stažení"
+
+#: ../raphodo/preferencedialog.py:609
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"JPEG for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+"Když jsou nalezeny odpovídající si soubory (RAW a JPEG) od jedné fotografie, "
+"neoznačovat automaticky JPEG variantu pro stahování. Samozřejmě jí stále "
+"můžete označit pro stahování ručně."
+
+#: ../raphodo/preferencedialog.py:614
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"RAW for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+"Když jsou nalezeny odpovídající si soubory (RAW a JPEG) od jedné fotografie, "
+"neoznačovat automaticky RAW variantu pro stahování. Samozřejmě jí stále "
+"můžete označit pro stahování ručně."
+
+#: ../raphodo/preferencedialog.py:619
+msgid ""
+"When matching RAW and JPEG photos are found, automatically mark both for "
+"download."
+msgstr ""
+"Když jsou nalezeny odpovídající si RAW a JPEG fotografie, automaticky obojí "
+"označit ke stahování."
+
+#: ../raphodo/preferencedialog.py:625
+msgid ""
+"If you disable file consolidation, choose what to do when a download device "
+"is inserted while completed downloads are displayed:"
+msgstr ""
+"Pokud vypnete konsolidaci souborů, zvolte co dělat když je připojeno "
+"zařízení ke stahování zatímco jsou zobrazena dokončená stahování:"
+
+#: ../raphodo/preferencedialog.py:631
+msgid ""
+"When a download device is inserted while completed downloads are displayed:"
+msgstr ""
+"Když je zařízení, ze kterého je stahováno, připojeno v okamžiku kdy jsou "
+"zobrazená dokončená stahování:"
+
+#: ../raphodo/preferencedialog.py:642
+msgid "Clear completed downloads"
+msgstr "Vyčistit dokončená stahování"
+
+#: ../raphodo/preferencedialog.py:643
+msgid "Keep displaying completed downloads"
+msgstr "Ponechat dokončená stahování zobrazená"
+
+#: ../raphodo/preferencedialog.py:644
+msgid "Prompt for what to do"
+msgstr "Zeptat se co dělat"
+
+#: ../raphodo/preferencedialog.py:649
+msgid ""
+"Automatically clear the display of completed downloads whenever a new "
+"download device is inserted."
+msgstr ""
+"Automaticky vyčistit zobrazení dokončených stahování kdykoli je připojeno "
+"nové zařízení ke stahování."
+
+#: ../raphodo/preferencedialog.py:654
+msgid ""
+"Keep displaying completed downloads whenever a new download device is "
+"inserted."
+msgstr ""
+"Ponechat dokončená stahování zobrazená kdykoli je připojeno nové zařízení ke "
+"stahování."
+
+#: ../raphodo/preferencedialog.py:658
+msgid ""
+"Prompt whether to keep displaying completed downloads or clear them whenever "
+"a new download device is inserted."
+msgstr ""
+"Dotázat se zda ponechat zobrazená dokončená stahování nebo je vyčistit "
+"kdykoli je připojeno nové zařízení ke stahování."
+
+#: ../raphodo/preferencedialog.py:702
 msgid "Version Check"
 msgstr "Kontrola verze"
 
-#: ../raphodo/preferencedialog.py:470
+#: ../raphodo/preferencedialog.py:703
 msgid "Check for new version at startup"
 msgstr "Zjišťovat dostupnost nové verze při spouštění"
 
-#: ../raphodo/preferencedialog.py:471
+#: ../raphodo/preferencedialog.py:705
 msgid "Check for a new version of the program each time the program starts."
 msgstr ""
 "Zjišťovat dostupnost případné nové verze aplikace při každém jejím spouštění."
 
-#: ../raphodo/preferencedialog.py:473
+#: ../raphodo/preferencedialog.py:707
 msgid "Include development releases"
 msgstr "Zobrazovat i vývojové verze"
 
-#: ../raphodo/preferencedialog.py:474
+#: ../raphodo/preferencedialog.py:709
 msgid ""
 "Include alpha, beta and other development releases when checking for a new "
 "version of the program.\n"
@@ -2478,11 +3170,11 @@ msgstr ""
 "\n"
 "Pokud už vývojové vydání provozujete, budou zahrnuty vždy."
 
-#: ../raphodo/preferencedialog.py:489
+#: ../raphodo/preferencedialog.py:725
 msgid "Ignore DNG date/time metadata on MTP devices"
 msgstr "U MTP zařízení ignorovat datum a čas z metadat DNG fotografií"
 
-#: ../raphodo/preferencedialog.py:490
+#: ../raphodo/preferencedialog.py:727
 msgid ""
 "Ignore date/time metadata in DNG files located on MTP devices, and use the "
 "file's modification time instead.\n"
@@ -2496,15 +3188,19 @@ msgstr ""
 "Užitečné u zařízení jako jsou některé telefony a tablety, která vytvářejí "
 "neplatná DNG metadata."
 
+#: ../raphodo/preferencedialog.py:741
+msgid "Completed Downloads"
+msgstr "Dokončená stahování"
+
 #. Translators: substituted value is a description for the set of preferences
 #. shown in the preference dialog window, e.g. Devices, Automation, etc.
 #. This string is shown in a tooltip for the "Restore Defaults" button
-#: ../raphodo/preferencedialog.py:710
+#: ../raphodo/preferencedialog.py:1067
 #, python-format
 msgid "Restores default %s preference values"
 msgstr "Vrátit předvolby %s na výchozí hodnoty"
 
-#: ../raphodo/preferencedialog.py:832
+#: ../raphodo/preferencedialog.py:1208
 msgid ""
 "Do you want to purge the thumbnail cache? The cache will be purged when the "
 "program is next started."
@@ -2512,11 +3208,11 @@ msgstr ""
 "Vyčistit mezipaměť náhledových obrázků? Vyprázdnění proběhne při příštím "
 "spuštění aplikace."
 
-#: ../raphodo/preferencedialog.py:835
+#: ../raphodo/preferencedialog.py:1212
 msgid "Purge Thumbnail Cache"
 msgstr "Vyčistit mezipaměť náhledových obrázků"
 
-#: ../raphodo/preferencedialog.py:847
+#: ../raphodo/preferencedialog.py:1225
 msgid ""
 "Do you want to optimize the thumbnail cache? The cache will be optimized "
 "when the program is next started."
@@ -2524,39 +3220,51 @@ msgstr ""
 "Provézt optimalizaci mezipaměti náhledových obrázků? Optimalizace proběhne "
 "při příštím spuštění aplikace."
 
-#: ../raphodo/preferencedialog.py:850
+#: ../raphodo/preferencedialog.py:1229
 msgid "Optimize Thumbnail Cache"
 msgstr "Optimalizovat mezipaměť náhledových obrázků"
 
-#: ../raphodo/preferencedialog.py:1045
+#: ../raphodo/preferencedialog.py:1481
+msgid "Enter a Folder to Scan"
+msgstr "Zadejte složku kterou skenovat"
+
+#: ../raphodo/preferencedialog.py:1482
+msgid "Specify a folder that will be scanned for photos and videos"
+msgstr "Zadejte složku která bude skenována na přítomnost fotografií a videí"
+
+#: ../raphodo/preferencedialog.py:1483
+msgid "Folder:"
+msgstr "Složka:"
+
+#: ../raphodo/preferencedialog.py:1497
 msgid "Enter a Path to Ignore"
 msgstr "Zadejte popis umístění které ignorovat"
 
-#: ../raphodo/preferencedialog.py:1046
+#: ../raphodo/preferencedialog.py:1498
 msgid "Specify a path that will never be scanned for photos or videos"
 msgstr "Zadejte popis umístění ve kterém nikdy nehledat fotografie ani videa"
 
-#: ../raphodo/preferencedialog.py:1047
+#: ../raphodo/preferencedialog.py:1499
 msgid "Path:"
 msgstr "Popis umístění:"
 
-#: ../raphodo/preferencedialog.py:1061
+#: ../raphodo/preferencedialog.py:1513
 msgid "Enter a File Extension"
 msgstr "Zadejte příponu souboru"
 
-#: ../raphodo/preferencedialog.py:1062
+#: ../raphodo/preferencedialog.py:1514
 msgid "Specify a file extension (without the leading dot)"
 msgstr "Zadejte příponu souboru (bez úvodní tečky)"
 
-#: ../raphodo/preferencedialog.py:1063 ../raphodo/renamepanel.py:122
+#: ../raphodo/preferencedialog.py:1515 ../raphodo/renamepanel.py:122
 msgid "Extension:"
 msgstr "Přípona:"
 
-#: ../raphodo/preferencedialog.py:1078
+#: ../raphodo/preferencedialog.py:1530
 msgid "Invalid File Extension"
 msgstr "Neplatná přípona souboru"
 
-#: ../raphodo/preferencedialog.py:1079
+#: ../raphodo/preferencedialog.py:1531
 #, python-format
 msgid ""
 "The file extension <b>%s</b> is recognized by Rapid Photo Downloader, so it "
@@ -2565,7 +3273,7 @@ msgstr ""
 "Přípona souborů <b>%s</b> je aplikací Rapid Photo Downloader běžně "
 "rozpoznávána, takže nedává smysl varovat o její přítomnosti."
 
-#: ../raphodo/preferencedialog.py:1081
+#: ../raphodo/preferencedialog.py:1533
 #, python-format
 msgid ""
 "Recognized file types:\n"
@@ -2604,42 +3312,41 @@ msgstr "Svatba"
 msgid "Birthday"
 msgstr "Narozeniny"
 
-#: ../raphodo/preferences.py:614
+#: ../raphodo/preferences.py:624
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Předvolby podsložky by neměly začínat na %s"
 
-#: ../raphodo/preferences.py:617
+#: ../raphodo/preferences.py:627
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Předvolby podsložky by neměly končit na %s"
 
-#: ../raphodo/preferences.py:622
+#: ../raphodo/preferences.py:632
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr "Předvolby podsložky by neměla obsahovat dvě %s za sebou"
 
-#. self.setFlat(True)
 #: ../raphodo/primarybutton.py:72
 msgid "Download 8 Photos and 10 Videos"
 msgstr "Stáhnout 8 fotografií a 10 videí"
 
-#: ../raphodo/problemnotification.py:86 ../raphodo/problemnotification.py:208
+#: ../raphodo/problemnotification.py:87 ../raphodo/problemnotification.py:209
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr "Chyba: %(errno)s %(strerror)s"
 
-#: ../raphodo/problemnotification.py:89
+#: ../raphodo/problemnotification.py:90
 #, python-format
 msgid "Error: %s"
 msgstr "Chyba: %s"
 
-#: ../raphodo/problemnotification.py:116
+#: ../raphodo/problemnotification.py:117
 #, python-format
 msgid "GPhoto2 Error: %s"
 msgstr "Chyba knihovny GPhoto2: %s"
 
-#: ../raphodo/problemnotification.py:124
+#: ../raphodo/problemnotification.py:125
 msgid ""
 "Unable to initialize the camera, probably because another program is using "
 "it. No files were copied from it."
@@ -2647,63 +3354,63 @@ msgstr ""
 "Nedaří se inicializovat fotoaparát, nejspíš protože ho používá jiná "
 "aplikace. Nebyly z něj proto zkopírovány žádné soubory."
 
-#: ../raphodo/problemnotification.py:134
+#: ../raphodo/problemnotification.py:135
 #, python-format
 msgid "Unable to read directory %s"
 msgstr "Nedaří se číst složku %s"
 
-#: ../raphodo/problemnotification.py:140
+#: ../raphodo/problemnotification.py:141
 #, python-format
 msgid "Unable to access modification time or size from %s"
 msgstr "Nedaří se zjistit okamžik úpravy nebo velikost z %s"
 
-#: ../raphodo/problemnotification.py:146
+#: ../raphodo/problemnotification.py:147
 #, python-format
 msgid "Unable to read file %s"
 msgstr "Nedaří se načíst soubor %s"
 
-#: ../raphodo/problemnotification.py:152
+#: ../raphodo/problemnotification.py:153
 #, python-format
 msgid "Unable to write file %s"
 msgstr "Nedaří se zapsat do souboru %s"
 
-#: ../raphodo/problemnotification.py:158
+#: ../raphodo/problemnotification.py:159
 #, python-format
 msgid "Unable to move file %s"
 msgstr "Nedaří se přesunout soubor %s"
 
-#: ../raphodo/problemnotification.py:164
+#: ../raphodo/problemnotification.py:165
 #, python-format
 msgid "Unable to remove file %s"
 msgstr "Nedaří se odebrat soubor %s"
 
-#: ../raphodo/problemnotification.py:170
+#: ../raphodo/problemnotification.py:171
 #, python-format
 msgid "Unable to copy file %s"
 msgstr "Nedaří se zkopírovat soubor %s"
 
-#: ../raphodo/problemnotification.py:176
+#: ../raphodo/problemnotification.py:177
 #, python-format
 msgid "Zero length file %s will not be downloaded"
 msgstr "Soubor %s, který má nulovou velikost, nebude stažen"
 
-#: ../raphodo/problemnotification.py:182
+#: ../raphodo/problemnotification.py:183
 #, python-format
 msgid "Could not determine filesystem modification time for %s"
 msgstr "Nedaří se zjistit ze souborového systému okamžik úpravy %s"
 
-#: ../raphodo/problemnotification.py:188
+#: ../raphodo/problemnotification.py:189
 #, python-format
 msgid "Unable to load metadata from %s"
 msgstr "Nedaří se načíst metadata z %s"
 
-#: ../raphodo/problemnotification.py:194
+#: ../raphodo/problemnotification.py:195
 #, python-format
 msgid ""
 "Unable to load metadata from %(name)s. The %(filetype)s was not downloaded."
 msgstr "Nedaří se načíst metadata z %(name)s. %(filetype)s nebylo staženo."
 
-#: ../raphodo/problemnotification.py:202
+#: ../raphodo/problemnotification.py:203
 #, python-format
 msgid ""
 "An error occurred setting a file's filesystem metadata on the filesystem %s. "
@@ -2714,17 +3421,17 @@ msgstr ""
 "Pokud se stejná chyba vyskytne znovu na stejném souborovém systému, nebude "
 "už hlášena."
 
-#: ../raphodo/problemnotification.py:216
+#: ../raphodo/problemnotification.py:217
 #, python-format
 msgid "Encountered unhandled file %s. It will not be downloaded."
 msgstr "Zjištěn neobsluhovaný soubor %s. Nebude stažen."
 
-#: ../raphodo/problemnotification.py:223
+#: ../raphodo/problemnotification.py:224
 #, python-format
 msgid "%(filetype)s %(destination)s already exists."
 msgstr "%(filetype)s %(destination)s už existuje."
 
-#: ../raphodo/problemnotification.py:234 ../raphodo/problemnotification.py:262
+#: ../raphodo/problemnotification.py:235 ../raphodo/problemnotification.py:263
 #, python-format
 msgid ""
 "The existing %(filetype)s %(destination)s was last modified on %(date)s at "
@@ -2733,22 +3440,22 @@ msgstr ""
 "Existující %(filetype)s %(destination)s bylo naposledy upraveno %(date)s v "
 "%(time)s."
 
-#: ../raphodo/problemnotification.py:245
+#: ../raphodo/problemnotification.py:246
 #, python-format
 msgid "The %(filetype)s %(source)s was not downloaded from %(device)s."
 msgstr "%(filetype)s %(source)s nebylo staženo ze %(device)s."
 
-#: ../raphodo/problemnotification.py:273
+#: ../raphodo/problemnotification.py:274
 #, python-format
 msgid "The %(filetype)s %(source)s was downloaded from %(device)s."
 msgstr "%(filetype)s %(source)s bylo staženo z %(device)s."
 
-#: ../raphodo/problemnotification.py:282
+#: ../raphodo/problemnotification.py:283
 #, python-format
 msgid "The unique identifier '%s' was added to the filename."
 msgstr "K názvu souboru byl přidán neopakující se identifikátor „%s“."
 
-#: ../raphodo/problemnotification.py:298
+#: ../raphodo/problemnotification.py:299
 #, python-format
 msgid ""
 "The existing backup %(filetype)s %(destination)s was last modified on "
@@ -2757,12 +3464,12 @@ msgstr ""
 "Existující záloha %(filetype)s %(destination)s byla posledně upravena "
 "%(date)s v %(time)s."
 
-#: ../raphodo/problemnotification.py:309
+#: ../raphodo/problemnotification.py:310
 #, python-format
 msgid "The %(filetype)s %(source)s was not backed up from %(device)s."
 msgstr "%(filetype)s %(source)s nebylo zazálohováno z %(device)s."
 
-#: ../raphodo/problemnotification.py:326
+#: ../raphodo/problemnotification.py:327
 #, python-format
 msgid ""
 "The previous backup %(filetype)s %(destination)s was last modified on "
@@ -2771,7 +3478,7 @@ msgstr ""
 "Předchozí záloha %(filetype)s %(destination)s byla posledně upravena "
 "%(date)s v %(time)s."
 
-#: ../raphodo/problemnotification.py:337
+#: ../raphodo/problemnotification.py:338
 #, python-format
 msgid ""
 "The %(filetype)s %(source)s from %(device)s was backed up, overwriting the "
@@ -2780,7 +3487,7 @@ msgstr ""
 "%(filetype)s %(source)s ze %(device)s bylo zazálohováno, předchozí záloha "
 "%(filetype)s byla přepsána."
 
-#: ../raphodo/problemnotification.py:356
+#: ../raphodo/problemnotification.py:357
 #, python-format
 msgid ""
 "When synchronizing RAW + JPEG sequence values, a duplicate %(filetype)s "
@@ -2789,7 +3496,7 @@ msgstr ""
 "Při synchronizaci pořadových hodnot pro RAW + JPEG byla zjištěna duplicita "
 "%(filetype)s %(file)s a nebyla proto stažena."
 
-#: ../raphodo/problemnotification.py:366
+#: ../raphodo/problemnotification.py:367
 msgid ""
 "When synchronizing RAW + JPEG sequence values, photos were detected with the "
 "same filenames, but taken at different times:"
@@ -2797,7 +3504,7 @@ msgstr ""
 "Při synchronizaci pořadových hodnot pro RAW + JPEG byly zjištěny stejně "
 "nazvané fotografie, ovšem pořízené v rozdílné okamžiky:"
 
-#: ../raphodo/problemnotification.py:373
+#: ../raphodo/problemnotification.py:374
 #, python-format
 msgid ""
 "%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
@@ -2806,12 +3513,12 @@ msgstr ""
 "%(image1)s byl pořízen %(image1_date)s v %(image1_time)s a %(image2)s "
 "%(image2_date)s v %(image2_time)s."
 
-#: ../raphodo/problemnotification.py:389
+#: ../raphodo/problemnotification.py:390
 #, python-format
 msgid "Unable to finalize the filename for %s"
 msgstr "Nedaří se dokončit název souboru pro %s"
 
-#: ../raphodo/problemnotification.py:424
+#: ../raphodo/problemnotification.py:425
 #, python-format
 msgid ""
 "The filename %(destination)s was not fully generated for %(filetype)s "
@@ -2819,22 +3526,22 @@ msgid ""
 msgstr ""
 "Název souboru %(destination)s nebyl dovytvořen pro %(filetype)s %(source)s."
 
-#: ../raphodo/problemnotification.py:433
+#: ../raphodo/problemnotification.py:434
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr "Metadata %(type)s chybí."
 
-#: ../raphodo/problemnotification.py:439
+#: ../raphodo/problemnotification.py:440
 #, python-format
 msgid "The following metadata is missing: %s."
 msgstr "Chybí následující metadata: %s."
 
-#: ../raphodo/problemnotification.py:445
+#: ../raphodo/problemnotification.py:446
 #, python-format
 msgid "Date/time conversion failed: %s."
 msgstr "Převod data/času se nezdařil: %s."
 
-#: ../raphodo/problemnotification.py:451
+#: ../raphodo/problemnotification.py:452
 msgid ""
 "Could not extract valid date/time metadata or determine the file "
 "modification time."
@@ -2842,20 +3549,20 @@ msgstr ""
 "Nedaří se vyzískat platná metadata o datu/času nebo zjistit okamžik úpravy "
 "souboru."
 
-#: ../raphodo/problemnotification.py:457
+#: ../raphodo/problemnotification.py:458
 msgid "Filename does not have an extension."
 msgstr "V názvu souboru není přítomna přípona."
 
-#: ../raphodo/problemnotification.py:460
+#: ../raphodo/problemnotification.py:461
 msgid "Filename does not have a number component."
 msgstr "V názvu souboru není přítomna číselná část."
 
-#: ../raphodo/problemnotification.py:464
+#: ../raphodo/problemnotification.py:465
 #, python-format
 msgid "Error generating component %(component)s. Error: %(error)s"
 msgstr "Chyba při vytváření části %(component)s. Chyba: %(error)s"
 
-#: ../raphodo/problemnotification.py:477
+#: ../raphodo/problemnotification.py:478
 #, python-format
 msgid ""
 "The download subfolders %(folder)s were only partially generated for "
@@ -2864,7 +3571,7 @@ msgstr ""
 "Podsložky stahování %(folder)s byly pouze částečně vytvořeny pro "
 "%(filetype)s %(source)s."
 
-#: ../raphodo/problemnotification.py:486
+#: ../raphodo/problemnotification.py:487
 #, python-format
 msgid ""
 "There is no data with which to generate the %(subfolder_file)s for "
@@ -2873,7 +3580,7 @@ msgstr ""
 "Nejsou k dispozici údaje pro vytvoření %(subfolder_file)s pro %(filename)s. "
 "%(filetype)s nebylo staženo."
 
-#: ../raphodo/problemnotification.py:499
+#: ../raphodo/problemnotification.py:500
 #, python-format
 msgid ""
 "Unable to create the %(filetype)s %(destination)s in %(folder)s. The "
@@ -2882,67 +3589,67 @@ msgstr ""
 "Nedaří se vytvořit %(filetype)s %(destination)s v %(folder)s. Stahovaný "
 "soubor byl %(source)s na %(device)s. Nebylo staženo."
 
-#: ../raphodo/problemnotification.py:514
+#: ../raphodo/problemnotification.py:515
 #, python-format
 msgid "Unable to create the download subfolder %s."
 msgstr "Nedaří se vytvořit podsložku pro stažení %s."
 
-#: ../raphodo/problemnotification.py:526
+#: ../raphodo/problemnotification.py:527
 #, python-format
 msgid "Unable to create the backup subfolder %s."
 msgstr "Nedaří se vytvořit podsložku zálohy %s."
 
-#: ../raphodo/problemnotification.py:577
+#: ../raphodo/problemnotification.py:578
 #, python-format
 msgid "Problems scanning %s"
 msgstr "Problémy při prohledávání %s"
 
-#: ../raphodo/problemnotification.py:584
+#: ../raphodo/problemnotification.py:585
 #, python-format
 msgid "Problems copying from %s"
 msgstr "Problémy při kopírování z %s"
 
-#: ../raphodo/problemnotification.py:591
+#: ../raphodo/problemnotification.py:592
 msgid "Problems while finalizing filenames and generating subfolders"
 msgstr "Problémy při dokončování názvů souborů a vytváření podsložek"
 
-#: ../raphodo/problemnotification.py:598
+#: ../raphodo/problemnotification.py:599
 #, python-format
 msgid "Problems backing up to %s"
 msgstr "Problémy při zálohování na %s"
 
-#. Translators: for example Nov 3 or Dec 31
+#. Translators: for example Nov 3 2015, 11:25 AM
+#. Translators: for example, Nov 3, 12:15 PM
+#: ../raphodo/proximity.py:188 ../raphodo/proximity.py:213
+#: ../raphodo/proximity.py:236 ../raphodo/proximity.py:239
+#, python-format
+msgid "%(date)s, %(time)s"
+msgstr "%(date)s, %(time)s"
+
+#: ../raphodo/proximity.py:204
+#, python-format
+msgid "%(starttime)s - %(endtime)s"
+msgstr "%(starttime)s - %(endtime)s"
+
 #. The start and end dates are on a different day
 #. Translators: for example Nov 3 or Dec 31
-#: ../raphodo/proximity.py:105 ../raphodo/proximity.py:221
-#: ../raphodo/proximity.py:224 ../raphodo/proximity.py:828
+#: ../raphodo/proximity.py:221 ../raphodo/proximity.py:225
+#: ../raphodo/proximity.py:980 ../raphodo/timeutils.py:105
 #, python-format
 msgid "%(month)s %(numeric_day)s"
 msgstr "%(month)s %(numeric_day)s"
 
-#. Translators: for example Nov 15 2015
 #. Translators: for example Nov 3 2015
-#: ../raphodo/proximity.py:109 ../raphodo/proximity.py:230
-#: ../raphodo/proximity.py:231 ../raphodo/proximity.py:831
+#. Translators: for example Nov 2 2015
+#. Translators: for example Nov 15 2015
+#: ../raphodo/proximity.py:232 ../raphodo/proximity.py:233
+#: ../raphodo/proximity.py:985 ../raphodo/timeutils.py:110
 #, python-format
 msgid "%(date)s %(year)s"
 msgstr "%(date)s %(year)s"
 
-#. Translators: for example Nov 3 2015, 11:25 AM
-#. Translators: for example, Nov 3, 12:15 PM
-#: ../raphodo/proximity.py:197 ../raphodo/proximity.py:215
-#: ../raphodo/proximity.py:234 ../raphodo/proximity.py:236
-#, python-format
-msgid "%(date)s, %(time)s"
-msgstr "%(date)s, %(time)s"
-
-#: ../raphodo/proximity.py:209
-#, python-format
-msgid "%(starttime)s - %(endtime)s"
-msgstr "%(starttime)s - %(endtime)s"
-
 #. Translators: for example, Nov 3, 12:15 PM - Nov 4, 1:00 AM
-#: ../raphodo/proximity.py:241
+#: ../raphodo/proximity.py:245
 #, python-format
 msgid "%(earlier_time)s - %(later_time)s"
 msgstr "%(earlier_time)s - %(later_time)s"
@@ -2951,7 +3658,7 @@ msgstr "%(earlier_time)s - %(later_time)s"
 #. Nov 3 2012, 12:15 PM -
 #. Nov 4 2012, 1:00 AM
 #. (please keep the line break signified by \n)
-#: ../raphodo/proximity.py:248
+#: ../raphodo/proximity.py:253
 #, python-format
 msgid ""
 "%(earlier_time)s -\n"
@@ -2960,18 +3667,18 @@ msgstr ""
 "%(earlier_time)s -\n"
 "%(later_time)s"
 
-#: ../raphodo/proximity.py:359
+#: ../raphodo/proximity.py:382
 #, python-format
 msgid "%(month)s  %(year)s"
 msgstr "%(month)s  %(year)s"
 
 #. Translators: for example Nov 2015
-#: ../raphodo/proximity.py:833
+#: ../raphodo/proximity.py:987
 #, python-format
 msgid "%(month)s %(year)s"
 msgstr "%(month)s %(year)s"
 
-#: ../raphodo/proximity.py:1344
+#: ../raphodo/proximity.py:1595
 msgid ""
 "The time elapsed between consecutive photos and videos that is used to build "
 "the Timeline"
@@ -2983,26 +3690,26 @@ msgstr ""
 #. Replace the very last character (after the d) with the correct
 #. localized value, keeping everything else. In other words, change
 #. only the m character.
-#: ../raphodo/proximity.py:1406
+#: ../raphodo/proximity.py:1652
 #, python-format
 msgid "%(minutes)dm"
 msgstr "%(minutes)dm"
 
 #. Translators: i.e. "1.5h", which is short for 1.5 hours.
 #. Replace the entire string with the correct localized value
-#: ../raphodo/proximity.py:1410
+#: ../raphodo/proximity.py:1656
 msgid "1.5h"
 msgstr "1.5h"
 
 #. Translators: e.g. "5h", which is short for 5 hours.
 #. Replace the very last character (after the d) with the correct localized value,
 #. keeping everything else. In other words, change only the h character.
-#: ../raphodo/proximity.py:1415
+#: ../raphodo/proximity.py:1661
 #, python-format
 msgid "%(hours)dh"
 msgstr "%(hours)dh"
 
-#: ../raphodo/proximity.py:1461
+#: ../raphodo/proximity.py:1710
 msgid ""
 "The Timeline groups photos and videos based on how much time elapsed between "
 "consecutive shots. Use it to identify photos and videos taken at different "
@@ -3012,7 +3719,7 @@ msgstr ""
 "sobě následujícími záběry. Použijte ji pro identifikaci fotografií a videí "
 "pořízených v různých dobách jednoho nebo vícero po sobě jdoucích dnů."
 
-#: ../raphodo/proximity.py:1464
+#: ../raphodo/proximity.py:1715
 msgid ""
 "Use the slider (below) to adjust the time elapsed between consecutive shots "
 "that is used to build the Timeline."
@@ -3020,15 +3727,15 @@ msgstr ""
 "Posuvníkem (níže) upravte časový rozestup mezi po sobě následujícími záběry "
 "a dle toho bude vytvořena časová osa."
 
-#: ../raphodo/proximity.py:1466
+#: ../raphodo/proximity.py:1718
 msgid "Timeline build pending..."
 msgstr "Čekání na vytváření časové osy…"
 
-#: ../raphodo/proximity.py:1467
+#: ../raphodo/proximity.py:1719
 msgid "Timeline is building..."
 msgstr "Vytváření časové osy…"
 
-#: ../raphodo/proximity.py:1468
+#: ../raphodo/proximity.py:1721
 msgid ""
 "The Timeline needs to be rebuilt because the file modification time does not "
 "match the time a shot was taken for one or more shots.<br><br>The Timeline "
@@ -3049,16 +3756,16 @@ msgstr ""
 "potvrzen při vytváření náhledových obrázků nebo při stahování, při kterém už "
 "jsou metadata načítána."
 
-#: ../raphodo/rapid.py:485 ../raphodo/rapid.py:2461 ../raphodo/rapid.py:3728
-#: ../raphodo/rapid.py:3846 ../raphodo/rapid.py:3850 ../raphodo/rapid.py:3870
-#: ../raphodo/rapid.py:3874 ../raphodo/rapid.py:3998 ../raphodo/rapid.py:4007
-#: ../raphodo/rapid.py:4495 ../raphodo/rapid.py:4888 ../raphodo/rapid.py:5722
-#: ../raphodo/rememberthisdialog.py:97
+#: ../raphodo/rapid.py:493 ../raphodo/rapid.py:2555 ../raphodo/rapid.py:3934
+#: ../raphodo/rapid.py:4065 ../raphodo/rapid.py:4069 ../raphodo/rapid.py:4092
+#: ../raphodo/rapid.py:4096 ../raphodo/rapid.py:4226 ../raphodo/rapid.py:4237
+#: ../raphodo/rapid.py:4743 ../raphodo/rapid.py:5195 ../raphodo/rapid.py:5997
+#: ../raphodo/rememberthisdialog.py:99
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:3
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: ../raphodo/rapid.py:1100
+#: ../raphodo/rapid.py:1131
 msgid ""
 "<b>ExifTool has a problem</b><br><br> Rapid Photo Downloader uses ExifTool "
 "to get metadata from videos and photos. The program will run without it, but "
@@ -3069,11 +3776,11 @@ msgstr ""
 "bude fungovat i bez ExifTool, ale jeho funkční instalace je <b>důrazně</b> "
 "doporučována."
 
-#: ../raphodo/rapid.py:1110 ../raphodo/rapid.py:1130
+#: ../raphodo/rapid.py:1141 ../raphodo/rapid.py:1161
 msgid "Problem with libmediainfo"
 msgstr "Problém s knihovnou libmediainfo"
 
-#: ../raphodo/rapid.py:1119
+#: ../raphodo/rapid.py:1150
 msgid ""
 "<b>The library libmediainfo appears to be missing</b><br><br> Rapid Photo "
 "Downloader uses libmediainfo to get the date and time a video was shot. The "
@@ -3083,18 +3790,18 @@ msgstr ""
 "Rapid Photo Downloader ji používá pro získávání data a času natočení videa. "
 "Aplikace bude spuštěna i tak, ale je doporučeno knihovnu nainstalovat."
 
-#: ../raphodo/rapid.py:1417
+#: ../raphodo/rapid.py:1448
 msgid "Download failed"
 msgstr "Stahování se nezdařilo"
 
-#: ../raphodo/rapid.py:1419
+#: ../raphodo/rapid.py:1450
 msgid ""
 "Sorry, the download of the new version of Rapid Photo Downloader failed."
 msgstr ""
 "Je nám líto, ale stažení nové verze aplikace Rapid Photo Downloader se "
 "nezdařilo."
 
-#: ../raphodo/rapid.py:1425
+#: ../raphodo/rapid.py:1457
 msgid ""
 "The new version was successfully downloaded. Do you want to close Rapid "
 "Photo Downloader and install it now?"
@@ -3102,19 +3809,19 @@ msgstr ""
 "Nová verze byla úspěšně stažena. Chcete ukončit aplikaci Rapid Photo "
 "Downloader a nainstalovat ji?"
 
-#: ../raphodo/rapid.py:1428
+#: ../raphodo/rapid.py:1461
 msgid "Update Rapid Photo Downloader"
 msgstr "Aktualizovat aplikaci Rapid Photo Downloader"
 
-#: ../raphodo/rapid.py:1432
+#: ../raphodo/rapid.py:1465
 msgid "Install"
 msgstr "Nainstalovat"
 
-#: ../raphodo/rapid.py:1450
+#: ../raphodo/rapid.py:1483
 msgid "New version saved"
 msgstr "Nová verze uložena"
 
-#: ../raphodo/rapid.py:1451
+#: ../raphodo/rapid.py:1485
 #, python-format
 msgid ""
 "The tar file and installer script are saved at:\n"
@@ -3125,11 +3832,11 @@ msgstr ""
 "\n"
 " %s"
 
-#: ../raphodo/rapid.py:1468
+#: ../raphodo/rapid.py:1502
 msgid "Upgrade failed"
 msgstr "Přechod na novější verzi se nezdařil"
 
-#: ../raphodo/rapid.py:1469
+#: ../raphodo/rapid.py:1505
 msgid ""
 "Sorry, upgrading Rapid Photo Downloader failed because there was an error "
 "opening the installer."
@@ -3137,76 +3844,76 @@ msgstr ""
 "Je nám líto, ale přechod na novější verzi aplikace Rapid Photo Downloader se "
 "nezdařil kvůli chybě při otevírání instalátoru."
 
-#: ../raphodo/rapid.py:1667 ../raphodo/rapid.py:2331
+#: ../raphodo/rapid.py:1709 ../raphodo/rapid.py:2425
 msgid "Download"
 msgstr "Stáhnout"
 
-#: ../raphodo/rapid.py:1671
+#: ../raphodo/rapid.py:1713
 msgid "&Refresh..."
 msgstr "Obnovit…"
 
-#: ../raphodo/rapid.py:1675
+#: ../raphodo/rapid.py:1717
 msgid "&Preferences"
 msgstr "&Předvolby"
 
-#: ../raphodo/rapid.py:1679
+#: ../raphodo/rapid.py:1721
 msgid "&Quit"
 msgstr "Ukončit"
 
-#: ../raphodo/rapid.py:1683
+#: ../raphodo/rapid.py:1725
 msgid "Error &Reports"
 msgstr "Chybová hlášení"
 
-#: ../raphodo/rapid.py:1687
+#: ../raphodo/rapid.py:1729
 msgid "Clear Completed Downloads"
 msgstr "Vyčistit dokončená stahování"
 
-#: ../raphodo/rapid.py:1691
+#: ../raphodo/rapid.py:1733
 msgid "Get Help Online..."
 msgstr "Otevřít nápovědu z webu projektu…"
 
-#: ../raphodo/rapid.py:1695
+#: ../raphodo/rapid.py:1737
 msgid "&Tip of the Day..."
 msgstr "&Tip dne…"
 
-#: ../raphodo/rapid.py:1699
+#: ../raphodo/rapid.py:1741
 msgid "Report a Problem..."
 msgstr "Nahlásit problém…"
 
-#: ../raphodo/rapid.py:1703
+#: ../raphodo/rapid.py:1745
 msgid "Make a Donation..."
 msgstr "Podpořit vývoj darem…"
 
-#: ../raphodo/rapid.py:1707
+#: ../raphodo/rapid.py:1749
 msgid "Translate this Application..."
 msgstr "Přeložit texty v této aplikaci do svého jazyka…"
 
-#: ../raphodo/rapid.py:1711
+#: ../raphodo/rapid.py:1753
 msgid "&About..."
 msgstr "O &aplikaci…"
 
-#: ../raphodo/rapid.py:1715
+#: ../raphodo/rapid.py:1757
 msgid "Check for Updates..."
 msgstr "Zkontrolovat dostupnost aktualizací…"
 
-#: ../raphodo/rapid.py:1797
+#: ../raphodo/rapid.py:1840
 msgid "Timeline"
 msgstr "Časová osa"
 
-#: ../raphodo/rapid.py:1807
+#: ../raphodo/rapid.py:1850
 msgid "Destination"
 msgstr "Cíl"
 
-#: ../raphodo/rapid.py:1808
+#: ../raphodo/rapid.py:1851
 msgid "Rename"
 msgstr "Přejmenovat"
 
-#: ../raphodo/rapid.py:1810
+#: ../raphodo/rapid.py:1853
 msgid "Back Up"
 msgstr "Zálohovat"
 
 #. Devices Header and View
-#: ../raphodo/rapid.py:1926
+#: ../raphodo/rapid.py:1977
 msgid ""
 "Turn on or off the use of devices attached to this computer as download "
 "sources"
@@ -3215,79 +3922,79 @@ msgstr ""
 "zdrojů pro stahování"
 
 #. This Computer Header and View
-#: ../raphodo/rapid.py:1940
+#: ../raphodo/rapid.py:1994
 msgid ""
 "Turn on or off the use of a folder on this computer as a download source"
 msgstr ""
 "Vypnout nebo zapnout použití složky v tomto počítači jako zdroje pro "
 "stahování"
 
-#: ../raphodo/rapid.py:1941
+#: ../raphodo/rapid.py:1996
 msgid "This Computer"
 msgstr "Tento počítač"
 
-#: ../raphodo/rapid.py:1952
+#: ../raphodo/rapid.py:2009
 msgid "Select a source folder"
 msgstr "Vyberte zdrojovou složku"
 
-#: ../raphodo/rapid.py:1975
+#: ../raphodo/rapid.py:2038
 msgid "Projected Storage Use"
 msgstr "Předpokládané využití úložiště"
 
-#: ../raphodo/rapid.py:1989 ../raphodo/rapid.py:1997
+#: ../raphodo/rapid.py:2056 ../raphodo/rapid.py:2068
 msgid "Select a destination folder"
 msgstr "Vyberte cílovou složku"
 
-#: ../raphodo/rapid.py:2045
+#: ../raphodo/rapid.py:2117
 msgid "All"
 msgstr "Vše"
 
-#: ../raphodo/rapid.py:2046
+#: ../raphodo/rapid.py:2118
 msgid "New"
 msgstr "Nové"
 
-#: ../raphodo/rapid.py:2048
+#: ../raphodo/rapid.py:2120
 msgid "Show:"
 msgstr "Zobrazit:"
 
-#: ../raphodo/rapid.py:2051
+#: ../raphodo/rapid.py:2123
 msgid "Modification Time"
 msgstr "Okamžik úpravy"
 
-#: ../raphodo/rapid.py:2052
+#: ../raphodo/rapid.py:2124
 msgid "Checked State"
 msgstr "Zaškrtnuto"
 
-#: ../raphodo/rapid.py:2055
+#: ../raphodo/rapid.py:2127
 msgid "File Type"
 msgstr "Typ souboru"
 
-#: ../raphodo/rapid.py:2056
+#: ../raphodo/rapid.py:2128
 msgid "Device"
 msgstr "Zařízení"
 
-#: ../raphodo/rapid.py:2058
+#: ../raphodo/rapid.py:2130
 msgid "Sort:"
 msgstr "Seřadit:"
 
-#: ../raphodo/rapid.py:2069
+#: ../raphodo/rapid.py:2141
 msgid "Select All:"
 msgstr "Vybrat všechny:"
 
-#: ../raphodo/rapid.py:2311
+#: ../raphodo/rapid.py:2405
 #, python-format
 msgid "Download %(files)s"
 msgstr "Stáhnout %(files)s"
 
-#: ../raphodo/rapid.py:2327
+#: ../raphodo/rapid.py:2421
 msgid "Resume Download"
 msgstr "Pokračovat ve stahování"
 
-#: ../raphodo/rapid.py:2329
+#: ../raphodo/rapid.py:2423
 msgid "Pause"
 msgstr "Pozastavit"
 
-#: ../raphodo/rapid.py:2417
+#: ../raphodo/rapid.py:2511
 #, python-brace-format
 msgid ""
 "Please report the problem at <a href=\"{website}\">{website}</a>.<br><br>\n"
@@ -3298,15 +4005,15 @@ msgstr ""
 "Problém nahlaste na <a href=\"{website}\">{website}</a>.<br><br>\n"
 "            K hlášení přiložte soubor se záznamem událostí (log) "
 "<i>{log_file}</i> (Složku\n"
-"            ve které se nachází otevřete kliknutím <a href="
-"\"{log_path}\">sem</a>.\n"
+"            ve které se nachází otevřete kliknutím <a "
+"href=\"{log_path}\">sem</a>).\n"
 "            "
 
-#: ../raphodo/rapid.py:2431
+#: ../raphodo/rapid.py:2525
 msgid "Thank you for reporting a problem in Rapid Photo Downloader"
 msgstr "Děkujeme za nahlášení problému v aplikaci Rapid Photo Downloader"
 
-#: ../raphodo/rapid.py:2529
+#: ../raphodo/rapid.py:2624
 #, python-format
 msgid ""
 "<b>Changing This Computer source path</b><br><br>Do you really want to "
@@ -3319,11 +4026,11 @@ msgstr ""
 "%(source_path)s.<br><br>Pokud popis umístění změníte, právě probíhající "
 "stahování z tohoto počítače bude zrušeno."
 
-#: ../raphodo/rapid.py:2595
+#: ../raphodo/rapid.py:2694
 msgid "You cannot change the download destination while downloading."
 msgstr "V průběhu stahování není možné měnit cíl stahování."
 
-#: ../raphodo/rapid.py:2604
+#: ../raphodo/rapid.py:2704
 #, python-format
 msgid ""
 "<b>Confirm Download Destination</b><br><br>Are you sure you want to set the "
@@ -3332,27 +4039,25 @@ msgstr ""
 "<b>Potvrzení cíle stahování</b><br><br>Opravdu chcete nastavit cíl stahování "
 "%(file_type)s na %(path)s?"
 
-#: ../raphodo/rapid.py:2682
+#: ../raphodo/rapid.py:2785
 msgid ""
+"\n"
 "<b>Downloading all files</b><br><br>\n"
-"                    A download always includes all files that are checked "
-"for download,\n"
-"                    including those that are not currently displayed because "
-"the Timeline\n"
-"                    is being used or because only new files are being shown."
-"<br><br>\n"
-"                    Do you want to proceed with the download?"
+"A download always includes all files that are checked for download,\n"
+"including those that are not currently displayed because the Timeline\n"
+"is being used or because only new files are being shown.<br><br>\n"
+"Do you want to proceed with the download?\n"
+"                        "
 msgstr ""
+"\n"
 "<b>Stahování všech souborů</b><br><br>\n"
-"                    Stahování vždy zahrnuje všechny soubory, které byly "
-"označeny ke stažení,\n"
-"                    včetně těch, které aktuálně nejsou zobrazeny, protože je "
-"použita funkce \n"
-"                    časová osa nebo jsou zobrazovány pouze nové soubory."
-"<br><br>\n"
-"                    Pokračovat ve stahování?"
+"Stahování vždy obsahuje všechny soubory které jsou označené ke stažení,\n"
+"včetně těch, které nyní nejsou zobrazené protože je používána časová osa\n"
+"nebo protože jsou zobrazeny pouze nové soubory.<br><br>\n"
+"Chcete pokračovat ve stahování?\n"
+"                        "
 
-#: ../raphodo/rapid.py:2820
+#: ../raphodo/rapid.py:2937
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -3363,7 +4068,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: ../raphodo/rapid.py:2824
+#: ../raphodo/rapid.py:2940
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -3372,15 +4077,15 @@ msgstr ""
 "Tato složka pro stahování není platná:\n"
 "%s"
 
-#: ../raphodo/rapid.py:2827
+#: ../raphodo/rapid.py:2943
 msgid "Download Failure"
 msgstr "Stahování se nezdařilo"
 
-#: ../raphodo/rapid.py:2828
+#: ../raphodo/rapid.py:2944
 msgid "The download cannot proceed."
 msgstr "Stahování nemůže pokračovat."
 
-#: ../raphodo/rapid.py:2842
+#: ../raphodo/rapid.py:2962
 msgid ""
 "Photos and videos will not be backed up because there is nowhere to back "
 "them up. Do you still want to start the download?"
@@ -3388,8 +4093,7 @@ msgstr ""
 "Fotografie a videa nebudou zazálohovány protože není kam. Přesto zahájit "
 "stahování?"
 
-#. Translators: filetype will be replaced with 'photos' or 'videos'
-#: ../raphodo/rapid.py:2847 ../raphodo/rapid.py:2854
+#: ../raphodo/rapid.py:2969 ../raphodo/rapid.py:2979
 #, python-format
 msgid ""
 "No backup device exists for backing up %(filetype)s. Do you still want to "
@@ -3397,125 +4101,120 @@ msgid ""
 msgstr ""
 "Neexistuje zálohovací zařízení pro %(filetype)s. Přesto zahájit stahování?"
 
-#: ../raphodo/rapid.py:2848 ../raphodo/rpdfile.py:228
+#: ../raphodo/rapid.py:2971 ../raphodo/rpdfile.py:228
 msgid "photos"
 msgstr "fotografie"
 
-#: ../raphodo/rapid.py:2855 ../raphodo/rpdfile.py:223
+#: ../raphodo/rapid.py:2981 ../raphodo/rpdfile.py:223
 msgid "videos"
 msgstr "videa"
 
-#: ../raphodo/rapid.py:2861
+#: ../raphodo/rapid.py:2989
 msgid ""
 "<b>The photo and video backup destinations do not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
-"<b>Cíl zálohování fotografií a videí neexistuje nebo do něj nelze zapisovat."
-"</b><br><br>Přesto zahájit stahování?"
+"<b>Cíl zálohování fotografií a videí neexistuje nebo do něj nelze "
+"zapisovat.</b><br><br>Přesto zahájit stahování?"
 
-#: ../raphodo/rapid.py:2869 ../raphodo/rapid.py:2876
+#: ../raphodo/rapid.py:2999 ../raphodo/rapid.py:3008
 #, python-format
 msgid ""
 "<b>The %(filetype)s backup destination does not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
-"<b>Cíl zálohování %(filetype)s neexistuje nebo do něj nelze zapisovat.</"
-"b><br><br>Přesto zahájit stahování?"
+"<b>Cíl zálohování %(filetype)s neexistuje nebo do něj nelze "
+"zapisovat.</b><br><br>Přesto zahájit stahování?"
 
-#: ../raphodo/rapid.py:2871 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:818
+#: ../raphodo/rapid.py:3001 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:843
 msgid "photo"
 msgstr "fotografie"
 
-#: ../raphodo/rapid.py:2878 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:858
+#: ../raphodo/rapid.py:3010 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:883
 msgid "video"
 msgstr "video"
 
-#: ../raphodo/rapid.py:2886
+#: ../raphodo/rapid.py:3018
 msgid "Backup problem"
 msgstr "Chyba zálohování"
 
-#. Translators - in the middle is a unicode em dash - please retain it
-#. This string is displayed in the status bar when the download is running
-#: ../raphodo/rapid.py:3571
+#: ../raphodo/rapid.py:3756
 #, python-format
 msgid "%(downloading_from)s — %(time_left)s left (%(speed)s)"
 msgstr "%(downloading_from)s — %(time_left)s zbývá (%(speed)s)"
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3640
+#: ../raphodo/rapid.py:3828
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s staženo"
 
-#. Translators: e.g. 2 videos failed to download
-#: ../raphodo/rapid.py:3645
+#: ../raphodo/rapid.py:3836
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "%(noFiles)s %(filetypes)s se nepodařilo stáhnout"
 
-#: ../raphodo/rapid.py:3650 ../raphodo/rapid.py:3723
+#: ../raphodo/rapid.py:3842 ../raphodo/rapid.py:3927
 msgid "warnings"
 msgstr "varování"
 
-#: ../raphodo/rapid.py:3679
+#: ../raphodo/rapid.py:3873
 msgid "All downloads complete"
 msgstr "Všechna stahování dokončena"
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3686 ../raphodo/rapid.py:3695 ../raphodo/rapid.py:3704
-#: ../raphodo/rapid.py:3713 ../raphodo/rapid.py:3721
+#: ../raphodo/rapid.py:3881 ../raphodo/rapid.py:3892 ../raphodo/rapid.py:3903
+#: ../raphodo/rapid.py:3914 ../raphodo/rapid.py:3924
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: ../raphodo/rapid.py:3688 ../raphodo/rapid.py:3706
+#: ../raphodo/rapid.py:3884 ../raphodo/rapid.py:3906
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s staženo"
 
-#: ../raphodo/rapid.py:3697 ../raphodo/rapid.py:3715
+#: ../raphodo/rapid.py:3895 ../raphodo/rapid.py:3917
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "%(filetype)s se nepodařilo stáhnout"
 
-#: ../raphodo/rapid.py:3742
+#: ../raphodo/rapid.py:3950
 msgid "1 failure"
 msgstr "1 nezdar"
 
-#: ../raphodo/rapid.py:3744
+#: ../raphodo/rapid.py:3952
 #, python-format
 msgid "%d failures"
 msgstr "%d nezdarů"
 
-#: ../raphodo/rapid.py:3749
+#: ../raphodo/rapid.py:3957
 msgid "1 warning"
 msgstr "1 varování"
 
-#: ../raphodo/rapid.py:3751
+#: ../raphodo/rapid.py:3959
 #, python-format
 msgid "%d warnings"
 msgstr "%d varování"
 
-#: ../raphodo/rapid.py:3771
+#: ../raphodo/rapid.py:3981
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s"
 msgstr "Staženo %(no_files_and_types)s z %(devices)s"
 
-#: ../raphodo/rapid.py:3774
+#: ../raphodo/rapid.py:3985
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s — %(failures)s"
 msgstr "Staženo %(no_files_and_types)s z %(devices)s — %(failures)s"
 
-#: ../raphodo/rapid.py:3779
+#: ../raphodo/rapid.py:3989
 #, python-format
 msgid "No files downloaded — %(failures)s"
 msgstr "Nebyly staženy žádné soubory — %(failures)s"
 
-#: ../raphodo/rapid.py:3781
+#: ../raphodo/rapid.py:3991
 msgid "No files downloaded"
 msgstr "Žádné stažené soubory"
 
-#: ../raphodo/rapid.py:3805
+#: ../raphodo/rapid.py:4021
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
@@ -3524,7 +4223,7 @@ msgstr ""
 "Cílové podsložky a časová osa budou znovu vytvořeny poté co budou pro "
 "%(camera)s vytvořeny všechny náhledové obrázky"
 
-#: ../raphodo/rapid.py:3809
+#: ../raphodo/rapid.py:4026
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for this computer"
@@ -3532,7 +4231,7 @@ msgstr ""
 "Cílové podsložky a časová osa budou znovu vytvořeny poté co budou pro tento "
 "počítač vytvořeny všechny náhledové obrázky"
 
-#: ../raphodo/rapid.py:3812
+#: ../raphodo/rapid.py:4031
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
@@ -3541,7 +4240,7 @@ msgstr ""
 "Cílové podsložky a časová osa budou znovu vytvořeny poté co budou pro "
 "%(device)s vytvořeny všechny náhledové obrázky"
 
-#: ../raphodo/rapid.py:3820
+#: ../raphodo/rapid.py:4039
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
@@ -3550,7 +4249,7 @@ msgstr ""
 "Cílové podsložky a časová osa budou znovu vytvořeny poté co budou pro "
 "%(number_devices)s a tento počítač vytvořeny všechny náhledové obrázky"
 
-#: ../raphodo/rapid.py:3833
+#: ../raphodo/rapid.py:4052
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
@@ -3559,7 +4258,7 @@ msgstr ""
 "Cílové podsložky a časová osa budou znovu vytvořeny poté co budou pro "
 "%(camera)s a tento počítač vytvořeny všechny náhledové obrázky"
 
-#: ../raphodo/rapid.py:3837
+#: ../raphodo/rapid.py:4056
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
@@ -3568,7 +4267,7 @@ msgstr ""
 "Cílové podsložky a časová osa budou znovu vytvořeny poté co budou pro "
 "%(device)s a tento počítač vytvořeny všechny náhledové obrázky"
 
-#: ../raphodo/rapid.py:3841
+#: ../raphodo/rapid.py:4060
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
@@ -3577,15 +4276,15 @@ msgstr ""
 "Cílové podsložky a časová osa budou znovu vytvořeny poté co budou pro "
 "%(number_devices)s zařízení vytvořeny všechny náhledové obrázky"
 
-#: ../raphodo/rapid.py:3867
+#: ../raphodo/rapid.py:4087
 msgid "The Destination subfolders and Timeline have been rebuilt"
 msgstr "Cílové podsložky a časová osa byly znovu vytvořeny"
 
-#: ../raphodo/rapid.py:3922
+#: ../raphodo/rapid.py:4144
 msgid "Program preferences are invalid"
 msgstr "Předvolby aplikace nejsou platné"
 
-#: ../raphodo/rapid.py:3999
+#: ../raphodo/rapid.py:4228
 #, python-format
 msgid ""
 "<b>All files on the %(camera)s are inaccessible</b>.<br><br>It may be locked "
@@ -3597,41 +4296,42 @@ msgstr ""
 "<b>Veškeré soubory v %(camera)s jsou nepřístupné</b>.<br><br>Může být "
 "zamčený nebo není nastavený pro přenos souborů protokolem MTP. Můžete ho "
 "odemknout a zkusit to znovu.<br><br>Na některých modelech může také být "
-"třeba změnit nastavení z <i>USB nabíjení</i> na <i>USB přenos souborů</i>."
-"<br><br>Případně toto zařízení můžete ignorovat."
+"třeba změnit nastavení z <i>USB nabíjení</i> na <i>USB přenos "
+"souborů</i>.<br><br>Případně toto zařízení můžete ignorovat."
 
-#: ../raphodo/rapid.py:4008
+#: ../raphodo/rapid.py:4239
 #, python-format
 msgid ""
-"<b>The %(camera)s appears to be in use by another application.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again.<br><br>Alternatively, you can ignore this "
-"device."
+"<b>The %(camera)s appears to be in use by another "
+"application.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again.<br><br>Alternatively, you "
+"can ignore this device."
 msgstr ""
 "<b>Zdá se, že %(camera)s je používán jinou aplikací.</b><br><br>Můžete "
 "ukončit všechny ostatní aplikace (jako například správce souborů) které ho "
 "používají a zkusit to znovu. Pokud to nepomůže, odpojte %(camera)s od "
 "počítače a opět připojte.<br><br>Případně toto zařízení můžete ignorovat."
 
-#: ../raphodo/rapid.py:4019
+#: ../raphodo/rapid.py:4250
 msgid "&Try Again"
 msgstr "Zkusi&t znovu"
 
-#: ../raphodo/rapid.py:4020
+#: ../raphodo/rapid.py:4251
 msgid "&Ignore This Device"
 msgstr "&Ignorovat toto zařízení"
 
-#: ../raphodo/rapid.py:4086
+#: ../raphodo/rapid.py:4323
 #, python-format
 msgid "Sorry, an unexpected problem occurred while scanning %s."
-msgstr "Omlouváme se, ale při prohledávání %s došlo k neočekávanému problému."
+msgstr ""
+"Omlouváme se, ale při prohledávání %s došlo k neočekávanému problému."
 
-#: ../raphodo/rapid.py:4087
+#: ../raphodo/rapid.py:4324
 msgid "Unfortunately you cannot download from this device."
 msgstr "Z tohoto zařízení žel není možné stahovat."
 
-#: ../raphodo/rapid.py:4091
+#: ../raphodo/rapid.py:4328
 msgid ""
 "A possible workaround for the problem might be downloading from the camera's "
 "memory card using a card reader."
@@ -3639,31 +4339,31 @@ msgstr ""
 "Možným způsobem jak problém obejít by mohlo být vyjmout paměťovou kartu z "
 "fotoaparátu, vložit jí do čtečky a stahovat přímo z ní."
 
-#: ../raphodo/rapid.py:4096
+#: ../raphodo/rapid.py:4333
 msgid "Device scan failed"
 msgstr "Prohledání zařízení se nezdařilo"
 
-#: ../raphodo/rapid.py:4472
+#: ../raphodo/rapid.py:4720
 #, python-format
 msgid ""
-"<b>The %(camera)s cannot be scanned because it cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again."
+"<b>The %(camera)s cannot be scanned because it cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again."
 msgstr ""
 "<b>%(camera)s není možné prohledat, protože se nedaří získat výhradní "
 "přístup k němu.</b><br><br>Můžete ukončit všechny ostatní aplikace (jako "
 "například správce souborů) které ho používají a zkusit to znovu. Pokud to "
 "nepomůže, odpojte %(camera)s od počítače a opět připojte."
 
-#: ../raphodo/rapid.py:4496
+#: ../raphodo/rapid.py:4745
 #, python-format
 msgid ""
-"<b>The download cannot start because the %(camera)s cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again, and choose which files you want to "
-"download from it."
+"<b>The download cannot start because the %(camera)s cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again, and choose which files "
+"you want to download from it."
 msgstr ""
 "<b>Stahování nemůže začít, protože k %(camera)s se nedaří získat výhradní "
 "přístup.</b><br><br>Můžete ukončit všechny ostatní aplikace (jako například "
@@ -3671,40 +4371,67 @@ msgstr ""
 "odpojte %(camera)s od počítače a opět připojte a zvolte soubory, které z něj "
 "chcete stáhnout."
 
-#: ../raphodo/rapid.py:4635
+#: ../raphodo/rapid.py:4842
+msgid "Completed Downloads Present"
+msgstr "Současná dokončená stahování"
+
+#: ../raphodo/rapid.py:4844
+#, python-format
+msgid "%s whose download have completed are displayed."
+msgstr "Jsou zobrazeny %s jejihž stahování je dokončeno."
+
+#: ../raphodo/rapid.py:4846
+msgid "Do you want to clear the completed downloads?"
+msgstr "Chcete vyčistit dokončená stahování?"
+
+#: ../raphodo/rapid.py:4848
+msgid "Completed Download Present"
+msgstr "Prezentace dokončených stahování"
+
+#: ../raphodo/rapid.py:4850
+#, python-format
+msgid "%s whose download has completed is displayed."
+msgstr "Je zobrazeno %s jehož stahování je dokončeno."
+
+#: ../raphodo/rapid.py:4852
+msgid "Do you want to clear the completed download?"
+msgstr "Chcete vyčistit dokončená stahování?"
+
+#: ../raphodo/rapid.py:4933
 #, python-format
 msgid ""
 "Do you want to download photos and videos from the device <i>%(device)s</i>?"
 msgstr "Stáhnout fotografie a videa ze zařízení <i>%(device)s</i>?"
 
-#: ../raphodo/rapid.py:4877
+#: ../raphodo/rapid.py:5183
 #, python-format
 msgid "<b>Do you want to ignore the %s whenever this program is run?</b>"
 msgstr "<b>Ignorovat %s pokaždé, když je tato aplikace spuštěná?</b>"
 
-#: ../raphodo/rapid.py:4879
+#: ../raphodo/rapid.py:5186
 msgid ""
 "All cameras, phones and tablets with the same model name will be ignored."
 msgstr ""
 "Veškeré fotoaparáty, telefony a tablety se stejným názvem modelu budou "
 "ignorovány."
 
-#: ../raphodo/rapid.py:4883
+#: ../raphodo/rapid.py:5190
 #, python-format
 msgid ""
 "<b>Do you want to ignore the device %s whenever this program is run?</b>"
-msgstr "<b>Ignorovat zařízení %s pokaždé, když je tato aplikace spuštěná?</b>"
+msgstr ""
+"<b>Ignorovat zařízení %s pokaždé, když je tato aplikace spuštěná?</b>"
 
-#: ../raphodo/rapid.py:4885
+#: ../raphodo/rapid.py:5192
 msgid "Any device with the same name will be ignored."
 msgstr "Všechna zařízení s takovým názvem budou ignorována."
 
-#: ../raphodo/rapid.py:5178
+#: ../raphodo/rapid.py:5492
 #, python-format
 msgid "Downloading from %(location)s on This Computer."
 msgstr "Stahování z %(location)s na tomto počítači."
 
-#: ../raphodo/rapid.py:5180
+#: ../raphodo/rapid.py:5496
 msgid ""
 "Do you really want to download from here?<br><br>On some systems, scanning "
 "this location can take a very long time."
@@ -3712,93 +4439,93 @@ msgstr ""
 "Opravdu chcete stáhnout odsud?<br><br>Na některých systémech totiž "
 "prohledávání tohoto umístění může trvat opravdu dlouho."
 
-#: ../raphodo/rapid.py:5224
+#: ../raphodo/rapid.py:5537
 #, python-format
 msgid "Generating thumbnails for %s"
 msgstr "Vytváření náhledových obrázků pro %s"
 
-#: ../raphodo/rapid.py:5227
+#: ../raphodo/rapid.py:5540
 #, python-format
 msgid "Scanning %s"
 msgstr "Prohledávání %s"
 
-#: ../raphodo/rapid.py:5237
+#: ../raphodo/rapid.py:5551
 #, python-format
 msgid ""
 "%(number)s of %(available files)s checked for download (%(hidden)s hidden)"
 msgstr ""
 "%(number)s z %(available files)s označeno ke stažení (%(hidden)s skryto)"
 
-#: ../raphodo/rapid.py:5243
+#: ../raphodo/rapid.py:5559
 #, python-format
 msgid "%(number)s of %(available files)s checked for download"
 msgstr "%(number)s z %(available files)s označeno ke stažení"
 
-#: ../raphodo/rapid.py:5494
+#: ../raphodo/rapid.py:5764
 msgid "Display program information when run from the command line."
 msgstr ""
 "Při spuštění aplikace z příkazového řádku v něm vypisovat informace z "
 "aplikace."
 
-#: ../raphodo/rapid.py:5496
+#: ../raphodo/rapid.py:5766
 msgid "Display debugging information when run from the command line."
 msgstr ""
 "Při spuštění aplikace z příkazového řádku v něm vypisovat ladicí informace."
 
-#: ../raphodo/rapid.py:5499
+#: ../raphodo/rapid.py:5769
 msgid "List photo and video file extensions the program recognizes and exit."
 msgstr ""
 "Zobrazit přípony souborů s fotografiemi a videi které aplikace rozpoznává a "
 "skončit."
 
-#: ../raphodo/rapid.py:5502
+#: ../raphodo/rapid.py:5772
 msgid "Turn on or off the the renaming of photos."
 msgstr "Zapnout nebo vypnout přejmenovávání fotografií."
 
-#: ../raphodo/rapid.py:5504
+#: ../raphodo/rapid.py:5774
 msgid "turn on or off the the renaming of videos."
 msgstr "zapnout nebo vypnout přejmenovávání videí."
 
-#: ../raphodo/rapid.py:5506
+#: ../raphodo/rapid.py:5776
 msgid ""
 "Turn on or off the automatic detection of devices from which to download."
 msgstr ""
 "Zapnout nebo vypnout automatické zjišťování zařízení ze kterých stahovat."
 
-#: ../raphodo/rapid.py:5510
+#: ../raphodo/rapid.py:5780
 msgid "Turn on or off downloading from this computer."
 msgstr "Zapnout nebo vypnout stahování z tohoto počítače."
 
-#: ../raphodo/rapid.py:5512 ../raphodo/rapid.py:5515 ../raphodo/rapid.py:5518
-#: ../raphodo/rapid.py:5539 ../raphodo/rapid.py:5543
+#: ../raphodo/rapid.py:5782 ../raphodo/rapid.py:5785 ../raphodo/rapid.py:5788
+#: ../raphodo/rapid.py:5809 ../raphodo/rapid.py:5813
 msgid "PATH"
 msgstr "POPIS UMÍSTĚNÍ"
 
-#: ../raphodo/rapid.py:5513
+#: ../raphodo/rapid.py:5783
 msgid "The PATH on this computer from which to download."
 msgstr "POPIS UMÍSTĚNÍ na tomto počítači ze kterého stahovat."
 
-#: ../raphodo/rapid.py:5516
+#: ../raphodo/rapid.py:5786
 msgid "The PATH where photos will be downloaded to."
 msgstr "POPIS UMÍSTĚNÍ do kterého budou stahovány fotografie."
 
-#: ../raphodo/rapid.py:5519
+#: ../raphodo/rapid.py:5789
 msgid "The PATH where videos will be downloaded to."
 msgstr "POPIS UMÍSTĚNÍ do kterého budou stahována videa."
 
-#: ../raphodo/rapid.py:5521
+#: ../raphodo/rapid.py:5791
 msgid "Turn on or off the backing up of photos and videos while downloading."
 msgstr "Zapnout nebo vypnout zálohování fotografií a videí během stahování."
 
-#: ../raphodo/rapid.py:5525
+#: ../raphodo/rapid.py:5795
 msgid "Turn on or off the automatic detection of backup devices."
 msgstr "Zapnout nebo vypnout automatické zjišťování zálohovacích zařízení."
 
-#: ../raphodo/rapid.py:5527 ../raphodo/rapid.py:5533
+#: ../raphodo/rapid.py:5797 ../raphodo/rapid.py:5803
 msgid "FOLDER"
 msgstr "SLOŽKA"
 
-#: ../raphodo/rapid.py:5528
+#: ../raphodo/rapid.py:5798
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected photo "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3811,7 +4538,7 @@ msgstr ""
 "si přejete používat pro zálohování fotografií, vytvořte složku s tímto "
 "názvem."
 
-#: ../raphodo/rapid.py:5534
+#: ../raphodo/rapid.py:5804
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected video "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3823,7 +4550,7 @@ msgstr ""
 "zda zařízení slouží pro zálohování. Proto na každém zařízení, které si "
 "přejete používat pro zálohování videí, vytvořte složku s tímto názvem."
 
-#: ../raphodo/rapid.py:5540
+#: ../raphodo/rapid.py:5810
 msgid ""
 "The PATH where photos will be backed up when automatic detection of backup "
 "devices is turned off."
@@ -3831,7 +4558,7 @@ msgstr ""
 "POPIS UMÍSTĚNÍ do kterého budou zálohovány fotografie v případě vypnutí "
 "automatického zjišťování zálohovacích zařízení."
 
-#: ../raphodo/rapid.py:5544
+#: ../raphodo/rapid.py:5814
 msgid ""
 "The PATH where videos will be backed up when automatic detection of backup "
 "devices is turned off."
@@ -3839,24 +4566,25 @@ msgstr ""
 "POPIS UMÍSTĚNÍ do kterého budou zálohována videa v případě vypnutí "
 "automatického zjišťování zálohovacích zařízení."
 
-#: ../raphodo/rapid.py:5547
+#: ../raphodo/rapid.py:5817
 #, python-format
 msgid "Ignore photos with the following extensions: %s"
 msgstr "Nevšímat si fotografií s následujícími příponami: %s"
 
-#: ../raphodo/rapid.py:5551
-msgid "Turn on or off starting downloads as soon as the program itself starts."
+#: ../raphodo/rapid.py:5821
+msgid ""
+"Turn on or off starting downloads as soon as the program itself starts."
 msgstr ""
 "Zapnout nebo vypnout automatiku zahájení stahování spouštěnou startem této "
 "aplikace."
 
-#: ../raphodo/rapid.py:5554
+#: ../raphodo/rapid.py:5824
 msgid "Turn on or off starting downloads as soon as a device is inserted."
 msgstr ""
 "Zapnout nebo vypnout automatiku zahájení stahování spouštěnou připojením "
 "zařízení."
 
-#: ../raphodo/rapid.py:5557
+#: ../raphodo/rapid.py:5827
 msgid ""
 "Turn on or off use of the Rapid Photo Downloader Thumbnail Cache. Turning it "
 "off does not delete existing cache contents."
@@ -3864,7 +4592,7 @@ msgstr ""
 "Zapnout nebo vypnout používání mezipaměti náhledových obrázků aplikace Rapid "
 "Photo Downloader. Vypnutí nesmaže už existující obsah mezipaměti."
 
-#: ../raphodo/rapid.py:5561
+#: ../raphodo/rapid.py:5831
 msgid ""
 "Delete all thumbnails in the Rapid Photo Downloader Thumbnail Cache, and "
 "exit."
@@ -3872,11 +4600,11 @@ msgstr ""
 "Vymazat veškeré náhledové obrázky z mezipaměti aplikace Rapid Photo "
 "Downloader a skončit."
 
-#: ../raphodo/rapid.py:5565
+#: ../raphodo/rapid.py:5835
 msgid "Forget which files have been previously downloaded, and exit."
 msgstr "Zapomenout které soubory byly dříve staženy a skončit."
 
-#: ../raphodo/rapid.py:5568
+#: ../raphodo/rapid.py:5838
 msgid ""
 "Import preferences from an old program version and exit. Requires the "
 "command line program gconftool-2."
@@ -3884,7 +4612,7 @@ msgstr ""
 "Importovat předvolby ze starší verze aplikace a skončit. Vyžaduje přítomnost "
 "nástroje gconftool-2."
 
-#: ../raphodo/rapid.py:5571
+#: ../raphodo/rapid.py:5841
 msgid ""
 "Reset all program settings to their default values, delete all thumbnails in "
 "the Thumbnail cache, forget which files have been previously downloaded, and "
@@ -3894,16 +4622,16 @@ msgstr ""
 "veškeré náhledové obrázky, zapomenout které soubory byly dříve staženy a "
 "skončit."
 
-#: ../raphodo/rapid.py:5575
+#: ../raphodo/rapid.py:5845
 msgid "Include gphoto2 debugging information in log files."
 msgstr ""
 "Do souborů se záznamy událostí zahrnout i ladící informace knihovny gphoto2."
 
-#: ../raphodo/rapid.py:5579
+#: ../raphodo/rapid.py:5849
 msgid "Print information to the terminal about attached cameras and exit."
 msgstr "Vypsat na terminál informace o připojených fotoaparátech a skončit."
 
-#: ../raphodo/rapid.py:5640
+#: ../raphodo/rapid.py:5911
 msgid ""
 "To import preferences from the old version of Rapid Photo Downloader, you "
 "must install the program gconftool-2."
@@ -3911,35 +4639,47 @@ msgstr ""
 "Pro import předvoleb ze starší verze aplikace Rapid Photo Downloader je "
 "třeba nainstalovat nástroj gconftool-2."
 
-#: ../raphodo/rapid.py:5649
+#: ../raphodo/rapid.py:5920
 msgid "No prior program preferences detected: exiting"
 msgstr "Nebyly zjištěny žádné předchozí předvolby aplikace: ukončování"
 
-#: ../raphodo/rapid.py:5652
+#: ../raphodo/rapid.py:5923
 #, python-format
 msgid "Importing preferences from Rapid Photo Downloader %(version)s"
 msgstr "Import předvoleb z Rapid Photo Downloader %(version)s"
 
-#: ../raphodo/rapid.py:5714
+#: ../raphodo/rapid.py:5989
 #, python-format
-msgid "Do you want to copy the stored sequence number, which has the value %d?"
+msgid ""
+"Do you want to copy the stored sequence number, which has the value %d?"
 msgstr "Zkopírovat uložené pořadové číslo, které má hodnotu %d?"
 
-#: ../raphodo/rapid.py:5726
+#: ../raphodo/rapid.py:6000
 msgid "Program aborting."
 msgstr "Ukončování aplikace."
 
-#: ../raphodo/rapid.py:5736
+#: ../raphodo/rapid.py:6010
 msgid "Never run this program as the sudo / root user."
 msgstr "Nikdy tuto aplikaci nespouštějte s právy správy systému (sudo/root)."
 
-#: ../raphodo/rapid.py:5740
+#: ../raphodo/rapid.py:6014
 msgid "You must install ExifTool to run Rapid Photo Downloader."
 msgstr ""
 "Pro provoz aplikace Rapid Photo Downloader je třeba nainstalovat nástroj "
 "ExifTool."
 
-#: ../raphodo/rapid.py:5794
+#: ../raphodo/rapid.py:6026
+msgid ""
+"Rapid Photo Downloader is installed in multiple locations.\n"
+"\n"
+"Uninstall all copies except the version you want to run."
+msgstr ""
+"Rapid Photo Downloader je na tomto počítači nainstalovaný vícekrát "
+"najednou.\n"
+"\n"
+"Ponechte pouze tu instalaci, kterou chcete používat a ostatní odinstalujte."
+
+#: ../raphodo/rapid.py:6083
 msgid ""
 "When specifying a path on the command line, do not also specify an\n"
 "option for device auto detection or a path on \"This Computer\"."
@@ -3948,15 +4688,15 @@ msgstr ""
 "předvolbu pro automatické zjišťování zařízení nebo popis umístění na „Tento "
 "počítač“."
 
-#: ../raphodo/rapid.py:5950
+#: ../raphodo/rapid.py:6243
 msgid "All settings and caches have been reset"
 msgstr "Veškerá nastavení a mezipaměti byly resetovány"
 
-#: ../raphodo/rapid.py:5958
+#: ../raphodo/rapid.py:6251
 msgid "Thumbnail Cache has been reset"
 msgstr "Mezipaměť náhledových obrázků byla resetována"
 
-#: ../raphodo/rapid.py:5964
+#: ../raphodo/rapid.py:6257
 msgid "Remembered files have been forgotten"
 msgstr "Zapamatované soubory byly zapomenuty"
 
@@ -3974,15 +4714,15 @@ msgstr ""
 "Napříště už nevarovat ohle&dně chybějících nebo poškozených softwarových "
 "knihoven"
 
-#: ../raphodo/renameandmovefile.py:546
+#: ../raphodo/renameandmovefile.py:554
 msgid "subfolder and filename"
 msgstr "podsložka a název souboru"
 
-#: ../raphodo/renameandmovefile.py:548
+#: ../raphodo/renameandmovefile.py:556
 msgid "filename"
 msgstr "název souboru"
 
-#: ../raphodo/renameandmovefile.py:550
+#: ../raphodo/renameandmovefile.py:558
 msgid "subfolder"
 msgstr "podsložka"
 
@@ -4071,160 +4811,237 @@ msgstr "fotografie a videa"
 msgid "photos or videos"
 msgstr "fotografie nebo videa"
 
-#: ../raphodo/rpdfile.py:306
+#: ../raphodo/rpdfile.py:315
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: ../raphodo/rpdfile.py:318
+#. translators: natural language expression signifying a single video
+#: ../raphodo/rpdfile.py:337
+msgid "a video"
+msgstr "video"
+
+#: ../raphodo/rpdfile.py:339
 msgid "1 Video"
 msgstr "1 video"
 
-#: ../raphodo/rpdfile.py:323
+#. translators: natural language expression signifying a single photo
+#: ../raphodo/rpdfile.py:346
+msgid "a photo"
+msgstr "fotografie"
+
+#: ../raphodo/rpdfile.py:348
 msgid "1 Photo"
 msgstr "1 fotografie"
 
-#: ../raphodo/rpdfile.py:803
+#: ../raphodo/rpdfile.py:828
 #, python-format
 msgid "%(path)s on %(camera)s"
 msgstr "%(path)s na %(camera)s"
 
-#: ../raphodo/rpdfile.py:819
+#: ../raphodo/rpdfile.py:844
 msgid "Photo"
 msgstr "Fotografie"
 
-#: ../raphodo/rpdfile.py:859
+#: ../raphodo/rpdfile.py:884
 msgid "Video"
 msgstr "Video"
 
-#: ../raphodo/storage.py:138
+#: ../raphodo/storage.py:141
 msgid "File system root"
 msgstr "Kořen souborového systému"
 
 #. translators: the name of the Pictures folder
-#: ../raphodo/storage.py:433
+#: ../raphodo/storage.py:437
 msgid "Pictures"
-msgstr "Obrázky"
+msgstr "Fotografie"
 
-#: ../raphodo/thumbnaildisplay.py:426
+#: ../raphodo/thumbnaildisplay.py:432
 #, python-format
 msgid "Taken on %(date_time)s (%(human_readable)s)"
 msgstr "Pořízeno %(date_time)s (%(human_readable)s)"
 
-#: ../raphodo/thumbnaildisplay.py:431
+#: ../raphodo/thumbnaildisplay.py:439
 #, python-format
 msgid "Modified on %(date_time)s (%(human_readable)s)"
 msgstr "Upraveno %(date_time)s (%(human_readable)s)"
 
-#: ../raphodo/thumbnaildisplay.py:437 ../raphodo/thumbnaildisplay.py:466
+#: ../raphodo/thumbnaildisplay.py:447 ../raphodo/thumbnaildisplay.py:481
 #, python-format
 msgid "%(date_time)s (%(human_readable)s)"
 msgstr "%(date_time)s (%(human_readable)s)"
 
-#: ../raphodo/thumbnaildisplay.py:451
+#: ../raphodo/thumbnaildisplay.py:464
 #, python-format
 msgid "Memory cards: %s"
 msgstr "Paměťové karty: %s"
 
-#: ../raphodo/thumbnaildisplay.py:457
+#: ../raphodo/thumbnaildisplay.py:468
+#, python-format
+msgid "Memory card: %s"
+msgstr "Paměťová karta: %s"
+
+#: ../raphodo/thumbnaildisplay.py:473
 msgid "Downloaded as:"
 msgstr "Staženo jako:"
 
-#: ../raphodo/thumbnaildisplay.py:472
+#: ../raphodo/thumbnaildisplay.py:489
 #, python-format
 msgid "<br><br>Previous download:<br>%(filename)s<br>%(path)s<br>%(date)s"
 msgstr "<br><br>Předchozí stahování:<br>%(filename)s<br>%(path)s<br>%(date)s"
 
-#: ../raphodo/thumbnaildisplay.py:1603
+#: ../raphodo/thumbnaildisplay.py:1645
 msgid "Copy Path"
 msgstr "Kopírovat popis umístění"
 
+#. Translators: these values are file size suffixes like B representing bytes, KB representing
+#. kilobytes, etc.
+#: ../raphodo/utilities.py:170
+msgid "B"
+msgstr "B"
+
+#: ../raphodo/utilities.py:170
+msgid "KB"
+msgstr "KB"
+
+#: ../raphodo/utilities.py:170
+msgid "MB"
+msgstr "MB"
+
+#: ../raphodo/utilities.py:170
+msgid "GB"
+msgstr "GB"
+
+#: ../raphodo/utilities.py:170
+msgid "TB"
+msgstr "TB"
+
+#: ../raphodo/utilities.py:170
+msgid "PB"
+msgstr "PB"
+
+#: ../raphodo/utilities.py:170
+msgid "EB"
+msgstr "EB"
+
+#: ../raphodo/utilities.py:170
+msgid "ZB"
+msgstr "ZB"
+
+#: ../raphodo/utilities.py:170
+msgid "YB"
+msgstr "YB"
+
 #. two things in a list e.g. "device1 and device2"
-#: ../raphodo/utilities.py:391
+#: ../raphodo/utilities.py:394
 #, python-format
 msgid "%(first_item)s and %(last_item)s"
 msgstr "%(first_item)s a %(last_item)s"
 
-#: ../raphodo/utilities.py:464
+#: ../raphodo/utilities.py:468
 msgid "one"
 msgstr "jedna"
 
-#: ../raphodo/utilities.py:465
+#: ../raphodo/utilities.py:469
 msgid "two"
 msgstr "dvě"
 
-#: ../raphodo/utilities.py:466
+#: ../raphodo/utilities.py:470
 msgid "three"
 msgstr "tři"
 
-#: ../raphodo/utilities.py:467
+#: ../raphodo/utilities.py:471
 msgid "four"
 msgstr "čtyři"
 
-#: ../raphodo/utilities.py:468
+#: ../raphodo/utilities.py:472
 msgid "five"
 msgstr "pět"
 
-#: ../raphodo/utilities.py:469
+#: ../raphodo/utilities.py:473
 msgid "six"
 msgstr "šest"
 
-#: ../raphodo/utilities.py:470
+#: ../raphodo/utilities.py:474
 msgid "seven"
 msgstr "sedm"
 
-#: ../raphodo/utilities.py:471
+#: ../raphodo/utilities.py:475
 msgid "eight"
 msgstr "osm"
 
-#: ../raphodo/utilities.py:472
+#: ../raphodo/utilities.py:476
 msgid "nine"
 msgstr "devět"
 
-#: ../raphodo/utilities.py:473
+#: ../raphodo/utilities.py:477
 msgid "ten"
 msgstr "deset"
 
-#: ../raphodo/utilities.py:474
+#: ../raphodo/utilities.py:478
 msgid "eleven"
 msgstr "jedenáct"
 
-#: ../raphodo/utilities.py:475
+#: ../raphodo/utilities.py:479
 msgid "twelve"
 msgstr "dvanáct"
 
-#: ../raphodo/utilities.py:476
+#: ../raphodo/utilities.py:480
 msgid "thirteen"
 msgstr "třináct"
 
-#: ../raphodo/utilities.py:477
+#: ../raphodo/utilities.py:481
 msgid "fourteen"
 msgstr "patnáct"
 
-#: ../raphodo/utilities.py:478
+#: ../raphodo/utilities.py:482
 msgid "fifteen"
 msgstr "patnáct"
 
-#: ../raphodo/utilities.py:479
+#: ../raphodo/utilities.py:483
 msgid "sixteen"
 msgstr "šestnáct"
 
-#: ../raphodo/utilities.py:480
+#: ../raphodo/utilities.py:484
 msgid "seventeen"
 msgstr "sedmnáct"
 
-#: ../raphodo/utilities.py:481
+#: ../raphodo/utilities.py:485
 msgid "eighteen"
 msgstr "osmnáct"
 
-#: ../raphodo/utilities.py:482
+#: ../raphodo/utilities.py:486
 msgid "ninenteen"
 msgstr "devatenáct"
 
-#: ../raphodo/utilities.py:483
+#: ../raphodo/utilities.py:487
 msgid "twenty"
 msgstr "dvacet"
 
+#: ../raphodo/viewutils.py:240
+msgid "&OK"
+msgstr "&OK"
+
+#: ../raphodo/viewutils.py:243
+msgid "&Save"
+msgstr "&Uložit"
+
+#: ../raphodo/viewutils.py:244
+msgid "&Help"
+msgstr "&Nápověda"
+
+#: ../raphodo/viewutils.py:245
+msgid "Restore Defaults"
+msgstr "Vrátit na výchozí hodnoty"
+
+#: ../raphodo/viewutils.py:246
+msgid "&Yes"
+msgstr "&Ano"
+
+#: ../raphodo/viewutils.py:247
+msgid "&No"
+msgstr "&Ne"
+
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:1
 msgid ""
 "Rapid Photo Downloader imports photos and videos from cameras, phones, "
@@ -4295,16 +5112,17 @@ msgstr "Nástroj pro stahování fotografií"
 #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:5
 msgid ""
-"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;"
-"memory;card;"
+"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;memory"
+";card;"
 msgstr ""
-"fotografie;stahování;fotografování;import;video;RAW;fotoaparát;telefon;"
-"záloha;paměť;karta;"
+"fotografie;stahování;fotografování;import;video;RAW;fotoaparát;telefon;záloha"
+";paměť;karta;"
 
 #: ../data/kde/net.damonlynch.rapid-photo-downloader.desktop.in.h:1
 msgid "Download Photos and Videos with Rapid Photo Downloader"
 msgstr "Stáhnout fotografie a videa pomocí aplikace Rapid Photo Downloader"
 
+#, python-format
 #~ msgid "<i>Example: %s</i>"
 #~ msgstr "<i>Příklad: %s</i>"
 
@@ -4326,6 +5144,7 @@ msgstr "Stáhnout fotografie a videa pomocí aplikace Rapid Photo Downloader"
 #~ msgid "and"
 #~ msgstr "a"
 
+#, python-format
 #~ msgid "and %s"
 #~ msgstr "a %s"
 
@@ -4422,6 +5241,7 @@ msgstr "Stáhnout fotografie a videa pomocí aplikace Rapid Photo Downloader"
 #~ msgid "Rename Options"
 #~ msgstr "Možnosti přejmenování"
 
+#, python-format
 #~ msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 #~ msgstr "Zbývá %(minutes)i:%(seconds)02i minut"
 
@@ -4431,11 +5251,11 @@ msgstr "Stáhnout fotografie a videa pomocí aplikace Rapid Photo Downloader"
 #~ msgid "only output errors to the command line"
 #~ msgstr "pouze výstup chyb do příkazové řádky"
 
+#, 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)"
+#~ msgstr "zobrazit informace o programu na příkazové řádce (default: %default)"
 
 #~ msgid " hh:mm"
 #~ msgstr " hh:mm"
@@ -4474,12 +5294,14 @@ msgstr "Stáhnout fotografie a videa pomocí aplikace Rapid Photo Downloader"
 #~ msgid "Size"
 #~ msgstr "Velikost"
 
+#, python-format
 #~ msgid "About %i seconds remaining"
 #~ msgstr "Zbývá %i sekund"
 
 #~ msgid "About 1 second remaining"
 #~ msgstr "Zbývá 1 sekunda"
 
+#, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
 #~ "Destination: %(destination)s"
@@ -4545,8 +5367,8 @@ msgstr "Stáhnout fotografie a videa pomocí aplikace Rapid Photo Downloader"
 #~ "Specify the time in 24 hour format at which the <i>Downloads today</i> "
 #~ "sequence number should be reset."
 #~ msgstr ""
-#~ "Specifikujte čas ve 24 hodinovém formátu aby mohlo být resetováno "
-#~ "sekvenční číslo v <i>Dnešní stahování</i>."
+#~ "Specifikujte čas ve 24 hodinovém formátu aby mohlo být resetováno sekvenční "
+#~ "číslo v <i>Dnešní stahování</i>."
 
 #~ msgid "Device Detected"
 #~ msgstr "Zařízení detekováno"
@@ -4569,12 +5391,14 @@ msgstr "Stáhnout fotografie a videa pomocí aplikace Rapid Photo Downloader"
 #~ msgid "Using backup devices"
 #~ msgstr "Používání zálohovacích zařízení"
 
+#, python-format
 #~ msgid "Source: %(source)s"
 #~ msgstr "Zdroj: %(source)s"
 
 #~ msgid "Remove all Job Codes?"
 #~ msgstr "Odstranit všechny pracovní kódy?"
 
+#, python-format
 #~ msgid "Destination directory could not be created: %(directory)s\n"
 #~ msgstr "Adresář destinace nelze vytvořit: %(directory)s\n"
 
@@ -4596,9 +5420,11 @@ msgstr "Stáhnout fotografie a videa pomocí aplikace Rapid Photo Downloader"
 #~ msgid "_File"
 #~ msgstr "_Soubor"
 
+#, python-format
 #~ msgid "Error: %(inst)s"
 #~ msgstr "Chyba: %(inst)s"
 
+#, python-format
 #~ msgid "Backing up to %(path)s"
 #~ msgstr "Zálohování %(path)s"
 
@@ -4629,8 +5455,7 @@ msgstr "Stáhnout fotografie a videa pomocí aplikace Rapid Photo Downloader"
 #~ "<span weight=\"bold\" size=\"x-large\">Složky stahování fotografií</span>"
 
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Složky stahování videa</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Složky stahování videa</span>"
 
 #~ msgid "Automatically detect devices"
 #~ msgstr "Automaticky detekovat zařízení"
@@ -4647,6 +5472,7 @@ msgstr "Stáhnout fotografie a videa pomocí aplikace Rapid Photo Downloader"
 #~ msgid "Photo Folders"
 #~ msgstr "Složky fotografií"
 
+#, python-format
 #~ msgid ""
 #~ "%(date)s\n"
 #~ "%(time)s"
@@ -4654,12 +5480,15 @@ msgstr "Stáhnout fotografie a videa pomocí aplikace Rapid Photo Downloader"
 #~ "%(date)s\n"
 #~ "%(time)s"
 
+#, python-format
 #~ msgid "%(date)s %(time)s"
 #~ msgstr "%(date)s %(time)s"
 
+#, python-format
 #~ msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
+#, python-format
 #~ msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
@@ -4669,27 +5498,34 @@ msgstr "Stáhnout fotografie a videa pomocí aplikace Rapid Photo Downloader"
 #~ msgid "Free space:"
 #~ msgstr "Volné místo:"
 
+#, python-format
 #~ msgid "(%(file_type)s)"
 #~ msgstr "(%(file_type)s)"
 
+#, python-format
 #~ msgid "%(free)s %(file_type)s"
 #~ msgstr "%(free)s %(file_type)s"
 
 #~ msgid "."
 #~ msgstr "."
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s"
 #~ msgstr "%(number)s z celkem %(total)s %(filetypes)s"
 
+#, python-format
 #~ msgid "%(file_type)s download folder is not writable"
 #~ msgstr "%(file_type)s do složky nelze zapisovat"
 
+#, python-format
 #~ msgid "Folder: %s"
 #~ msgstr "Složka: %s"
 
+#, python-format
 #~ msgid "%(file_type)s download folder is invalid"
 #~ msgstr "%(file_type)s složka je neplatná"
 
+#, python-format
 #~ msgid "%(file_type)s download folder does not exist"
 #~ msgstr "%(file_type)s složka neexistuje"
 
@@ -4699,6 +5535,7 @@ msgstr "Stáhnout fotografie a videa pomocí aplikace Rapid Photo Downloader"
 #~ msgid "list photo and video file extensions the program recognizes and exit"
 #~ msgstr "zobrazit přípony souborů, které program rozpozná, a skončit"
 
+#, python-format
 #~ msgid "%(free)s free"
 #~ msgstr "%(free)s volné"
 
@@ -4718,6 +5555,7 @@ msgstr "Stáhnout fotografie a videa pomocí aplikace Rapid Photo Downloader"
 #~ "Should this device or partition be used to download photos or videos from?"
 #~ msgstr "Nacházejí se na tomto zařízení fotografie nebo videa ke stažení?"
 
+#, python-format
 #~ msgid ""
 #~ "%(problem)s\n"
 #~ "File: %(file)s"
@@ -4725,21 +5563,27 @@ msgstr "Stáhnout fotografie a videa pomocí aplikace Rapid Photo Downloader"
 #~ "%(problem)s\n"
 #~ "Soubor: %(file)s"
 
+#, python-format
 #~ msgid "Select a folder containing %(file_types)s"
 #~ msgstr "Vyberte složku, která obsahuje %(file_types)s"
 
+#, python-format
 #~ msgid "%(filetype)s metadata cannot be read"
 #~ msgstr "Metadata %(filetype)s nelze načíst."
 
+#, python-format
 #~ msgid "Error generating component %s."
 #~ msgstr "Chyba při vytváření části %s."
 
+#, python-format
 #~ msgid "An error occurred when copying the %(filetype)s"
 #~ msgstr "Při kopírování %(filetype)s došlo k chybě."
 
+#, python-format
 #~ msgid "%(filetype)s %(area)s could not be generated"
 #~ msgstr "Nelze vytvořit %(filetype)s %(area)s"
 
+#, python-format
 #~ msgid ""
 #~ "The %(filetype)s subfolder preferences entered are invalid and cannot be "
 #~ "used.\n"
@@ -4749,6 +5593,7 @@ msgstr "Stáhnout fotografie a videa pomocí aplikace Rapid Photo Downloader"
 #~ "použít.\n"
 #~ "Použijí se výchozí hodnoty."
 
+#, python-format
 #~ msgid "Date time value %s appears invalid."
 #~ msgstr "Hodnota pro datum nebo čas %s je neplatná."
 
@@ -4765,27 +5610,32 @@ msgstr "Stáhnout fotografie a videa pomocí aplikace Rapid Photo Downloader"
 #~ "subfolders. Please use other subfolder naming options.</i>"
 #~ msgstr ""
 #~ "<i><b>Varování:</b> Není k dispozici dostatečný počet metadat, aby bylo "
-#~ "možné vytvořit složky. Použijte prosím pro vytvoření jména  jiné možnosti."
-#~ "</i>"
+#~ "možné vytvořit složky. Použijte prosím pro vytvoření jména  jiné "
+#~ "možnosti.</i>"
 
+#, python-format
 #~ msgid ""
 #~ "%(filetype)s could not be backed up because no suitable backup locations "
 #~ "were found."
 #~ msgstr ""
 #~ "%(filetype)s nelze zálohovat, protože nebylo nalezeno vhodné umístění."
 
+#, python-format
 #~ msgid "%(filetype)s already exists"
 #~ msgstr "%(filetype)s a již existuje"
 
+#, python-format
 #~ msgid "%(filetype)s was already downloaded"
 #~ msgstr "%(filetype)s byl už stažen"
 
+#, 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."
 
+#, python-format
 #~ msgid ""
-#~ "The existing %(filetype)s was last modified on %(date)s at %(time)s. "
-#~ "Unique identifier '%(identifier)s' added."
+#~ "The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
+#~ "identifier '%(identifier)s' added."
 #~ 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'."
@@ -4793,9 +5643,11 @@ msgstr "Stáhnout fotografie a videa pomocí aplikace Rapid Photo Downloader"
 #~ msgid "The metadata might be corrupt."
 #~ msgstr "Metadata jsou pravděpodobně poškozená."
 
+#, python-format
 #~ msgid "There is no data with which to name the %(filetype)s."
 #~ msgstr "Neexistují žádná data k pojmenování %(filetype)s."
 
+#, python-format
 #~ msgid "Error: %(errorno)s %(strerror)s"
 #~ msgstr "Chyba: %(errorno)s %(strerror)s"
 
@@ -4804,21 +5656,26 @@ msgstr "Stáhnout fotografie a videa pomocí aplikace Rapid Photo Downloader"
 #~ "downloaded."
 #~ msgstr "Jméno souboru, přípona a EXIF naznačují, že soubor byl již stažen."
 
+#, python-format
 #~ msgid "%(volume)s, "
 #~ msgstr "%(volume)s, "
 
+#, python-format
 #~ msgid "%(volume)s (%(inst)s), "
 #~ msgstr "%(volume)s (%(inst)s), "
 
+#, 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."
 
 #~ 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í: "
 
+#, 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."
 
+#, python-format
 #~ msgid ""
 #~ "Photos detected with the same filenames, but taken at different times: "
 #~ "%(details)s"
@@ -4826,60 +5683,72 @@ msgstr "Stáhnout fotografie a videa pomocí aplikace Rapid Photo Downloader"
 #~ "Byly nalezeny fotky se stejným jménem, ale rozdílným časem vzniku: "
 #~ "%(details)s"
 
+#, python-format
 #~ msgid " It was backed up to %(volume)s"
 #~ msgstr " byl zálohován na %(volume)s"
 
 #~ msgid " It was backed up to these devices: "
 #~ msgstr " byl zálohován na následující zařízení: "
 
+#, python-format
 #~ msgid "%s, "
 #~ msgstr "%s, "
 
+#, python-format
 #~ msgid "%(volumes)s and %(final_volume)s."
 #~ msgstr "%(volumes)s a %(final_volume)s."
 
 #~ msgid "Backups overwritten on these devices: "
 #~ msgstr "Zálohy na následujících zařízeních byly přepsány: "
 
+#, python-format
 #~ msgid "Backup overwritten on %(volume)s."
 #~ msgstr "Záloha na %(volume)s byla přepsána."
 
 #~ msgid "Backups already exist in these locations: "
 #~ msgstr "Zálohy už existují, a to v těchto umístěních: "
 
+#, python-format
 #~ msgid "Backup already exists on %(volume)s."
 #~ msgstr "Na zařízení %(volume)s už záloha existuje."
 
+#, python-format
 #~ msgid "%(volumes)s and %(volume)s."
 #~ msgstr "%(volumes)s a %(volume)s."
 
+#, python-format
 #~ msgid "%(volumes)s and %(volume)s (%(inst)s)."
 #~ msgstr "%(volumes)s a %(volume)s (%(inst)s)."
 
+#, python-format
 #~ msgid "%(previousproblem)s Additionally, %(newproblem)s"
 #~ msgstr "%(previousproblem)s - kromě toho: %(newproblem)s"
 
+#, python-format
 #~ msgid " Furthermore, there were %(problems)s."
 #~ msgstr " Kromě toho došlo k dalším %(problems)s problémům."
 
+#, 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."
 
 #~ msgid ""
-#~ "Errors occurred when creating directories on the following backup "
-#~ "devices: "
+#~ "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: "
 
+#, python-format
 #~ msgid "Problem in %s generation"
 #~ msgstr "Problém při vytváření %s"
 
+#, python-format
 #~ msgid "Problems in %s generation"
 #~ msgstr "Problémy při vytváření %s"
 
-#~ msgid ""
-#~ "An error occurred when copying the %(filetype)s, but it was backed up"
+#, 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"
 
+#, python-format
 #~ msgid "%(filetype)s already exists, but it was backed up"
 #~ msgstr "%(filetype)s už existuje, ale byl zálohován"
 
@@ -4889,10 +5758,11 @@ msgstr "Stáhnout fotografie a videa pomocí aplikace Rapid Photo Downloader"
 #~ msgid "Problems in subfolder and filename generation"
 #~ msgstr "Problémy při vytváření názvů pro složky a soubory"
 
-#~ msgid ""
-#~ "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
+#, python-format
+#~ msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
 #~ msgstr "%(missing_metadata_elements)s a %(final_missing_metadata_element)s."
 
+#, python-format
 #~ msgid " Furthermore, there was a %(problem)s."
 #~ msgstr " Kromě toho došlo k %(problem)s."
 
@@ -4908,12 +5778,14 @@ msgstr "Stáhnout fotografie a videa pomocí aplikace Rapid Photo Downloader"
 #~ msgid "there was an error backing up"
 #~ msgstr "chyba při zálohování"
 
+#, python-format
 #~ msgid "%(previousproblem)s, and %(backinguperror)s"
 #~ msgstr "%(previousproblem)s a %(backinguperror)s"
 
 #~ msgid "There was an error backing up"
 #~ msgstr "Chyba při zálohování"
 
+#, python-format
 #~ msgid "Path: %s"
 #~ msgstr "Cesta: %s"
 
@@ -4923,8 +5795,7 @@ msgstr "Stáhnout fotografie a videa pomocí aplikace Rapid Photo Downloader"
 #~ msgid "Photo has already been downloaded"
 #~ msgstr "Fotka už byla stažena"
 
-#~ msgid ""
-#~ "Photos detected with the same filenames, but taken at different times"
+#~ 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"
 
 #~ msgid "Next File"
@@ -4968,8 +5839,8 @@ msgstr "Stáhnout fotografie a videa pomocí aplikace Rapid Photo Downloader"
 #~ "Specify whether photo, video and folder names should have any characters "
 #~ "removed that are not allowed by other operating systems."
 #~ msgstr ""
-#~ "Určete znaky, které se mohou objevit v názvech souborů, ale mohly by "
-#~ "později působit problémy"
+#~ "Určete znaky, které se mohou objevit v názvech souborů, ale mohly by později "
+#~ "působit problémy"
 
 #~ msgid "Video backup folder name:"
 #~ msgstr "Název složky pro zálohu videí"
@@ -4981,12 +5852,11 @@ msgstr "Stáhnout fotografie a videa pomocí aplikace Rapid Photo Downloader"
 #~ msgstr "Po stažení souborů odpojit zařízení"
 
 #~ 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."
+#~ "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 ""
-#~ "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."
+#~ "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."
 
 #~ msgid "Import your photos and videos efficiently and reliably"
 #~ msgstr "Importovat fotky a videa spolehlivě"
@@ -5004,6 +5874,7 @@ msgstr "Stáhnout fotografie a videa pomocí aplikace Rapid Photo Downloader"
 #~ msgid "The following metadata is missing: "
 #~ msgstr "Následující metada chybí: "
 
+#, python-format
 #~ msgid "%(freespace)s. %(backuppaths)s."
 #~ msgstr "%(freespace)s. %(backuppaths)s."
 
@@ -5011,14 +5882,15 @@ msgstr "Stáhnout fotografie a videa pomocí aplikace Rapid Photo Downloader"
 #~ "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>"
+#~ "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 ""
 #~ "Vyberte složku, ve které jsou na zařízení uloženy zálohy.  \n"
-#~ "<i>Poznámka: Podle toho se také pozná, zda je zařízení použito pro "
-#~ "zálohy. Na každém zařízení, které chcete pro zálohy použít, vytvořte "
-#~ "složku s některým jménem. </i>"
+#~ "<i>Poznámka: Podle toho se také pozná, zda je zařízení použito pro zálohy. "
+#~ "Na každém zařízení, které chcete pro zálohy použít, vytvořte složku s "
+#~ "některým jménem. </i>"
 
+#, python-format
 #~ msgid "%(device)s did not unmount"
 #~ msgstr "%(device)s se neodpojilo"
 
@@ -5037,9 +5909,11 @@ msgstr "Stáhnout fotografie a videa pomocí aplikace Rapid Photo Downloader"
 #~ msgid "Performance"
 #~ msgstr "Výkon"
 
+#, 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"
 
+#, python-format
 #~ msgid "Backing up photos and videos to %(path)s"
 #~ msgstr "Zálohování fotografií a videí do %(path)s"
 
@@ -5049,6 +5923,7 @@ msgstr "Stáhnout fotografie a videa pomocí aplikace Rapid Photo Downloader"
 #~ msgid "Select a folder in which to backup videos"
 #~ msgstr "Zvolte složku ve které budou zálohována videa"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 #~ msgstr "%(number)s z %(total)s %(filetypes)s (%(remaining)s remaining)"
 
@@ -5073,6 +5948,7 @@ msgstr "Stáhnout fotografie a videa pomocí aplikace Rapid Photo Downloader"
 #~ msgid "Should all ignored paths be removed?"
 #~ msgstr "Opravdu chcete smazat všechny ignorované cesty?"
 
+#, python-format
 #~ msgid "Downloading from %(location)s."
 #~ msgstr "Stahování z %(location)s."
 
@@ -5097,12 +5973,14 @@ msgstr "Stáhnout fotografie a videa pomocí aplikace Rapid Photo Downloader"
 #~ msgid "Automatically rotate JPEG images"
 #~ msgstr "Automaticky otáčet obrázky formátu JPEG"
 
+#, python-format
 #~ msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
 #~ msgstr "hledám (nalezeno %(photos)s fotek a %(videos)s videí)..."
 
 #~ msgid "An unknown error occurred"
 #~ msgstr "Došlo k neznámé chybě"
 
+#, python-format
 #~ msgid "The %(filetype)s did not download correctly"
 #~ msgstr "%(filetype)s nebylo správně staženo"
 
@@ -5115,9 +5993,10 @@ msgstr "Stáhnout fotografie a videa pomocí aplikace Rapid Photo Downloader"
 #~ "Error: specify device auto-detection or manually specify a device's path "
 #~ "from which to download, but do not do both."
 #~ msgstr ""
-#~ "Chyba: vyberte autodetekci přístroje nebo ručně nastavte cestu ze které "
-#~ "se má stahovat, ale ne obojí."
+#~ "Chyba: vyberte autodetekci přístroje nebo ručně nastavte cestu ze které se "
+#~ "má stahovat, ale ne obojí."
 
+#, python-format
 #~ msgid ""
 #~ "The following regular expressions are invalid, and will be removed unless "
 #~ "you correct them:\n"
@@ -5131,15 +6010,18 @@ msgstr "Stáhnout fotografie a videa pomocí aplikace Rapid Photo Downloader"
 #~ "Do you really want to download from here? On some systems, scanning this "
 #~ "location can take a very long time."
 #~ msgstr ""
-#~ "Opravdu chcete stahovat odtud? Na některých systémech může sken této "
-#~ "lokace trvat velmi dlouho."
+#~ "Opravdu chcete stahovat odtud? Na některých systémech může sken této lokace "
+#~ "trvat velmi dlouho."
 
+#, python-format
 #~ msgid "Backup %(file_type)s overwritten"
 #~ msgstr "Záloha %(file_type)s přepsána"
 
+#, python-format
 #~ msgid "%(file_type)s not backed up"
 #~ msgstr "%(file_type)s nebylo zazálohováno"
 
+#, python-format
 #~ msgid "Backup of %(file_type)s already exists"
 #~ msgstr "Záloha %(file_type)s již existuje"
 
@@ -5151,38 +6033,38 @@ msgstr "Stáhnout fotografie a videa pomocí aplikace Rapid Photo Downloader"
 #~ "momentálnímu nastavení programu"
 
 #~ msgid ""
-#~ "manually specify the PATH of the device from which to download, "
-#~ "overwriting existing program preferences"
+#~ "manually specify the PATH of the device from which to download, overwriting "
+#~ "existing program preferences"
 #~ msgstr ""
 #~ "ručně vybrat cestu k přístroji ze kterého se má stahovat, nadřazené "
 #~ "momentálnímu nastavení programu"
 
+#, python-format
 #~ msgid "No backup device contains a valid folder for backing up %(filetype)s"
 #~ msgstr ""
-#~ "Žádný záložní přístroj neobsahuje platý adresář pro zálohování "
-#~ "%(filetype)s"
+#~ "Žádný záložní přístroj neobsahuje platý adresář pro zálohování %(filetype)s"
 
 #~ 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."
+#~ "devices for photos or videos. Any path ending with the values below will not "
+#~ "be scanned."
 #~ msgstr ""
 #~ "Upřesněte koncovou část jakékoliv cesty kterou chcete ignorovat při "
-#~ "prohledávání přístrojů pro fotografie a videa. Jakákoliv cesta končící "
-#~ "níže vypsanými hodnotami nebude prohledána."
+#~ "prohledávání přístrojů pro fotografie a videa. Jakákoliv cesta končící níže "
+#~ "vypsanými hodnotami nebude prohledána."
 
 #~ 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>."
+#~ "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 ""
 #~ "Omlouváme se, možnost stahování videa je vypnuta. Pro stahování videí "
 #~ "nainstalujte prosím buď <i>hachoir metadata</i> a <i>kaa metadata</i> "
 #~ "balíčky pro python, nebo <i>exiftool</i>."
 
 #~ msgid ""
-#~ "If you disable automatic detection, choose the exact location of the "
-#~ "photos and videos."
+#~ "If you disable automatic detection, choose the exact location of the photos "
+#~ "and videos."
 #~ msgstr ""
 #~ "Pokud vypnete automatickou detekci, vyberte přesné umístění fotografií a "
 #~ "videí."
@@ -5191,8 +6073,8 @@ msgstr "Stáhnout fotografie a videa pomocí aplikace Rapid Photo Downloader"
 #~ "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."
+#~ "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 ""
 #~ "Pokud povolíte automatickou detekci přenosných pamětoých médií, bude "
 #~ "skenován celý přístroj. Tot může na velkých přístrojích trvat déle.\n"
@@ -5204,28 +6086,28 @@ msgstr "Stáhnout fotografie a videa pomocí aplikace Rapid Photo Downloader"
 #~ "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"
+#~ "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>"
+#~ "<i>Downloading directly from cameras is currently an experimental feature. "
+#~ "If downloading directly from your camera works poorly or not at all, try "
+#~ "setting it to PTP mode. If that is not possible, a card reader must be "
+#~ "used.</i>"
 #~ msgstr ""
 #~ "Přístroje nastavují odkud má probíhat stahování fotek a videí, jaké jsou "
 #~ "fotoaparáty, pamětové karty nebo přenosné datove zdroje.\n"
 #~ "\n"
-#~ "Můžete stahovat z několika přístrojů naráz, nebo můžete vybrat cestu na "
-#~ "svůj disk.\n"
+#~ "Můžete stahovat z několika přístrojů naráz, nebo můžete vybrat cestu na svůj "
+#~ "disk.\n"
 #~ "\n"
-#~ "<i>Přímé stahování z fotoaparátů je momentálně pouze experimentální. "
-#~ "Pokud stahování přímo z fotoaparátu funguje špatně nebo vůbec, zkuste "
-#~ "nastavit PTP mód. Pokud toto není možné, je třeba použít čtečku karet.</i>"
+#~ "<i>Přímé stahování z fotoaparátů je momentálně pouze experimentální. Pokud "
+#~ "stahování přímo z fotoaparátu funguje špatně nebo vůbec, zkuste nastavit PTP "
+#~ "mód. Pokud toto není možné, je třeba použít čtečku karet.</i>"
 
 #~ 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."
+#~ "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 ""
 #~ "Uložené cesty jsou ty, které jsou přiřazeny přístrojům které jste vybrali "
 #~ "vždy prohledávat nebo ignorovat, pokud je zapnuta automatická detekce "
@@ -5237,9 +6119,10 @@ msgstr "Stáhnout fotografie a videa pomocí aplikace Rapid Photo Downloader"
 #~ msgid "Verify files as they are downloaded"
 #~ msgstr "Ověřovat soubory při stahování"
 
+#, python-format
 #~ msgid ""
-#~ "This regular expression is invalid, and will be removed unless you "
-#~ "correct it:\n"
+#~ "This regular expression is invalid, and will be removed unless you correct "
+#~ "it:\n"
 #~ " %s"
 #~ msgstr ""
 #~ "Tento regulární výraz je neplatný a bude odstraněn pokud ho neopravíte:\n"
@@ -5263,9 +6146,10 @@ msgstr "Stáhnout fotografie a videa pomocí aplikace Rapid Photo Downloader"
 #~ msgid "File verification failed on these devices: "
 #~ msgstr "Ověření souboru selhalo na těchto přístrojích: "
 
+#, python-format
 #~ msgid ""
-#~ "File verification failed on %(volume)s. The backed up version is "
-#~ "different from the downloaded version."
+#~ "File verification failed on %(volume)s. The backed up version is different "
+#~ "from the downloaded version."
 #~ msgstr ""
 #~ "Ověření souboru selhalo na %(volume)s. Zálohovaná verze je jiná než ta "
 #~ "stažená."
diff --git a/po/da.po b/po/da.po
index 560fe67..0de8a4a 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,35 +7,386 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: damonlynch@gmail.com\n"
-"POT-Creation-Date: 2017-07-08 19:16-0500\n"
-"PO-Revision-Date: 2017-07-04 11:06+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2017-09-12 17:01-0400\n"
+"PO-Revision-Date: 2017-09-13 18:32+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: Danish <da@li.org>\n"
-"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-07-05 23:04+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-09-26 22:04+0000\n"
+"X-Generator: Launchpad (build 18463)\n"
+"Language: da\n"
+
+#: ../install.py:65
+msgid "Rapid Photo Downloader installer"
+msgstr ""
+
+#: ../install.py:66
+msgid "Download and install latest version of Rapid Photo Downloader."
+msgstr ""
+
+#: ../install.py:236 ../install.py:1732
+msgid "Installer not found:"
+msgstr ""
+
+#. Translators: do not translate the term tar.gz
+#: ../install.py:240 ../install.py:1736
+msgid "Installer not in tar.gz format:"
+msgstr ""
+
+#: ../install.py:465
+msgid ""
+"Incorrect folder ownership detected. Changing ownership of and resetting "
+"permissions for"
+msgstr ""
+
+#: ../install.py:540
+msgid "The following command will be run:"
+msgstr ""
+
+#: ../install.py:543 ../install.py:1479 ../install.py:1484
+msgid "sudo may prompt you for the sudo password."
+msgstr ""
+
+#: ../install.py:547
+msgid "Would you like to run the command now?"
+msgstr ""
+
+#: ../install.py:549
+msgid "Answer is not yes, exiting."
+msgstr ""
+
+#: ../install.py:559 ../install.py:751 ../install.py:966
+msgid "Command failed"
+msgstr ""
+
+#: ../install.py:561 ../install.py:752 ../install.py:967
+msgid "Exiting"
+msgstr ""
+
+#: ../install.py:582
+msgid "The Universe repository must be enabled."
+msgstr ""
+
+#: ../install.py:606
+msgid ""
+"Do you want to to uninstall the previous version of Rapid Photo Downloader:"
+msgstr ""
+
+#: ../install.py:715 ../install.py:740
+msgid ""
+"Querying package system to see if an older version of Rapid Photo Downloader "
+"is installed (this may take a while)..."
+msgstr ""
+
+#: ../install.py:726
+msgid ""
+"Unable to query package system. Please check your Internet connection and "
+"try again"
+msgstr ""
+
+#: ../install.py:756
+msgid "Checking if previous version installed with pip..."
+msgstr ""
+
+#: ../install.py:850
+msgid "The following package is unknown on your system: {}\n"
+msgstr ""
+
+#: ../install.py:857 ../install.py:929 ../install.py:974
+msgid ""
+"To continue, some packages required to run the application will be installed."
+msgstr ""
+
+#: ../install.py:886
+msgid "Querying installed and available packages (this may take a while)"
+msgstr ""
+
+#: ../install.py:958
+msgid ""
+"Querying zypper to see if any required packages are already installed (this "
+"may take a while)... "
+msgstr ""
+
+#: ../install.py:1004
+msgid "Query to confirm action at each step."
+msgstr ""
+
+#: ../install.py:1011
+msgid ""
+"When downloading the latest version, install the development version if it "
+"is newer than the stable version."
+msgstr ""
+
+#: ../install.py:1020
+msgid ""
+"Optional tar.gz Rapid Photo Downloader installer archive. If not specified, "
+"the latest version is downloaded from the Internet."
+msgstr ""
+
+#: ../install.py:1043
+msgid ""
+"Do not run the installer in the tar.gz Rapid Photo Downloader installer "
+"archive if it is newer than this version ({}). The default is to run "
+"whichever installer is newer."
+msgstr ""
+
+#: ../install.py:1050
+msgid ""
+"Uninstall Rapid Photo Downloader that was installed with pip, keeping its "
+"dependencies."
+msgstr ""
+
+#: ../install.py:1054
+msgid ""
+"Uninstall the dependencies installed by pip during Rapid Photo Downloader's "
+"installation, and Rapid Photo Downloader itself, then exit."
+msgstr ""
+
+#: ../install.py:1059
+msgid ""
+"Note: this will not uninstall any version of Rapid Photo Downloader "
+"installed by your Linux distribution's package manager."
+msgstr ""
+
+#: ../install.py:1066
+msgid ""
+"Dependencies will only be removed if they are not required by other programs."
+msgstr ""
+
+#: ../install.py:1072
+msgid ""
+"Note: this option will remove the dependencies regardless of whether they "
+"are required by another program pip has installed. Upgrade to pip 9.0 or "
+"above if you want to avoid this behavior. You can do so using the command "
+"'python3 -m pip install pip -U --user'. Also note that any version of Rapid "
+"Photo Downloader installed by your Linux distribution's package manager will "
+"not be uninstalled."
+msgstr ""
 
-#. type: QPushButton
-#: ../raphodo/aboutdialog.py:217
+#: ../install.py:1122
+msgid "Failed to download versions file"
+msgstr ""
+
+#: ../install.py:1126
+msgid "Got error code {} while accessing versions file"
+msgstr ""
+
+#: ../install.py:1234
+msgid ""
+"Sorry, could not locate installer. Please check your Internet connection and "
+"verify if you can reach https://www.damonlynch.net\n"
+"\n"
+"Exiting.\n"
+msgstr ""
+
+#: ../install.py:1408
+msgid "Installing application requirements..."
+msgstr ""
+
+#: ../install.py:1424
+msgid "Received error code"
+msgstr ""
+
+#: ../install.py:1425
+msgid "Failed to install application requirements: exiting"
+msgstr ""
+
+#: ../install.py:1428
+msgid "Installing application..."
+msgstr ""
+
+#: ../install.py:1441
+msgid "Failed to install application: exiting..."
+msgstr ""
+
+#: ../install.py:1465
+msgid ""
+"You may have to restart the computer to be able to run the program from the "
+"commmand line or application launcher."
+msgstr ""
+
+#: ../install.py:1476
+msgid "Do you want to install the application's man pages?"
+msgstr ""
+
+#: ../install.py:1477
+msgid "They will be installed into {}"
+msgstr ""
+
+#: ../install.py:1478 ../install.py:1483
+msgid "If you uninstall the application, remove these manpages yourself."
+msgstr ""
+
+#: ../install.py:1480
+msgid "Do want to install the man pages?"
+msgstr ""
+
+#: ../install.py:1482
+msgid "Installing man pages into {}"
+msgstr ""
+
+#: ../install.py:1499
+msgid "Failed to create man page directory: exiting"
+msgstr ""
+
+#: ../install.py:1511
+msgid "Failed to copy man page."
+msgstr ""
+
+#: ../install.py:1521
+msgid "(If a segmentation fault occurs at exit, you can ignore it...)"
+msgstr ""
+
+#: ../install.py:1534
+msgid ""
+"The python3 tool pip is required to uninstall a version of Rapid Photo "
+"Downloader that was installed with pip.\n"
+"Cannot continue. Exiting."
+msgstr ""
+
+#: ../install.py:1575
+msgid ""
+"Do not run this installer script as sudo / root user.\n"
+"Run it using the user who will run the program.\n"
+msgstr ""
+
+#: ../install.py:1585 ../install.py:1599
+msgid "Do not include any other command line arguments when specifying"
+msgstr ""
+
+#: ../install.py:1614
+msgid ""
+"Sorry, this installer does not support a custom python installation.\n"
+"Exiting..."
+msgstr ""
+
+#: ../install.py:1620
+msgid "Restarting script using system python..."
+msgstr ""
+
+#: ../install.py:1651
+msgid "Exiting..."
+msgstr ""
+
+#. Translators: do not translate the term python3-apt
+#: ../install.py:1670
+msgid "To continue, the package python3-apt must be installed."
+msgstr ""
+
+#: ../install.py:1689
+msgid ""
+"Install the following packages using your Linux distribution's standard "
+"package manager, and then rerun this installer"
+msgstr ""
+
+#: ../install.py:1698
+msgid ""
+"To run this program, programs to assist Python 3 and its package management "
+"must be installed."
+msgstr ""
+
+#. Translators: do not translate the terms Python 3, pip and setuptools
+#: ../install.py:1713
+msgid "Python 3's pip and setuptools must be upgraded for your user."
+msgstr ""
+
+#. Translators: do not translate the term python or requests
+#: ../install.py:1726
+msgid "Installing python requests"
+msgstr ""
+
+#: ../upgrade.py:79
+msgid "Upgrade Rapid Photo Downloader"
+msgstr ""
+
+#: ../upgrade.py:401 ../raphodo/viewutils.py:242
+msgid "&Cancel"
+msgstr ""
+
+#: ../upgrade.py:405
+msgid "&Upgrade"
+msgstr ""
+
+#: ../upgrade.py:410
+#, python-format
+msgid "Click the Upgrade button to upgrade to version %s."
+msgstr ""
+
+#: ../upgrade.py:413
+msgid "Click the Upgrade button to start the upgrade."
+msgstr ""
+
+#: ../upgrade.py:416 ../upgrade.py:422 ../raphodo/viewutils.py:241
+msgid "&Close"
+msgstr ""
+
+#: ../upgrade.py:417
+msgid "&Run"
+msgstr ""
+
+#: ../upgrade.py:447
+msgid "Close Rapid Photo Downloader before running this upgrade"
+msgstr ""
+
+#: ../upgrade.py:450
+msgid "Upgrade running..."
+msgstr ""
+
+#: ../upgrade.py:486
+#, python-format
+msgid ""
+"Successfully upgraded to %s. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:491
+msgid ""
+"Upgrade finished successfully. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:495
+msgid "Upgrade failed. Click Close to exit."
+msgstr ""
+
+#: ../upgrade.py:6967
+#, python-format
+msgid "Upgrading %s..."
+msgstr ""
+
+#: ../upgrade.py:6969
+msgid "Press any key to continue..."
+msgstr ""
+
+#: ../upgrade.py:6982
+msgid "Rapid Photo Downloader upgrade failed"
+msgstr ""
+
+#: ../upgrade.py:6984
+#, python-format
+msgid ""
+"The python package %s could not be updated. The upgrade cannot continue."
+msgstr ""
+
+#: ../raphodo/aboutdialog.py:225
 msgid "Credits"
 msgstr "Udviklere"
 
-#: ../raphodo/backuppanel.py:239
+#: ../raphodo/backuppanel.py:240
 msgid "Backups are not configured"
 msgstr "Sikkerhedskopi er ikke indstillet"
 
-#: ../raphodo/backuppanel.py:241
+#: ../raphodo/backuppanel.py:242
 msgid "No backup devices detected"
 msgstr "Ingen backup enheder fundet"
 
-#: ../raphodo/backuppanel.py:243
+#: ../raphodo/backuppanel.py:244
 msgid "Valid backup locations not yet specified"
 msgstr "Sti til sikkerhedskopier er ikke angivet"
 
-#: ../raphodo/backuppanel.py:401
+#: ../raphodo/backuppanel.py:404
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
@@ -43,97 +394,106 @@ msgstr ""
 "Dine fotos og videoer kan sikkerhedskopieres til flere steder mens de "
 "downloades, for eksempel til en ekstern harddisk."
 
-#: ../raphodo/backuppanel.py:407
+#: ../raphodo/backuppanel.py:412
 msgid "Back up photos and videos when downloading"
 msgstr "Tag sikkerhedskopi af fotos og videoer mens de downloades"
 
-#: ../raphodo/backuppanel.py:413
+#: ../raphodo/backuppanel.py:418
 msgid "Automatically detect backup devices"
 msgstr "Opdag backup-enheder automatisk"
 
-#: ../raphodo/backuppanel.py:417
+#: ../raphodo/backuppanel.py:424
 msgid ""
-"Specify the folder in which backups are stored on the device."
-"<br><br><i>Note: the presence of a folder with this name is used to "
+"Specify the folder in which backups are stored on the "
+"device.<br><br><i>Note: the presence of a folder with this name is used to "
 "determine if 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 folder names. By "
 "adding both folders, the same device can be used to back up both photos and "
 "videos.</i>"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:428
+#: ../raphodo/backuppanel.py:439
 msgid "Photo folder name:"
 msgstr "Navn til fotomappe:"
 
-#: ../raphodo/backuppanel.py:433
+#: ../raphodo/backuppanel.py:444
 msgid "Video folder name:"
 msgstr "Navn til videomappe:"
 
-#: ../raphodo/backuppanel.py:438 ../raphodo/nameeditor.py:883
+#: ../raphodo/backuppanel.py:449 ../raphodo/nameeditor.py:890
 #: ../raphodo/renamepanel.py:123
 msgid "Example:"
 msgstr "Eksempel:"
 
-#: ../raphodo/backuppanel.py:448
-msgid "If you disable automatic detection, choose the exact backup locations."
+#: ../raphodo/backuppanel.py:460
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
 "Vælg nøjagtig placering af sikkerhedskopier, hvis du slår automatisk "
 "opdagelse fra."
 
-#: ../raphodo/backuppanel.py:452
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:468
 msgid "Photo backup location:"
 msgstr "Placering af foto sikkerhedskopier:"
 
-#: ../raphodo/backuppanel.py:454
+#: ../raphodo/backuppanel.py:474
 msgid "Select Photo Backup Location"
 msgstr "Vælg sti til sikkerhedskopier for fotos"
 
-#: ../raphodo/backuppanel.py:460
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:485
 msgid "Video backup location:"
 msgstr "Placering af video sikkerhedskopi:"
 
-#: ../raphodo/backuppanel.py:462
+#: ../raphodo/backuppanel.py:491
 msgid "Select Video Backup Location"
 msgstr "Vælg sti til sikkerhedskopier for videoer"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:564
+#: ../raphodo/backuppanel.py:595
 msgid "drive1"
 msgstr "drev1"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:567
+#: ../raphodo/backuppanel.py:598
 msgid "drive2"
 msgstr "drev2"
 
-#: ../raphodo/backuppanel.py:628
+#: ../raphodo/backuppanel.py:663
 msgid "Projected Backup Storage Use"
 msgstr "Forventet pladsforbrug til sikkerhedskopier"
 
-#: ../raphodo/backuppanel.py:632
+#: ../raphodo/backuppanel.py:669
 msgid "Backup Options"
 msgstr "Valg for sikkerhedskopier"
 
 #. translators: refers to the video thumbnail file that some
 #. cameras generate -- it has a .THM file extension
-#: ../raphodo/copyfiles.py:476
+#: ../raphodo/copyfiles.py:491
 msgid "video THM"
 msgstr "video THM"
 
-#: ../raphodo/copyfiles.py:482
+#: ../raphodo/copyfiles.py:497
 msgid "audio"
 msgstr "lyd"
 
 #: ../raphodo/destinationdisplay.py:78 ../raphodo/devicedisplay.py:1079
-#: ../raphodo/rpdfile.py:321
+#: ../raphodo/rpdfile.py:342
 #, python-format
 msgid "%(no_photos)s Photos"
 msgstr "%(no_photos)s fotos"
 
 #: ../raphodo/destinationdisplay.py:82 ../raphodo/devicedisplay.py:1081
-#: ../raphodo/rpdfile.py:316
+#: ../raphodo/rpdfile.py:333
 #, python-format
 msgid "%(no_videos)s Videos"
 msgstr "%(no_videos)s videoer"
@@ -161,15 +521,15 @@ msgid "%(size_free)s free of %(size_total)s"
 msgstr "%(size_free)s fri af %(size_total)s"
 
 #: ../raphodo/destinationdisplay.py:190 ../raphodo/devicedisplay.py:993
-#: ../raphodo/rapid.py:1964 ../raphodo/rapid.py:2079 ../raphodo/rapid.py:5753
-#: ../raphodo/rpdfile.py:905
+#: ../raphodo/rapid.py:2023 ../raphodo/rapid.py:2151 ../raphodo/rapid.py:6043
+#: ../raphodo/rpdfile.py:930
 msgid "Photos"
 msgstr "Fotos"
 
 #. translators: the name of the Videos folder
 #: ../raphodo/destinationdisplay.py:191 ../raphodo/devicedisplay.py:994
-#: ../raphodo/rapid.py:1967 ../raphodo/rapid.py:2080 ../raphodo/rapid.py:5754
-#: ../raphodo/rpdfile.py:933 ../raphodo/storage.py:445
+#: ../raphodo/rapid.py:2028 ../raphodo/rapid.py:2152 ../raphodo/rapid.py:6044
+#: ../raphodo/rpdfile.py:958 ../raphodo/storage.py:449
 msgid "Videos"
 msgstr "Videoer"
 
@@ -177,7 +537,7 @@ msgstr "Videoer"
 msgid "Projected storage use after download"
 msgstr "Forventet pladsforbrug efter download"
 
-#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:516
+#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:521
 msgid "Custom..."
 msgstr "Brugerdefineret..."
 
@@ -215,57 +575,58 @@ msgstr "Søg igen"
 msgid "%s full"
 msgstr "%s fuld"
 
-#: ../raphodo/devices.py:459
+#: ../raphodo/devices.py:463
 msgid "Cameras"
 msgstr "Kameraer"
 
-#: ../raphodo/devices.py:460 ../raphodo/devices.py:920
-#: ../raphodo/preferencedialog.py:85 ../raphodo/rapid.py:1927
+#: ../raphodo/devices.py:464 ../raphodo/devices.py:927
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/rapid.py:1979
 msgid "Devices"
 msgstr "Enheder"
 
-#: ../raphodo/devices.py:720
+#: ../raphodo/devices.py:724
 #, python-format
 msgid "Downloading from %(device_names)s"
 msgstr "Henter fra %(device_names)s"
 
 #. Translators: e.g. Three Devices
-#: ../raphodo/devices.py:780
+#: ../raphodo/devices.py:784
 #, python-format
 msgid "%(no_devices)s %(device_type)s"
 msgstr "%(no_devices)s %(device_type)s"
 
-#: ../raphodo/devices.py:905 ../raphodo/rapid.py:1764
+#: ../raphodo/devices.py:912 ../raphodo/rapid.py:1807
 msgid "Select Source"
 msgstr "Vælg kilde"
 
-#: ../raphodo/devices.py:936 ../raphodo/devices.py:947
+#: ../raphodo/devices.py:943 ../raphodo/devices.py:954
 #, python-format
 msgid "%(device1)s + %(device2)s"
 msgstr "%(device1)s + %(device2)s"
 
 #. Number of cameras e.g. 3 Cameras
-#: ../raphodo/devices.py:958
+#: ../raphodo/devices.py:965
 #, python-format
 msgid "%(no_cameras)s Cameras"
 msgstr "%(no_cameras)s kameraer"
 
-#: ../raphodo/devices.py:963
+#: ../raphodo/devices.py:970
 #, python-format
 msgid "%(no_devices)s Devices"
 msgstr "%(no_devices)s enheder"
 
 #. Translators: two folder names, separated by a plus sign
-#: ../raphodo/devices.py:1258
+#: ../raphodo/devices.py:1265
 #, python-format
 msgid "%s + %s"
 msgstr "%s + %s"
 
-#: ../raphodo/didyouknow.py:44
+#: ../raphodo/didyouknow.py:45
 msgid "Click on a file's checkbox to mark or unmark it for download."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:50
+#: ../raphodo/didyouknow.py:51
 msgid ""
 "Files that have already been downloaded are remembered. You can still mark "
 "previously downloaded files to download again, but they are unchecked by "
@@ -273,34 +634,67 @@ msgid ""
 "files that are yet to be downloaded."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:59
+#: ../raphodo/didyouknow.py:60
 msgid ""
 "If more than one file is selected, they'll all take the mark of the file "
 "whose checkbox was clicked, regardless of whether they previously had a "
 "checkmark or not."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:67
+#: ../raphodo/didyouknow.py:68
 msgid ""
 "Click on a device's checkbox to quickly mark or unmark all its files for "
 "downloading."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:74
+#: ../raphodo/didyouknow.py:75
+msgid ""
+"After a download finishes, an icon replaces the thumbnail's checkbox. The "
+"icon's color indicates whether the download was successful (green), had file "
+"renaming problems (yellow/orange), or failed (red)."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:83
+msgid ""
+"\n"
+"            In case of any problems, a red icon will appear at the bottom of "
+"the window\n"
+"            indicating how many error reports there are. Clicking on it "
+"opens the Error Report \n"
+"            window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:91
+msgid ""
+"\n"
+"            The Error Report window lists any problems encountered before, "
+"during or after the \n"
+"            download. An orange triangle represents a warning, a red circle "
+"indicates a failure, \n"
+"            and a black circle indicates more serious failures. You can "
+"click on the hyperlinks to \n"
+"            open its file or device in a file manager. You can also search "
+"the reports using the \n"
+"            search box in the lower left of the Error Report window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:103
 msgid ""
 "You can simultaneously download from multiple cameras, smartphones, memory "
 "cards, and hard drives&mdash;as many devices as your computer can handle at "
 "one time."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:81
+#: ../raphodo/didyouknow.py:110
 msgid ""
 "The <b>Timeline</b> groups photos and videos based on how much time elapsed "
 "between consecutive shots. Use it to identify photos and videos taken at "
 "different periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:88
+#: ../raphodo/didyouknow.py:117
 msgid ""
 "\n"
 "<p>In the illustration above, the first row of the Timeline is black because "
@@ -312,7 +706,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:99
+#: ../raphodo/didyouknow.py:128
 msgid ""
 "To view photos and videos for a particular time range, use the mouse "
 "(optionally in combination with the <tt>Shift</tt> or <tt>Ctrl</tt> keys) to "
@@ -320,20 +714,20 @@ msgid ""
 "the left side of the main window will be highlighted."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:106
+#: ../raphodo/didyouknow.py:135
 msgid ""
 "A download always includes all files that are checked for download, "
 "including those that are not currently displayed because the Timeline is "
 "being used."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:113
+#: ../raphodo/didyouknow.py:142
 msgid ""
 "You can hide or display the download sources by clicking on the name of the "
 "device you're downloading from at the top left of the program window."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:120
+#: ../raphodo/didyouknow.py:149
 msgid ""
 "\n"
 "          Thumbnails can be sorted using a variety of criteria:\n"
@@ -352,33 +746,33 @@ msgid ""
 "</ol> "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:137
+#: ../raphodo/didyouknow.py:166
 msgid ""
 "One of Rapid Photo Downloader's most useful features is its ability to "
 "automatically generate download subfolders and rename files as it downloads, "
 "using a scheme of your choosing."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:143
+#: ../raphodo/didyouknow.py:172
 msgid ""
 "To specify where you want your files downloaded and how you want them named, "
 "open the appropriate panel on the right-side of the application window: "
 "<b>Destination</b>, <b>Rename</b>, or <b>Job Code</b>."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:150
+#: ../raphodo/didyouknow.py:179
 msgid ""
 "\n"
 "When thinking about your download directory structure, keep in mind two "
 "different types\n"
 "of directory:\n"
 "<ol>\n"
-"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, &quot;"
-"Photos&quot;, or\n"
+"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, "
+"&quot;Photos&quot;, or\n"
 "&quot;Videos&quot;. This directory should already exist on your computer. In "
 "the illustration \n"
-"below, the destination folders are &quot;Pictures&quot; and &quot;"
-"Videos&quot;. The\n"
+"below, the destination folders are &quot;Pictures&quot; and "
+"&quot;Videos&quot;. The\n"
 "name of the destination folder is displayed in the grey bar directly above "
 "the folder tree, \n"
 "with a folder icon to its left and a gear icon to its far right.</li>\n"
@@ -391,7 +785,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:167
+#: ../raphodo/didyouknow.py:196
 msgid ""
 "\n"
 "You can download photos and videos to the same destination folder, or "
@@ -404,14 +798,14 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:177
+#: ../raphodo/didyouknow.py:206
 msgid ""
 "Automatically generated download subfolders can contain further "
 "automatically generated subfolders if need be. A common scheme is to create "
 "a year subfolder and then a series of year-month-day subfolders within it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:186
+#: ../raphodo/didyouknow.py:215
 msgid ""
 "\n"
 "Whenever possible, the program previews the download subfolders of photos "
@@ -429,7 +823,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:201
+#: ../raphodo/didyouknow.py:230
 msgid ""
 "\n"
 "Download subfolder names are typically generated using some or all of the "
@@ -453,7 +847,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:219
+#: ../raphodo/didyouknow.py:248
 msgid ""
 "\n"
 "To automatically create download subfolders as you download, \n"
@@ -463,7 +857,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:227
+#: ../raphodo/didyouknow.py:256
 msgid ""
 "\n"
 "Using the drop-down menu, select a built-in preset or click on <b>Custom</b> "
@@ -473,20 +867,20 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:237
+#: ../raphodo/didyouknow.py:266
 msgid ""
 "It's easy to download raw images into one folder, and jpeg images into "
 "another. Simply use the <b>Filename Extension</b> as part of your download "
 "subfolder generation scheme:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:242
+#: ../raphodo/didyouknow.py:271
 msgid ""
 "This illustration shows a saved custom preset named &quot;My custom "
 "preset&quot;."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:246
+#: ../raphodo/didyouknow.py:275
 msgid ""
 "\n"
 "You do not have to create nested download subfolders. This illustration "
@@ -497,7 +891,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:256
+#: ../raphodo/didyouknow.py:285
 msgid ""
 "\n"
 "Although there are many built-in date/time naming options, you may find that "
@@ -511,7 +905,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:265
+#: ../raphodo/didyouknow.py:294
 msgid ""
 "\n"
 "Read more about all the ways you can generate download subfolder names and "
@@ -521,7 +915,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:273
+#: ../raphodo/didyouknow.py:302
 msgid ""
 "\n"
 "<b>Job Codes</b> let you easily enter text that describes sets of photos and "
@@ -533,7 +927,7 @@ msgid ""
 "&quot;Green Bazaar&quot;: \n"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:282
+#: ../raphodo/didyouknow.py:311
 msgid ""
 "\n"
 "You can apply new or existing Job Codes before you start a download. If "
@@ -544,36 +938,36 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:291
+#: ../raphodo/didyouknow.py:320
 msgid "Look for hints to guide you when working with Job Codes:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:295
+#: ../raphodo/didyouknow.py:324
 msgid ""
 "Hints will vary depending on the context, such as when the mouse is hovering "
 "over a button."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:301
+#: ../raphodo/didyouknow.py:330
 msgid ""
 "\n"
 "When you give your photos and videos unique filenames, you'll never be "
 "confused as to \n"
 "which file is which. Using <b>sequence numbers</b> to make filenames unique "
 "is highly \n"
-"recommended!.\n"
+"recommended!\n"
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:309
+#: ../raphodo/didyouknow.py:338
 msgid ""
 "\n"
 "<p>Four types of sequence values are available to help you assign unique "
 "names to your photos and \n"
 "videos:\n"
 "<ol>\n"
-"<li><b>Downloads today</b>: tracks downloads completed during that day.</"
-"li>\n"
+"<li><b>Downloads today</b>: tracks downloads completed during that "
+"day.</li>\n"
 "<li><b>Stored number</b>: similar to Downloads today, but it is remembered "
 "from the last time the  \n"
 "program was run.</li>\n"
@@ -587,7 +981,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:327
+#: ../raphodo/didyouknow.py:356
 msgid ""
 "\n"
 "The <b>Rename</b> panel allows you to configure file renaming. To rename "
@@ -596,7 +990,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:334
+#: ../raphodo/didyouknow.py:363
 msgid ""
 "\n"
 "<p>The <b>Synchronize RAW + JPEG</b> option is useful if you use the RAW + "
@@ -615,7 +1009,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:348
+#: ../raphodo/didyouknow.py:377
 msgid ""
 "\n"
 "You can have your photos and videos backed up to multiple locations as they "
@@ -626,7 +1020,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:356
+#: ../raphodo/didyouknow.py:385
 msgid ""
 "In this example, the drive <b>photobackup</b> does not contain a folder "
 "named <tt>Videos</tt>, so videos will not be backed up to it."
@@ -634,7 +1028,7 @@ msgstr ""
 "I dette eksempel indeholder drevet <b>photobackup</b> ikke en mappe "
 "<tt>Videos</tt>, derfor bliver videoer ikke sikkerhedskopieret til derhen."
 
-#: ../raphodo/didyouknow.py:362
+#: ../raphodo/didyouknow.py:391
 msgid ""
 "\n"
 "Several of the program's preferences can be set from the command line, "
@@ -645,7 +1039,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:372
+#: ../raphodo/didyouknow.py:396
+msgid "You can also import program preferences from the older 0.4 version."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:401
 msgid ""
 "\n"
 "Rapid Photo Downloader deals with three types of cache:\n"
@@ -655,8 +1053,8 @@ msgid ""
 "memory cards, and other devices.</li>\n"
 "<li>A <b>temporary cache</b> of files downloaded from a camera, one for "
 "photos and another for \n"
-"videos. They are located in temporary subfolders in the download destination."
-"</li>\n"
+"videos. They are located in temporary subfolders in the download "
+"destination.</li>\n"
 "<li>The <b>desktop's thumbnail cache</b>, in which Rapid Photo Downloader "
 "stores thumbnails of \n"
 "RAW and TIFF photos once they have been downloaded. File browsers like Gnome "
@@ -671,23 +1069,23 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:431
+#: ../raphodo/didyouknow.py:460
 msgid "Tip of the Day"
 msgstr "Dagens tip"
 
-#: ../raphodo/didyouknow.py:439
+#: ../raphodo/didyouknow.py:468
 msgid "Did you know...?"
 msgstr "Vidste du...?"
 
-#: ../raphodo/didyouknow.py:466
+#: ../raphodo/didyouknow.py:495
 msgid "Show tips on startup"
 msgstr "Vis tips ved start"
 
-#: ../raphodo/didyouknow.py:470
+#: ../raphodo/didyouknow.py:499
 msgid "&Next"
 msgstr "&Næste"
 
-#: ../raphodo/didyouknow.py:471
+#: ../raphodo/didyouknow.py:500
 msgid "&Previous"
 msgstr "&Forrige"
 
@@ -794,68 +1192,68 @@ msgstr "%d dage, 1 hour"
 msgid "%(days)d days, %(hours)d hours"
 msgstr "%(days)d dage, %(hours)d timer"
 
-#: ../raphodo/errorlog.py:65
+#: ../raphodo/errorlog.py:66
 msgid "Find"
 msgstr "Find"
 
-#: ../raphodo/errorlog.py:135
+#: ../raphodo/errorlog.py:136
 msgid "Error Reports - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/errorlog.py:170
+#: ../raphodo/errorlog.py:171
 msgid "Find in reports"
 msgstr ""
 
-#: ../raphodo/errorlog.py:187
+#: ../raphodo/errorlog.py:188
 msgid "Find the previous occurrence of the phrase"
 msgstr "Find det foregående sted med denne frase"
 
-#: ../raphodo/errorlog.py:192
+#: ../raphodo/errorlog.py:193
 msgid "Find the next occurrence of the phrase"
 msgstr "Find det næste sted med denne frase"
 
-#: ../raphodo/errorlog.py:194
+#: ../raphodo/errorlog.py:195
 msgid "&Highlight All"
 msgstr "&Fremhæv alle"
 
-#: ../raphodo/errorlog.py:195
+#: ../raphodo/errorlog.py:196
 msgid "Highlight all occurrences of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:196
+#: ../raphodo/errorlog.py:197
 msgid "&Match Case"
 msgstr ""
 
-#: ../raphodo/errorlog.py:197
+#: ../raphodo/errorlog.py:198
 msgid "Search with case sensitivity"
 msgstr ""
 
-#: ../raphodo/errorlog.py:198
+#: ../raphodo/errorlog.py:199
 msgid "&Whole Words"
 msgstr "&Hele ord"
 
-#: ../raphodo/errorlog.py:199
+#: ../raphodo/errorlog.py:200
 msgid "Search whole words only"
 msgstr "Søg kun hele ord"
 
-#: ../raphodo/errorlog.py:209 ../raphodo/errorlog.py:341
+#: ../raphodo/errorlog.py:210 ../raphodo/errorlog.py:345
 #, python-format
 msgid "%s of %s matches"
 msgstr "%s af %s træffere"
 
-#: ../raphodo/errorlog.py:228
+#: ../raphodo/errorlog.py:232
 msgid "Clear"
 msgstr "Ryd"
 
-#: ../raphodo/errorlog.py:328
+#: ../raphodo/errorlog.py:332
 msgid "Phrase not found"
 msgstr "Tekst ikke fundet"
 
-#: ../raphodo/errorlog.py:487
+#: ../raphodo/errorlog.py:491
 msgid "Search pending..."
 msgstr ""
 
-#: ../raphodo/errorlog.py:535
+#: ../raphodo/errorlog.py:539
 msgid ""
 "The number of new entries added to the Error Report since it was last open. "
 "Click to open the Error Report."
@@ -869,8 +1267,8 @@ msgstr "Problem i Rapid Photo Downloader"
 #, python-brace-format
 msgid ""
 "<b>A problem occurred in Rapid Photo Downloader</b><br><br>\n"
-"    Please report the problem at <a href=\"{website}\">{website}</a>."
-"<br><br>\n"
+"    Please report the problem at <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
 "    Attach the log file <i>{log_file}</i> to your bug report (click\n"
 "    <a href=\"{log_path}\">here</a> to open the log directory).<br><br>If "
 "the same problem occurs\n"
@@ -891,7 +1289,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1601
+#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1643
 msgid "Open in File Browser..."
 msgstr ""
 
@@ -909,531 +1307,531 @@ msgstr "Anden..."
 msgid "%s (location does not exist)"
 msgstr "%s (sti findes ikke)"
 
-#: ../raphodo/generatenameconfig.py:186
+#: ../raphodo/generatenameconfig.py:190
 msgid "Date time"
 msgstr "Dato og klokkeslæt"
 
-#: ../raphodo/generatenameconfig.py:187
+#: ../raphodo/generatenameconfig.py:191
 msgid "Text"
 msgstr "Tekst"
 
-#: ../raphodo/generatenameconfig.py:188 ../raphodo/rapid.py:2053
+#: ../raphodo/generatenameconfig.py:192 ../raphodo/rapid.py:2125
 msgid "Filename"
 msgstr "Filnavn"
 
-#: ../raphodo/generatenameconfig.py:189 ../raphodo/preferencedialog.py:488
+#: ../raphodo/generatenameconfig.py:193 ../raphodo/preferencedialog.py:724
 msgid "Metadata"
 msgstr "Metadata"
 
-#: ../raphodo/generatenameconfig.py:190
+#: ../raphodo/generatenameconfig.py:194
 msgid "Sequences"
 msgstr "Sekvenser"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: ../raphodo/generatenameconfig.py:193
+#: ../raphodo/generatenameconfig.py:197
 msgid "Job code"
 msgstr "Job kode"
 
-#: ../raphodo/generatenameconfig.py:194
+#: ../raphodo/generatenameconfig.py:198
 msgid "Image date"
 msgstr "Billedets dato"
 
-#: ../raphodo/generatenameconfig.py:195
+#: ../raphodo/generatenameconfig.py:199
 msgid "Video date"
 msgstr "Videoens dato"
 
-#: ../raphodo/generatenameconfig.py:196
+#: ../raphodo/generatenameconfig.py:200
 msgid "Today"
 msgstr "I dag"
 
-#: ../raphodo/generatenameconfig.py:197
+#: ../raphodo/generatenameconfig.py:201
 msgid "Yesterday"
 msgstr "I går"
 
 #. Translators: Download time is the time and date that the download started (when the
 #. user clicked the Download button)
-#: ../raphodo/generatenameconfig.py:200
+#: ../raphodo/generatenameconfig.py:204
 msgid "Download time"
 msgstr "Download klokkeslæt"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:203
+#: ../raphodo/generatenameconfig.py:207
 msgid "Name"
 msgstr "Navn"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:206 ../raphodo/rapid.py:2054
+#: ../raphodo/generatenameconfig.py:210 ../raphodo/rapid.py:2126
 msgid "Extension"
 msgstr "Udvidelse"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:209
+#: ../raphodo/generatenameconfig.py:213
 msgid "Image number"
 msgstr "Billedets nummer"
 
-#: ../raphodo/generatenameconfig.py:210
+#: ../raphodo/generatenameconfig.py:214
 msgid "Video number"
 msgstr "Videoens nummer"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:213
+#: ../raphodo/generatenameconfig.py:217
 msgid "Aperture"
 msgstr "Blænde"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:216
+#: ../raphodo/generatenameconfig.py:220
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:219
+#: ../raphodo/generatenameconfig.py:223
 msgid "Exposure time"
 msgstr "Lukkertid"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:222
+#: ../raphodo/generatenameconfig.py:226
 msgid "Focal length"
 msgstr "Brændvidde"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:225
+#: ../raphodo/generatenameconfig.py:229
 msgid "Camera make"
 msgstr "Kameramærke"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:228
+#: ../raphodo/generatenameconfig.py:232
 msgid "Camera model"
 msgstr "Kameramodel"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:231
+#: ../raphodo/generatenameconfig.py:235
 msgid "Short camera model"
 msgstr "Forkortet kameramodel"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:234
+#: ../raphodo/generatenameconfig.py:238
 msgid "Hyphenated short camera model"
 msgstr "Forkortet kameramodel med bindestreg"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:237
+#: ../raphodo/generatenameconfig.py:241
 msgid "Serial number"
 msgstr "Serienummer"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:240
+#: ../raphodo/generatenameconfig.py:244
 msgid "Shutter count"
 msgstr "Lukker-antal"
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: ../raphodo/generatenameconfig.py:242
+#: ../raphodo/generatenameconfig.py:246
 msgid "File number"
 msgstr "Filnummer"
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:244
+#: ../raphodo/generatenameconfig.py:248
 msgid "Folder only"
 msgstr "Kun mappen"
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:246
+#: ../raphodo/generatenameconfig.py:250
 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
-#: ../raphodo/generatenameconfig.py:249
+#: ../raphodo/generatenameconfig.py:253
 msgid "Owner name"
 msgstr "Ejernavn"
 
-#: ../raphodo/generatenameconfig.py:250
+#: ../raphodo/generatenameconfig.py:254
 msgid "Codec"
 msgstr "Kodning"
 
-#: ../raphodo/generatenameconfig.py:251
+#: ../raphodo/generatenameconfig.py:255
 msgid "Width"
 msgstr "Bredde"
 
-#: ../raphodo/generatenameconfig.py:252
+#: ../raphodo/generatenameconfig.py:256
 msgid "Height"
 msgstr "Højde"
 
-#: ../raphodo/generatenameconfig.py:253
+#: ../raphodo/generatenameconfig.py:257
 msgid "Length"
 msgstr "Længde"
 
-#: ../raphodo/generatenameconfig.py:254
+#: ../raphodo/generatenameconfig.py:258
 msgid "Frames Per Second"
 msgstr "Billeder per sekund"
 
-#: ../raphodo/generatenameconfig.py:255
+#: ../raphodo/generatenameconfig.py:259
 msgid "Artist"
 msgstr "Kunstner"
 
-#: ../raphodo/generatenameconfig.py:256
+#: ../raphodo/generatenameconfig.py:260
 msgid "Copyright"
 msgstr "Ophavsret"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:259
+#: ../raphodo/generatenameconfig.py:263
 msgid "Downloads today"
 msgstr "Downloads i dag"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:262
+#: ../raphodo/generatenameconfig.py:266
 msgid "Session number"
 msgstr "Kørselsnummer"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:265
+#: ../raphodo/generatenameconfig.py:269
 msgid "Subfolder number"
 msgstr "Undermappe nummer"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:268
+#: ../raphodo/generatenameconfig.py:272
 msgid "Stored number"
 msgstr "Gemt nummer"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: ../raphodo/generatenameconfig.py:271
+#: ../raphodo/generatenameconfig.py:275
 msgid "Sequence letter"
 msgstr "Sekvensbogstav"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:274
+#: ../raphodo/generatenameconfig.py:278
 msgid "All digits"
 msgstr "Alle cifre"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:277
+#: ../raphodo/generatenameconfig.py:281
 msgid "Last digit"
 msgstr "Sidste ciffer"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:280
+#: ../raphodo/generatenameconfig.py:284
 msgid "Last 2 digits"
 msgstr "Sidste 2 cifre"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:283
+#: ../raphodo/generatenameconfig.py:287
 msgid "Last 3 digits"
 msgstr "Sidste 3 cifre"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:286
+#: ../raphodo/generatenameconfig.py:290
 msgid "Last 4 digits"
 msgstr "Sidste 4 cifre"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:289
+#: ../raphodo/generatenameconfig.py:293
 msgid "Original Case"
 msgstr "Oprindelige Store/Små Bogstaver"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:292
+#: ../raphodo/generatenameconfig.py:296
 msgid "UPPERCASE"
 msgstr "STORE BOGSTAVER"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:295
+#: ../raphodo/generatenameconfig.py:299
 msgid "lowercase"
 msgstr "små bogstaver"
 
-#: ../raphodo/generatenameconfig.py:296
+#: ../raphodo/generatenameconfig.py:300
 msgid "One digit"
 msgstr "Et ciffer"
 
-#: ../raphodo/generatenameconfig.py:297
+#: ../raphodo/generatenameconfig.py:301
 msgid "Two digits"
 msgstr "To cifre"
 
-#: ../raphodo/generatenameconfig.py:298
+#: ../raphodo/generatenameconfig.py:302
 msgid "Three digits"
 msgstr "Tre cifre"
 
-#: ../raphodo/generatenameconfig.py:299
+#: ../raphodo/generatenameconfig.py:303
 msgid "Four digits"
 msgstr "Fire cifre"
 
-#: ../raphodo/generatenameconfig.py:300
+#: ../raphodo/generatenameconfig.py:304
 msgid "Five digits"
 msgstr "Fem cifre"
 
-#: ../raphodo/generatenameconfig.py:301
+#: ../raphodo/generatenameconfig.py:305
 msgid "Six digits"
 msgstr "Seks cifre"
 
-#: ../raphodo/generatenameconfig.py:302
+#: ../raphodo/generatenameconfig.py:306
 msgid "Seven digits"
 msgstr "Syv cifre"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:305
+#: ../raphodo/generatenameconfig.py:309
 msgid "Subseconds"
 msgstr "Delsekunder"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:308 ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:312 ../raphodo/generatenameconfig.py:393
 msgid "YYYYMMDD"
 msgstr "ÅÅÅÅMMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:311 ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:315 ../raphodo/generatenameconfig.py:394
 msgid "YYYY-MM-DD"
 msgstr "ÅÅÅÅ-MM-DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:314 ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:318 ../raphodo/generatenameconfig.py:395
 msgid "YYYY_MM_DD"
 msgstr "YYYY_MM_DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:317
+#: ../raphodo/generatenameconfig.py:321
 msgid "YYMMDD"
 msgstr "ÅÅMMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:320
+#: ../raphodo/generatenameconfig.py:324
 msgid "YY-MM-DD"
 msgstr "ÅÅ-MM-DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:323
+#: ../raphodo/generatenameconfig.py:327
 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
-#: ../raphodo/generatenameconfig.py:326
+#: ../raphodo/generatenameconfig.py:330
 msgid "MMDDYYYY"
 msgstr "MMDDÅÅÅÅ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:329
+#: ../raphodo/generatenameconfig.py:333
 msgid "MMDDYY"
 msgstr "MMDDÅÅ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:332
+#: ../raphodo/generatenameconfig.py:336
 msgid "MMDD"
 msgstr "MMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:335
+#: ../raphodo/generatenameconfig.py:339
 msgid "DDMMYYYY"
 msgstr "DDMMÅÅÅÅ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:338
+#: ../raphodo/generatenameconfig.py:342
 msgid "DDMMYY"
 msgstr "DDMMÅÅ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:341 ../raphodo/generatenameconfig.py:389
-#: ../raphodo/generatenameconfig.py:390 ../raphodo/generatenameconfig.py:391
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:345 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:394 ../raphodo/generatenameconfig.py:395
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:397
 msgid "YYYY"
 msgstr "ÅÅÅÅ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:344
+#: ../raphodo/generatenameconfig.py:348
 msgid "YY"
 msgstr "ÅÅ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:347
+#: ../raphodo/generatenameconfig.py:351
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:350
+#: ../raphodo/generatenameconfig.py:354
 msgid "DD"
 msgstr "DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:353
+#: ../raphodo/generatenameconfig.py:357
 msgid "Month (full)"
 msgstr "Måned (udskrevet)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:356
+#: ../raphodo/generatenameconfig.py:360
 msgid "Month (abbreviated)"
 msgstr "Måned (forkortet)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:359
+#: ../raphodo/generatenameconfig.py:363
 msgid "HHMMSS"
 msgstr "TTMMSS"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:362
+#: ../raphodo/generatenameconfig.py:366
 msgid "HHMM"
 msgstr "TTMM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:365
+#: ../raphodo/generatenameconfig.py:369
 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
-#: ../raphodo/generatenameconfig.py:368
+#: ../raphodo/generatenameconfig.py:372
 msgid "HH-MM"
 msgstr "TT-MM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:371
+#: ../raphodo/generatenameconfig.py:375
 msgid "HH"
 msgstr "TT"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:374
+#: ../raphodo/generatenameconfig.py:378
 msgid "MM (minutes)"
 msgstr "MM (minutter)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:377
+#: ../raphodo/generatenameconfig.py:381
 msgid "SS"
 msgstr "SS"
 
-#: ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:393
 msgid "Date"
 msgstr "Dato"
 
-#: ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:394
 msgid "Date (hyphens)"
 msgstr "Dato (bindestreger)"
 
-#: ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:395
 msgid "Date (underscores)"
 msgstr "Dato (understreger)"
 
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:438
-#: ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:442
+#: ../raphodo/generatenameconfig.py:537
 msgid "Date and Job Code"
 msgstr "Dato og jobkode"
 
-#: ../raphodo/generatenameconfig.py:392
+#: ../raphodo/generatenameconfig.py:396
 msgid "YYYYMM_Job Code"
 msgstr "YYYYMM_Jobkode"
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "Date and Job Code Subfolder"
 msgstr "Dato og jobkode undermappe"
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "YYYYMM"
 msgstr "YYYYMM"
 
-#: ../raphodo/generatenameconfig.py:393 ../raphodo/jobcodepanel.py:198
-#: ../raphodo/nameeditor.py:827 ../raphodo/rapid.py:1809
+#: ../raphodo/generatenameconfig.py:397 ../raphodo/jobcodepanel.py:199
+#: ../raphodo/nameeditor.py:833 ../raphodo/rapid.py:1852
 #: ../raphodo/renamepanel.py:83 ../raphodo/renamepanel.py:241
 msgid "Job Code"
 msgstr "Jobkode"
 
-#: ../raphodo/generatenameconfig.py:433 ../raphodo/generatenameconfig.py:512
+#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:532
 msgid "Original Filename"
 msgstr "Oprindeligt filnavn"
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "Date-Time and Downloads today"
 msgstr "Dato-tid og downloads i dag"
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "YYYYMMDD-HHMM-1"
 msgstr "YYYYMMDD-HHMM-1"
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "Date and Downloads today"
 msgstr "Dato og downloads i dag"
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "YYYYMMDD-1"
 msgstr "YYYYMMDD-1"
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "Date-Time and Image number"
 msgstr "DAto-tid og billed nummer"
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "YYYYMMDD-1234"
 msgstr "YYYYMMDD-1234"
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "Date-Time and Job Code"
 msgstr "Dato-tid og jobkode"
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "YYYYMMDD-HHMM-Job Code-1"
 msgstr "YYYYMMDD-HHMM-jobkode-1"
 
-#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:442 ../raphodo/generatenameconfig.py:537
 msgid "YYYYMMDD-Job Code-1"
 msgstr "YYYYMMDD-jobkode-1"
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "Date-Time and Video number"
 msgstr "Dato-tid og video nummer"
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "YYYYMMDD_1234"
 msgstr "YYYYMMDD_1234"
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "Resolution"
 msgstr "Opløsning"
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "YYYYMMDD-HHMM-1-1920x1080"
 msgstr "YYYYMMDD-HHMM-1-1920x1080"
 
@@ -1492,18 +1890,19 @@ msgstr "&Jobkode:"
 msgid "&Remember this choice"
 msgstr "&Husk dette valg"
 
-#: ../raphodo/jobcodepanel.py:185
+#: ../raphodo/jobcodepanel.py:186
 msgid ""
 "Select photos and videos to be able to apply a new or existing Job Code to "
 "them."
 msgstr "Vælg fotos og videoer for at give dem en jobkode."
 
-#: ../raphodo/jobcodepanel.py:186
-msgid "The new Job Code will be applied to all selected photos and/or videos."
+#: ../raphodo/jobcodepanel.py:187
+msgid ""
+"The new Job Code will be applied to all selected photos and/or videos."
 msgstr ""
 "Den nye jobkode vil blive anvendt til alle markerede fotos og/eller videoer."
 
-#: ../raphodo/jobcodepanel.py:187
+#: ../raphodo/jobcodepanel.py:188
 msgid ""
 "Click the Apply button to apply the current Job Code to all selected photos "
 "and/or videos. You can also simply double click the Job Code."
@@ -1511,60 +1910,60 @@ msgstr ""
 "Klik på knappen Anvend for at anvende den aktuelle jobkode til alle "
 "markerede fotos og/eller videoer. Du kan også bare dobbeltklikke på jobkoden."
 
-#: ../raphodo/jobcodepanel.py:189
+#: ../raphodo/jobcodepanel.py:190
 msgid ""
 "Removing a Job Code removes it only from the list of saved Job Codes, not "
 "from any photos or videos that it may have been applied to."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:191
+#: ../raphodo/jobcodepanel.py:192
 msgid ""
 "If you want to use Job Codes, configure file renaming or destination "
 "subfolder names to use them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:197
+#: ../raphodo/jobcodepanel.py:198
 msgid "Last Used"
 msgstr "Senest anvendt"
 
-#: ../raphodo/jobcodepanel.py:202
+#: ../raphodo/jobcodepanel.py:203
 msgid "Job Code Sort:"
 msgstr "Jobkode sortering:"
 
-#: ../raphodo/jobcodepanel.py:205 ../raphodo/rapid.py:2061
+#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2133
 msgid "Ascending"
 msgstr "Stigende"
 
-#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2062
+#: ../raphodo/jobcodepanel.py:207 ../raphodo/rapid.py:2134
 msgid "Descending"
 msgstr "Faldende"
 
-#: ../raphodo/jobcodepanel.py:216
+#: ../raphodo/jobcodepanel.py:217
 msgid "&New..."
 msgstr "&Ny..."
 
-#: ../raphodo/jobcodepanel.py:220
+#: ../raphodo/jobcodepanel.py:221
 msgid "&Apply"
 msgstr "&Anvend"
 
-#: ../raphodo/jobcodepanel.py:224
+#: ../raphodo/jobcodepanel.py:225
 msgid "&Remove"
 msgstr "&Fjern"
 
-#: ../raphodo/jobcodepanel.py:228 ../raphodo/preferencedialog.py:125
-#: ../raphodo/preferencedialog.py:154 ../raphodo/preferencedialog.py:433
+#: ../raphodo/jobcodepanel.py:229 ../raphodo/preferencedialog.py:200
+#: ../raphodo/preferencedialog.py:229 ../raphodo/preferencedialog.py:531
 msgid "Remove All"
 msgstr "Fjern alle"
 
-#: ../raphodo/jobcodepanel.py:427
+#: ../raphodo/jobcodepanel.py:428
 msgid "Do you really want to remove all the Job Codes?"
 msgstr "Vil du virkelig fjerne alle jobkoder?"
 
-#: ../raphodo/jobcodepanel.py:429
+#: ../raphodo/jobcodepanel.py:430
 msgid "Remove all Job Codes"
 msgstr "Fjern alle jobkoder"
 
-#: ../raphodo/jobcodepanel.py:492
+#: ../raphodo/jobcodepanel.py:493
 msgid "Job Codes"
 msgstr "Jobkoder"
 
@@ -1575,42 +1974,58 @@ msgstr "Jobkoder"
 msgid "<i><b>Hint:</b> %(message)s"
 msgstr "<i><b>Tip:</b> %(message)s"
 
-#: ../raphodo/nameeditor.py:418 ../raphodo/nameeditor.py:432
+#: ../raphodo/nameeditor.py:423 ../raphodo/nameeditor.py:437
 #, python-format
 msgid "%(description)s - %(elements)s"
 msgstr "%(description)s - %(elements)s"
 
-#: ../raphodo/nameeditor.py:512
+#: ../raphodo/nameeditor.py:517
 msgid "Save New Custom Preset..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:513
+#: ../raphodo/nameeditor.py:518
 msgid "Remove All Custom Presets..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:559
+#: ../raphodo/nameeditor.py:564
 msgid "(New Custom Preset)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:576
+#: ../raphodo/nameeditor.py:581
 #, python-format
 msgid "%s (edited)"
 msgstr "%s (ændret)"
 
-#: ../raphodo/nameeditor.py:579 ../raphodo/nameeditor.py:1370
+#: ../raphodo/nameeditor.py:584 ../raphodo/nameeditor.py:1379
 #, python-format
 msgid "Update Custom Preset \"%s\""
 msgstr ""
 
-#: ../raphodo/nameeditor.py:667
+#: ../raphodo/nameeditor.py:672
 msgid "Save New Custom Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:675
+#: ../raphodo/nameeditor.py:680
 msgid "Preset Name:"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:836
+#: ../raphodo/nameeditor.py:799
+msgid "Photo Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:805
+msgid "Video Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:811
+msgid "Photo Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:817
+msgid "Video Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:842
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>There is insufficient data to "
 "fully generate the name. Please use other renaming options.</i>"
@@ -1619,7 +2034,7 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees.
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:846
+#: ../raphodo/nameeditor.py:853
 #, python-format
 msgid "The character</i> %(separator)s <i>creates a new subfolder level."
 msgstr ""
@@ -1627,50 +2042,50 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:851
+#: ../raphodo/nameeditor.py:858
 #, python-format
 msgid ""
 "There is no need start or end with the folder separator </i> "
 "%(separator)s<i>, because it is added automatically."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:859
+#: ../raphodo/nameeditor.py:866
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>Unique filenames may not be "
 "generated. Make filenames unique by using Sequence values.</i>"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:882 ../raphodo/renamepanel.py:121
+#: ../raphodo/nameeditor.py:889 ../raphodo/renamepanel.py:121
 msgid "Preset:"
 msgstr ""
 
 #. Translators: appears in a combobox, e.g. Image Date (YYYY)
-#: ../raphodo/nameeditor.py:959 ../raphodo/nameeditor.py:980
+#: ../raphodo/nameeditor.py:966 ../raphodo/nameeditor.py:987
 #, python-brace-format
 msgid "{choice} ({variant})"
 msgstr "{choice} ({variant})"
 
-#: ../raphodo/nameeditor.py:1005 ../raphodo/preferencedialog.py:530
+#: ../raphodo/nameeditor.py:1012 ../raphodo/preferencedialog.py:783
 msgid "Get help online..."
 msgstr "Få hjælp online..."
 
-#: ../raphodo/nameeditor.py:1025
+#: ../raphodo/nameeditor.py:1034
 msgid "Insert"
 msgstr "Indsæt"
 
-#: ../raphodo/nameeditor.py:1351
+#: ../raphodo/nameeditor.py:1360
 msgid "Save Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1356
+#: ../raphodo/nameeditor.py:1365
 msgid ""
-"<b>Do you want to save the changes in a new custom preset?</"
-"b><br><br>Creating a custom preset is not required, but can help you keep "
-"organized.<br><br>The changes to the preferences will still be applied "
-"regardless of whether you create a new custom preset or not."
+"<b>Do you want to save the changes in a new custom "
+"preset?</b><br><br>Creating a custom preset is not required, but can help "
+"you keep organized.<br><br>The changes to the preferences will still be "
+"applied regardless of whether you create a new custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1365
+#: ../raphodo/nameeditor.py:1374
 msgid ""
 "<b>Do you want to save the changes in a custom preset?</b><br><br>If you "
 "like, you can create a new custom preset or update the existing custom "
@@ -1678,95 +2093,100 @@ msgid ""
 "regardless of whether you save a custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1372
+#: ../raphodo/nameeditor.py:1381
 msgid "Save New Custom Preset"
 msgstr ""
 
-#: ../raphodo/newversion.py:306
+#: ../raphodo/newversion.py:312
 msgid "Checking for new version..."
 msgstr "Tjek for ny version..."
 
-#: ../raphodo/newversion.py:307
+#: ../raphodo/newversion.py:313
 msgid "You are running the latest version."
 msgstr "Du bruger den nyeste version."
 
-#: ../raphodo/newversion.py:308
+#: ../raphodo/newversion.py:314
 msgid "Failed to contact the update server."
 msgstr "Kunne ikke få svar fra opdateringsserveren."
 
-#: ../raphodo/newversion.py:310
+#: ../raphodo/newversion.py:316
 #, python-format
 msgid "A new version of Rapid Photo Downloader (%s) is available."
 msgstr "En ny version af Rapid Photo Downloader (%s) er tilgængelig."
 
-#: ../raphodo/newversion.py:312
+#: ../raphodo/newversion.py:318
 msgid "Do you want to download the new version?"
 msgstr "Vil du hente den nye version?"
 
-#: ../raphodo/newversion.py:313
+#: ../raphodo/newversion.py:319
 #, python-format
 msgid "Changes in the new release can be viewed <a href=\"%s\">here</a>."
 msgstr "Ændringer i den nye version kan læses <a href=\"%s\">her</a>."
 
 #. Translators: this text appears in a button - the & sets the s key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:340 ../raphodo/newversion.py:353
+#: ../raphodo/newversion.py:348 ../raphodo/newversion.py:363
 msgid "&Skip this release"
 msgstr "&Spring denne version over"
 
 #. Translators: this text appears in a button - the & sets the o key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:356
+#: ../raphodo/newversion.py:366
 msgid "&Open Download Page"
 msgstr "&Åben download siden"
 
-#: ../raphodo/newversion.py:376
+#: ../raphodo/newversion.py:386
 msgid "Rapid Photo Downloader updates"
 msgstr "Rapid Photo Downloader opdateringer"
 
 #. Translators: shows how much of a file has been downloaded e.g  123 KB of 1.3 MB
-#: ../raphodo/newversion.py:478
+#: ../raphodo/newversion.py:488
 #, python-format
 msgid "%(downloaded)s of %(total)s"
 msgstr "%(downloaded)s af %(total)s"
 
-#: ../raphodo/newversion.py:495
+#: ../raphodo/newversion.py:507
 msgid "Downloading..."
 msgstr "Henter..."
 
-#: ../raphodo/preferencedialog.py:76
+#: ../raphodo/preferencedialog.py:86
 msgid "Preferences"
 msgstr "Indstillinger"
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Automation"
 msgstr "Automatisering"
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Thumbnails"
 msgstr "Små billeder"
 
-#: ../raphodo/preferencedialog.py:85 ../raphodo/preferencedialog.py:343
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/preferencedialog.py:428
 msgid "Error Handling"
 msgstr "Fejlhåndtering"
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Warnings"
 msgstr "Advarsler"
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:109
+msgid "Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:109 ../raphodo/preferencedialog.py:119
 msgid "Miscellaneous"
 msgstr "Diverse"
 
-#: ../raphodo/preferencedialog.py:94
+#: ../raphodo/preferencedialog.py:147
 msgid "Device Scanning"
 msgstr "Enhedssøgning"
 
-#: ../raphodo/preferencedialog.py:96
+#: ../raphodo/preferencedialog.py:148
 msgid "Scan only external devices"
 msgstr "Søg kun på eksterne enheder"
 
-#: ../raphodo/preferencedialog.py:98
+#: ../raphodo/preferencedialog.py:150
 msgid ""
 "Scan for photos and videos only on devices that are external to the "
 "computer,\n"
@@ -1775,41 +2195,67 @@ msgstr ""
 "Søg kun efter fotos og videoer på eksterne enheder,\n"
 "for eksempel kameraer, hukommelseskort, eksterne harddiske og USB drev."
 
-#: ../raphodo/preferencedialog.py:102
-msgid "Scan non-camera devices lacking a DCIM folder"
-msgstr "Søg på enheder som ikke er kameraer og som ikke har en DCIM mappe."
+#: ../raphodo/preferencedialog.py:153
+msgid "Scan only specific folders on devices"
+msgstr ""
 
-#: ../raphodo/preferencedialog.py:104
+#: ../raphodo/preferencedialog.py:155
 msgid ""
-"Scan the entirety of a device for photos and videos, irrespective of whether "
-"it contains a DCIM folder,\n"
-"as opposed to only scanning within a DCIM folder.\n"
+"Scan for photos and videos only in the folders specified below (except "
+"paths\n"
+"specified in Ignored Paths).\n"
 "\n"
-"Changing this setting causes all devices to be scanned again.\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:161
+msgid "Folders to scan:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:164
+msgid ""
+"Folders at the base level of device file systems that will be scanned\n"
+"for photos and videos."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:167 ../raphodo/preferencedialog.py:219
+msgid "Add..."
+msgstr "Tilføj …"
+
+#: ../raphodo/preferencedialog.py:169
+msgid ""
+"Add a folder to the list of folders to scan for photos and videos.\n"
 "\n"
-"Note: With cameras, only the DCIM folder is scanned."
+"Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:116
+#: ../raphodo/preferencedialog.py:172 ../raphodo/preferencedialog.py:198
+#: ../raphodo/preferencedialog.py:224 ../raphodo/preferencedialog.py:529
+msgid "Remove"
+msgstr "Fjern"
+
+#: ../raphodo/preferencedialog.py:174
+msgid ""
+"Remove a folder from the list of folders to scan for photos and videos.\n"
+"\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:191
 msgid "Devices that have been set to automatically ignore or download from."
 msgstr "Enheder som er indstillet til ikke at hente billeder og videoer fra."
 
-#: ../raphodo/preferencedialog.py:117
+#: ../raphodo/preferencedialog.py:192
 msgid "Remembered Devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:121
+#: ../raphodo/preferencedialog.py:196
 msgid ""
 "Remove a device from the list of devices to automatically ignore or download "
 "from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:123 ../raphodo/preferencedialog.py:149
-#: ../raphodo/preferencedialog.py:431
-msgid "Remove"
-msgstr "Fjern"
-
-#: ../raphodo/preferencedialog.py:127
+#: ../raphodo/preferencedialog.py:202
 msgid ""
 "Clear the list of devices from which to automatically ignore or download "
 "from.\n"
@@ -1817,180 +2263,178 @@ msgid ""
 "Note: Changes take effect when the computer is next scanned for devices."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:140
+#: ../raphodo/preferencedialog.py:215
 msgid "Ignored Paths"
 msgstr "Ignorerede stier"
 
-#: ../raphodo/preferencedialog.py:141
+#: ../raphodo/preferencedialog.py:216
 msgid ""
 "The end part of a path that should never be scanned for photos or videos."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:144
-msgid "Add..."
-msgstr "Tilføj …"
-
-#: ../raphodo/preferencedialog.py:146
+#: ../raphodo/preferencedialog.py:221
 msgid ""
 "Add a path to the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:151
+#: ../raphodo/preferencedialog.py:226
 msgid ""
 "Remove a path from the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:156
+#: ../raphodo/preferencedialog.py:231
 msgid ""
 "Clear the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:164
+#: ../raphodo/preferencedialog.py:239
 msgid ""
-"Use python-style <a href=\"http://damonlynch.net/rapid/documentation/"
-"#regularexpressions\">regular expressions</a>"
+"Use python-style <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">regula"
+"r expressions</a>"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:168
+#: ../raphodo/preferencedialog.py:243
 msgid ""
 "Use regular expressions in the list of ignored paths.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:208
+#: ../raphodo/preferencedialog.py:283
 msgid "Program Automation"
 msgstr "Programautomatisering"
 
-#: ../raphodo/preferencedialog.py:209
+#: ../raphodo/preferencedialog.py:284
 msgid "Start downloading at program startup"
 msgstr "Start download når programmet starter"
 
-#: ../raphodo/preferencedialog.py:210
+#: ../raphodo/preferencedialog.py:285
 msgid "Start downloading upon device insertion"
 msgstr "Start download når enhed tilsluttes"
 
-#: ../raphodo/preferencedialog.py:211
+#: ../raphodo/preferencedialog.py:286
 msgid "Unmount (eject) device upon download completion"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:212
+#: ../raphodo/preferencedialog.py:287
 msgid "Exit program when download completes"
 msgstr "Afslut programmet når download er afsluttet"
 
-#: ../raphodo/preferencedialog.py:213
+#: ../raphodo/preferencedialog.py:288
 msgid "Exit program even if download had warnings or errors"
-msgstr "Afslut programmet selvom der opstod fejl eller advarsler ved download"
+msgstr ""
+"Afslut programmet selvom der opstod fejl eller advarsler ved download"
 
-#: ../raphodo/preferencedialog.py:240
+#: ../raphodo/preferencedialog.py:315
 msgid "Thumbnail Generation"
 msgstr "Miniaturer"
 
-#: ../raphodo/preferencedialog.py:241
+#: ../raphodo/preferencedialog.py:316
 msgid "Generate thumbnails"
 msgstr "Dan miniaturer"
 
-#: ../raphodo/preferencedialog.py:242
+#: ../raphodo/preferencedialog.py:318
 msgid "Generate thumbnails to show in the main program window"
 msgstr "Dan miniaturer til programmets hovedvindue"
 
-#: ../raphodo/preferencedialog.py:244
+#: ../raphodo/preferencedialog.py:320
 msgid "Cache thumbnails"
 msgstr "Gem miniaturer"
 
-#: ../raphodo/preferencedialog.py:245
+#: ../raphodo/preferencedialog.py:323
 msgid ""
 "Save thumbnails shown in the main program window in a thumbnail cache unique "
 "to Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:247
+#: ../raphodo/preferencedialog.py:327
 msgid "Generate system thumbnails"
 msgstr "Dan systemminiaturer"
 
-#: ../raphodo/preferencedialog.py:248
+#: ../raphodo/preferencedialog.py:330
 msgid ""
 "While downloading, save thumbnails that can be used by desktop file managers "
 "and other programs"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:255
+#: ../raphodo/preferencedialog.py:339
 msgid "Number of CPU cores used to generate thumbnails."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:256
+#: ../raphodo/preferencedialog.py:340
 msgid "CPU cores:"
 msgstr ""
 
 #. Translators: the * acts as an asterisk to denote a reference to an annotation
 #. such as '* Takes effect upon program restart'
-#: ../raphodo/preferencedialog.py:271 ../raphodo/preferencedialog.py:317
+#: ../raphodo/preferencedialog.py:355 ../raphodo/preferencedialog.py:401
 msgid "*"
 msgstr "*"
 
-#: ../raphodo/preferencedialog.py:294
+#: ../raphodo/preferencedialog.py:378
 msgid "Thumbnail Cache"
 msgstr "Miniature-cache"
 
-#: ../raphodo/preferencedialog.py:296
+#: ../raphodo/preferencedialog.py:380
 msgid "Calculating..."
 msgstr "Beregner..."
 
-#: ../raphodo/preferencedialog.py:302
+#: ../raphodo/preferencedialog.py:386
 msgid "days"
 msgstr "dage"
 
-#: ../raphodo/preferencedialog.py:303
+#: ../raphodo/preferencedialog.py:387
 msgid "forever"
 msgstr "for evigt"
 
-#: ../raphodo/preferencedialog.py:308
+#: ../raphodo/preferencedialog.py:392
 msgid "Cache size:"
 msgstr "Cache størrelse:"
 
-#: ../raphodo/preferencedialog.py:310
+#: ../raphodo/preferencedialog.py:394
 msgid "Number of thumbnails:"
 msgstr "Antal miniaturer:"
 
-#: ../raphodo/preferencedialog.py:312
+#: ../raphodo/preferencedialog.py:396
 msgid "Database size:"
 msgstr "Database størrelse:"
 
-#: ../raphodo/preferencedialog.py:314
+#: ../raphodo/preferencedialog.py:398
 msgid "Cache unaccessed thumbnails for:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:322
+#: ../raphodo/preferencedialog.py:406
 msgid "Purge Cache..."
 msgstr "Ryd cache..."
 
-#: ../raphodo/preferencedialog.py:323
+#: ../raphodo/preferencedialog.py:408
 msgid "Optimize Cache..."
 msgstr "Optimér cache..."
 
-#: ../raphodo/preferencedialog.py:336
+#: ../raphodo/preferencedialog.py:421
 msgid "* Takes effect upon program restart"
 msgstr "* Træder i kraft næste gang programmet starter"
 
-#: ../raphodo/preferencedialog.py:346
+#: ../raphodo/preferencedialog.py:431
 msgid "Skip download"
 msgstr "Spring download over"
 
-#: ../raphodo/preferencedialog.py:347
+#: ../raphodo/preferencedialog.py:432
 msgid "Don't download the file, and issue an error message"
 msgstr "Hent ikke filen, og vis en fejlmeddelelse"
 
-#: ../raphodo/preferencedialog.py:348
+#: ../raphodo/preferencedialog.py:433
 msgid "Add unique identifier"
 msgstr "Tilføj entydig angivelse"
 
-#: ../raphodo/preferencedialog.py:349
+#: ../raphodo/preferencedialog.py:436
 msgid ""
 "Add an identifier like _1 or _2 to the end of the filename, immediately "
 "before the file's extension"
@@ -1998,64 +2442,73 @@ msgstr ""
 "Tilføj en markering som _1 eller _2 til slutningen af filnavnet, lige før "
 "udvidelsen"
 
-#: ../raphodo/preferencedialog.py:355
+#: ../raphodo/preferencedialog.py:444
 msgid "Overwrite"
 msgstr "Overskriv"
 
-#: ../raphodo/preferencedialog.py:356
+#: ../raphodo/preferencedialog.py:445
 msgid "Overwrite the previously backed up file"
 msgstr "Overskriv den tidligere sikkerhedskopi"
 
-#: ../raphodo/preferencedialog.py:357
+#: ../raphodo/preferencedialog.py:446
 msgid "Skip"
 msgstr "Spring over"
 
-#: ../raphodo/preferencedialog.py:358
+#: ../raphodo/preferencedialog.py:448
 msgid "Don't overwrite the backup file, and issue an error message"
-msgstr "Overskriv ikke den tidligere sikkerhedskopi, og vis en fejlmeddelelse"
+msgstr ""
+"Overskriv ikke den tidligere sikkerhedskopi, og vis en fejlmeddelelse"
 
-#: ../raphodo/preferencedialog.py:364
+#: ../raphodo/preferencedialog.py:455
 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 identifier:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:378
+#: ../raphodo/preferencedialog.py:464
+msgid ""
+"Using sequence numbers to automatically generate unique filenames is "
+"strongly recommended. Configure file renaming in the Rename panel in the "
+"main window."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:473
 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 ""
 
-#: ../raphodo/preferencedialog.py:398
+#: ../raphodo/preferencedialog.py:494
 msgid "Program Warnings"
 msgstr "Advarsler"
 
-#: ../raphodo/preferencedialog.py:399
+#: ../raphodo/preferencedialog.py:495
 msgid "Show a warning when:"
 msgstr "Vis en advarsel når:"
 
-#: ../raphodo/preferencedialog.py:402
+#: ../raphodo/preferencedialog.py:498
 msgid "Downloading files currently not displayed"
 msgstr "Henter filer som ikke bliver vist"
 
-#: ../raphodo/preferencedialog.py:403
+#: ../raphodo/preferencedialog.py:499
 msgid ""
 "Warn when about to download files that are not displayed in the main window."
 msgstr "Giv advarsel før filer hentes som ikke bliver vist i hovedvinduet."
 
-#: ../raphodo/preferencedialog.py:405
+#: ../raphodo/preferencedialog.py:501
 msgid "Backup destinations are missing"
 msgstr "Sti til sikkerhedskopiering mangler"
 
-#: ../raphodo/preferencedialog.py:406
-msgid "Warn before starting a download if it is not possible to back up files."
+#: ../raphodo/preferencedialog.py:502
+msgid ""
+"Warn before starting a download if it is not possible to back up files."
 msgstr "Giv advarsel før filer hentes hvis en sikkerhedskopi ikke er mulig."
 
-#: ../raphodo/preferencedialog.py:408
+#: ../raphodo/preferencedialog.py:504
 msgid "Program libraries are missing or broken"
 msgstr "Programbiblioteker mangler eller er defekte"
 
-#: ../raphodo/preferencedialog.py:409
+#: ../raphodo/preferencedialog.py:505
 msgid ""
 "Warn if a software library used by Rapid Photo Downloader is missing or not "
 "functioning."
@@ -2063,11 +2516,11 @@ msgstr ""
 "Giv advarsel når software biblioteker, som Rapid Photo Downloader behøver, "
 "mangler eller ikke fungerer."
 
-#: ../raphodo/preferencedialog.py:412
+#: ../raphodo/preferencedialog.py:508
 msgid "Filesystem metadata cannot be set"
 msgstr "Metadata ikke kan skrives til filsystemet"
 
-#: ../raphodo/preferencedialog.py:413
+#: ../raphodo/preferencedialog.py:509
 msgid ""
 "Warn if there is an error setting a file's filesystem metadata, such as its "
 "modification time."
@@ -2075,63 +2528,179 @@ msgstr ""
 "Giv advarsel når der opstår fejl ved skrivning af metadata som f.eks. "
 "ændringstidspunkt."
 
-#: ../raphodo/preferencedialog.py:416
+#: ../raphodo/preferencedialog.py:512
 msgid "Encountering unhandled files"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:417
+#: ../raphodo/preferencedialog.py:513
 msgid ""
 "Warn after scanning a device or this computer if there are unrecognized "
 "files that will not be included in the download."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:420
+#: ../raphodo/preferencedialog.py:517
 msgid "Do not warn about unhandled files with extensions:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:424
+#: ../raphodo/preferencedialog.py:522
 msgid ""
 "File extensions are case insensitive and do not need to include the leading "
 "dot."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:427
+#: ../raphodo/preferencedialog.py:525
 msgid "Add"
 msgstr "Tilføj"
 
-#: ../raphodo/preferencedialog.py:428
+#: ../raphodo/preferencedialog.py:526
 msgid ""
 "Add a file extension to the list of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:430
+#: ../raphodo/preferencedialog.py:528
 msgid ""
 "Remove a file extension from the list of unhandled file types to not warn "
 "about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:434
+#: ../raphodo/preferencedialog.py:532
 msgid ""
 "Clear the list of file extensions of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:469
+#: ../raphodo/preferencedialog.py:568
+msgid "Photo and Video Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:571
+msgid "Consolidate files across devices and downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:574
+msgid ""
+"Analyze the results of device scans looking for duplicate files and matching "
+"RAW and JPEG pairs,\n"
+"comparing them across multiple devices and download sessions."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:580
+msgid "Treat matching RAW and JPEG files as:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:581
+msgid "One photo"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:582
+msgid "Two photos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:584
+msgid ""
+"Display matching pairs of RAW and JPEG photos as one photo, and if marked, "
+"download both."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:589
+msgid ""
+"Display matching pairs of RAW and JPEG photos as two different photos. You "
+"can still synchronize their sequence numbers."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:598
+msgid "With matching RAW and JPEG photos:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:600
+msgid "Do not mark JPEG for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:601
+msgid "Do not mark RAW for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:602
+msgid "Mark both for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:609
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"JPEG for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:614
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"RAW for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:619
+msgid ""
+"When matching RAW and JPEG photos are found, automatically mark both for "
+"download."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:625
+msgid ""
+"If you disable file consolidation, choose what to do when a download device "
+"is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:631
+msgid ""
+"When a download device is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:642
+msgid "Clear completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:643
+msgid "Keep displaying completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:644
+msgid "Prompt for what to do"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:649
+msgid ""
+"Automatically clear the display of completed downloads whenever a new "
+"download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:654
+msgid ""
+"Keep displaying completed downloads whenever a new download device is "
+"inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:658
+msgid ""
+"Prompt whether to keep displaying completed downloads or clear them whenever "
+"a new download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:702
 msgid "Version Check"
 msgstr "Versionskontrol"
 
-#: ../raphodo/preferencedialog.py:470
+#: ../raphodo/preferencedialog.py:703
 msgid "Check for new version at startup"
 msgstr "Kontroller ved programstart om der er en nyere version"
 
-#: ../raphodo/preferencedialog.py:471
+#: ../raphodo/preferencedialog.py:705
 msgid "Check for a new version of the program each time the program starts."
 msgstr "Kontroller om der er en nyere version hver gang programmet starter."
 
-#: ../raphodo/preferencedialog.py:473
+#: ../raphodo/preferencedialog.py:707
 msgid "Include development releases"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:474
+#: ../raphodo/preferencedialog.py:709
 msgid ""
 "Include alpha, beta and other development releases when checking for a new "
 "version of the program.\n"
@@ -2140,11 +2709,11 @@ msgid ""
 "occur."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:489
+#: ../raphodo/preferencedialog.py:725
 msgid "Ignore DNG date/time metadata on MTP devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:490
+#: ../raphodo/preferencedialog.py:727
 msgid ""
 "Ignore date/time metadata in DNG files located on MTP devices, and use the "
 "file's modification time instead.\n"
@@ -2153,63 +2722,79 @@ msgid ""
 "metadata."
 msgstr ""
 
+#: ../raphodo/preferencedialog.py:741
+msgid "Completed Downloads"
+msgstr ""
+
 #. Translators: substituted value is a description for the set of preferences
 #. shown in the preference dialog window, e.g. Devices, Automation, etc.
 #. This string is shown in a tooltip for the "Restore Defaults" button
-#: ../raphodo/preferencedialog.py:710
+#: ../raphodo/preferencedialog.py:1067
 #, python-format
 msgid "Restores default %s preference values"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:832
+#: ../raphodo/preferencedialog.py:1208
 msgid ""
 "Do you want to purge the thumbnail cache? The cache will be purged when the "
 "program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:835
+#: ../raphodo/preferencedialog.py:1212
 msgid "Purge Thumbnail Cache"
 msgstr "Ryd miniature cache"
 
-#: ../raphodo/preferencedialog.py:847
+#: ../raphodo/preferencedialog.py:1225
 msgid ""
 "Do you want to optimize the thumbnail cache? The cache will be optimized "
 "when the program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:850
+#: ../raphodo/preferencedialog.py:1229
 msgid "Optimize Thumbnail Cache"
 msgstr "Optimér miniature cache"
 
-#: ../raphodo/preferencedialog.py:1045
+#: ../raphodo/preferencedialog.py:1481
+msgid "Enter a Folder to Scan"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1482
+msgid "Specify a folder that will be scanned for photos and videos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1483
+msgid "Folder:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1497
 msgid "Enter a Path to Ignore"
 msgstr "Angiv en sti der skal ignoreres"
 
-#: ../raphodo/preferencedialog.py:1046
+#: ../raphodo/preferencedialog.py:1498
 msgid "Specify a path that will never be scanned for photos or videos"
 msgstr "Angiv en sti som aldrig skal gennemsøges efter fotos og videoer"
 
-#: ../raphodo/preferencedialog.py:1047
+#: ../raphodo/preferencedialog.py:1499
 msgid "Path:"
 msgstr "Sti:"
 
-#: ../raphodo/preferencedialog.py:1061
+#: ../raphodo/preferencedialog.py:1513
 msgid "Enter a File Extension"
 msgstr "Angiv en filendelse"
 
-#: ../raphodo/preferencedialog.py:1062
+#: ../raphodo/preferencedialog.py:1514
 msgid "Specify a file extension (without the leading dot)"
 msgstr "Angiv en filendelse (uden punktum i starten)"
 
-#: ../raphodo/preferencedialog.py:1063 ../raphodo/renamepanel.py:122
+#: ../raphodo/preferencedialog.py:1515 ../raphodo/renamepanel.py:122
 msgid "Extension:"
 msgstr "Filendelse:"
 
-#: ../raphodo/preferencedialog.py:1078
+#: ../raphodo/preferencedialog.py:1530
 msgid "Invalid File Extension"
 msgstr "Ugyldig filendelse"
 
-#: ../raphodo/preferencedialog.py:1079
+#: ../raphodo/preferencedialog.py:1531
 #, python-format
 msgid ""
 "The file extension <b>%s</b> is recognized by Rapid Photo Downloader, so it "
@@ -2218,7 +2803,7 @@ msgstr ""
 "Filendelsen <b>%s</b> bliver genkendt af Rapid Photo Downloader, så det "
 "giver ikke mening at advare om den."
 
-#: ../raphodo/preferencedialog.py:1081
+#: ../raphodo/preferencedialog.py:1533
 #, python-format
 msgid ""
 "Recognized file types:\n"
@@ -2244,42 +2829,41 @@ msgstr "Bryllup"
 msgid "Birthday"
 msgstr "Fødselsdag"
 
-#: ../raphodo/preferences.py:614
+#: ../raphodo/preferences.py:624
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Undermappe indstillinger bør ikke begynde med et %s"
 
-#: ../raphodo/preferences.py:617
+#: ../raphodo/preferences.py:627
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Undermappe indstillinger bør ikke slutte med et %s"
 
-#: ../raphodo/preferences.py:622
+#: ../raphodo/preferences.py:632
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr "Undermappe indstillinger bør ikke indeholde to %s efter hinanden"
 
-#. self.setFlat(True)
 #: ../raphodo/primarybutton.py:72
 msgid "Download 8 Photos and 10 Videos"
 msgstr "Hent 8 fotos og 10 videoer"
 
-#: ../raphodo/problemnotification.py:86 ../raphodo/problemnotification.py:208
+#: ../raphodo/problemnotification.py:87 ../raphodo/problemnotification.py:209
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr "Fejl: %(errno)s %(strerror)s"
 
-#: ../raphodo/problemnotification.py:89
+#: ../raphodo/problemnotification.py:90
 #, python-format
 msgid "Error: %s"
 msgstr "Fejl: %s"
 
-#: ../raphodo/problemnotification.py:116
+#: ../raphodo/problemnotification.py:117
 #, python-format
 msgid "GPhoto2 Error: %s"
 msgstr "GPhoto2 fejl: %s"
 
-#: ../raphodo/problemnotification.py:124
+#: ../raphodo/problemnotification.py:125
 msgid ""
 "Unable to initialize the camera, probably because another program is using "
 "it. No files were copied from it."
@@ -2287,63 +2871,63 @@ msgstr ""
 "Kan ikke benytte kameraet, sandsynligvis fordi et andet program bruger det. "
 "Ingen filer blev kopieret fra det."
 
-#: ../raphodo/problemnotification.py:134
+#: ../raphodo/problemnotification.py:135
 #, python-format
 msgid "Unable to read directory %s"
 msgstr "Kan ikke læse mappen %s"
 
-#: ../raphodo/problemnotification.py:140
+#: ../raphodo/problemnotification.py:141
 #, python-format
 msgid "Unable to access modification time or size from %s"
 msgstr "Kan ikke ændre ændringstidspunkt eller filstørrelse af %s"
 
-#: ../raphodo/problemnotification.py:146
+#: ../raphodo/problemnotification.py:147
 #, python-format
 msgid "Unable to read file %s"
 msgstr "Kan ikke læse filen %s"
 
-#: ../raphodo/problemnotification.py:152
+#: ../raphodo/problemnotification.py:153
 #, python-format
 msgid "Unable to write file %s"
 msgstr "Kan ikke skrive filen %s"
 
-#: ../raphodo/problemnotification.py:158
+#: ../raphodo/problemnotification.py:159
 #, python-format
 msgid "Unable to move file %s"
 msgstr "Kan ikke flytte filen %s"
 
-#: ../raphodo/problemnotification.py:164
+#: ../raphodo/problemnotification.py:165
 #, python-format
 msgid "Unable to remove file %s"
 msgstr "Kan ikke fjerne filen %s"
 
-#: ../raphodo/problemnotification.py:170
+#: ../raphodo/problemnotification.py:171
 #, python-format
 msgid "Unable to copy file %s"
 msgstr "Kan ikke kopiere filen %s"
 
-#: ../raphodo/problemnotification.py:176
+#: ../raphodo/problemnotification.py:177
 #, python-format
 msgid "Zero length file %s will not be downloaded"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:182
+#: ../raphodo/problemnotification.py:183
 #, python-format
 msgid "Could not determine filesystem modification time for %s"
 msgstr "Kan ikke afgøre ændringstidspunkt eller filstørrelse af %s"
 
-#: ../raphodo/problemnotification.py:188
+#: ../raphodo/problemnotification.py:189
 #, python-format
 msgid "Unable to load metadata from %s"
 msgstr "Kan ikke læse metadata fra %s"
 
-#: ../raphodo/problemnotification.py:194
+#: ../raphodo/problemnotification.py:195
 #, python-format
 msgid ""
 "Unable to load metadata from %(name)s. The %(filetype)s was not downloaded."
 msgstr "Kan ikke læse metadata fra %(name)s. %(filetype)s blev ikke hentet."
 
-#: ../raphodo/problemnotification.py:202
+#: ../raphodo/problemnotification.py:203
 #, python-format
 msgid ""
 "An error occurred setting a file's filesystem metadata on the filesystem %s. "
@@ -2351,78 +2935,78 @@ msgid ""
 "again."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:216
+#: ../raphodo/problemnotification.py:217
 #, python-format
 msgid "Encountered unhandled file %s. It will not be downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:223
+#: ../raphodo/problemnotification.py:224
 #, python-format
 msgid "%(filetype)s %(destination)s already exists."
 msgstr "%(filetype)s %(destination)s findes allerede."
 
-#: ../raphodo/problemnotification.py:234 ../raphodo/problemnotification.py:262
+#: ../raphodo/problemnotification.py:235 ../raphodo/problemnotification.py:263
 #, python-format
 msgid ""
 "The existing %(filetype)s %(destination)s was last modified on %(date)s at "
 "%(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:245
+#: ../raphodo/problemnotification.py:246
 #, python-format
 msgid "The %(filetype)s %(source)s was not downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:273
+#: ../raphodo/problemnotification.py:274
 #, python-format
 msgid "The %(filetype)s %(source)s was downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:282
+#: ../raphodo/problemnotification.py:283
 #, python-format
 msgid "The unique identifier '%s' was added to the filename."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:298
+#: ../raphodo/problemnotification.py:299
 #, python-format
 msgid ""
 "The existing backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:309
+#: ../raphodo/problemnotification.py:310
 #, python-format
 msgid "The %(filetype)s %(source)s was not backed up from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:326
+#: ../raphodo/problemnotification.py:327
 #, python-format
 msgid ""
 "The previous backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:337
+#: ../raphodo/problemnotification.py:338
 #, python-format
 msgid ""
 "The %(filetype)s %(source)s from %(device)s was backed up, overwriting the "
 "previous backup %(filetype)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:356
+#: ../raphodo/problemnotification.py:357
 #, python-format
 msgid ""
 "When synchronizing RAW + JPEG sequence values, a duplicate %(filetype)s "
 "%(file)s was encountered, and was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:366
+#: ../raphodo/problemnotification.py:367
 msgid ""
 "When synchronizing RAW + JPEG sequence values, photos were detected with the "
 "same filenames, but taken at different times:"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:373
+#: ../raphodo/problemnotification.py:374
 #, python-format
 msgid ""
 "%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
@@ -2431,134 +3015,134 @@ msgstr ""
 "%(image1)s blev taget den %(image1_date)s kl. %(image1_time)s, og %(image2)s "
 "den %(image2_date)s kl. %(image2_time)s."
 
-#: ../raphodo/problemnotification.py:389
+#: ../raphodo/problemnotification.py:390
 #, python-format
 msgid "Unable to finalize the filename for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:424
+#: ../raphodo/problemnotification.py:425
 #, python-format
 msgid ""
 "The filename %(destination)s was not fully generated for %(filetype)s "
 "%(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:433
+#: ../raphodo/problemnotification.py:434
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr "Der mangler %(type)s metadata."
 
-#: ../raphodo/problemnotification.py:439
+#: ../raphodo/problemnotification.py:440
 #, python-format
 msgid "The following metadata is missing: %s."
 msgstr "Følgende metadata mangler: %s."
 
-#: ../raphodo/problemnotification.py:445
+#: ../raphodo/problemnotification.py:446
 #, python-format
 msgid "Date/time conversion failed: %s."
 msgstr "Dato/tidskonvertering slog fejl: %s."
 
-#: ../raphodo/problemnotification.py:451
+#: ../raphodo/problemnotification.py:452
 msgid ""
 "Could not extract valid date/time metadata or determine the file "
 "modification time."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:457
+#: ../raphodo/problemnotification.py:458
 msgid "Filename does not have an extension."
 msgstr "Filnavnet har ingen udvidelse."
 
-#: ../raphodo/problemnotification.py:460
+#: ../raphodo/problemnotification.py:461
 msgid "Filename does not have a number component."
 msgstr "Filnavnet indeholder ingen tal."
 
-#: ../raphodo/problemnotification.py:464
+#: ../raphodo/problemnotification.py:465
 #, python-format
 msgid "Error generating component %(component)s. Error: %(error)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:477
+#: ../raphodo/problemnotification.py:478
 #, python-format
 msgid ""
 "The download subfolders %(folder)s were only partially generated for "
 "%(filetype)s %(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:486
+#: ../raphodo/problemnotification.py:487
 #, python-format
 msgid ""
 "There is no data with which to generate the %(subfolder_file)s for "
 "%(filename)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:499
+#: ../raphodo/problemnotification.py:500
 #, python-format
 msgid ""
 "Unable to create the %(filetype)s %(destination)s in %(folder)s. The "
 "download file was %(source)s in %(device)s. It was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:514
+#: ../raphodo/problemnotification.py:515
 #, python-format
 msgid "Unable to create the download subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:526
+#: ../raphodo/problemnotification.py:527
 #, python-format
 msgid "Unable to create the backup subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:577
+#: ../raphodo/problemnotification.py:578
 #, python-format
 msgid "Problems scanning %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:584
+#: ../raphodo/problemnotification.py:585
 #, python-format
 msgid "Problems copying from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:591
+#: ../raphodo/problemnotification.py:592
 msgid "Problems while finalizing filenames and generating subfolders"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:598
+#: ../raphodo/problemnotification.py:599
 #, python-format
 msgid "Problems backing up to %s"
 msgstr ""
 
-#. Translators: for example Nov 3 or Dec 31
-#. The start and end dates are on a different day
-#. Translators: for example Nov 3 or Dec 31
-#: ../raphodo/proximity.py:105 ../raphodo/proximity.py:221
-#: ../raphodo/proximity.py:224 ../raphodo/proximity.py:828
+#. Translators: for example Nov 3 2015, 11:25 AM
+#. Translators: for example, Nov 3, 12:15 PM
+#: ../raphodo/proximity.py:188 ../raphodo/proximity.py:213
+#: ../raphodo/proximity.py:236 ../raphodo/proximity.py:239
 #, python-format
-msgid "%(month)s %(numeric_day)s"
+msgid "%(date)s, %(time)s"
 msgstr ""
 
-#. Translators: for example Nov 15 2015
-#. Translators: for example Nov 3 2015
-#: ../raphodo/proximity.py:109 ../raphodo/proximity.py:230
-#: ../raphodo/proximity.py:231 ../raphodo/proximity.py:831
+#: ../raphodo/proximity.py:204
 #, python-format
-msgid "%(date)s %(year)s"
+msgid "%(starttime)s - %(endtime)s"
 msgstr ""
 
-#. Translators: for example Nov 3 2015, 11:25 AM
-#. Translators: for example, Nov 3, 12:15 PM
-#: ../raphodo/proximity.py:197 ../raphodo/proximity.py:215
-#: ../raphodo/proximity.py:234 ../raphodo/proximity.py:236
+#. The start and end dates are on a different day
+#. Translators: for example Nov 3 or Dec 31
+#: ../raphodo/proximity.py:221 ../raphodo/proximity.py:225
+#: ../raphodo/proximity.py:980 ../raphodo/timeutils.py:105
 #, python-format
-msgid "%(date)s, %(time)s"
+msgid "%(month)s %(numeric_day)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:209
+#. Translators: for example Nov 3 2015
+#. Translators: for example Nov 2 2015
+#. Translators: for example Nov 15 2015
+#: ../raphodo/proximity.py:232 ../raphodo/proximity.py:233
+#: ../raphodo/proximity.py:985 ../raphodo/timeutils.py:110
 #, python-format
-msgid "%(starttime)s - %(endtime)s"
+msgid "%(date)s %(year)s"
 msgstr ""
 
 #. Translators: for example, Nov 3, 12:15 PM - Nov 4, 1:00 AM
-#: ../raphodo/proximity.py:241
+#: ../raphodo/proximity.py:245
 #, python-format
 msgid "%(earlier_time)s - %(later_time)s"
 msgstr ""
@@ -2567,25 +3151,25 @@ msgstr ""
 #. Nov 3 2012, 12:15 PM -
 #. Nov 4 2012, 1:00 AM
 #. (please keep the line break signified by \n)
-#: ../raphodo/proximity.py:248
+#: ../raphodo/proximity.py:253
 #, python-format
 msgid ""
 "%(earlier_time)s -\n"
 "%(later_time)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:359
+#: ../raphodo/proximity.py:382
 #, python-format
 msgid "%(month)s  %(year)s"
 msgstr ""
 
 #. Translators: for example Nov 2015
-#: ../raphodo/proximity.py:833
+#: ../raphodo/proximity.py:987
 #, python-format
 msgid "%(month)s %(year)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:1344
+#: ../raphodo/proximity.py:1595
 msgid ""
 "The time elapsed between consecutive photos and videos that is used to build "
 "the Timeline"
@@ -2595,47 +3179,47 @@ msgstr ""
 #. Replace the very last character (after the d) with the correct
 #. localized value, keeping everything else. In other words, change
 #. only the m character.
-#: ../raphodo/proximity.py:1406
+#: ../raphodo/proximity.py:1652
 #, python-format
 msgid "%(minutes)dm"
 msgstr ""
 
 #. Translators: i.e. "1.5h", which is short for 1.5 hours.
 #. Replace the entire string with the correct localized value
-#: ../raphodo/proximity.py:1410
+#: ../raphodo/proximity.py:1656
 msgid "1.5h"
 msgstr ""
 
 #. Translators: e.g. "5h", which is short for 5 hours.
 #. Replace the very last character (after the d) with the correct localized value,
 #. keeping everything else. In other words, change only the h character.
-#: ../raphodo/proximity.py:1415
+#: ../raphodo/proximity.py:1661
 #, python-format
 msgid "%(hours)dh"
 msgstr ""
 
-#: ../raphodo/proximity.py:1461
+#: ../raphodo/proximity.py:1710
 msgid ""
 "The Timeline groups photos and videos based on how much time elapsed between "
 "consecutive shots. Use it to identify photos and videos taken at different "
 "periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/proximity.py:1464
+#: ../raphodo/proximity.py:1715
 msgid ""
 "Use the slider (below) to adjust the time elapsed between consecutive shots "
 "that is used to build the Timeline."
 msgstr ""
 
-#: ../raphodo/proximity.py:1466
+#: ../raphodo/proximity.py:1718
 msgid "Timeline build pending..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1467
+#: ../raphodo/proximity.py:1719
 msgid "Timeline is building..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1468
+#: ../raphodo/proximity.py:1721
 msgid ""
 "The Timeline needs to be rebuilt because the file modification time does not "
 "match the time a shot was taken for one or more shots.<br><br>The Timeline "
@@ -2647,61 +3231,61 @@ msgid ""
 "downloading, which is when the metadata is read."
 msgstr ""
 
-#: ../raphodo/rapid.py:485 ../raphodo/rapid.py:2461 ../raphodo/rapid.py:3728
-#: ../raphodo/rapid.py:3846 ../raphodo/rapid.py:3850 ../raphodo/rapid.py:3870
-#: ../raphodo/rapid.py:3874 ../raphodo/rapid.py:3998 ../raphodo/rapid.py:4007
-#: ../raphodo/rapid.py:4495 ../raphodo/rapid.py:4888 ../raphodo/rapid.py:5722
-#: ../raphodo/rememberthisdialog.py:97
+#: ../raphodo/rapid.py:493 ../raphodo/rapid.py:2555 ../raphodo/rapid.py:3934
+#: ../raphodo/rapid.py:4065 ../raphodo/rapid.py:4069 ../raphodo/rapid.py:4092
+#: ../raphodo/rapid.py:4096 ../raphodo/rapid.py:4226 ../raphodo/rapid.py:4237
+#: ../raphodo/rapid.py:4743 ../raphodo/rapid.py:5195 ../raphodo/rapid.py:5997
+#: ../raphodo/rememberthisdialog.py:99
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:3
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: ../raphodo/rapid.py:1100
+#: ../raphodo/rapid.py:1131
 msgid ""
 "<b>ExifTool has a problem</b><br><br> Rapid Photo Downloader uses ExifTool "
 "to get metadata from videos and photos. The program will run without it, but "
 "installing it is <b>highly</b> recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1110 ../raphodo/rapid.py:1130
+#: ../raphodo/rapid.py:1141 ../raphodo/rapid.py:1161
 msgid "Problem with libmediainfo"
 msgstr ""
 
-#: ../raphodo/rapid.py:1119
+#: ../raphodo/rapid.py:1150
 msgid ""
 "<b>The library libmediainfo appears to be missing</b><br><br> Rapid Photo "
 "Downloader uses libmediainfo to get the date and time a video was shot. The "
 "program will run  without it, but installing it is recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1417
+#: ../raphodo/rapid.py:1448
 msgid "Download failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1419
+#: ../raphodo/rapid.py:1450
 msgid ""
 "Sorry, the download of the new version of Rapid Photo Downloader failed."
 msgstr ""
 
-#: ../raphodo/rapid.py:1425
+#: ../raphodo/rapid.py:1457
 msgid ""
 "The new version was successfully downloaded. Do you want to close Rapid "
 "Photo Downloader and install it now?"
 msgstr ""
 
-#: ../raphodo/rapid.py:1428
+#: ../raphodo/rapid.py:1461
 msgid "Update Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:1432
+#: ../raphodo/rapid.py:1465
 msgid "Install"
 msgstr ""
 
-#: ../raphodo/rapid.py:1450
+#: ../raphodo/rapid.py:1483
 msgid "New version saved"
 msgstr ""
 
-#: ../raphodo/rapid.py:1451
+#: ../raphodo/rapid.py:1485
 #, python-format
 msgid ""
 "The tar file and installer script are saved at:\n"
@@ -2709,163 +3293,163 @@ msgid ""
 " %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:1468
+#: ../raphodo/rapid.py:1502
 msgid "Upgrade failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1469
+#: ../raphodo/rapid.py:1505
 msgid ""
 "Sorry, upgrading Rapid Photo Downloader failed because there was an error "
 "opening the installer."
 msgstr ""
 
-#: ../raphodo/rapid.py:1667 ../raphodo/rapid.py:2331
+#: ../raphodo/rapid.py:1709 ../raphodo/rapid.py:2425
 msgid "Download"
 msgstr "Hent"
 
-#: ../raphodo/rapid.py:1671
+#: ../raphodo/rapid.py:1713
 msgid "&Refresh..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1675
+#: ../raphodo/rapid.py:1717
 msgid "&Preferences"
 msgstr ""
 
-#: ../raphodo/rapid.py:1679
+#: ../raphodo/rapid.py:1721
 msgid "&Quit"
 msgstr ""
 
-#: ../raphodo/rapid.py:1683
+#: ../raphodo/rapid.py:1725
 msgid "Error &Reports"
 msgstr ""
 
-#: ../raphodo/rapid.py:1687
+#: ../raphodo/rapid.py:1729
 msgid "Clear Completed Downloads"
 msgstr ""
 
-#: ../raphodo/rapid.py:1691
+#: ../raphodo/rapid.py:1733
 msgid "Get Help Online..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1695
+#: ../raphodo/rapid.py:1737
 msgid "&Tip of the Day..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1699
+#: ../raphodo/rapid.py:1741
 msgid "Report a Problem..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1703
+#: ../raphodo/rapid.py:1745
 msgid "Make a Donation..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1707
+#: ../raphodo/rapid.py:1749
 msgid "Translate this Application..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1711
+#: ../raphodo/rapid.py:1753
 msgid "&About..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1715
+#: ../raphodo/rapid.py:1757
 msgid "Check for Updates..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1797
+#: ../raphodo/rapid.py:1840
 msgid "Timeline"
 msgstr ""
 
-#: ../raphodo/rapid.py:1807
+#: ../raphodo/rapid.py:1850
 msgid "Destination"
 msgstr ""
 
-#: ../raphodo/rapid.py:1808
+#: ../raphodo/rapid.py:1851
 msgid "Rename"
 msgstr ""
 
-#: ../raphodo/rapid.py:1810
+#: ../raphodo/rapid.py:1853
 msgid "Back Up"
 msgstr ""
 
 #. Devices Header and View
-#: ../raphodo/rapid.py:1926
+#: ../raphodo/rapid.py:1977
 msgid ""
 "Turn on or off the use of devices attached to this computer as download "
 "sources"
 msgstr ""
 
 #. This Computer Header and View
-#: ../raphodo/rapid.py:1940
+#: ../raphodo/rapid.py:1994
 msgid ""
 "Turn on or off the use of a folder on this computer as a download source"
 msgstr ""
 
-#: ../raphodo/rapid.py:1941
+#: ../raphodo/rapid.py:1996
 msgid "This Computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:1952
+#: ../raphodo/rapid.py:2009
 msgid "Select a source folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:1975
+#: ../raphodo/rapid.py:2038
 msgid "Projected Storage Use"
 msgstr ""
 
-#: ../raphodo/rapid.py:1989 ../raphodo/rapid.py:1997
+#: ../raphodo/rapid.py:2056 ../raphodo/rapid.py:2068
 msgid "Select a destination folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:2045
+#: ../raphodo/rapid.py:2117
 msgid "All"
 msgstr ""
 
-#: ../raphodo/rapid.py:2046
+#: ../raphodo/rapid.py:2118
 msgid "New"
 msgstr ""
 
-#: ../raphodo/rapid.py:2048
+#: ../raphodo/rapid.py:2120
 msgid "Show:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2051
+#: ../raphodo/rapid.py:2123
 msgid "Modification Time"
 msgstr ""
 
-#: ../raphodo/rapid.py:2052
+#: ../raphodo/rapid.py:2124
 msgid "Checked State"
 msgstr ""
 
-#: ../raphodo/rapid.py:2055
+#: ../raphodo/rapid.py:2127
 msgid "File Type"
 msgstr ""
 
-#: ../raphodo/rapid.py:2056
+#: ../raphodo/rapid.py:2128
 msgid "Device"
 msgstr "Enhed"
 
-#: ../raphodo/rapid.py:2058
+#: ../raphodo/rapid.py:2130
 msgid "Sort:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2069
+#: ../raphodo/rapid.py:2141
 msgid "Select All:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2311
+#: ../raphodo/rapid.py:2405
 #, python-format
 msgid "Download %(files)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2327
+#: ../raphodo/rapid.py:2421
 msgid "Resume Download"
 msgstr ""
 
-#: ../raphodo/rapid.py:2329
+#: ../raphodo/rapid.py:2423
 msgid "Pause"
 msgstr "Pause"
 
-#: ../raphodo/rapid.py:2417
+#: ../raphodo/rapid.py:2511
 #, python-brace-format
 msgid ""
 "Please report the problem at <a href=\"{website}\">{website}</a>.<br><br>\n"
@@ -2874,11 +3458,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/rapid.py:2431
+#: ../raphodo/rapid.py:2525
 msgid "Thank you for reporting a problem in Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:2529
+#: ../raphodo/rapid.py:2624
 #, python-format
 msgid ""
 "<b>Changing This Computer source path</b><br><br>Do you really want to "
@@ -2887,30 +3471,29 @@ msgid ""
 "from This Computer will be cancelled."
 msgstr ""
 
-#: ../raphodo/rapid.py:2595
+#: ../raphodo/rapid.py:2694
 msgid "You cannot change the download destination while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:2604
+#: ../raphodo/rapid.py:2704
 #, python-format
 msgid ""
 "<b>Confirm Download Destination</b><br><br>Are you sure you want to set the "
 "%(file_type)s download destination to %(path)s?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2682
+#: ../raphodo/rapid.py:2785
 msgid ""
+"\n"
 "<b>Downloading all files</b><br><br>\n"
-"                    A download always includes all files that are checked "
-"for download,\n"
-"                    including those that are not currently displayed because "
-"the Timeline\n"
-"                    is being used or because only new files are being shown."
-"<br><br>\n"
-"                    Do you want to proceed with the download?"
+"A download always includes all files that are checked for download,\n"
+"including those that are not currently displayed because the Timeline\n"
+"is being used or because only new files are being shown.<br><br>\n"
+"Do you want to proceed with the download?\n"
+"                        "
 msgstr ""
 
-#: ../raphodo/rapid.py:2820
+#: ../raphodo/rapid.py:2937
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -2921,7 +3504,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: ../raphodo/rapid.py:2824
+#: ../raphodo/rapid.py:2940
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -2930,199 +3513,193 @@ msgstr ""
 "Denne download mappe er ugyldig:\n"
 "%s"
 
-#: ../raphodo/rapid.py:2827
+#: ../raphodo/rapid.py:2943
 msgid "Download Failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:2828
+#: ../raphodo/rapid.py:2944
 msgid "The download cannot proceed."
 msgstr ""
 
-#: ../raphodo/rapid.py:2842
+#: ../raphodo/rapid.py:2962
 msgid ""
 "Photos and videos will not be backed up because there is nowhere to back "
 "them up. Do you still want to start the download?"
 msgstr ""
 
-#. Translators: filetype will be replaced with 'photos' or 'videos'
-#: ../raphodo/rapid.py:2847 ../raphodo/rapid.py:2854
+#: ../raphodo/rapid.py:2969 ../raphodo/rapid.py:2979
 #, python-format
 msgid ""
 "No backup device exists for backing up %(filetype)s. Do you still want to "
 "start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2848 ../raphodo/rpdfile.py:228
+#: ../raphodo/rapid.py:2971 ../raphodo/rpdfile.py:228
 msgid "photos"
 msgstr "fotos"
 
-#: ../raphodo/rapid.py:2855 ../raphodo/rpdfile.py:223
+#: ../raphodo/rapid.py:2981 ../raphodo/rpdfile.py:223
 msgid "videos"
 msgstr "videoer"
 
-#: ../raphodo/rapid.py:2861
+#: ../raphodo/rapid.py:2989
 msgid ""
 "<b>The photo and video backup destinations do not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2869 ../raphodo/rapid.py:2876
+#: ../raphodo/rapid.py:2999 ../raphodo/rapid.py:3008
 #, python-format
 msgid ""
 "<b>The %(filetype)s backup destination does not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2871 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:818
+#: ../raphodo/rapid.py:3001 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:843
 msgid "photo"
 msgstr "foto"
 
-#: ../raphodo/rapid.py:2878 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:858
+#: ../raphodo/rapid.py:3010 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:883
 msgid "video"
 msgstr "video"
 
-#: ../raphodo/rapid.py:2886
+#: ../raphodo/rapid.py:3018
 msgid "Backup problem"
 msgstr ""
 
-#. Translators - in the middle is a unicode em dash - please retain it
-#. This string is displayed in the status bar when the download is running
-#: ../raphodo/rapid.py:3571
+#: ../raphodo/rapid.py:3756
 #, python-format
 msgid "%(downloading_from)s — %(time_left)s left (%(speed)s)"
 msgstr ""
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3640
+#: ../raphodo/rapid.py:3828
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s hentet"
 
-#. Translators: e.g. 2 videos failed to download
-#: ../raphodo/rapid.py:3645
+#: ../raphodo/rapid.py:3836
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "%(noFiles)s %(filetypes)s kunne ikke hentes"
 
-#: ../raphodo/rapid.py:3650 ../raphodo/rapid.py:3723
+#: ../raphodo/rapid.py:3842 ../raphodo/rapid.py:3927
 msgid "warnings"
 msgstr "advarsler"
 
-#: ../raphodo/rapid.py:3679
+#: ../raphodo/rapid.py:3873
 msgid "All downloads complete"
 msgstr "Alle downloads er afsluttet"
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3686 ../raphodo/rapid.py:3695 ../raphodo/rapid.py:3704
-#: ../raphodo/rapid.py:3713 ../raphodo/rapid.py:3721
+#: ../raphodo/rapid.py:3881 ../raphodo/rapid.py:3892 ../raphodo/rapid.py:3903
+#: ../raphodo/rapid.py:3914 ../raphodo/rapid.py:3924
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: ../raphodo/rapid.py:3688 ../raphodo/rapid.py:3706
+#: ../raphodo/rapid.py:3884 ../raphodo/rapid.py:3906
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s hentet"
 
-#: ../raphodo/rapid.py:3697 ../raphodo/rapid.py:3715
+#: ../raphodo/rapid.py:3895 ../raphodo/rapid.py:3917
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "%(filetype)s kunne ikke hentes"
 
-#: ../raphodo/rapid.py:3742
+#: ../raphodo/rapid.py:3950
 msgid "1 failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:3744
+#: ../raphodo/rapid.py:3952
 #, python-format
 msgid "%d failures"
 msgstr ""
 
-#: ../raphodo/rapid.py:3749
+#: ../raphodo/rapid.py:3957
 msgid "1 warning"
 msgstr ""
 
-#: ../raphodo/rapid.py:3751
+#: ../raphodo/rapid.py:3959
 #, python-format
 msgid "%d warnings"
 msgstr ""
 
-#: ../raphodo/rapid.py:3771
+#: ../raphodo/rapid.py:3981
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3774
+#: ../raphodo/rapid.py:3985
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3779
+#: ../raphodo/rapid.py:3989
 #, python-format
 msgid "No files downloaded — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3781
+#: ../raphodo/rapid.py:3991
 msgid "No files downloaded"
 msgstr ""
 
-#: ../raphodo/rapid.py:3805
+#: ../raphodo/rapid.py:4021
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3809
+#: ../raphodo/rapid.py:4026
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3812
+#: ../raphodo/rapid.py:4031
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3820
+#: ../raphodo/rapid.py:4039
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3833
+#: ../raphodo/rapid.py:4052
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3837
+#: ../raphodo/rapid.py:4056
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3841
+#: ../raphodo/rapid.py:4060
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices"
 msgstr ""
 
-#: ../raphodo/rapid.py:3867
+#: ../raphodo/rapid.py:4087
 msgid "The Destination subfolders and Timeline have been rebuilt"
 msgstr ""
 
-#: ../raphodo/rapid.py:3922
+#: ../raphodo/rapid.py:4144
 msgid "Program preferences are invalid"
 msgstr "Programmets indstillinger er ugyldige"
 
-#: ../raphodo/rapid.py:3999
+#: ../raphodo/rapid.py:4228
 #, python-format
 msgid ""
 "<b>All files on the %(camera)s are inaccessible</b>.<br><br>It may be locked "
@@ -3132,179 +3709,205 @@ msgid ""
 "ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4008
+#: ../raphodo/rapid.py:4239
 #, python-format
 msgid ""
-"<b>The %(camera)s appears to be in use by another application.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again.<br><br>Alternatively, you can ignore this "
-"device."
+"<b>The %(camera)s appears to be in use by another "
+"application.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again.<br><br>Alternatively, you "
+"can ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4019
+#: ../raphodo/rapid.py:4250
 msgid "&Try Again"
 msgstr ""
 
-#: ../raphodo/rapid.py:4020
+#: ../raphodo/rapid.py:4251
 msgid "&Ignore This Device"
 msgstr ""
 
-#: ../raphodo/rapid.py:4086
+#: ../raphodo/rapid.py:4323
 #, python-format
 msgid "Sorry, an unexpected problem occurred while scanning %s."
 msgstr ""
 
-#: ../raphodo/rapid.py:4087
+#: ../raphodo/rapid.py:4324
 msgid "Unfortunately you cannot download from this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4091
+#: ../raphodo/rapid.py:4328
 msgid ""
 "A possible workaround for the problem might be downloading from the camera's "
 "memory card using a card reader."
 msgstr ""
 
-#: ../raphodo/rapid.py:4096
+#: ../raphodo/rapid.py:4333
 msgid "Device scan failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:4472
+#: ../raphodo/rapid.py:4720
 #, python-format
 msgid ""
-"<b>The %(camera)s cannot be scanned because it cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again."
+"<b>The %(camera)s cannot be scanned because it cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again."
 msgstr ""
 
-#: ../raphodo/rapid.py:4496
+#: ../raphodo/rapid.py:4745
 #, python-format
 msgid ""
-"<b>The download cannot start because the %(camera)s cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again, and choose which files you want to "
-"download from it."
+"<b>The download cannot start because the %(camera)s cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again, and choose which files "
+"you want to download from it."
+msgstr ""
+
+#: ../raphodo/rapid.py:4842
+msgid "Completed Downloads Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4844
+#, python-format
+msgid "%s whose download have completed are displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4846
+msgid "Do you want to clear the completed downloads?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4848
+msgid "Completed Download Present"
 msgstr ""
 
-#: ../raphodo/rapid.py:4635
+#: ../raphodo/rapid.py:4850
+#, python-format
+msgid "%s whose download has completed is displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4852
+msgid "Do you want to clear the completed download?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4933
 #, python-format
 msgid ""
 "Do you want to download photos and videos from the device <i>%(device)s</i>?"
 msgstr ""
 
-#: ../raphodo/rapid.py:4877
+#: ../raphodo/rapid.py:5183
 #, python-format
 msgid "<b>Do you want to ignore the %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4879
+#: ../raphodo/rapid.py:5186
 msgid ""
 "All cameras, phones and tablets with the same model name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:4883
+#: ../raphodo/rapid.py:5190
 #, python-format
 msgid ""
 "<b>Do you want to ignore the device %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4885
+#: ../raphodo/rapid.py:5192
 msgid "Any device with the same name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:5178
+#: ../raphodo/rapid.py:5492
 #, python-format
 msgid "Downloading from %(location)s on This Computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5180
+#: ../raphodo/rapid.py:5496
 msgid ""
 "Do you really want to download from here?<br><br>On some systems, scanning "
 "this location can take a very long time."
 msgstr ""
 
-#: ../raphodo/rapid.py:5224
+#: ../raphodo/rapid.py:5537
 #, python-format
 msgid "Generating thumbnails for %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5227
+#: ../raphodo/rapid.py:5540
 #, python-format
 msgid "Scanning %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5237
+#: ../raphodo/rapid.py:5551
 #, python-format
 msgid ""
 "%(number)s of %(available files)s checked for download (%(hidden)s hidden)"
 msgstr ""
 
-#: ../raphodo/rapid.py:5243
+#: ../raphodo/rapid.py:5559
 #, python-format
 msgid "%(number)s of %(available files)s checked for download"
 msgstr ""
 
-#: ../raphodo/rapid.py:5494
+#: ../raphodo/rapid.py:5764
 msgid "Display program information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5496
+#: ../raphodo/rapid.py:5766
 msgid "Display debugging information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5499
+#: ../raphodo/rapid.py:5769
 msgid "List photo and video file extensions the program recognizes and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5502
+#: ../raphodo/rapid.py:5772
 msgid "Turn on or off the the renaming of photos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5504
+#: ../raphodo/rapid.py:5774
 msgid "turn on or off the the renaming of videos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5506
+#: ../raphodo/rapid.py:5776
 msgid ""
 "Turn on or off the automatic detection of devices from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5510
+#: ../raphodo/rapid.py:5780
 msgid "Turn on or off downloading from this computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5512 ../raphodo/rapid.py:5515 ../raphodo/rapid.py:5518
-#: ../raphodo/rapid.py:5539 ../raphodo/rapid.py:5543
+#: ../raphodo/rapid.py:5782 ../raphodo/rapid.py:5785 ../raphodo/rapid.py:5788
+#: ../raphodo/rapid.py:5809 ../raphodo/rapid.py:5813
 msgid "PATH"
 msgstr ""
 
-#: ../raphodo/rapid.py:5513
+#: ../raphodo/rapid.py:5783
 msgid "The PATH on this computer from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5516
+#: ../raphodo/rapid.py:5786
 msgid "The PATH where photos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5519
+#: ../raphodo/rapid.py:5789
 msgid "The PATH where videos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5521
+#: ../raphodo/rapid.py:5791
 msgid "Turn on or off the backing up of photos and videos while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:5525
+#: ../raphodo/rapid.py:5795
 msgid "Turn on or off the automatic detection of backup devices."
 msgstr ""
 
-#: ../raphodo/rapid.py:5527 ../raphodo/rapid.py:5533
+#: ../raphodo/rapid.py:5797 ../raphodo/rapid.py:5803
 msgid "FOLDER"
 msgstr ""
 
-#: ../raphodo/rapid.py:5528
+#: ../raphodo/rapid.py:5798
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected photo "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3312,7 +3915,7 @@ msgid ""
 "photos up to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5534
+#: ../raphodo/rapid.py:5804
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected video "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3320,115 +3923,124 @@ msgid ""
 "up videos to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5540
+#: ../raphodo/rapid.py:5810
 msgid ""
 "The PATH where photos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5544
+#: ../raphodo/rapid.py:5814
 msgid ""
 "The PATH where videos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5547
+#: ../raphodo/rapid.py:5817
 #, python-format
 msgid "Ignore photos with the following extensions: %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5551
-msgid "Turn on or off starting downloads as soon as the program itself starts."
+#: ../raphodo/rapid.py:5821
+msgid ""
+"Turn on or off starting downloads as soon as the program itself starts."
 msgstr ""
 
-#: ../raphodo/rapid.py:5554
+#: ../raphodo/rapid.py:5824
 msgid "Turn on or off starting downloads as soon as a device is inserted."
 msgstr ""
 
-#: ../raphodo/rapid.py:5557
+#: ../raphodo/rapid.py:5827
 msgid ""
 "Turn on or off use of the Rapid Photo Downloader Thumbnail Cache. Turning it "
 "off does not delete existing cache contents."
 msgstr ""
 
-#: ../raphodo/rapid.py:5561
+#: ../raphodo/rapid.py:5831
 msgid ""
 "Delete all thumbnails in the Rapid Photo Downloader Thumbnail Cache, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5565
+#: ../raphodo/rapid.py:5835
 msgid "Forget which files have been previously downloaded, and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5568
+#: ../raphodo/rapid.py:5838
 msgid ""
 "Import preferences from an old program version and exit. Requires the "
 "command line program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5571
+#: ../raphodo/rapid.py:5841
 msgid ""
 "Reset all program settings to their default values, delete all thumbnails in "
 "the Thumbnail cache, forget which files have been previously downloaded, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5575
+#: ../raphodo/rapid.py:5845
 msgid "Include gphoto2 debugging information in log files."
 msgstr ""
 
-#: ../raphodo/rapid.py:5579
+#: ../raphodo/rapid.py:5849
 msgid "Print information to the terminal about attached cameras and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5640
+#: ../raphodo/rapid.py:5911
 msgid ""
 "To import preferences from the old version of Rapid Photo Downloader, you "
 "must install the program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5649
+#: ../raphodo/rapid.py:5920
 msgid "No prior program preferences detected: exiting"
 msgstr ""
 
-#: ../raphodo/rapid.py:5652
+#: ../raphodo/rapid.py:5923
 #, python-format
 msgid "Importing preferences from Rapid Photo Downloader %(version)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5714
+#: ../raphodo/rapid.py:5989
 #, python-format
-msgid "Do you want to copy the stored sequence number, which has the value %d?"
+msgid ""
+"Do you want to copy the stored sequence number, which has the value %d?"
 msgstr ""
 
-#: ../raphodo/rapid.py:5726
+#: ../raphodo/rapid.py:6000
 msgid "Program aborting."
 msgstr ""
 
-#: ../raphodo/rapid.py:5736
+#: ../raphodo/rapid.py:6010
 msgid "Never run this program as the sudo / root user."
 msgstr ""
 
-#: ../raphodo/rapid.py:5740
+#: ../raphodo/rapid.py:6014
 msgid "You must install ExifTool to run Rapid Photo Downloader."
 msgstr ""
 
-#: ../raphodo/rapid.py:5794
+#: ../raphodo/rapid.py:6026
+msgid ""
+"Rapid Photo Downloader is installed in multiple locations.\n"
+"\n"
+"Uninstall all copies except the version you want to run."
+msgstr ""
+
+#: ../raphodo/rapid.py:6083
 msgid ""
 "When specifying a path on the command line, do not also specify an\n"
 "option for device auto detection or a path on \"This Computer\"."
 msgstr ""
 
-#: ../raphodo/rapid.py:5950
+#: ../raphodo/rapid.py:6243
 msgid "All settings and caches have been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5958
+#: ../raphodo/rapid.py:6251
 msgid "Thumbnail Cache has been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5964
+#: ../raphodo/rapid.py:6257
 msgid "Remembered files have been forgotten"
 msgstr ""
 
@@ -3444,15 +4056,15 @@ msgstr ""
 msgid "&Don't warn me again about missing or broken program libraries"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:546
+#: ../raphodo/renameandmovefile.py:554
 msgid "subfolder and filename"
 msgstr "undermappe og filnavn"
 
-#: ../raphodo/renameandmovefile.py:548
+#: ../raphodo/renameandmovefile.py:556
 msgid "filename"
 msgstr "filnavn"
 
-#: ../raphodo/renameandmovefile.py:550
+#: ../raphodo/renameandmovefile.py:558
 msgid "subfolder"
 msgstr "undermappe"
 
@@ -3532,160 +4144,237 @@ msgstr "fotos og videoer"
 msgid "photos or videos"
 msgstr "fotos eller videoer"
 
-#: ../raphodo/rpdfile.py:306
+#: ../raphodo/rpdfile.py:315
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: ../raphodo/rpdfile.py:318
+#. translators: natural language expression signifying a single video
+#: ../raphodo/rpdfile.py:337
+msgid "a video"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:339
 msgid "1 Video"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:323
+#. translators: natural language expression signifying a single photo
+#: ../raphodo/rpdfile.py:346
+msgid "a photo"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:348
 msgid "1 Photo"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:803
+#: ../raphodo/rpdfile.py:828
 #, python-format
 msgid "%(path)s on %(camera)s"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:819
+#: ../raphodo/rpdfile.py:844
 msgid "Photo"
 msgstr "Foto"
 
-#: ../raphodo/rpdfile.py:859
+#: ../raphodo/rpdfile.py:884
 msgid "Video"
 msgstr "Video"
 
-#: ../raphodo/storage.py:138
+#: ../raphodo/storage.py:141
 msgid "File system root"
 msgstr ""
 
 #. translators: the name of the Pictures folder
-#: ../raphodo/storage.py:433
+#: ../raphodo/storage.py:437
 msgid "Pictures"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:426
+#: ../raphodo/thumbnaildisplay.py:432
 #, python-format
 msgid "Taken on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:431
+#: ../raphodo/thumbnaildisplay.py:439
 #, python-format
 msgid "Modified on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:437 ../raphodo/thumbnaildisplay.py:466
+#: ../raphodo/thumbnaildisplay.py:447 ../raphodo/thumbnaildisplay.py:481
 #, python-format
 msgid "%(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:451
+#: ../raphodo/thumbnaildisplay.py:464
 #, python-format
 msgid "Memory cards: %s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:457
+#: ../raphodo/thumbnaildisplay.py:468
+#, python-format
+msgid "Memory card: %s"
+msgstr ""
+
+#: ../raphodo/thumbnaildisplay.py:473
 msgid "Downloaded as:"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:472
+#: ../raphodo/thumbnaildisplay.py:489
 #, python-format
 msgid "<br><br>Previous download:<br>%(filename)s<br>%(path)s<br>%(date)s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:1603
+#: ../raphodo/thumbnaildisplay.py:1645
 msgid "Copy Path"
 msgstr ""
 
+#. Translators: these values are file size suffixes like B representing bytes, KB representing
+#. kilobytes, etc.
+#: ../raphodo/utilities.py:170
+msgid "B"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "KB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "MB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "GB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "TB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "PB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "EB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "ZB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "YB"
+msgstr ""
+
 #. two things in a list e.g. "device1 and device2"
-#: ../raphodo/utilities.py:391
+#: ../raphodo/utilities.py:394
 #, python-format
 msgid "%(first_item)s and %(last_item)s"
 msgstr ""
 
-#: ../raphodo/utilities.py:464
+#: ../raphodo/utilities.py:468
 msgid "one"
 msgstr ""
 
-#: ../raphodo/utilities.py:465
+#: ../raphodo/utilities.py:469
 msgid "two"
 msgstr ""
 
-#: ../raphodo/utilities.py:466
+#: ../raphodo/utilities.py:470
 msgid "three"
 msgstr ""
 
-#: ../raphodo/utilities.py:467
+#: ../raphodo/utilities.py:471
 msgid "four"
 msgstr ""
 
-#: ../raphodo/utilities.py:468
+#: ../raphodo/utilities.py:472
 msgid "five"
 msgstr ""
 
-#: ../raphodo/utilities.py:469
+#: ../raphodo/utilities.py:473
 msgid "six"
 msgstr ""
 
-#: ../raphodo/utilities.py:470
+#: ../raphodo/utilities.py:474
 msgid "seven"
 msgstr ""
 
-#: ../raphodo/utilities.py:471
+#: ../raphodo/utilities.py:475
 msgid "eight"
 msgstr ""
 
-#: ../raphodo/utilities.py:472
+#: ../raphodo/utilities.py:476
 msgid "nine"
 msgstr ""
 
-#: ../raphodo/utilities.py:473
+#: ../raphodo/utilities.py:477
 msgid "ten"
 msgstr ""
 
-#: ../raphodo/utilities.py:474
+#: ../raphodo/utilities.py:478
 msgid "eleven"
 msgstr ""
 
-#: ../raphodo/utilities.py:475
+#: ../raphodo/utilities.py:479
 msgid "twelve"
 msgstr ""
 
-#: ../raphodo/utilities.py:476
+#: ../raphodo/utilities.py:480
 msgid "thirteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:477
+#: ../raphodo/utilities.py:481
 msgid "fourteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:478
+#: ../raphodo/utilities.py:482
 msgid "fifteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:479
+#: ../raphodo/utilities.py:483
 msgid "sixteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:480
+#: ../raphodo/utilities.py:484
 msgid "seventeen"
 msgstr ""
 
-#: ../raphodo/utilities.py:481
+#: ../raphodo/utilities.py:485
 msgid "eighteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:482
+#: ../raphodo/utilities.py:486
 msgid "ninenteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:483
+#: ../raphodo/utilities.py:487
 msgid "twenty"
 msgstr ""
 
+#: ../raphodo/viewutils.py:240
+msgid "&OK"
+msgstr ""
+
+#: ../raphodo/viewutils.py:243
+msgid "&Save"
+msgstr ""
+
+#: ../raphodo/viewutils.py:244
+msgid "&Help"
+msgstr ""
+
+#: ../raphodo/viewutils.py:245
+msgid "Restore Defaults"
+msgstr ""
+
+#: ../raphodo/viewutils.py:246
+msgid "&Yes"
+msgstr ""
+
+#: ../raphodo/viewutils.py:247
+msgid "&No"
+msgstr ""
+
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:1
 msgid ""
 "Rapid Photo Downloader imports photos and videos from cameras, phones, "
@@ -3739,17 +4428,19 @@ msgstr ""
 #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:5
 msgid ""
-"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;"
-"memory;card;"
+"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;memory"
+";card;"
 msgstr ""
 
 #: ../data/kde/net.damonlynch.rapid-photo-downloader.desktop.in.h:1
 msgid "Download Photos and Videos with Rapid Photo Downloader"
 msgstr ""
 
+#, python-format
 #~ msgid "%(device)s did not unmount"
 #~ msgstr "%(device)s kunne ikke afmonteres"
 
+#, python-format
 #~ msgid ""
 #~ "%(date)s\n"
 #~ "%(time)s"
@@ -3763,6 +4454,7 @@ msgstr ""
 #~ msgid "Download Progress"
 #~ msgstr "Downloadfremgang"
 
+#, python-format
 #~ msgid "About %i seconds remaining"
 #~ msgstr "Cirka %i sekunder endnu"
 
@@ -3775,15 +4467,18 @@ msgstr ""
 #~ msgid "Download cannot proceed"
 #~ msgstr "Download kan ikke fortsætte"
 
+#, python-format
 #~ msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 #~ msgstr "Cirka %(minutes)i:%(seconds)02i sekunder endnu"
 
 #~ msgid "Free space:"
 #~ msgstr "Fri plads:"
 
+#, python-format
 #~ msgid "(%(file_type)s)"
 #~ msgstr "(%(file_type)s)"
 
+#, python-format
 #~ msgid "%(free)s %(file_type)s"
 #~ msgstr "%(free)s %(file_type)s"
 
@@ -3793,18 +4488,22 @@ msgstr ""
 #~ msgid "Using backup device"
 #~ msgstr "Benytter backup enhed"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s"
 #~ msgstr "%(number)s af %(total)s %(filetypes)s"
 
 #~ msgid "Using backup devices"
 #~ msgstr "Benytter backup enheder"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 #~ msgstr "%(number)s af %(total)s %(filetypes)s (%(remaining)s endnu)"
 
+#, python-format
 #~ msgid "Folder: %s"
 #~ msgstr "Mappe: %s"
 
+#, python-format
 #~ msgid "%(file_type)s download folder does not exist"
 #~ msgstr "%(file_type)s download mappe findes ikke"
 
@@ -3814,18 +4513,23 @@ msgstr ""
 #~ msgid "."
 #~ msgstr ","
 
+#, python-format
 #~ msgid "%(free)s free"
 #~ msgstr "%(free)s fri plads"
 
+#, python-format
 #~ msgid "Backing up to %(path)s"
 #~ msgstr "Tager sikkerhedskopi til %(path)s"
 
+#, python-format
 #~ msgid "%(freespace)s. %(backuppaths)s."
 #~ msgstr "%(freespace)s. %(backuppaths)s."
 
+#, python-format
 #~ msgid "%(file_type)s download folder is not writable"
 #~ msgstr "%(file_type)s download mappe er skrivebeskyttet"
 
+#, python-format
 #~ msgid "%(file_type)s download folder is invalid"
 #~ msgstr "%(file_type)s download mappe er ugyldig"
 
@@ -3844,6 +4548,7 @@ msgstr ""
 #~ msgid "only output errors to the command line"
 #~ msgstr "vis kun fejl på kommandolinien"
 
+#, python-format
 #~ msgid ""
 #~ "display program information on the command line as the program runs "
 #~ "(default: %default)"
@@ -3858,6 +4563,7 @@ msgstr ""
 #~ msgid "All settings and preferences have been reset"
 #~ msgstr "Alle indstillinger er blevet nulstillet"
 
+#, python-format
 #~ msgid "and %s"
 #~ msgstr "og %s"
 
@@ -3865,6 +4571,7 @@ msgstr ""
 #~ "Should this device or partition be used to download photos or videos from?"
 #~ msgstr "Skal fotos og videoer hentes fra denne enhed?"
 
+#, python-format
 #~ msgid ""
 #~ "%(problem)s\n"
 #~ "File: %(file)s"
@@ -3872,9 +4579,11 @@ msgstr ""
 #~ "%(problem)s\n"
 #~ "Fil: %(file)s"
 
+#, python-format
 #~ msgid "Destination directory could not be created: %(directory)s\n"
 #~ msgstr "Destinationsmappe kunne ikke oprettes: %(directory)s\n"
 
+#, python-format
 #~ msgid "Error: %(inst)s"
 #~ msgstr "Fejl: %(inst)s"
 
@@ -3884,6 +4593,7 @@ msgstr ""
 #~ msgid "Device Detected"
 #~ msgstr "Enhed fundet"
 
+#, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
 #~ "Destination: %(destination)s"
@@ -3945,22 +4655,24 @@ msgstr ""
 #~ msgid "Invalid regular expression"
 #~ msgstr "Ugyldigt regulært udtryk"
 
+#, python-format
 #~ msgid ""
 #~ "The following regular expressions are invalid, and will be removed unless "
 #~ "you correct them:\n"
 #~ " %s"
 #~ msgstr ""
-#~ "De følgende regulære udtryk er ugyldige og vil blive fjernet, medmindre "
-#~ "du ændrer dem:\n"
+#~ "De følgende regulære udtryk er ugyldige og vil blive fjernet, medmindre du "
+#~ "ændrer dem:\n"
 #~ " %s"
 
+#, python-format
 #~ msgid ""
-#~ "This regular expression is invalid, and will be removed unless you "
-#~ "correct it:\n"
+#~ "This regular expression is invalid, and will be removed unless you correct "
+#~ "it:\n"
 #~ " %s"
 #~ msgstr ""
-#~ "Det følgende regulære udtryk er ugyldige og vil blive fjernet, medmindre "
-#~ "du ændrer det:\n"
+#~ "Det følgende regulære udtryk er ugyldige og vil blive fjernet, medmindre du "
+#~ "ændrer det:\n"
 #~ " %s"
 
 #~ msgid "Select a folder in which to backup photos"
@@ -3969,6 +4681,7 @@ msgstr ""
 #~ msgid "Select a folder in which to backup videos"
 #~ msgstr "Vælg en mappe til sikkerhedskopier af videoer"
 
+#, python-format
 #~ msgid ""
 #~ "The %(filetype)s subfolder preferences entered are invalid and cannot be "
 #~ "used.\n"
@@ -3981,19 +4694,21 @@ msgstr ""
 #~ "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 #~ "name. Please use other renaming options.</i>"
 #~ msgstr ""
-#~ "<i><b>Advarsel:</b> Metadata er utlistrækkelige til at generere navnet. "
-#~ "Vælg andre muligheder for omdøbning.</i>"
+#~ "<i><b>Advarsel:</b> Metadata er utlistrækkelige til at generere navnet. Vælg "
+#~ "andre muligheder for omdøbning.</i>"
 
 #~ msgid ""
 #~ "<i><b>Warning:</b> There is insufficient metadata to fully generate "
 #~ "subfolders. Please use other subfolder naming options.</i>"
 #~ msgstr ""
-#~ "<i><b>Advarsel:</b> Metadata er utlistrækkelige til at generere "
-#~ "undermapper. Vælg andre muligheder for navngivning af undermapper.</i>"
+#~ "<i><b>Advarsel:</b> Metadata er utlistrækkelige til at generere undermapper. "
+#~ "Vælg andre muligheder for navngivning af undermapper.</i>"
 
+#, python-format
 #~ msgid "Select a folder containing %(file_types)s"
 #~ msgstr "Vælg en mappe der indeholder %(file_types)s"
 
+#, python-format
 #~ msgid "<i>Example: %s</i>"
 #~ msgstr "<i>Eksempel: %s</i>"
 
@@ -4057,49 +4772,60 @@ msgstr ""
 #~ msgid "Berlin"
 #~ msgstr "Berlin"
 
+#, python-format
 #~ msgid "%(filetype)s already exists"
 #~ msgstr "%(filetype)s findes allerede"
 
+#, python-format
 #~ msgid "%(filetype)s metadata cannot be read"
 #~ msgstr "%(filetype)s metadata kan ikke læses"
 
+#, python-format
 #~ msgid "Error generating component %s."
 #~ msgstr "Kunne ikke generere component %s."
 
+#, python-format
 #~ msgid "An error occurred when copying the %(filetype)s"
 #~ msgstr "Der opstod en fejl ved kopiering af %(filetype)s"
 
+#, python-format
 #~ msgid "%(filetype)s %(area)s could not be generated"
 #~ msgstr "%(filetype)s %(area)s kunne ikke genereres"
 
+#, python-format
 #~ msgid "Date time value %s appears invalid."
 #~ msgstr "Værdi for dato og klokkeslæt %s forekommer ugyldigt."
 
+#, python-format
 #~ msgid ""
 #~ "%(filetype)s could not be backed up because no suitable backup locations "
 #~ "were found."
 #~ msgstr ""
-#~ "Der kunne ikke tages sikkerhedskopi af %(filetype)s, fordi der ikke "
-#~ "findes egnede placeringer til sikkerhedskopierne."
+#~ "Der kunne ikke tages sikkerhedskopi af %(filetype)s, fordi der ikke findes "
+#~ "egnede placeringer til sikkerhedskopierne."
 
+#, python-format
 #~ msgid "%(filetype)s was already downloaded"
 #~ msgstr "%(filetype)s er allerede blevet downloadet"
 
+#, 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."
+#~ "De eksisterende %(filetype)s er sidst ændret den %(date)s klokken %(time)s."
 
+#, python-format
 #~ msgid ""
-#~ "The existing %(filetype)s was last modified on %(date)s at %(time)s. "
-#~ "Unique identifier '%(identifier)s' added."
+#~ "The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
+#~ "identifier '%(identifier)s' added."
 #~ msgstr ""
-#~ "De eksisterende %(filetype)s er sidst ændret den %(date)s klokken "
-#~ "%(time)s. Entydig angivelse '%(identifier)s' blev tilføjet."
+#~ "De eksisterende %(filetype)s er sidst ændret den %(date)s klokken %(time)s. "
+#~ "Entydig angivelse '%(identifier)s' blev tilføjet."
 
+#, python-format
 #~ msgid "There is no data with which to name the %(filetype)s."
 #~ msgstr "Der mangler data til navngivning af %(filetype)sne."
 
+#, python-format
 #~ msgid "Error: %(errorno)s %(strerror)s"
 #~ msgstr "Fejl: %(errorno)s %(strerror)s"
 
@@ -4110,91 +4836,107 @@ msgstr ""
 #~ "The filename, extension and Exif information indicate it has already been "
 #~ "downloaded."
 #~ msgstr ""
-#~ "Filnavnet, udvidelsen og Exif informationerne antyder, at filen allerede "
-#~ "er blevet downloadet."
+#~ "Filnavnet, udvidelsen og Exif informationerne antyder, at filen allerede er "
+#~ "blevet downloadet."
 
+#, python-format
 #~ msgid " It was backed up to %(volume)s"
 #~ msgstr " Filen blev sikkerhedskopieret til %(volume)s"
 
+#, python-format
 #~ msgid "%(volume)s, "
 #~ msgstr "%(volume)s, "
 
+#, python-format
 #~ msgid "%(volume)s (%(inst)s), "
 #~ msgstr "%(volume)s (%(inst)s), "
 
 #~ msgid "Errors occurred when backing up on the following backup devices: "
 #~ msgstr "Der opstod fejl ved sikkerhedskopiering til de følgende enheder: "
 
+#, python-format
 #~ msgid "An error occurred when backing up on %(volume)s."
 #~ msgstr "Der opstod en fejl ved sikkerhedskopiering til %(volume)s."
 
+#, python-format
 #~ msgid ""
 #~ "Photos detected with the same filenames, but taken at different times: "
 #~ "%(details)s"
 #~ msgstr ""
 #~ "Der findes fotos med ens filnavne men forskellige datoer: %(details)s"
 
+#, 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."
+#~ msgstr "Der opstod en fejl ved sikkerhedskopiering til %(volume)s: %(inst)s."
 
 #~ msgid " It was backed up to these devices: "
 #~ msgstr " Filen blev sikkerhedskopieret til disse enheder: "
 
+#, python-format
 #~ msgid "%s, "
 #~ msgstr "%s, "
 
+#, python-format
 #~ msgid "%(volumes)s and %(final_volume)s."
 #~ msgstr "%(volumes)s og %(final_volume)s."
 
+#, python-format
 #~ msgid "%(volumes)s and %(volume)s (%(inst)s)."
 #~ msgstr "%(volumes)s og %(volume)s (%(inst)s)."
 
 #~ msgid "Backups overwritten on these devices: "
 #~ msgstr "Sikkerhedskopier blev overskrevet på disse enheder: "
 
+#, python-format
 #~ msgid "Backup overwritten on %(volume)s."
 #~ msgstr "Sikkerhedskopi blev overskrevet på %(volume)s."
 
 #~ msgid "Backups already exist in these locations: "
 #~ msgstr "Sikkerhedskopier findes allerede her: "
 
+#, python-format
 #~ msgid "Backup already exists on %(volume)s."
 #~ msgstr "Sikkerhedskopi findes allerede på %(volume)s."
 
+#, python-format
 #~ msgid "%(volumes)s and %(volume)s."
 #~ msgstr "%(volumes)s og %(volume)s."
 
+#, python-format
 #~ msgid "%(previousproblem)s Additionally, %(newproblem)s"
 #~ msgstr "%(previousproblem)s Og %(newproblem)s"
 
+#, python-format
 #~ msgid " Furthermore, there were %(problems)s."
 #~ msgstr " Desuden opstod der %(problems)s."
 
+#, 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."
+#~ msgstr "Der opstod en fejl ved oprettelse af mapper på %(volume)s: %(inst)s."
 
 #~ msgid ""
-#~ "Errors occurred when creating directories on the following backup "
-#~ "devices: "
+#~ "Errors occurred when creating directories on the following backup devices: "
 #~ msgstr "Der opstod fejl ved oprettelse af mapper på disse enheder: "
 
+#, python-format
 #~ msgid " Furthermore, there was a %(problem)s."
 #~ msgstr " Desuden opstod der %(problem)s."
 
+#, python-format
 #~ msgid "Problem in %s generation"
 #~ msgstr "Problem ved generering af %s"
 
+#, python-format
 #~ msgid "Problems in %s generation"
 #~ msgstr "Problemer ved generering af %s"
 
-#~ msgid ""
-#~ "An error occurred when copying the %(filetype)s, but it was backed up"
+#, 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"
 
+#, python-format
 #~ msgid "%(filetype)s already exists, but it was backed up"
 #~ msgstr "%(filetype)s findes allerede, men er sikkerhedskopieret"
 
@@ -4207,10 +4949,9 @@ msgstr ""
 #~ msgid "The following metadata is missing: "
 #~ msgstr "Følgende metadata mangler: "
 
-#~ msgid ""
-#~ "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
-#~ msgstr ""
-#~ "%(missing_metadata_elements)s og %(final_missing_metadata_element)s."
+#, python-format
+#~ msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
+#~ msgstr "%(missing_metadata_elements)s og %(final_missing_metadata_element)s."
 
 #~ msgid "Multiple problems were encountered"
 #~ msgstr "Der opstod adskillige problemer"
@@ -4224,32 +4965,37 @@ msgstr ""
 #~ msgid "There were errors backing up"
 #~ msgstr "Der opstod fejl ved sikkerhedskopiering"
 
+#, python-format
 #~ msgid "%(previousproblem)s, and %(backinguperror)s"
 #~ msgstr "%(previousproblem)s, og %(backinguperror)s"
 
 #~ msgid "There was an error backing up"
 #~ msgstr "Der opstod en fejl ved sikkerhedskopiering"
 
+#, python-format
 #~ msgid "%(date)s %(time)s"
 #~ msgstr "%(date)s %(time)s"
 
+#, python-format
 #~ msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
+#, python-format
 #~ msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
-#~ msgid ""
-#~ "Photos detected with the same filenames, but taken at different times"
+#~ 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"
 
+#, python-format
 #~ msgid "Source: %(source)s"
 #~ msgstr "Kilde: %(source)s"
 
 #~ msgid "Download / Pause"
 #~ msgstr "Download / Pause"
 
+#, python-format
 #~ msgid "Path: %s"
 #~ msgstr "Sti: %s"
 
@@ -4454,20 +5200,20 @@ msgstr ""
 #~ "Choose the download folder. Subfolders for the downloaded videos will be "
 #~ "automatically created in this folder using the structure specified below."
 #~ msgstr ""
-#~ "Vælg download mappen. Undermapper for de downloadede videoer vil "
-#~ "automatisk blive oprettet her ved hjælp af den nedenfor angivne struktur."
+#~ "Vælg download mappen. Undermapper for de downloadede videoer vil automatisk "
+#~ "blive oprettet her ved hjælp af den nedenfor angivne struktur."
 
 #~ 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"
+#~ "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>"
+#~ "<i>Downloading directly from cameras is currently an experimental feature. "
+#~ "If downloading directly from your camera works poorly or not at all, try "
+#~ "setting it to PTP mode. If that is not possible, a card reader must be "
+#~ "used.</i>"
 #~ msgstr ""
 #~ "Enheder er de steder, hvorfra fotos og videoer downloades, for eksempel "
 #~ "kameraer, hukommelseskort eller bærbare lagermedier.\n"
@@ -4484,8 +5230,8 @@ msgstr ""
 #~ msgstr "Opdag bærbare enheder automatisk"
 
 #~ msgid ""
-#~ "If you disable automatic detection, choose the exact location of the "
-#~ "photos and videos."
+#~ "If you disable automatic detection, choose the exact location of the photos "
+#~ "and videos."
 #~ msgstr ""
 #~ "Vælg nøjagtig placering af fotos og videoer, hvis du slår automatisk "
 #~ "opdagelse fra."
@@ -4494,14 +5240,14 @@ msgstr ""
 #~ "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."
+#~ "When this option is enabled, and a potential device is detected, you will be "
+#~ "prompted to determine if it should be scanned or not."
 #~ msgstr ""
 #~ "Hvis du slår automatisk opdagelse fra, bliver hele enheden gennemsøgt. På "
 #~ "store enheder kan det tage lang tid.\n"
 #~ "\n"
-#~ "Når en enhed bliver opdaget mens denne mulighed er valgt, bliver du "
-#~ "spurgt om enheden skal gennemsøges eller ej."
+#~ "Når en enhed bliver opdaget mens denne mulighed er valgt, bliver du spurgt "
+#~ "om enheden skal gennemsøges eller ej."
 
 #~ msgid "Re_move All"
 #~ msgstr "_Fjern alle"
@@ -4517,8 +5263,8 @@ msgstr ""
 #~ "Specify whether photo, video and folder names should have any characters "
 #~ "removed that are not allowed by other operating systems."
 #~ msgstr ""
-#~ "Angiv, om tegn skal fjernes fra foto-, video- og mappenavne, hvis de ikke "
-#~ "er tilladt på andre styresystemer."
+#~ "Angiv, om tegn skal fjernes fra foto-, video- og mappenavne, hvis de ikke er "
+#~ "tilladt på andre styresystemer."
 
 #~ msgid "scanning..."
 #~ msgstr "gennemsøger..."
@@ -4530,9 +5276,8 @@ msgstr ""
 #~ msgstr "Unmount enhed (\"skub ud\") når download er afsluttet"
 
 #~ 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."
+#~ "When a photo or video of the same name has already been downloaded, choose "
+#~ "whether to skip downloading the file, or to add a unique indentifier."
 #~ msgstr ""
 #~ "Vælg, om et foto eller en video skal springes over, eller om der skal "
 #~ "tilføjes en entydig kending, når et foto eller en video med samme navn "
@@ -4549,8 +5294,7 @@ msgstr ""
 #~ "that has the same name, or skip backing it up."
 #~ msgstr ""
 #~ "Vælg, om et foto eller en video skal springes over eller overskrives, når "
-#~ "sikkerhedskopien allerede indeholder et foto eller en video med samme "
-#~ "navn."
+#~ "sikkerhedskopien allerede indeholder et foto eller en video med samme navn."
 
 #~ msgid "Use _python-style regular expressions"
 #~ msgstr "brug regulære udtryk i _python-style"
@@ -4559,36 +5303,38 @@ msgstr ""
 #~ "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>"
+#~ "used for backups. For each device you wish to use for backing up to, create "
+#~ "a folder in it with one of these names.</i>"
 #~ msgstr ""
 #~ "Angiv den mappe hvor sikkerhedskopier er gemt på enheden.  \n"
 #~ "\n"
-#~ "<i>Bemærk: Dette afgør også, hvorvidt enheden bruges til "
-#~ "sikkerhedskopier. Opret en mappe med en af disse navne på hver enhed, du "
-#~ "ønsker at bruge til sikkerhedskopiering.</i>"
+#~ "<i>Bemærk: Dette afgør også, hvorvidt enheden bruges til sikkerhedskopier. "
+#~ "Opret en mappe med en af disse navne på hver enhed, du ønsker at bruge til "
+#~ "sikkerhedskopiering.</i>"
 
 #~ msgid "_Make a Donation..."
 #~ msgstr "_Giv et bidrag..."
 
+#, 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"
 
+#, python-format
 #~ msgid "Backing up photos and videos to %(path)s"
 #~ msgstr "Sikkerhedskopierer fotos og videoer til %(path)s"
 
 #~ 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."
+#~ "devices for photos or videos. Any path ending with the values below will not "
+#~ "be scanned."
 #~ msgstr ""
 #~ "Angiv den sidste del af stier, der skal ignoreres ved gennemsøgning af "
 #~ "enheder. Stier, der ender med disse værdier, vil ikke bliev gennemsøgt."
 
 #~ 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."
+#~ "Remembered paths are those associated with devices that you have chosen to "
+#~ "always scan or ignore when automatic detection of Portable Storage Devices "
+#~ "is enabled."
 #~ msgstr ""
 #~ "Huskede stier er stier til bestemte enheder, som enten altid eller aldrig "
 #~ "gennemsøges, når automatisk genkendelse af bærbare enheder er slået til."
@@ -4606,6 +5352,7 @@ msgstr ""
 #~ msgid "the root of the file system"
 #~ msgstr "filsystemets rod"
 
+#, python-format
 #~ msgid "Downloading from %(location)s."
 #~ msgstr "henter fra %(location)s."
 
@@ -4625,14 +5372,15 @@ msgstr ""
 #~ msgstr "Rotér JPEG billeder automatisk"
 
 #~ 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>."
+#~ "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 ""
-#~ "Funktionen til hentning af videoer er slået fra. For at hente videoer "
-#~ "skal du installere enten <i>hachoir metadata</i> og <i>kaa metadata</i> "
-#~ "pakkerne eller <i>exiftool</i>."
+#~ "Funktionen til hentning af videoer er slået fra. For at hente videoer skal "
+#~ "du installere enten <i>hachoir metadata</i> og <i>kaa metadata</i> pakkerne "
+#~ "eller <i>exiftool</i>."
 
+#, python-format
 #~ msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
 #~ msgstr "gennemsøger (%(photos)s fotos og %(videos)s videoer fundet)..."
 
@@ -4644,8 +5392,8 @@ msgstr ""
 #~ "hvorfra der skal hentes, men angiv ikke begge dele."
 
 #~ msgid ""
-#~ "manually specify the PATH of the device from which to download, "
-#~ "overwriting existing program preferences"
+#~ "manually specify the PATH of the device from which to download, overwriting "
+#~ "existing program preferences"
 #~ msgstr ""
 #~ "angiv stien manuelt, hvorfra der skal hentes, og overskriv eksisterende "
 #~ "programindstillinger"
diff --git a/po/de.po b/po/de.po
index 630d40a..6cb78a9 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,35 +7,469 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: damonlynch@gmail.com\n"
-"POT-Creation-Date: 2017-07-08 19:16-0500\n"
-"PO-Revision-Date: 2017-07-06 22:08+0000\n"
-"Last-Translator: Ferdinand Thommes <fe.thomm@posteo.net>\n"
+"POT-Creation-Date: 2017-09-12 17:01-0400\n"
+"PO-Revision-Date: 2017-09-18 11:22+0000\n"
+"Last-Translator: Spheniscus <Unknown>\n"
 "Language-Team: German <de@li.org>\n"
-"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-07-07 19:32+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-09-26 22:04+0000\n"
+"X-Generator: Launchpad (build 18463)\n"
+"Language: de\n"
+
+#: ../install.py:65
+msgid "Rapid Photo Downloader installer"
+msgstr "Installationsdatei der Rapid-Fotoübertragung"
+
+#: ../install.py:66
+msgid "Download and install latest version of Rapid Photo Downloader."
+msgstr ""
+"Die neueste Version der Rapid-Fotoübertragung herunterladen und installieren."
+
+#: ../install.py:236 ../install.py:1732
+msgid "Installer not found:"
+msgstr "Installationsdatei nicht gefunden:"
+
+#. Translators: do not translate the term tar.gz
+#: ../install.py:240 ../install.py:1736
+msgid "Installer not in tar.gz format:"
+msgstr "Installationsdatei ist nicht im tar.gz-Format:"
+
+#: ../install.py:465
+msgid ""
+"Incorrect folder ownership detected. Changing ownership of and resetting "
+"permissions for"
+msgstr ""
+"Die Ordner-Besitzrechte stimmen nicht. Ändern der Besitzrechte und "
+"zurücksetzen der Zugriffsrechte für"
+
+#: ../install.py:540
+msgid "The following command will be run:"
+msgstr "Der folgende Befehl wird ausgeführt:"
+
+#: ../install.py:543 ../install.py:1479 ../install.py:1484
+msgid "sudo may prompt you for the sudo password."
+msgstr "Sudo fragt möglicherweise nach dem Sudo-Passwort."
+
+#: ../install.py:547
+msgid "Would you like to run the command now?"
+msgstr "Möchten Sie den Befehl jetzt ausführen?"
+
+#: ../install.py:549
+msgid "Answer is not yes, exiting."
+msgstr "Die Antwort ist nicht ja, deshalb Abbruch."
+
+#: ../install.py:559 ../install.py:751 ../install.py:966
+msgid "Command failed"
+msgstr "Ausführung des Befehls fehlgeschlagen"
+
+#: ../install.py:561 ../install.py:752 ../install.py:967
+msgid "Exiting"
+msgstr "Beenden"
+
+#: ../install.py:582
+msgid "The Universe repository must be enabled."
+msgstr "Das Repository \"Universe\" muß aktiviert werden."
+
+#: ../install.py:606
+msgid ""
+"Do you want to to uninstall the previous version of Rapid Photo Downloader:"
+msgstr ""
+"Möchten Sie die bisherige Version der Rapid-Fotoübertragung deinstallieren:"
+
+#: ../install.py:715 ../install.py:740
+msgid ""
+"Querying package system to see if an older version of Rapid Photo Downloader "
+"is installed (this may take a while)..."
+msgstr ""
+"Die Paketdatenbank wird nach einer installierten älteren Version von Rapid-"
+"Fotoübertragung durchsucht. Das kann etwas dauern."
+
+#: ../install.py:726
+msgid ""
+"Unable to query package system. Please check your Internet connection and "
+"try again"
+msgstr ""
+"Das Paketsystem kann nicht durchsucht werden. Bitte die Internetverbindung "
+"überprüfen und neu versuchen"
+
+#: ../install.py:756
+msgid "Checking if previous version installed with pip..."
+msgstr "Es wird geprüft, ob eine ältere Version mit pip installiert wurde …"
+
+#: ../install.py:850
+msgid "The following package is unknown on your system: {}\n"
+msgstr ""
+"Das folgende Paket wird für ihr Betriebssystem nicht bereitgestellt: {}\n"
+
+#: ../install.py:857 ../install.py:929 ../install.py:974
+msgid ""
+"To continue, some packages required to run the application will be installed."
+msgstr ""
+"Zur Fortsetzung werden einige von der Anwendung benötigte Pakete installiert."
+
+#: ../install.py:886
+msgid "Querying installed and available packages (this may take a while)"
+msgstr ""
+"Es wird nach installierten und nach verfügbaren Paketen gesucht (kann einen "
+"Moment dauern)"
+
+#: ../install.py:958
+msgid ""
+"Querying zypper to see if any required packages are already installed (this "
+"may take a while)... "
+msgstr ""
+"Es wird nach zypper gesucht um zu prüfen, ob benötigte Pakete schon "
+"installiert sind (kann einen Moment dauern) "
+
+#: ../install.py:1004
+msgid "Query to confirm action at each step."
+msgstr "Query to confirm action at each step."
+
+#: ../install.py:1011
+msgid ""
+"When downloading the latest version, install the development version if it "
+"is newer than the stable version."
+msgstr ""
+"Wenn Sie die neueste Version herunter laden, installieren Sie die "
+"Entwicklerversion, falls diese aktueller als die aktuellste 'stabile' "
+"Version ist."
+
+#: ../install.py:1020
+msgid ""
+"Optional tar.gz Rapid Photo Downloader installer archive. If not specified, "
+"the latest version is downloaded from the Internet."
+msgstr ""
+"Optionales tar.gz-Installationsarchiv der Rapid-Fotoübertragung. Wenn nicht "
+"anders angegeben, wird die aktuellste Version aus dem Internet geladen."
+
+#: ../install.py:1043
+msgid ""
+"Do not run the installer in the tar.gz Rapid Photo Downloader installer "
+"archive if it is newer than this version ({}). The default is to run "
+"whichever installer is newer."
+msgstr ""
+"Bitte nicht die Installationsdatei im Rapid-Installationsarchiv ausführen, "
+"wenn dieses neuer als die Version ({}) ist. Die Voreinstellung ist, die "
+"jeweils neueste Version auszuführen."
+
+#: ../install.py:1050
+msgid ""
+"Uninstall Rapid Photo Downloader that was installed with pip, keeping its "
+"dependencies."
+msgstr ""
+"Die mit pip installierte Rapid-Version wird deinstalliert. Abhängigkeiten "
+"bleiben erhalten."
+
+#: ../install.py:1054
+msgid ""
+"Uninstall the dependencies installed by pip during Rapid Photo Downloader's "
+"installation, and Rapid Photo Downloader itself, then exit."
+msgstr ""
+"Die Abhängigkeiten die mit pip durch die Rapid-Installation installiert "
+"wurden deinstallieren und ebenfalls die Rapid-Fotoübertragung – danach "
+"Programmenden."
+
+#: ../install.py:1059
+msgid ""
+"Note: this will not uninstall any version of Rapid Photo Downloader "
+"installed by your Linux distribution's package manager."
+msgstr ""
+"Hinweis: dies wird nicht eine über ihren Paket-Manager installierte Version "
+"von Rapid Photo Downloader deinstallieren."
+
+#: ../install.py:1066
+msgid ""
+"Dependencies will only be removed if they are not required by other programs."
+msgstr ""
+"Abhängigkeiten werden nur entfernt, wenn sie nicht von anderen Programmen "
+"benötigt werden."
+
+#: ../install.py:1072
+msgid ""
+"Note: this option will remove the dependencies regardless of whether they "
+"are required by another program pip has installed. Upgrade to pip 9.0 or "
+"above if you want to avoid this behavior. You can do so using the command "
+"'python3 -m pip install pip -U --user'. Also note that any version of Rapid "
+"Photo Downloader installed by your Linux distribution's package manager will "
+"not be uninstalled."
+msgstr ""
+"Hinweis: Diese Option entfernt die Abhängigkeiten unabhängig davon, ob sie "
+"von einem anderen Programm, das pip installiert hat, benötigt werden. "
+"Aktualisieren Sie auf Pip 9.0 oder höher, wenn Sie dieses Verhalten "
+"vermeiden möchten. Sie können dies mit dem Befehl 'python3 -m pip install "
+"pip -U --user' tun. Beachten Sie auch, dass jede Version von Rapid Photo "
+"Downloader, die vom Paketmanager Ihrer Linux Distribution installiert wurde, "
+"erhalten bleibt."
+
+#: ../install.py:1122
+msgid "Failed to download versions file"
+msgstr "Fehler beim Herunterladen der Versionsdatei."
+
+#: ../install.py:1126
+msgid "Got error code {} while accessing versions file"
+msgstr ""
+"Beim Versuch, auf die Versionsdatei zuzugreifen, wurde der Fehlercode {} "
+"zurückgegeben"
+
+#: ../install.py:1234
+msgid ""
+"Sorry, could not locate installer. Please check your Internet connection and "
+"verify if you can reach https://www.damonlynch.net\n"
+"\n"
+"Exiting.\n"
+msgstr ""
+"Entschuldigung, aber die Installationsdatei konnte nicht gefunden werden. "
+"Bitte prüfen sie ihre Internetverbindung und testen sie, ob sie die Webseite "
+"http://www.damonlynch.net erreichen können.\n"
+"\n"
+"Programm wird beendet.\n"
+
+#: ../install.py:1408
+msgid "Installing application requirements..."
+msgstr "Anwendungsabhängigkeiten werden installiert …"
+
+#: ../install.py:1424
+msgid "Received error code"
+msgstr "Fehlermeldung erhalten"
+
+#: ../install.py:1425
+msgid "Failed to install application requirements: exiting"
+msgstr ""
+"Beim Versuch, die erforderlichen Hifsdateien zu installieren, ist ein Fehler "
+"aufgetreten. Programm wird beendet."
+
+#: ../install.py:1428
+msgid "Installing application..."
+msgstr "Anwendung wird installiert …"
+
+#: ../install.py:1441
+msgid "Failed to install application: exiting..."
+msgstr ""
+"Beim Versuch, das Programm zu installieren, ist ein Fehler aufgetreten: "
+"Programm wird beendet."
+
+#: ../install.py:1465
+msgid ""
+"You may have to restart the computer to be able to run the program from the "
+"commmand line or application launcher."
+msgstr ""
+"Möglicherweise müssen Sie den Rechner neu starten, um das Programm über das "
+"Terminal oder das Startmenü starten zu können."
+
+#: ../install.py:1476
+msgid "Do you want to install the application's man pages?"
+msgstr "Möchten Sie die Hilfeseiten zum Programm installieren?"
+
+#: ../install.py:1477
+msgid "They will be installed into {}"
+msgstr "Sie werden in das Verzeichnis {} installiert"
+
+#: ../install.py:1478 ../install.py:1483
+msgid "If you uninstall the application, remove these manpages yourself."
+msgstr ""
+"Wenn Sie das Programm deinstallieren, bitte diese Hilfeseiten selbst "
+"entfernen."
+
+#: ../install.py:1480
+msgid "Do want to install the man pages?"
+msgstr "Möchten sie die Hilfeseiten installieren?"
+
+#: ../install.py:1482
+msgid "Installing man pages into {}"
+msgstr "Die Hilfeseiten werden im Verzeichnis {} installiert"
+
+#: ../install.py:1499
+msgid "Failed to create man page directory: exiting"
+msgstr ""
+"Das Erstellen des Hilfeseitenverzeichnisses ist fehlgeschlagen. Programmende."
+
+#: ../install.py:1511
+msgid "Failed to copy man page."
+msgstr "Fehler beim Kopieren der Hilfeseiten."
+
+#: ../install.py:1521
+msgid "(If a segmentation fault occurs at exit, you can ignore it...)"
+msgstr ""
+"(Falls beim Beenden ein Aufteilungsfehler auftritt, können Sie diesen "
+"ignorieren...)"
+
+#: ../install.py:1534
+msgid ""
+"The python3 tool pip is required to uninstall a version of Rapid Photo "
+"Downloader that was installed with pip.\n"
+"Cannot continue. Exiting."
+msgstr ""
+"Um eine Rapid Photo Downloader Version zu deinstallieren, die mit dem "
+"Python3 - Werkzeug 'pip' installiert wurde, ist dieses Programm notwendig "
+"(hier aber nicht installiert). Vorgang kann nicht fortgesetzt werden. Das "
+"Programm wird beendet."
+
+#: ../install.py:1575
+msgid ""
+"Do not run this installer script as sudo / root user.\n"
+"Run it using the user who will run the program.\n"
+msgstr ""
+"Bitte rufen sie dieses Installationsskript nicht als sudo oder root auf.\n"
+"Sondern als der Benutzer, der das Programm benutzen wird.\n"
+
+#: ../install.py:1585 ../install.py:1599
+msgid "Do not include any other command line arguments when specifying"
+msgstr "Beim Festlegen bitte keine andere Terminalbefehl-Argumente einfügen"
+
+#: ../install.py:1614
+msgid ""
+"Sorry, this installer does not support a custom python installation.\n"
+"Exiting..."
+msgstr ""
+"Entschuldigung, aber die Installationsdatei funktioniert nicht mit einer "
+"veränderten Python-Installation.\n"
+"Das Programm wird beendet..."
+
+#: ../install.py:1620
+msgid "Restarting script using system python..."
+msgstr "Skript wird mittels System-Python neu gestartet...."
+
+#: ../install.py:1651
+msgid "Exiting..."
+msgstr "Wird beendet …"
+
+#. Translators: do not translate the term python3-apt
+#: ../install.py:1670
+msgid "To continue, the package python3-apt must be installed."
+msgstr ""
+"Um fortsetzen zu können, muss das Paket 'python3-apt' installiert sein."
 
-#. type: QPushButton
-#: ../raphodo/aboutdialog.py:217
+#: ../install.py:1689
+msgid ""
+"Install the following packages using your Linux distribution's standard "
+"package manager, and then rerun this installer"
+msgstr ""
+"Bitte installieren sie die folgenden Pakete über ihren Paket-Manager, und "
+"wiederholen sie danach die Installation"
+
+#: ../install.py:1698
+msgid ""
+"To run this program, programs to assist Python 3 and its package management "
+"must be installed."
+msgstr ""
+"Um dieses Programm ausführen zu können müssten Hilfsprogramme für Python3 "
+"und seine Paketverwaltung installiert sein."
+
+#. Translators: do not translate the terms Python 3, pip and setuptools
+#: ../install.py:1713
+msgid "Python 3's pip and setuptools must be upgraded for your user."
+msgstr ""
+"Python 3's pip und setuptools müssen für den gewünschten Benutzer "
+"aktualisiert werden."
+
+#. Translators: do not translate the term python or requests
+#: ../install.py:1726
+msgid "Installing python requests"
+msgstr "python requests werden installiert"
+
+#: ../upgrade.py:79
+msgid "Upgrade Rapid Photo Downloader"
+msgstr "Rapid-Fotoübertragung aktualisieren"
+
+#: ../upgrade.py:401 ../raphodo/viewutils.py:242
+msgid "&Cancel"
+msgstr "Abbre&chen"
+
+#: ../upgrade.py:405
+msgid "&Upgrade"
+msgstr "&Upgrade"
+
+#: ../upgrade.py:410
+#, python-format
+msgid "Click the Upgrade button to upgrade to version %s."
+msgstr ""
+"Bitte den Upgrade button anklicken, um auf Version %s zu aktualisieren."
+
+#: ../upgrade.py:413
+msgid "Click the Upgrade button to start the upgrade."
+msgstr ""
+"Bitte den Upgrade button anklicken, um die Aktualisierung zu beginnen."
+
+#: ../upgrade.py:416 ../upgrade.py:422 ../raphodo/viewutils.py:241
+msgid "&Close"
+msgstr "&Schließen"
+
+#: ../upgrade.py:417
+msgid "&Run"
+msgstr "RPD Starten"
+
+#: ../upgrade.py:447
+msgid "Close Rapid Photo Downloader before running this upgrade"
+msgstr "Bitte vor der Aktualisierung die Rapid-Fotoübertragung schließen"
+
+#: ../upgrade.py:450
+msgid "Upgrade running..."
+msgstr "Die Aktualisierung läuft …"
+
+#: ../upgrade.py:486
+#, python-format
+msgid ""
+"Successfully upgraded to %s. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+"Die Aktualisierung auf die Version %s war erfolgreich. Zum Beenden bitte auf "
+"'Schließen' klicken, zum Starten des aktualisierten Programms bitte 'Start' "
+"anklicken."
+
+#: ../upgrade.py:491
+msgid ""
+"Upgrade finished successfully. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+"Die Aktualisierung war erfolgreich. Zum Beenden bitte auf 'Schließen' "
+"klicken, zum Starten des aktualisierten Programms bitte 'Start' anklicken."
+
+#: ../upgrade.py:495
+msgid "Upgrade failed. Click Close to exit."
+msgstr ""
+"Die Aktualisierung hat nicht funktioniert. Zum beenden bitte 'Schließen' "
+"anklicken."
+
+#: ../upgrade.py:6967
+#, python-format
+msgid "Upgrading %s..."
+msgstr "Führe Upgrade durch %s..."
+
+#: ../upgrade.py:6969
+msgid "Press any key to continue..."
+msgstr "Bitte eine Taste drücken, um fortzufahren …"
+
+#: ../upgrade.py:6982
+msgid "Rapid Photo Downloader upgrade failed"
+msgstr "Rapid Photo Downloader Aktualisierung fehlgeschlagen"
+
+#: ../upgrade.py:6984
+#, python-format
+msgid ""
+"The python package %s could not be updated. The upgrade cannot continue."
+msgstr ""
+"Das Python-Paket %s konnte nicht aktualisiert werden. Das Upgrade kann nicht "
+"fortgesetzt werden."
+
+#: ../raphodo/aboutdialog.py:225
 msgid "Credits"
 msgstr "Mitwirkende"
 
-#: ../raphodo/backuppanel.py:239
+#: ../raphodo/backuppanel.py:240
 msgid "Backups are not configured"
 msgstr "Es ist keine Sicherung konfiguriert"
 
-#: ../raphodo/backuppanel.py:241
+#: ../raphodo/backuppanel.py:242
 msgid "No backup devices detected"
 msgstr "Es wurden keine Sicherungsgeräte gefunden"
 
-#: ../raphodo/backuppanel.py:243
+#: ../raphodo/backuppanel.py:244
 msgid "Valid backup locations not yet specified"
 msgstr "Es existiert kein gültiges Ziel für eine Sicherung"
 
-#: ../raphodo/backuppanel.py:401
+#: ../raphodo/backuppanel.py:404
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
@@ -43,97 +477,112 @@ msgstr ""
 "Fotos und Filme können während des Herunterladens an mehreren Orten "
 "gespeichert werden, z.B. auf externen Laufwerken."
 
-#: ../raphodo/backuppanel.py:407
+#: ../raphodo/backuppanel.py:412
 msgid "Back up photos and videos when downloading"
 msgstr "Die Fotos und Filme während des Herunterladens sichern"
 
-#: ../raphodo/backuppanel.py:413
+#: ../raphodo/backuppanel.py:418
 msgid "Automatically detect backup devices"
 msgstr "Automatisch Sicherungsgeräte erkennen"
 
-#: ../raphodo/backuppanel.py:417
+#: ../raphodo/backuppanel.py:424
 msgid ""
-"Specify the folder in which backups are stored on the device."
-"<br><br><i>Note: the presence of a folder with this name is used to "
+"Specify the folder in which backups are stored on the "
+"device.<br><br><i>Note: the presence of a folder with this name is used to "
 "determine if 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 folder names. By "
 "adding both folders, the same device can be used to back up both photos and "
 "videos.</i>"
 msgstr ""
+"Benennen Sie die Ordner, in denen Sicherungen auf den Geräten gespeichert "
+"werden. <br><br><i>Hinweis: Nur wenn ein Ordner mit diesem Namen vorhanden "
+"ist, kann das Gerät für Sicherungen genutzt werden. Erstellen Sie in jedem "
+"Gerät, dass Sie für Sicherungen benutzen wollen, einen Ordner mit diesem "
+"Namen. Durch Hinzufügen beider Ordner kann das Gerät zur Sicherung von Fotos "
+"und Videos genutzt werden</i>"
 
-#: ../raphodo/backuppanel.py:428
+#: ../raphodo/backuppanel.py:439
 msgid "Photo folder name:"
 msgstr "Name des Foto-Ordners"
 
-#: ../raphodo/backuppanel.py:433
+#: ../raphodo/backuppanel.py:444
 msgid "Video folder name:"
 msgstr "Name des Video-Ordners"
 
-#: ../raphodo/backuppanel.py:438 ../raphodo/nameeditor.py:883
+#: ../raphodo/backuppanel.py:449 ../raphodo/nameeditor.py:890
 #: ../raphodo/renamepanel.py:123
 msgid "Example:"
 msgstr "Beispiel:"
 
-#: ../raphodo/backuppanel.py:448
-msgid "If you disable automatic detection, choose the exact backup locations."
+#: ../raphodo/backuppanel.py:460
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
 "Wenn Sie die automatische Erkennung ausschalten, wählen Sie den Ort zur "
 "Erstellung der Sicherungskopien."
 
-#: ../raphodo/backuppanel.py:452
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:468
 msgid "Photo backup location:"
 msgstr "Sicherungsort der Fotos:"
 
-#: ../raphodo/backuppanel.py:454
+#: ../raphodo/backuppanel.py:474
 msgid "Select Photo Backup Location"
 msgstr "Verzeichnis für Foto-Sicherung wählen"
 
-#: ../raphodo/backuppanel.py:460
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:485
 msgid "Video backup location:"
 msgstr "Sicherungsort der Filme:"
 
-#: ../raphodo/backuppanel.py:462
+#: ../raphodo/backuppanel.py:491
 msgid "Select Video Backup Location"
 msgstr "Verzeichnis für Video-Sicherung wählen"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:564
+#: ../raphodo/backuppanel.py:595
 msgid "drive1"
 msgstr "Laufwerk1"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:567
+#: ../raphodo/backuppanel.py:598
 msgid "drive2"
 msgstr "Laufwerk2"
 
-#: ../raphodo/backuppanel.py:628
+#: ../raphodo/backuppanel.py:663
 msgid "Projected Backup Storage Use"
-msgstr ""
+msgstr "Prognostizierte Sicherungsspeichernutzung"
 
-#: ../raphodo/backuppanel.py:632
+#: ../raphodo/backuppanel.py:669
 msgid "Backup Options"
 msgstr "Optionen der Sicherung"
 
 #. translators: refers to the video thumbnail file that some
 #. cameras generate -- it has a .THM file extension
-#: ../raphodo/copyfiles.py:476
+#: ../raphodo/copyfiles.py:491
 msgid "video THM"
-msgstr ""
+msgstr "Video THM"
 
-#: ../raphodo/copyfiles.py:482
+#: ../raphodo/copyfiles.py:497
 msgid "audio"
 msgstr "Audio"
 
 #: ../raphodo/destinationdisplay.py:78 ../raphodo/devicedisplay.py:1079
-#: ../raphodo/rpdfile.py:321
+#: ../raphodo/rpdfile.py:342
 #, python-format
 msgid "%(no_photos)s Photos"
 msgstr "%(no_photos)s Fotos"
 
 #: ../raphodo/destinationdisplay.py:82 ../raphodo/devicedisplay.py:1081
-#: ../raphodo/rpdfile.py:316
+#: ../raphodo/rpdfile.py:333
 #, python-format
 msgid "%(no_videos)s Videos"
 msgstr "%(no_videos)s Videos"
@@ -161,33 +610,33 @@ msgid "%(size_free)s free of %(size_total)s"
 msgstr "%(size_free)s frei von %(size_total)s"
 
 #: ../raphodo/destinationdisplay.py:190 ../raphodo/devicedisplay.py:993
-#: ../raphodo/rapid.py:1964 ../raphodo/rapid.py:2079 ../raphodo/rapid.py:5753
-#: ../raphodo/rpdfile.py:905
+#: ../raphodo/rapid.py:2023 ../raphodo/rapid.py:2151 ../raphodo/rapid.py:6043
+#: ../raphodo/rpdfile.py:930
 msgid "Photos"
 msgstr "Fotos"
 
 #. translators: the name of the Videos folder
 #: ../raphodo/destinationdisplay.py:191 ../raphodo/devicedisplay.py:994
-#: ../raphodo/rapid.py:1967 ../raphodo/rapid.py:2080 ../raphodo/rapid.py:5754
-#: ../raphodo/rpdfile.py:933 ../raphodo/storage.py:445
+#: ../raphodo/rapid.py:2028 ../raphodo/rapid.py:2152 ../raphodo/rapid.py:6044
+#: ../raphodo/rpdfile.py:958 ../raphodo/storage.py:449
 msgid "Videos"
 msgstr "Filme"
 
 #: ../raphodo/destinationdisplay.py:192
 msgid "Projected storage use after download"
-msgstr ""
+msgstr "Prognostizierte Speichernutzung nach der Übertragung"
 
-#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:516
+#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:521
 msgid "Custom..."
-msgstr ""
+msgstr "Benutzerdefiniert …"
 
 #: ../raphodo/destinationdisplay.py:678
 msgid "Configure photo subfolder creation"
-msgstr ""
+msgstr "Fotounterordnererstellung konfigurieren"
 
 #: ../raphodo/destinationdisplay.py:680
 msgid "Configure video subfolder creation"
-msgstr ""
+msgstr "Videounterordnererstellung konfigurieren"
 
 #: ../raphodo/devicedisplay.py:983
 msgid "Other"
@@ -213,94 +662,169 @@ msgstr "Erneut einlesen"
 #: ../raphodo/devicedisplay.py:1093
 #, python-format
 msgid "%s full"
-msgstr ""
+msgstr "%s voll"
 
-#: ../raphodo/devices.py:459
+#: ../raphodo/devices.py:463
 msgid "Cameras"
 msgstr "Kameras"
 
-#: ../raphodo/devices.py:460 ../raphodo/devices.py:920
-#: ../raphodo/preferencedialog.py:85 ../raphodo/rapid.py:1927
+#: ../raphodo/devices.py:464 ../raphodo/devices.py:927
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/rapid.py:1979
 msgid "Devices"
 msgstr "Geräte"
 
-#: ../raphodo/devices.py:720
+#: ../raphodo/devices.py:724
 #, python-format
 msgid "Downloading from %(device_names)s"
 msgstr "Von %(device_names)s wird heruntergeladen"
 
 #. Translators: e.g. Three Devices
-#: ../raphodo/devices.py:780
+#: ../raphodo/devices.py:784
 #, python-format
 msgid "%(no_devices)s %(device_type)s"
 msgstr "%(no_devices)s %(device_type)s"
 
-#: ../raphodo/devices.py:905 ../raphodo/rapid.py:1764
+#: ../raphodo/devices.py:912 ../raphodo/rapid.py:1807
 msgid "Select Source"
 msgstr "Quelle auswählen"
 
-#: ../raphodo/devices.py:936 ../raphodo/devices.py:947
+#: ../raphodo/devices.py:943 ../raphodo/devices.py:954
 #, python-format
 msgid "%(device1)s + %(device2)s"
 msgstr "%(device1)s + %(device2)s"
 
 #. Number of cameras e.g. 3 Cameras
-#: ../raphodo/devices.py:958
+#: ../raphodo/devices.py:965
 #, python-format
 msgid "%(no_cameras)s Cameras"
 msgstr "%(no_cameras)s Kameras"
 
-#: ../raphodo/devices.py:963
+#: ../raphodo/devices.py:970
 #, python-format
 msgid "%(no_devices)s Devices"
 msgstr "%(no_devices)s Geräte"
 
 #. Translators: two folder names, separated by a plus sign
-#: ../raphodo/devices.py:1258
+#: ../raphodo/devices.py:1265
 #, python-format
 msgid "%s + %s"
-msgstr ""
+msgstr "%s + %s"
 
-#: ../raphodo/didyouknow.py:44
+#: ../raphodo/didyouknow.py:45
 msgid "Click on a file's checkbox to mark or unmark it for download."
 msgstr ""
+"Bitte auf das Auswahlfeld neben der Datei klicken, um sie für das "
+"Herunterladen an- oder abzuwählen."
 
-#: ../raphodo/didyouknow.py:50
+#: ../raphodo/didyouknow.py:51
 msgid ""
 "Files that have already been downloaded are remembered. You can still mark "
 "previously downloaded files to download again, but they are unchecked by "
 "default, and their thumbnails are dimmed so you can differentiate them from "
 "files that are yet to be downloaded."
 msgstr ""
+"Das Programm merkt sich Dateien, die schon heruntergeladen wurden. Um sie "
+"trotzdem nochmal herunterzuladen, bitte das Auswahlfeld bei der jeweiligen "
+"Datei anklicken. Normalerweise ist das Auswahlfeld abgewählt und das "
+"Vorschaubild ist grau gekennzeichnet, damit die Datei von erstmalig "
+"herunterzuladenden Dateien unterscheidbar ist."
 
-#: ../raphodo/didyouknow.py:59
+#: ../raphodo/didyouknow.py:60
 msgid ""
 "If more than one file is selected, they'll all take the mark of the file "
 "whose checkbox was clicked, regardless of whether they previously had a "
 "checkmark or not."
 msgstr ""
+"Wenn mehr als eine Datei ausgewählt ist, werden alle ausgewählten Dateien "
+"die Markierung der Datei übernehmen, deren Auswahlfeld angeklickt wurde "
+"(unabhängig davon, ob sie selbst zuvor ein Häkchen hatten oder nicht)."
 
-#: ../raphodo/didyouknow.py:67
+#: ../raphodo/didyouknow.py:68
 msgid ""
 "Click on a device's checkbox to quickly mark or unmark all its files for "
 "downloading."
 msgstr ""
+"Klicken Sie auf das Auswahlfeld eines Gerätes, um alle Dateien des Gerätes "
+"zum Herunterladen (oder nicht) zu markieren."
+
+#: ../raphodo/didyouknow.py:75
+msgid ""
+"After a download finishes, an icon replaces the thumbnail's checkbox. The "
+"icon's color indicates whether the download was successful (green), had file "
+"renaming problems (yellow/orange), or failed (red)."
+msgstr ""
+"Nachdem eine Übertragung beendet ist, ersetzt ein Symbol das Auswahlfeld des "
+"Vorschaubildes. Die Farbe des Symbols zeigt an, ob die Übertragung "
+"erfolgreich war (grün), ob es Umbenennungsprobleme gab (gelb/orange) oder "
+"die Übertragung fehlgeschlagen ist (rot)."
 
-#: ../raphodo/didyouknow.py:74
+#: ../raphodo/didyouknow.py:83
+msgid ""
+"\n"
+"            In case of any problems, a red icon will appear at the bottom of "
+"the window\n"
+"            indicating how many error reports there are. Clicking on it "
+"opens the Error Report \n"
+"            window.\n"
+"            "
+msgstr ""
+"\n"
+"            Im Falle von Problemen erscheint ein rotes Symbol am unteren "
+"Rand des Fensters\n"
+"            und zeigt an, wie viele Fehlerberichte es gibt. Wenn Sie darauf "
+"klicken, öffnet sich der Fehlerbericht-\n"
+"            Fenster.\n"
+"            "
+
+#: ../raphodo/didyouknow.py:91
+msgid ""
+"\n"
+"            The Error Report window lists any problems encountered before, "
+"during or after the \n"
+"            download. An orange triangle represents a warning, a red circle "
+"indicates a failure, \n"
+"            and a black circle indicates more serious failures. You can "
+"click on the hyperlinks to \n"
+"            open its file or device in a file manager. You can also search "
+"the reports using the \n"
+"            search box in the lower left of the Error Report window.\n"
+"            "
+msgstr ""
+"\n"
+"            The Error Report window lists any problems encountered before, "
+"during or after the \n"
+"            download. An orange triangle represents a warning, a red circle "
+"indicates a failure, \n"
+"            and a black circle indicates more serious failures. You can "
+"click on the hyperlinks to \n"
+"            open its file or device in a file manager. You can also search "
+"the reports using the \n"
+"            search box in the lower left of the Error Report window.\n"
+"            "
+
+#: ../raphodo/didyouknow.py:103
 msgid ""
 "You can simultaneously download from multiple cameras, smartphones, memory "
 "cards, and hard drives&mdash;as many devices as your computer can handle at "
 "one time."
 msgstr ""
+"Sie können gleichzeitig von mehreren Kameras, Smartphones, Speicherkarten "
+"und Festplatten usw. herunterladen, so viele Geräte wie Ihr Rechner auf "
+"einmal verarbeiten kann."
 
-#: ../raphodo/didyouknow.py:81
+#: ../raphodo/didyouknow.py:110
 msgid ""
 "The <b>Timeline</b> groups photos and videos based on how much time elapsed "
 "between consecutive shots. Use it to identify photos and videos taken at "
 "different periods in a single day or over consecutive days."
 msgstr ""
+"Die <b> Timeline </ b> gruppiert Fotos und Videos, auf Grundlage der Zeit, "
+"die zwischen aufeinanderfolgenden Aufnahmen verstrichen ist. Verwenden Sie "
+"es, um Fotos und Videos zu identifizieren, die zu verschiedenen Zeitpunkten "
+"an einem Tag oder an aufeinanderfolgenden Tagen aufgenommen wurden."
 
-#: ../raphodo/didyouknow.py:88
+#: ../raphodo/didyouknow.py:117
 msgid ""
 "\n"
 "<p>In the illustration above, the first row of the Timeline is black because "
@@ -311,29 +835,47 @@ msgid ""
 "the Timeline:</p>\n"
 "            "
 msgstr ""
+"\n"
+"<p>Auf dem Bild oben ist die erste Zeile der Timeline schwarz, da alle "
+"Dateien mit \n"
+"diesem Datum schon einmal heruntergeladen wurden.</p>\n"
+"<p>Der Schieberegler der Timeline passt den Zeitraum an, für den zeitlich "
+"aufeinander folgende Aufnahmen \n"
+"angezeigt werden:</p>\n"
+"            "
 
-#: ../raphodo/didyouknow.py:99
+#: ../raphodo/didyouknow.py:128
 msgid ""
 "To view photos and videos for a particular time range, use the mouse "
 "(optionally in combination with the <tt>Shift</tt> or <tt>Ctrl</tt> keys) to "
 "select time periods. When a time range is selected, the Timeline button on "
 "the left side of the main window will be highlighted."
 msgstr ""
+"Um Fotos und Videos für einen bestimmten Zeitbereich anzuzeigen, verwenden "
+"Sie die Maus (optional in Kombination mit den Tasten <tt>Shift</tt> oder "
+"<tt>Ctrl</tt>), um Zeiträume auszuwählen. Wenn ein Zeitbereich ausgewählt "
+"ist, wird die Timeline-Taste auf der linken Seite des Hauptfensters "
+"hervorgehoben."
 
-#: ../raphodo/didyouknow.py:106
+#: ../raphodo/didyouknow.py:135
 msgid ""
 "A download always includes all files that are checked for download, "
 "including those that are not currently displayed because the Timeline is "
 "being used."
 msgstr ""
+"Ein Download enthält immer alle Dateien, die zum Download ausgewählt sind, "
+"einschließlich derjenigen, die derzeit nicht angezeigt werden, weil die "
+"Zeitleiste verwendet wird."
 
-#: ../raphodo/didyouknow.py:113
+#: ../raphodo/didyouknow.py:142
 msgid ""
 "You can hide or display the download sources by clicking on the name of the "
 "device you're downloading from at the top left of the program window."
 msgstr ""
+"Sie können die Downloadquellen ausblenden oder anzeigen, indem Sie auf den "
+"Namen des betreffenden Geräts oben links im Programmfenster klicken."
 
-#: ../raphodo/didyouknow.py:120
+#: ../raphodo/didyouknow.py:149
 msgid ""
 "\n"
 "          Thumbnails can be sorted using a variety of criteria:\n"
@@ -351,34 +893,56 @@ msgid ""
 "downloaded from.</li>\n"
 "</ol> "
 msgstr ""
+"\n"
+"          Vorschaubilder können nach folgenden Kriterien sortiert werden:\n"
+"<ol>\n"
+"<li><b>Änderungsdatm:</b> Wann die Datei zuletzt geändert wurde, den "
+"Metadaten zufolge (sofern verfügbar) oder dem Dateisystem zufolge (als "
+"Ersatz).</li>\n"
+"<li><b>Markierung:</b> Zeigt an, ob die Datei zur Übertragung ausgewählt "
+"ist.</li>\n"
+"<li><b>Dateiname:</b> Vollständiger Dateiname, einschließlich "
+"Erweiterung.</li>\n"
+"<li><b>Erweiterung</b> des Dateinamens. Damit lassen sich beispielsweise "
+"jpeg- und raw-Bilder gruppieren.</li>\n"
+"<li><b>Dateityp:</b> Foto oder Video.</li>\n"
+"<li><b>Gerät:</b> Bezeichnung des Geräts, von dem Fotos und Videos "
+"heruntergeladen werden.</li>\n"
+"</ol> "
 
-#: ../raphodo/didyouknow.py:137
+#: ../raphodo/didyouknow.py:166
 msgid ""
 "One of Rapid Photo Downloader's most useful features is its ability to "
 "automatically generate download subfolders and rename files as it downloads, "
 "using a scheme of your choosing."
 msgstr ""
+"Eine von Rapid Photo Downloaders nützlichsten Funktionen ist seine "
+"Fähigkeit, automatisch Unterordner für Übertragungen zu erzeugen und Dateien "
+"nach einem Schema Ihrer Wahl direkt bei der Übertragung umzubenennen."
 
-#: ../raphodo/didyouknow.py:143
+#: ../raphodo/didyouknow.py:172
 msgid ""
 "To specify where you want your files downloaded and how you want them named, "
 "open the appropriate panel on the right-side of the application window: "
 "<b>Destination</b>, <b>Rename</b>, or <b>Job Code</b>."
 msgstr ""
+"Um festzulegen, wohin Ihre Dateien übertragen werden und wie diese heißen "
+"sollen, öffnen Sie das zugehörige Panel am rechten Rand des "
+"Anwendungsfensters: <b>Ziel</b>, <b>Umbenennen</b> oder <b>Auftragscode</b>."
 
-#: ../raphodo/didyouknow.py:150
+#: ../raphodo/didyouknow.py:179
 msgid ""
 "\n"
 "When thinking about your download directory structure, keep in mind two "
 "different types\n"
 "of directory:\n"
 "<ol>\n"
-"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, &quot;"
-"Photos&quot;, or\n"
+"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, "
+"&quot;Photos&quot;, or\n"
 "&quot;Videos&quot;. This directory should already exist on your computer. In "
 "the illustration \n"
-"below, the destination folders are &quot;Pictures&quot; and &quot;"
-"Videos&quot;. The\n"
+"below, the destination folders are &quot;Pictures&quot; and "
+"&quot;Videos&quot;. The\n"
 "name of the destination folder is displayed in the grey bar directly above "
 "the folder tree, \n"
 "with a folder icon to its left and a gear icon to its far right.</li>\n"
@@ -390,8 +954,29 @@ msgid ""
 "</ol>\n"
 "            "
 msgstr ""
+"\n"
+"Bei der Ordnerstruktur für Übertragungen sind zwei verschiedene Arten\n"
+"von Verzeichnissen zu berücksichtigen:\n"
+"<ol>\n"
+"<li>Der <b>Zielordner</b>, z.B. &quot;Bilder&quot;, &quot;Fotos&quot;, oder\n"
+"&quot;Videos&quot;. Dieses Verzeichnis sollte bereits auf Ihrem Computer "
+"vorhanden \n"
+"sein. In der Abbildung unten sind die Zielordner &quot;Bilder&quot; und "
+"&quot;Videos&quot;. Der\n"
+"Name des Zielordners wird in der grauen Leiste direkt oberhalb des "
+"Verzeichnisbaums angezeigt, \n"
+"mit einem Ordnersymbol auf der linken und einem Zahnradsymbol auf der "
+"rechten Seite.</li>\n"
+"<li>Die <b>Unterordner für Übertratungen</b> sind Verzeichnisse, die "
+"automatisch von \n"
+"Rapid Photo Downloader erzeugt werden. Sie müssen nicht unbedingt bereits "
+"auf Ihrem Rechner \n"
+"vorhanden sein, aber es ist in Ordnung, wenn sie bereits existieren.\n"
+"Sie werden unterhalb des Zielordners erzeugt.</li>\n"
+"</ol>\n"
+"            "
 
-#: ../raphodo/didyouknow.py:167
+#: ../raphodo/didyouknow.py:196
 msgid ""
 "\n"
 "You can download photos and videos to the same destination folder, or "
@@ -403,15 +988,28 @@ msgid ""
 "type.            \n"
 "            "
 msgstr ""
+"\n"
+"Sie können Fotos und Videos in den gleichen Zielordner übertragen oder für "
+"jeden Typ einen \n"
+"anderen Zielordner angeben. Das gleiche gilt für die Unterordner von Fotos "
+"und \n"
+"Videos&mdash;übertragen Sie Fotos und Videos zum gleichen Unterordner, oder "
+"verwenden \n"
+"Sie ein anderes Schema für jeden Typ.            \n"
+"            "
 
-#: ../raphodo/didyouknow.py:177
+#: ../raphodo/didyouknow.py:206
 msgid ""
 "Automatically generated download subfolders can contain further "
 "automatically generated subfolders if need be. A common scheme is to create "
 "a year subfolder and then a series of year-month-day subfolders within it."
 msgstr ""
+"Automatisch erzeugte Unterordner für Übertragungen können weitere "
+"automatisch erzeugte Unterordner enthalten, wenn Sie das wünschen. Ein "
+"gängiges Schema ist, Jahres-Ordner und darin eine Reihe von Unterordnern "
+"Jahr-Monat-Tag anzulegen."
 
-#: ../raphodo/didyouknow.py:186
+#: ../raphodo/didyouknow.py:215
 msgid ""
 "\n"
 "Whenever possible, the program previews the download subfolders of photos "
@@ -428,8 +1026,22 @@ msgid ""
 "</ol>\n"
 "            "
 msgstr ""
+"\n"
+"Wann immer es möglich ist, zeigt das Programm eine Vorschau der Unterordner "
+"für Übertragungen an:\n"
+"<ol>\n"
+"<li>Der Verzeichnisbaum des Zielordners zeigt bereits vorhandene Unterordner "
+"auf Ihrem Rechner \n"
+"    (dargestellt in Standard-Schriftart, nicht-kursiv) und Unterordner, die "
+"beim Übertragen \n"
+"    frisch erzeugt werden (dargestellt in kursiver Schriftart).</li>\n"
+"<li>Der Verzeichnisbaum zeigt außerdem die Unterordner, in denen die Dateien "
+"abgelegt werden (dargestellt\n"
+"    in Schwarz).</li>\n"
+"</ol>\n"
+"            "
 
-#: ../raphodo/didyouknow.py:201
+#: ../raphodo/didyouknow.py:230
 msgid ""
 "\n"
 "Download subfolder names are typically generated using some or all of the "
@@ -452,8 +1064,27 @@ msgid ""
 "option:\n"
 "            "
 msgstr ""
+"\n"
+"Unterordner für Übertragungen werden typischerweise erstellt durch "
+"Verwendung einiger oder aller der folgenden Elemente:\n"
+"<ol>\n"
+"<li><b>Datei-Metadaten</b>, sehr oft einschließlich des Erstelldatums des "
+"Fotos oder Videos, aber möglicherweise \n"
+"auch \n"
+"einschließlich des Kamera-Modells, der Seriennummer oder der "
+"Dateierweiterung (z.B. JPG oder CR2).</li>\n"
+"<li>Einen <b>Auftragscode</b> als freier Text, den Sie zum Zeitpunkt der "
+"Übertragung festlegen, wie\n"
+"den Namen einer Veranstaltung oder eines Orts.</li>\n"
+"<li><b>Text</b> den Sie stets mitgeben möchten, wie ein Bindestrich oder ein "
+"Leerzeichen.</li>\n"
+"</ol>\n"
+"Unterordner mit Jahr, Monat und Tag im numerischen Format zu bezeichnen, "
+"erlaubt eine einfache \n"
+"Sortierung im Dateimanager. Deshalb ist dies die Voreinstellung:\n"
+"            "
 
-#: ../raphodo/didyouknow.py:219
+#: ../raphodo/didyouknow.py:248
 msgid ""
 "\n"
 "To automatically create download subfolders as you download, \n"
@@ -462,8 +1093,14 @@ msgid ""
 "the gear icon to bring up a drop-down menu:            \n"
 "            "
 msgstr ""
+"\n"
+"Um während des Downloads automatisch Unterordner zu erstellen, \n"
+"kann eines der in Rapid Photo Downloader enthaltenen Presets genutzt werden, "
+"oder es kann ein eigenes \n"
+"Preset erstellt werden. Dazu bitte das Zahnradsymbol anklicken:            \n"
+"            "
 
-#: ../raphodo/didyouknow.py:227
+#: ../raphodo/didyouknow.py:256
 msgid ""
 "\n"
 "Using the drop-down menu, select a built-in preset or click on <b>Custom</b> "
@@ -472,21 +1109,33 @@ msgid ""
 "Generation Editor:             \n"
 "            "
 msgstr ""
+"\n"
+"Nutzen Sie das Dropdown-Menü, um gegebene Voreinstellungen zu nutzen, oder "
+"wählen sie <b>Benutzerdefiniert</b> \n"
+"für Ihr eigenes Schema. Sie erstellen eigene Schemata mit dem Editor zur "
+"Erzeugung von Unterordnern für Fotos oder Videos:             \n"
+"            "
 
-#: ../raphodo/didyouknow.py:237
+#: ../raphodo/didyouknow.py:266
 msgid ""
 "It's easy to download raw images into one folder, and jpeg images into "
 "another. Simply use the <b>Filename Extension</b> as part of your download "
 "subfolder generation scheme:"
 msgstr ""
+"Es ist einfach, Bilder im raw-Format in einen Ordner zu übertragen und "
+"Bilder im jpeg-Format in einen anderen. Verwenden Sie einfach die "
+"<b>Dateinamenserweiterung</b> als Teil Ihres Schemas zur Erzeugung von "
+"Unterordnern für Übertragungen:"
 
-#: ../raphodo/didyouknow.py:242
+#: ../raphodo/didyouknow.py:271
 msgid ""
 "This illustration shows a saved custom preset named &quot;My custom "
 "preset&quot;."
 msgstr ""
+"Diese Abbildung zeigt eine gespeicherte benutzerspezifische Voreinstellung "
+"namens &quot;My custom preset&quot;."
 
-#: ../raphodo/didyouknow.py:246
+#: ../raphodo/didyouknow.py:275
 msgid ""
 "\n"
 "You do not have to create nested download subfolders. This illustration "
@@ -496,8 +1145,14 @@ msgid ""
 "Job Code:\n"
 "            "
 msgstr ""
+"\n"
+"Sie müssen verschachtelte Unterordner für Übertragungen nicht erzeugen. "
+"Diese Darstellung zeigt \n"
+"die Erstellung von Unterordnern, die lediglich das Aufnahmedatum und den "
+"Auftragscode beinhalten:\n"
+"            "
 
-#: ../raphodo/didyouknow.py:256
+#: ../raphodo/didyouknow.py:285
 msgid ""
 "\n"
 "Although there are many built-in date/time naming options, you may find that "
@@ -510,8 +1165,20 @@ msgid ""
 "circle around the hyphen):\n"
 "            "
 msgstr ""
+"\n"
+"Obwohl es in RPD zahlreiche Vorlagen für die Schreibweise von Datum/Zeit "
+"gibt, kann es \n"
+"sein, dass Sie etwas anderes wünschen. Deshalb können Sie auch Ihre eigenen "
+"Vorlagen erzeugen. Durch die\n"
+"Auswahl vorhandener Datums-/Zeitstempel können Sie neue Schreibweisen "
+"erstellen. Angenommen, \n"
+"Sie wünschen ein Datumsformat, dass Jahr (YYYY), Bindestrich und Monat (MM) "
+"enthält, um \n"
+"YYYY-MM abzubilden, so können Sie dieses so erstellen (beachten Sie den "
+"roten Kreis beim Bindestrich):\n"
+"            "
 
-#: ../raphodo/didyouknow.py:265
+#: ../raphodo/didyouknow.py:294
 msgid ""
 "\n"
 "Read more about all the ways you can generate download subfolder names and "
@@ -520,8 +1187,15 @@ msgid ""
 "documentation</a>.\n"
 "            "
 msgstr ""
+"\n"
+"Lesen Sie mehr über alle Möglichkeiten zum Erstellen von Unterordnern für "
+"Übertragungen und Dateinamen im \n"
+"<a \n"
+"href=\"http://damonlynch.net/rapid/documentation/#renamedateandtime\">Online-"
+"Handbuch (EN)</a>.\n"
+"            "
 
-#: ../raphodo/didyouknow.py:273
+#: ../raphodo/didyouknow.py:302
 msgid ""
 "\n"
 "<b>Job Codes</b> let you easily enter text that describes sets of photos and "
@@ -532,8 +1206,16 @@ msgid ""
 "the Job Code \n"
 "&quot;Green Bazaar&quot;: \n"
 msgstr ""
+"\n"
+"<b>Auftragscodes</b> lassen Sie einfach Text eingeben, der eine Reihe von "
+"Fotos oder Videos beschreibt. Sie können \n"
+"sie in Unterordnern oder für Dateinamen verwenden. In dieser Darstellung ist "
+"einigen Dateien der Auftragscode \n"
+"&quot;Street&quot; zugewiesen, und die markierten Dateien werden den "
+"Auftragscode \n"
+"&quot;Green Bazaar&quot; erhalten: \n"
 
-#: ../raphodo/didyouknow.py:282
+#: ../raphodo/didyouknow.py:311
 msgid ""
 "\n"
 "You can apply new or existing Job Codes before you start a download. If "
@@ -543,37 +1225,54 @@ msgid ""
 "a Job Code for them before the download begins.\n"
 "            "
 msgstr ""
+"\n"
+"Sie können neue oder bestehende Auftragscodes zuweisen, bevor Sie eine "
+"Übertragung starten. Wenn die \n"
+"Übertragung Dateien beinhaltet, denen noch kein Auftragscode zugewiesen "
+"wurde, werden Sie vor Beginn der \n"
+"Übertragung nach einem Auftragscode gefragt.\n"
+"            "
 
-#: ../raphodo/didyouknow.py:291
+#: ../raphodo/didyouknow.py:320
 msgid "Look for hints to guide you when working with Job Codes:"
 msgstr ""
+"Halten Sie Ausschau nach Hinweisen, wenn Sie mit Auftragscodes arbeiten:"
 
-#: ../raphodo/didyouknow.py:295
+#: ../raphodo/didyouknow.py:324
 msgid ""
 "Hints will vary depending on the context, such as when the mouse is hovering "
 "over a button."
 msgstr ""
+"Hinweise ändern sich abhängig vom Kontext, beispielsweise wenn der "
+"Mauszeiger über einer Schaltfläche positioniert ist."
 
-#: ../raphodo/didyouknow.py:301
+#: ../raphodo/didyouknow.py:330
 msgid ""
 "\n"
 "When you give your photos and videos unique filenames, you'll never be "
 "confused as to \n"
 "which file is which. Using <b>sequence numbers</b> to make filenames unique "
 "is highly \n"
-"recommended!.\n"
+"recommended!\n"
 "            "
 msgstr ""
+"\n"
+"Indem Sie für Ihre Fotos und Videos eindeutige Dateinamen vergeben, "
+"vermeiden Sie \n"
+"Verwechslungen. Der Einsatz von <b>Sequenznummern</b> für eindeutige "
+"Dateinamen \n"
+"wird dringend empfohlen!\n"
+"            "
 
-#: ../raphodo/didyouknow.py:309
+#: ../raphodo/didyouknow.py:338
 msgid ""
 "\n"
 "<p>Four types of sequence values are available to help you assign unique "
 "names to your photos and \n"
 "videos:\n"
 "<ol>\n"
-"<li><b>Downloads today</b>: tracks downloads completed during that day.</"
-"li>\n"
+"<li><b>Downloads today</b>: tracks downloads completed during that "
+"day.</li>\n"
 "<li><b>Stored number</b>: similar to Downloads today, but it is remembered "
 "from the last time the  \n"
 "program was run.</li>\n"
@@ -586,8 +1285,27 @@ msgid ""
 "documentation</a>.</p>\n"
 "            "
 msgstr ""
+"\n"
+"<p>Vier Arten von Sequenzwerten sind verfügbar, um Sie bei der Zuweisung "
+"eindeutiger Namen \n"
+"für Ihre Fotos und Videos zu unterstützen:\n"
+"<ol>\n"
+"<li><b>Übertragungen heute</b>: Enthält Übertragungen, die während dieses "
+"Tages erfolgten.</li>\n"
+"<li><b>Gespeicherte Nummer</b>: Identisch mit Übertragungen heute, bezieht "
+"sich jedoch auf den letzten  \n"
+"Programmstart.</li>\n"
+"<li><b>Sitzungsnummer</b>: Wird bei jedem Programmstart zurückgesetzt.</li>\n"
+"<li><b>Sequzenzbuchstabe</b>: Wie Sitzungsnummer, verwendet allerdings "
+"Buchstaben.</li>\n"
+"</ol></p>\n"
+"<p>\n"
+"Lesen Sie mehr über Sequenznummern in der <a \n"
+"href=\"http://damonlynch.net/rapid/documentation/#sequencenumbers\">Online-"
+"Dokumentation (EN)</a>.</p>\n"
+"            "
 
-#: ../raphodo/didyouknow.py:327
+#: ../raphodo/didyouknow.py:356
 msgid ""
 "\n"
 "The <b>Rename</b> panel allows you to configure file renaming. To rename "
@@ -595,8 +1313,14 @@ msgid ""
 "from among existing renaming presets or define your own.              \n"
 "            "
 msgstr ""
+"\n"
+"Im Panel <b>Umbenennen</b> konfigurieren Sie das Umbennen von Dateien. Um "
+"Ihre Dateien\n"
+"umzubenennen, können Sie bestehende Voreinstellungen verwenden oder eigene "
+"festlegen.              \n"
+"            "
 
-#: ../raphodo/didyouknow.py:334
+#: ../raphodo/didyouknow.py:363
 msgid ""
 "\n"
 "<p>The <b>Synchronize RAW + JPEG</b> option is useful if you use the RAW + "
@@ -614,8 +1338,23 @@ msgid ""
 "documentation</a>.</p>\n"
 "            "
 msgstr ""
+"\n"
+"<p>Die Option <b>Synchronisiere RAW + JPEG</b> ist nützlich, wenn Sie das "
+"RAW-  + JPEG-Möglichkeit \n"
+"Ihrer Kamera und Sequenznummern beim Umbenennen Ihrer Fotos verwenden. Ist "
+"diese Option aktiv, so \n"
+"wird das Programm übereinstimmende Paare von RAW- und JPEG-Fotos suchen und, "
+"sobald diese gefunden\n"
+"sind, beiden Fotos die gleiche Sequenznummer zuweisen. Darüber hinaus werden "
+"Sequenzen so aktualisiert, \n"
+"als ob die beiden Fotos eines wären.</p>\n"
+"<p>\n"
+"Lesen Sie mehr über das Umbenennen von Dateien in der <a \n"
+"href=\"http://damonlynch.net/rapid/documentation/#rename\">Online-"
+"Dokumentation (EN)</a>.</p>\n"
+"            "
 
-#: ../raphodo/didyouknow.py:348
+#: ../raphodo/didyouknow.py:377
 msgid ""
 "\n"
 "You can have your photos and videos backed up to multiple locations as they "
@@ -625,14 +1364,23 @@ msgid ""
 "backup locations specified.\n"
 "            "
 msgstr ""
+"\n"
+"Sie können Ihre Fotos und Videos während der Übertragung an mehrere Orte "
+"sichern, wie z.B. \n"
+"externe Festplatten oder Netzlaufwerke. Sicherungsmedien können automatisch "
+"erkannt oder \n"
+"ein Ort für die Datensicherung festgelegt werden.\n"
+"            "
 
-#: ../raphodo/didyouknow.py:356
+#: ../raphodo/didyouknow.py:385
 msgid ""
 "In this example, the drive <b>photobackup</b> does not contain a folder "
 "named <tt>Videos</tt>, so videos will not be backed up to it."
 msgstr ""
+"In diesem Beispiel enthält das Laufwerk <b>photobackup</b> keinen Ordner "
+"namens <tt>Videos</tt>. Deshalb werden Videos nicht dorthin gesichert."
 
-#: ../raphodo/didyouknow.py:362
+#: ../raphodo/didyouknow.py:391
 msgid ""
 "\n"
 "Several of the program's preferences can be set from the command line, "
@@ -642,8 +1390,22 @@ msgid ""
 "default state, and caches and remembered files cleared.            \n"
 "            "
 msgstr ""
+"\n"
+"Viele Programmeinstellungen können über die Kommandozeile festgelegt werden, "
+"einschließlich \n"
+"Übertragungsquellen, -zielen und Sicherungen. Zusätzlich lassen sich "
+"Voreinstellungen \n"
+"wiederherstellen und Zwischenspeicher sowie gemerkte Dateien löschen.        "
+"    \n"
+"            "
 
-#: ../raphodo/didyouknow.py:372
+#: ../raphodo/didyouknow.py:396
+msgid "You can also import program preferences from the older 0.4 version."
+msgstr ""
+"Sie können auch die Voreinstellungen des Programms aus der älteren Version "
+"0.4 importieren."
+
+#: ../raphodo/didyouknow.py:401
 msgid ""
 "\n"
 "Rapid Photo Downloader deals with three types of cache:\n"
@@ -653,8 +1415,8 @@ msgid ""
 "memory cards, and other devices.</li>\n"
 "<li>A <b>temporary cache</b> of files downloaded from a camera, one for "
 "photos and another for \n"
-"videos. They are located in temporary subfolders in the download destination."
-"</li>\n"
+"videos. They are located in temporary subfolders in the download "
+"destination.</li>\n"
 "<li>The <b>desktop's thumbnail cache</b>, in which Rapid Photo Downloader "
 "stores thumbnails of \n"
 "RAW and TIFF photos once they have been downloaded. File browsers like Gnome "
@@ -669,25 +1431,25 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:431
+#: ../raphodo/didyouknow.py:460
 msgid "Tip of the Day"
-msgstr ""
+msgstr "Tipp des Tages"
 
-#: ../raphodo/didyouknow.py:439
+#: ../raphodo/didyouknow.py:468
 msgid "Did you know...?"
-msgstr ""
+msgstr "Wussten Sie schon …?"
 
-#: ../raphodo/didyouknow.py:466
+#: ../raphodo/didyouknow.py:495
 msgid "Show tips on startup"
-msgstr ""
+msgstr "Tipps beim Start anzeigen"
 
-#: ../raphodo/didyouknow.py:470
+#: ../raphodo/didyouknow.py:499
 msgid "&Next"
-msgstr ""
+msgstr "&Weiter"
 
-#: ../raphodo/didyouknow.py:471
+#: ../raphodo/didyouknow.py:500
 msgid "&Previous"
-msgstr ""
+msgstr "&Zurück"
 
 #: ../raphodo/downloadtracker.py:402
 msgid "MB/sec"
@@ -792,93 +1554,105 @@ msgstr "%d Tage, 1 Stunde"
 msgid "%(days)d days, %(hours)d hours"
 msgstr "%(days)d Tage, %(hours)d Stunden"
 
-#: ../raphodo/errorlog.py:65
+#: ../raphodo/errorlog.py:66
 msgid "Find"
-msgstr ""
+msgstr "Suchen"
 
-#: ../raphodo/errorlog.py:135
+#: ../raphodo/errorlog.py:136
 msgid "Error Reports - Rapid Photo Downloader"
-msgstr ""
+msgstr "Fehlerberichte - Rapid-Fotoübertragung"
 
-#: ../raphodo/errorlog.py:170
+#: ../raphodo/errorlog.py:171
 msgid "Find in reports"
-msgstr ""
+msgstr "In Berichten suchen"
 
-#: ../raphodo/errorlog.py:187
+#: ../raphodo/errorlog.py:188
 msgid "Find the previous occurrence of the phrase"
-msgstr ""
+msgstr "Vorheriges Vorkommen der Phrase suchen"
 
-#: ../raphodo/errorlog.py:192
+#: ../raphodo/errorlog.py:193
 msgid "Find the next occurrence of the phrase"
-msgstr ""
+msgstr "Nächstes Vorkommen der Phrase suchen"
 
-#: ../raphodo/errorlog.py:194
+#: ../raphodo/errorlog.py:195
 msgid "&Highlight All"
-msgstr ""
+msgstr "Alles &hervorheben"
 
-#: ../raphodo/errorlog.py:195
+#: ../raphodo/errorlog.py:196
 msgid "Highlight all occurrences of the phrase"
-msgstr ""
+msgstr "Alle Vorkommen der Phrase hervorheben"
 
-#: ../raphodo/errorlog.py:196
+#: ../raphodo/errorlog.py:197
 msgid "&Match Case"
-msgstr ""
+msgstr "&Groß-/Kleinschreibung beachten"
 
-#: ../raphodo/errorlog.py:197
+#: ../raphodo/errorlog.py:198
 msgid "Search with case sensitivity"
-msgstr ""
+msgstr "Suche mit Beachtung der Groß-/Kleinschreibung"
 
-#: ../raphodo/errorlog.py:198
+#: ../raphodo/errorlog.py:199
 msgid "&Whole Words"
-msgstr ""
+msgstr "Ganze &Wörter"
 
-#: ../raphodo/errorlog.py:199
+#: ../raphodo/errorlog.py:200
 msgid "Search whole words only"
-msgstr ""
+msgstr "Nur ganze Wörter suchen"
 
-#: ../raphodo/errorlog.py:209 ../raphodo/errorlog.py:341
+#: ../raphodo/errorlog.py:210 ../raphodo/errorlog.py:345
 #, python-format
 msgid "%s of %s matches"
-msgstr ""
+msgstr "%s von %s Übereinstimmungen"
 
-#: ../raphodo/errorlog.py:228
+#: ../raphodo/errorlog.py:232
 msgid "Clear"
-msgstr ""
+msgstr "Leeren"
 
-#: ../raphodo/errorlog.py:328
+#: ../raphodo/errorlog.py:332
 msgid "Phrase not found"
-msgstr ""
+msgstr "Ausdruck nicht gefunden"
 
-#: ../raphodo/errorlog.py:487
+#: ../raphodo/errorlog.py:491
 msgid "Search pending..."
-msgstr ""
+msgstr "Suche ausstehend …"
 
-#: ../raphodo/errorlog.py:535
+#: ../raphodo/errorlog.py:539
 msgid ""
 "The number of new entries added to the Error Report since it was last open. "
 "Click to open the Error Report."
 msgstr ""
+"Anzahl neuer Einträge, die seit dem letzten Öffnen zum Fehlerbericht "
+"hinzugefügt wurden. Hier klicken, um den Fehlerbericht zu öffnen."
 
 #: ../raphodo/excepthook.py:77
 msgid "Problem in Rapid Photo Downloader"
-msgstr ""
+msgstr "Problem in Rapid-Fotoübertragung"
 
 #: ../raphodo/excepthook.py:81
 #, python-brace-format
 msgid ""
 "<b>A problem occurred in Rapid Photo Downloader</b><br><br>\n"
-"    Please report the problem at <a href=\"{website}\">{website}</a>."
-"<br><br>\n"
+"    Please report the problem at <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
 "    Attach the log file <i>{log_file}</i> to your bug report (click\n"
 "    <a href=\"{log_path}\">here</a> to open the log directory).<br><br>If "
 "the same problem occurs\n"
 "    again before the program exits, this is the only notification about it.\n"
 "    "
 msgstr ""
+"<b>Ein Problem ist in Rapid Photo Downloader aufgetreten</b><br><br>\n"
+"    Bitte melden Sie das Problem an <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
+"    Fügen Sie die Log-Datei <i>{log_file}</i> an Ihre Fehlerbeschreibung an "
+"(klicken Sie\n"
+"    <a href=\"{log_path}\">hier</a>, um das Verzeichnis der Log-Datei zu "
+"öffnen).<br><br>Falls das gleiche Problem\n"
+"    erneut auftritt, bevor das Programm schließt, ist dies die einzige "
+"Meldung, die Sie dazu erhalten.\n"
+"    "
 
 #: ../raphodo/excepthook.py:98
 msgid "A problem occurred in Rapid Photo Downloader\n"
-msgstr ""
+msgstr "In Rapid-Fotoübertragung ist ein Problem aufgetreten\n"
 
 #: ../raphodo/excepthook.py:99
 #, python-brace-format
@@ -888,564 +1662,568 @@ msgid ""
 "    Attach the log file to your bug report, found at {log_path}\n"
 "\n"
 msgstr ""
+"Bitte melden SIe das Verhalten an {website}\n"
+"\n"
+"    Fügen Sie die Log-Datei zur Fehlermeldung hinzu, siehe {log_path}\n"
+"\n"
 
-#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1601
+#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1643
 msgid "Open in File Browser..."
 msgstr "In Dateiverwaltung öffnen …"
 
 #: ../raphodo/foldercombo.py:120
 msgid "File System"
-msgstr ""
+msgstr "Dateisystem"
 
 #: ../raphodo/foldercombo.py:157
 msgid "Other..."
-msgstr ""
+msgstr "Andere …"
 
 #. Translators: indicate in combobox that a path does not exist
 #: ../raphodo/foldercombo.py:235
 #, python-format
 msgid "%s (location does not exist)"
-msgstr ""
+msgstr "%s (Ort existiert nicht)"
 
-#: ../raphodo/generatenameconfig.py:186
+#: ../raphodo/generatenameconfig.py:190
 msgid "Date time"
 msgstr "Datum & Uhrzeit"
 
-#: ../raphodo/generatenameconfig.py:187
+#: ../raphodo/generatenameconfig.py:191
 msgid "Text"
 msgstr "Text"
 
-#: ../raphodo/generatenameconfig.py:188 ../raphodo/rapid.py:2053
+#: ../raphodo/generatenameconfig.py:192 ../raphodo/rapid.py:2125
 msgid "Filename"
 msgstr "Dateiname"
 
-#: ../raphodo/generatenameconfig.py:189 ../raphodo/preferencedialog.py:488
+#: ../raphodo/generatenameconfig.py:193 ../raphodo/preferencedialog.py:724
 msgid "Metadata"
 msgstr "Metadaten"
 
-#: ../raphodo/generatenameconfig.py:190
+#: ../raphodo/generatenameconfig.py:194
 msgid "Sequences"
 msgstr "Sequenzen"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: ../raphodo/generatenameconfig.py:193
+#: ../raphodo/generatenameconfig.py:197
 msgid "Job code"
-msgstr "Auftragsbezeichnung"
+msgstr "Auftragscode"
 
-#: ../raphodo/generatenameconfig.py:194
+#: ../raphodo/generatenameconfig.py:198
 msgid "Image date"
 msgstr "Bilddatum"
 
-#: ../raphodo/generatenameconfig.py:195
+#: ../raphodo/generatenameconfig.py:199
 msgid "Video date"
 msgstr "Filmdatum"
 
-#: ../raphodo/generatenameconfig.py:196
+#: ../raphodo/generatenameconfig.py:200
 msgid "Today"
 msgstr "Heute"
 
-#: ../raphodo/generatenameconfig.py:197
+#: ../raphodo/generatenameconfig.py:201
 msgid "Yesterday"
 msgstr "Gestern"
 
 #. Translators: Download time is the time and date that the download started (when the
 #. user clicked the Download button)
-#: ../raphodo/generatenameconfig.py:200
+#: ../raphodo/generatenameconfig.py:204
 msgid "Download time"
 msgstr "Übertragungszeit"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:203
+#: ../raphodo/generatenameconfig.py:207
 msgid "Name"
 msgstr "Name"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:206 ../raphodo/rapid.py:2054
+#: ../raphodo/generatenameconfig.py:210 ../raphodo/rapid.py:2126
 msgid "Extension"
 msgstr "Erweiterung"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:209
+#: ../raphodo/generatenameconfig.py:213
 msgid "Image number"
 msgstr "Bildnummer"
 
-#: ../raphodo/generatenameconfig.py:210
+#: ../raphodo/generatenameconfig.py:214
 msgid "Video number"
 msgstr "Filmnummer"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:213
+#: ../raphodo/generatenameconfig.py:217
 msgid "Aperture"
 msgstr "Blende"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:216
+#: ../raphodo/generatenameconfig.py:220
 msgid "ISO"
 msgstr "ISO-Wert"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:219
+#: ../raphodo/generatenameconfig.py:223
 msgid "Exposure time"
 msgstr "Belichtungszeit"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:222
+#: ../raphodo/generatenameconfig.py:226
 msgid "Focal length"
 msgstr "Brennweite"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:225
+#: ../raphodo/generatenameconfig.py:229
 msgid "Camera make"
 msgstr "Kamerahersteller"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:228
+#: ../raphodo/generatenameconfig.py:232
 msgid "Camera model"
 msgstr "Kameramodell"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:231
+#: ../raphodo/generatenameconfig.py:235
 msgid "Short camera model"
 msgstr "Kameramodell (kurz)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:234
+#: ../raphodo/generatenameconfig.py:238
 msgid "Hyphenated short camera model"
 msgstr "Kameramodell (kurz, Bindestriche)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:237
+#: ../raphodo/generatenameconfig.py:241
 msgid "Serial number"
 msgstr "Seriennummer"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:240
+#: ../raphodo/generatenameconfig.py:244
 msgid "Shutter count"
 msgstr "Verschlusszähler"
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: ../raphodo/generatenameconfig.py:242
+#: ../raphodo/generatenameconfig.py:246
 msgid "File number"
 msgstr "Dateinummer"
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:244
+#: ../raphodo/generatenameconfig.py:248
 msgid "Folder only"
 msgstr "Nur Ordner"
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:246
+#: ../raphodo/generatenameconfig.py:250
 msgid "Folder and file"
 msgstr "Ordner und Datei"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:249
+#: ../raphodo/generatenameconfig.py:253
 msgid "Owner name"
 msgstr "Eigentümername"
 
-#: ../raphodo/generatenameconfig.py:250
+#: ../raphodo/generatenameconfig.py:254
 msgid "Codec"
 msgstr "Codec"
 
-#: ../raphodo/generatenameconfig.py:251
+#: ../raphodo/generatenameconfig.py:255
 msgid "Width"
 msgstr "Breite"
 
-#: ../raphodo/generatenameconfig.py:252
+#: ../raphodo/generatenameconfig.py:256
 msgid "Height"
 msgstr "Höhe"
 
-#: ../raphodo/generatenameconfig.py:253
+#: ../raphodo/generatenameconfig.py:257
 msgid "Length"
 msgstr "Länge"
 
-#: ../raphodo/generatenameconfig.py:254
+#: ../raphodo/generatenameconfig.py:258
 msgid "Frames Per Second"
 msgstr "Bilder pro Sekunde"
 
-#: ../raphodo/generatenameconfig.py:255
+#: ../raphodo/generatenameconfig.py:259
 msgid "Artist"
 msgstr "Autor"
 
-#: ../raphodo/generatenameconfig.py:256
+#: ../raphodo/generatenameconfig.py:260
 msgid "Copyright"
 msgstr "Urheberrecht"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:259
+#: ../raphodo/generatenameconfig.py:263
 msgid "Downloads today"
 msgstr "Übertragen heute"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:262
+#: ../raphodo/generatenameconfig.py:266
 msgid "Session number"
 msgstr "Sitzungsnummer"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:265
+#: ../raphodo/generatenameconfig.py:269
 msgid "Subfolder number"
 msgstr "Nummer des Unterordners"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:268
+#: ../raphodo/generatenameconfig.py:272
 msgid "Stored number"
 msgstr "Gespeicherte Nummer"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: ../raphodo/generatenameconfig.py:271
+#: ../raphodo/generatenameconfig.py:275
 msgid "Sequence letter"
 msgstr "Fortlaufender Buchstabe"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:274
+#: ../raphodo/generatenameconfig.py:278
 msgid "All digits"
 msgstr "Alle Ziffern"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:277
+#: ../raphodo/generatenameconfig.py:281
 msgid "Last digit"
 msgstr "Letzte Ziffer"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:280
+#: ../raphodo/generatenameconfig.py:284
 msgid "Last 2 digits"
 msgstr "Letzte 2 Ziffern"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:283
+#: ../raphodo/generatenameconfig.py:287
 msgid "Last 3 digits"
 msgstr "Letzte 3 Ziffern"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:286
+#: ../raphodo/generatenameconfig.py:290
 msgid "Last 4 digits"
 msgstr "Letze 4 Ziffern"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:289
+#: ../raphodo/generatenameconfig.py:293
 msgid "Original Case"
 msgstr "Ursprüngliche Schreibweise"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:292
+#: ../raphodo/generatenameconfig.py:296
 msgid "UPPERCASE"
 msgstr "GROSSBUCHSTABEN"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:295
+#: ../raphodo/generatenameconfig.py:299
 msgid "lowercase"
 msgstr "kleinschreibung"
 
-#: ../raphodo/generatenameconfig.py:296
+#: ../raphodo/generatenameconfig.py:300
 msgid "One digit"
 msgstr "Eine Ziffer"
 
-#: ../raphodo/generatenameconfig.py:297
+#: ../raphodo/generatenameconfig.py:301
 msgid "Two digits"
 msgstr "Zwei Ziffern"
 
-#: ../raphodo/generatenameconfig.py:298
+#: ../raphodo/generatenameconfig.py:302
 msgid "Three digits"
 msgstr "Drei Ziffern"
 
-#: ../raphodo/generatenameconfig.py:299
+#: ../raphodo/generatenameconfig.py:303
 msgid "Four digits"
 msgstr "Vier Ziffern"
 
-#: ../raphodo/generatenameconfig.py:300
+#: ../raphodo/generatenameconfig.py:304
 msgid "Five digits"
 msgstr "Fünf Ziffern"
 
-#: ../raphodo/generatenameconfig.py:301
+#: ../raphodo/generatenameconfig.py:305
 msgid "Six digits"
 msgstr "Sechs Ziffern"
 
-#: ../raphodo/generatenameconfig.py:302
+#: ../raphodo/generatenameconfig.py:306
 msgid "Seven digits"
 msgstr "Sieben Ziffern"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:305
+#: ../raphodo/generatenameconfig.py:309
 msgid "Subseconds"
 msgstr "Hundertstelsekunden"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:308 ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:312 ../raphodo/generatenameconfig.py:393
 msgid "YYYYMMDD"
 msgstr "JJJJMMTT"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:311 ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:315 ../raphodo/generatenameconfig.py:394
 msgid "YYYY-MM-DD"
 msgstr "JJJJ-MM-TT"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:314 ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:318 ../raphodo/generatenameconfig.py:395
 msgid "YYYY_MM_DD"
 msgstr "JJJJ_MM_TT"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:317
+#: ../raphodo/generatenameconfig.py:321
 msgid "YYMMDD"
 msgstr "JJMMTT"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:320
+#: ../raphodo/generatenameconfig.py:324
 msgid "YY-MM-DD"
 msgstr "JJ-MM-TT"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:323
+#: ../raphodo/generatenameconfig.py:327
 msgid "YY_MM_DD"
 msgstr "JJ_MM_TT"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:326
+#: ../raphodo/generatenameconfig.py:330
 msgid "MMDDYYYY"
 msgstr "MMTTJJJJ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:329
+#: ../raphodo/generatenameconfig.py:333
 msgid "MMDDYY"
 msgstr "MMTTJJ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:332
+#: ../raphodo/generatenameconfig.py:336
 msgid "MMDD"
 msgstr "MMTT"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:335
+#: ../raphodo/generatenameconfig.py:339
 msgid "DDMMYYYY"
 msgstr "TTMMJJJJ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:338
+#: ../raphodo/generatenameconfig.py:342
 msgid "DDMMYY"
 msgstr "TTMMJJ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:341 ../raphodo/generatenameconfig.py:389
-#: ../raphodo/generatenameconfig.py:390 ../raphodo/generatenameconfig.py:391
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:345 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:394 ../raphodo/generatenameconfig.py:395
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:397
 msgid "YYYY"
 msgstr "JJJJ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:344
+#: ../raphodo/generatenameconfig.py:348
 msgid "YY"
 msgstr "JJ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:347
+#: ../raphodo/generatenameconfig.py:351
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:350
+#: ../raphodo/generatenameconfig.py:354
 msgid "DD"
 msgstr "TT"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:353
+#: ../raphodo/generatenameconfig.py:357
 msgid "Month (full)"
 msgstr "Monat (ausgeschrieben)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:356
+#: ../raphodo/generatenameconfig.py:360
 msgid "Month (abbreviated)"
 msgstr "Monat (abgekürzt)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:359
+#: ../raphodo/generatenameconfig.py:363
 msgid "HHMMSS"
 msgstr "HHMMSS"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:362
+#: ../raphodo/generatenameconfig.py:366
 msgid "HHMM"
 msgstr "HHMM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:365
+#: ../raphodo/generatenameconfig.py:369
 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
-#: ../raphodo/generatenameconfig.py:368
+#: ../raphodo/generatenameconfig.py:372
 msgid "HH-MM"
 msgstr "HH-MM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:371
+#: ../raphodo/generatenameconfig.py:375
 msgid "HH"
 msgstr "HH"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:374
+#: ../raphodo/generatenameconfig.py:378
 msgid "MM (minutes)"
 msgstr "MM (Minuten)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:377
+#: ../raphodo/generatenameconfig.py:381
 msgid "SS"
 msgstr "SS"
 
-#: ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:393
 msgid "Date"
 msgstr "Datum"
 
-#: ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:394
 msgid "Date (hyphens)"
 msgstr "Datum (Bindestriche)"
 
-#: ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:395
 msgid "Date (underscores)"
 msgstr "Datum (Unterstriche)"
 
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:438
-#: ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:442
+#: ../raphodo/generatenameconfig.py:537
 msgid "Date and Job Code"
-msgstr "Datum und Auftragsbezeichnung"
+msgstr "Datum und Auftragscode"
 
-#: ../raphodo/generatenameconfig.py:392
+#: ../raphodo/generatenameconfig.py:396
 msgid "YYYYMM_Job Code"
-msgstr "JJJJMM_Auftragsbezeichnung"
+msgstr "JJJJMM_Auftragscode"
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "Date and Job Code Subfolder"
-msgstr ""
+msgstr "Datum- und Auftragscode-Unterordner"
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "YYYYMM"
 msgstr "JJJJMM"
 
-#: ../raphodo/generatenameconfig.py:393 ../raphodo/jobcodepanel.py:198
-#: ../raphodo/nameeditor.py:827 ../raphodo/rapid.py:1809
+#: ../raphodo/generatenameconfig.py:397 ../raphodo/jobcodepanel.py:199
+#: ../raphodo/nameeditor.py:833 ../raphodo/rapid.py:1852
 #: ../raphodo/renamepanel.py:83 ../raphodo/renamepanel.py:241
 msgid "Job Code"
-msgstr "Auftragsbezeichnung"
+msgstr "Auftragscode"
 
-#: ../raphodo/generatenameconfig.py:433 ../raphodo/generatenameconfig.py:512
+#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:532
 msgid "Original Filename"
-msgstr ""
+msgstr "Ursprünglicher Dateiname"
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "Date-Time and Downloads today"
-msgstr ""
+msgstr "Datum/Zeit und Übertragungen heute"
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "YYYYMMDD-HHMM-1"
-msgstr ""
+msgstr "JJJJMMTT-HHMM-1"
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "Date and Downloads today"
-msgstr ""
+msgstr "Datum und Übertragungen heute"
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "YYYYMMDD-1"
-msgstr ""
+msgstr "JJJJMMTT-1"
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "Date-Time and Image number"
-msgstr ""
+msgstr "Datum/Zeit und Bildnummer"
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "YYYYMMDD-1234"
-msgstr ""
+msgstr "JJJJMMTT-1234"
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "Date-Time and Job Code"
-msgstr ""
+msgstr "Datum/Zeit und Auftragscode"
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "YYYYMMDD-HHMM-Job Code-1"
-msgstr ""
+msgstr "JJJJMMTT-HHMM-Auftragscode-1"
 
-#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:442 ../raphodo/generatenameconfig.py:537
 msgid "YYYYMMDD-Job Code-1"
-msgstr ""
+msgstr "JJJJMMTT-Auftragscode-1"
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "Date-Time and Video number"
-msgstr ""
+msgstr "Datum/Zeit und Videonummer"
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "YYYYMMDD_1234"
-msgstr ""
+msgstr "JJJJMMTT_1234"
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "Resolution"
-msgstr ""
+msgstr "Auflösung"
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "YYYYMMDD-HHMM-1-1920x1080"
-msgstr ""
+msgstr "JJJJMMTT-HHMM-1-1920x1080"
 
 #: ../raphodo/jobcodepanel.py:64
 msgid "Enter a new Job Code, or select a previous one"
 msgstr ""
-"Geben Sie eine neue Auftragsbezeichung ein oder wählen Sie eine bestehende "
-"aus"
+"Geben Sie einen neuen Auftragscode ein oder wählen Sie einen bestehenden aus"
 
 #. Translators: the value substituted will be something like '1 photo'.
 #: ../raphodo/jobcodepanel.py:70
 #, python-format
 msgid "The Job Code will be applied to %s that does not yet have a Job Code."
 msgstr ""
+"Der Auftragscode wird auf %s angewendet, das noch keinen Auftragscode hat."
 
 #. Translators: the value substituted will be something like '85 photos and 5
 #. videos'.
@@ -1453,674 +2231,981 @@ msgstr ""
 #, python-format
 msgid "The Job Code will be applied to %s that do not yet have a Job Code."
 msgstr ""
+"Der Auftragscode wird auf %s angewendet, die noch keinen Auftragscode haben."
 
 #: ../raphodo/jobcodepanel.py:78
 msgid "Apply Job Code to Download"
-msgstr ""
+msgstr "Auftragscode auf Übertragung anwenden"
 
 #: ../raphodo/jobcodepanel.py:80
 msgid "Enter a new Job Code"
-msgstr "Geben Sie eine neue Auftragsbezeichung ein"
+msgstr "Geben Sie einen neuen Auftragscode ein"
 
 #: ../raphodo/jobcodepanel.py:86
 msgid "The new Job Code will not be applied to any photos or videos."
-msgstr ""
+msgstr "Der neue Auftragscode wird nicht auf Fotos oder Videos angewendet."
 
 #. Translators: the value substituted will be something like '100 photos and 5
 #. videos'.
 #: ../raphodo/jobcodepanel.py:92
 #, python-format
 msgid "The new Job Code will <b>not</b> be applied to %s."
-msgstr ""
+msgstr "Der neue Auftragscode wird <b>nicht</b> auf %s angewendet."
 
 #. Translators: the value substituted will be something like '100 photos and 5
 #. videos'.
 #: ../raphodo/jobcodepanel.py:97
 #, python-format
 msgid "The new Job Code will be applied to %s."
-msgstr ""
+msgstr "Der neue Auftragscode wird auf %s angewendet."
 
 #: ../raphodo/jobcodepanel.py:99
 msgid "New Job Code"
-msgstr ""
+msgstr "Neuer Auftragscode"
 
 #: ../raphodo/jobcodepanel.py:134
 msgid "&Job Code:"
-msgstr ""
+msgstr "&Auftragscode:"
 
 #: ../raphodo/jobcodepanel.py:136 ../raphodo/rememberthisdialog.py:68
 msgid "&Remember this choice"
-msgstr ""
+msgstr "Diese Auswahl me&rken"
 
-#: ../raphodo/jobcodepanel.py:185
+#: ../raphodo/jobcodepanel.py:186
 msgid ""
 "Select photos and videos to be able to apply a new or existing Job Code to "
 "them."
 msgstr ""
+"Wählen Sie Fotos und Videos aus, auf die ein neuer oder vorhandener "
+"Auftragscode angewendet werden kann."
 
-#: ../raphodo/jobcodepanel.py:186
-msgid "The new Job Code will be applied to all selected photos and/or videos."
+#: ../raphodo/jobcodepanel.py:187
+msgid ""
+"The new Job Code will be applied to all selected photos and/or videos."
 msgstr ""
+"Der neue Auftragscode wird allen ausgewählten Fotos und/oder Videos "
+"zugewiesen."
 
-#: ../raphodo/jobcodepanel.py:187
+#: ../raphodo/jobcodepanel.py:188
 msgid ""
 "Click the Apply button to apply the current Job Code to all selected photos "
 "and/or videos. You can also simply double click the Job Code."
 msgstr ""
+"Klicken Sie 'Anwenden', um den aktuellen Auftragscode allen ausgewählten "
+"Fotos und/oder Videos zuzuweisen. Sie können auch einfach den Auftragscode "
+"doppelt klicken."
 
-#: ../raphodo/jobcodepanel.py:189
+#: ../raphodo/jobcodepanel.py:190
 msgid ""
 "Removing a Job Code removes it only from the list of saved Job Codes, not "
 "from any photos or videos that it may have been applied to."
 msgstr ""
+"Das Entfernen eines Auftragscodes entfernt diesen nur aus der Liste der "
+"gespeicherten Auftragscodes, nicht jedoch von den Fotos oder Videos, denen "
+"er zugewiesen wurde."
 
-#: ../raphodo/jobcodepanel.py:191
+#: ../raphodo/jobcodepanel.py:192
 msgid ""
 "If you want to use Job Codes, configure file renaming or destination "
 "subfolder names to use them."
 msgstr ""
+"Wenn Sie Auftragscodes verwenden möchten, so richten Sie das Umbenennen von "
+"Dateien oder die Namen der Unterordner im Ziel für deren Verwendung ein."
 
-#: ../raphodo/jobcodepanel.py:197
+#: ../raphodo/jobcodepanel.py:198
 msgid "Last Used"
-msgstr ""
+msgstr "Zuletzt verwendet"
 
-#: ../raphodo/jobcodepanel.py:202
+#: ../raphodo/jobcodepanel.py:203
 msgid "Job Code Sort:"
-msgstr ""
+msgstr "Auftragscodesortierung:"
 
-#: ../raphodo/jobcodepanel.py:205 ../raphodo/rapid.py:2061
+#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2133
 msgid "Ascending"
 msgstr "Aufsteigend"
 
-#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2062
+#: ../raphodo/jobcodepanel.py:207 ../raphodo/rapid.py:2134
 msgid "Descending"
 msgstr "Absteigend"
 
-#: ../raphodo/jobcodepanel.py:216
+#: ../raphodo/jobcodepanel.py:217
 msgid "&New..."
-msgstr ""
+msgstr "&Neu …"
 
-#: ../raphodo/jobcodepanel.py:220
+#: ../raphodo/jobcodepanel.py:221
 msgid "&Apply"
-msgstr ""
+msgstr "&Anwenden"
 
-#: ../raphodo/jobcodepanel.py:224
+#: ../raphodo/jobcodepanel.py:225
 msgid "&Remove"
-msgstr ""
+msgstr "Entfe&rnen"
 
-#: ../raphodo/jobcodepanel.py:228 ../raphodo/preferencedialog.py:125
-#: ../raphodo/preferencedialog.py:154 ../raphodo/preferencedialog.py:433
+#: ../raphodo/jobcodepanel.py:229 ../raphodo/preferencedialog.py:200
+#: ../raphodo/preferencedialog.py:229 ../raphodo/preferencedialog.py:531
 msgid "Remove All"
-msgstr ""
+msgstr "Alle entfernen"
 
-#: ../raphodo/jobcodepanel.py:427
+#: ../raphodo/jobcodepanel.py:428
 msgid "Do you really want to remove all the Job Codes?"
-msgstr ""
+msgstr "Möchten Sie alle Auftragscodes wirklich entfernen?"
 
-#: ../raphodo/jobcodepanel.py:429
+#: ../raphodo/jobcodepanel.py:430
 msgid "Remove all Job Codes"
-msgstr ""
+msgstr "Alle Auftragscodes entfernen"
 
-#: ../raphodo/jobcodepanel.py:492
+#: ../raphodo/jobcodepanel.py:493
 msgid "Job Codes"
-msgstr "Auftragsbezeichnungen"
+msgstr "Auftragscodes"
 
 #. 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
 #: ../raphodo/messagewidget.py:65
 #, python-format
 msgid "<i><b>Hint:</b> %(message)s"
-msgstr ""
+msgstr "<i><b>Hinweis:</b> %(message)s"
 
-#: ../raphodo/nameeditor.py:418 ../raphodo/nameeditor.py:432
+#: ../raphodo/nameeditor.py:423 ../raphodo/nameeditor.py:437
 #, python-format
 msgid "%(description)s - %(elements)s"
-msgstr ""
+msgstr "%(description)s - %(elements)s"
 
-#: ../raphodo/nameeditor.py:512
+#: ../raphodo/nameeditor.py:517
 msgid "Save New Custom Preset..."
-msgstr ""
+msgstr "Neue benutzerdefinierte Voreinstellung speichern …"
 
-#: ../raphodo/nameeditor.py:513
+#: ../raphodo/nameeditor.py:518
 msgid "Remove All Custom Presets..."
-msgstr ""
+msgstr "Alle benutzerdefinierten Voreinstellungen entfernen …"
 
-#: ../raphodo/nameeditor.py:559
+#: ../raphodo/nameeditor.py:564
 msgid "(New Custom Preset)"
-msgstr ""
+msgstr "(Neue benutzerdefinierte Voreinstellung)"
 
-#: ../raphodo/nameeditor.py:576
+#: ../raphodo/nameeditor.py:581
 #, python-format
 msgid "%s (edited)"
-msgstr ""
+msgstr "%s (bearbeitet)"
 
-#: ../raphodo/nameeditor.py:579 ../raphodo/nameeditor.py:1370
+#: ../raphodo/nameeditor.py:584 ../raphodo/nameeditor.py:1379
 #, python-format
 msgid "Update Custom Preset \"%s\""
-msgstr ""
+msgstr "Benutzerdefinierte Voreinstellung »%s« aktualisieren"
 
-#: ../raphodo/nameeditor.py:667
+#: ../raphodo/nameeditor.py:672
 msgid "Save New Custom Preset - Rapid Photo Downloader"
 msgstr ""
+"Neue benutzerdefinierte Voreinstellung speichern - Rapid-Fotoübertragung"
 
-#: ../raphodo/nameeditor.py:675
+#: ../raphodo/nameeditor.py:680
 msgid "Preset Name:"
-msgstr ""
+msgstr "Voreinstellungsname:"
 
-#: ../raphodo/nameeditor.py:836
+#: ../raphodo/nameeditor.py:799
+msgid "Photo Subfolder Generation Editor"
+msgstr "Editor zur Erzeugung von Unterordnern für Fotos"
+
+#: ../raphodo/nameeditor.py:805
+msgid "Video Subfolder Generation Editor"
+msgstr "Editor zur Erzeugung von Unterordnern für Videos"
+
+#: ../raphodo/nameeditor.py:811
+msgid "Photo Renaming Editor"
+msgstr "Editor zum Umbenennen von Fotos"
+
+#: ../raphodo/nameeditor.py:817
+msgid "Video Renaming Editor"
+msgstr "Editor zum Umbenennen von Videos"
+
+#: ../raphodo/nameeditor.py:842
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>There is insufficient data to "
 "fully generate the name. Please use other renaming options.</i>"
 msgstr ""
+"<b><font color=\"red\">Warnung:</font></b> <i>Es stehen ungenügend Daten zur "
+"vollständigen Namenserzeugung bereit. Bitte wählen Sie andere Einstellungen "
+"zum Umbenennen.</i>"
 
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees.
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:846
+#: ../raphodo/nameeditor.py:853
 #, python-format
 msgid "The character</i> %(separator)s <i>creates a new subfolder level."
 msgstr ""
+"Das Zeichen</i> %(separator)s <i>erzeugt eine neue Unterordner-Ebene."
 
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:851
+#: ../raphodo/nameeditor.py:858
 #, python-format
 msgid ""
 "There is no need start or end with the folder separator </i> "
 "%(separator)s<i>, because it is added automatically."
 msgstr ""
+"Es ist unnötig, mit dem Trennzeichen für Ordner</i> %(separator)s <i>zu "
+"beginnen oder zu enden, da es automatisch hinzugefügt wird."
 
-#: ../raphodo/nameeditor.py:859
+#: ../raphodo/nameeditor.py:866
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>Unique filenames may not be "
 "generated. Make filenames unique by using Sequence values.</i>"
 msgstr ""
+"<b><font color=\"red\">Warnung:</font></b> <i>Eindeutige Dateinamen können "
+"nicht automatisch erstellt werden. Erzeuge eindeutige Dateinamen durch "
+"Verwendung von 'Sequenznummern'.</i>"
 
-#: ../raphodo/nameeditor.py:882 ../raphodo/renamepanel.py:121
+#: ../raphodo/nameeditor.py:889 ../raphodo/renamepanel.py:121
 msgid "Preset:"
-msgstr ""
+msgstr "Voreinstellung:"
 
 #. Translators: appears in a combobox, e.g. Image Date (YYYY)
-#: ../raphodo/nameeditor.py:959 ../raphodo/nameeditor.py:980
+#: ../raphodo/nameeditor.py:966 ../raphodo/nameeditor.py:987
 #, python-brace-format
 msgid "{choice} ({variant})"
-msgstr ""
+msgstr "{choice} ({variant})"
 
-#: ../raphodo/nameeditor.py:1005 ../raphodo/preferencedialog.py:530
+#: ../raphodo/nameeditor.py:1012 ../raphodo/preferencedialog.py:783
 msgid "Get help online..."
-msgstr ""
+msgstr "Im Netz Hilfe erhalten …"
 
-#: ../raphodo/nameeditor.py:1025
+#: ../raphodo/nameeditor.py:1034
 msgid "Insert"
-msgstr ""
+msgstr "Einfügen"
 
-#: ../raphodo/nameeditor.py:1351
+#: ../raphodo/nameeditor.py:1360
 msgid "Save Preset - Rapid Photo Downloader"
-msgstr ""
+msgstr "Voreinstellung speichern - Rapid-Fotoübertragung"
 
-#: ../raphodo/nameeditor.py:1356
+#: ../raphodo/nameeditor.py:1365
 msgid ""
-"<b>Do you want to save the changes in a new custom preset?</"
-"b><br><br>Creating a custom preset is not required, but can help you keep "
-"organized.<br><br>The changes to the preferences will still be applied "
-"regardless of whether you create a new custom preset or not."
+"<b>Do you want to save the changes in a new custom "
+"preset?</b><br><br>Creating a custom preset is not required, but can help "
+"you keep organized.<br><br>The changes to the preferences will still be "
+"applied regardless of whether you create a new custom preset or not."
 msgstr ""
+"<b>Möchten Sie die Änderungen in einer neuen benutzerspezifischen "
+"Voreinstellung speichern?</b><br><br>Das Erstellen benutzerspezifischer "
+"Voreinstellungen ist nicht erforderlich, kann jedoch helfen, den Überblick "
+"zu behalten.<br><br>Die Änderungen der Voreinstellungen werden in jedem Fall "
+"angewendet, unabhängig davon, ob Sie diese als benutzerspezifische "
+"Voreinstellung speichern oder nicht."
 
-#: ../raphodo/nameeditor.py:1365
+#: ../raphodo/nameeditor.py:1374
 msgid ""
 "<b>Do you want to save the changes in a custom preset?</b><br><br>If you "
 "like, you can create a new custom preset or update the existing custom "
 "preset.<br><br>The changes to the preferences will still be applied "
 "regardless of whether you save a custom preset or not."
 msgstr ""
+"<b>Möchten Sie die Änderungen in einer neuen benutzerspezifischen "
+"Voreinstellung speichern?</b><br><br>Wenn SIe mögen, können Sie eine neue "
+"benutzerspezifische Einstellung erstellen oder eine vorhandene "
+"auffrischen.<br><br>Die Änderungen der Voreinstellungen werden in jedem Fall "
+"angewendet, unabhängig davon, ob Sie diese als benutzerspezifische "
+"Voreinstellung speichern oder nicht."
 
-#: ../raphodo/nameeditor.py:1372
+#: ../raphodo/nameeditor.py:1381
 msgid "Save New Custom Preset"
-msgstr ""
+msgstr "Neue benutzerdefinierte Voreinstellung speichern"
 
-#: ../raphodo/newversion.py:306
+#: ../raphodo/newversion.py:312
 msgid "Checking for new version..."
-msgstr ""
+msgstr "Auf neue Version wird geprüft …"
 
-#: ../raphodo/newversion.py:307
+#: ../raphodo/newversion.py:313
 msgid "You are running the latest version."
-msgstr ""
+msgstr "Sie führen die neueste Version aus."
 
-#: ../raphodo/newversion.py:308
+#: ../raphodo/newversion.py:314
 msgid "Failed to contact the update server."
-msgstr ""
+msgstr "Server für Updates konnte nicht erreicht werden."
 
-#: ../raphodo/newversion.py:310
+#: ../raphodo/newversion.py:316
 #, python-format
 msgid "A new version of Rapid Photo Downloader (%s) is available."
-msgstr ""
+msgstr "Eine neue Version von Rapid-Fotoübertragung (%s) ist verfügbar."
 
-#: ../raphodo/newversion.py:312
+#: ../raphodo/newversion.py:318
 msgid "Do you want to download the new version?"
-msgstr ""
+msgstr "Möchten Sie die neue Version herunterladen?"
 
-#: ../raphodo/newversion.py:313
+#: ../raphodo/newversion.py:319
 #, python-format
 msgid "Changes in the new release can be viewed <a href=\"%s\">here</a>."
 msgstr ""
+"Änderungen in der neuen Version können <a href=\\\"%s\\\">hier</a> "
+"eingesehen werden."
 
 #. Translators: this text appears in a button - the & sets the s key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:340 ../raphodo/newversion.py:353
+#: ../raphodo/newversion.py:348 ../raphodo/newversion.py:363
 msgid "&Skip this release"
-msgstr ""
+msgstr "Diese Version über&springen"
 
 #. Translators: this text appears in a button - the & sets the o key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:356
+#: ../raphodo/newversion.py:366
 msgid "&Open Download Page"
-msgstr ""
+msgstr "Herunterladeseite &öffnen"
 
-#: ../raphodo/newversion.py:376
+#: ../raphodo/newversion.py:386
 msgid "Rapid Photo Downloader updates"
-msgstr ""
+msgstr "Aktualisierungen der Rapid-Fotoübertragung"
 
 #. Translators: shows how much of a file has been downloaded e.g  123 KB of 1.3 MB
-#: ../raphodo/newversion.py:478
+#: ../raphodo/newversion.py:488
 #, python-format
 msgid "%(downloaded)s of %(total)s"
-msgstr ""
+msgstr "%(downloaded)s von %(total)s"
 
-#: ../raphodo/newversion.py:495
+#: ../raphodo/newversion.py:507
 msgid "Downloading..."
-msgstr ""
+msgstr "Wird heruntergeladen …"
 
-#: ../raphodo/preferencedialog.py:76
+#: ../raphodo/preferencedialog.py:86
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Automation"
 msgstr "Automatisierung"
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Thumbnails"
 msgstr "Vorschaubilder"
 
-#: ../raphodo/preferencedialog.py:85 ../raphodo/preferencedialog.py:343
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/preferencedialog.py:428
 msgid "Error Handling"
 msgstr "Fehlerbehandlung"
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Warnings"
-msgstr ""
+msgstr "Warnungen"
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:109
+msgid "Consolidation"
+msgstr "Zusammenfassung"
+
+#: ../raphodo/preferencedialog.py:109 ../raphodo/preferencedialog.py:119
 msgid "Miscellaneous"
 msgstr "Verschiedenes"
 
-#: ../raphodo/preferencedialog.py:94
+#: ../raphodo/preferencedialog.py:147
 msgid "Device Scanning"
-msgstr ""
+msgstr "Gerätedurchsuchung"
 
-#: ../raphodo/preferencedialog.py:96
+#: ../raphodo/preferencedialog.py:148
 msgid "Scan only external devices"
-msgstr ""
+msgstr "Nur externe Geräte durchsuchen"
 
-#: ../raphodo/preferencedialog.py:98
+#: ../raphodo/preferencedialog.py:150
 msgid ""
 "Scan for photos and videos only on devices that are external to the "
 "computer,\n"
 "including cameras, memory cards, external hard drives, and USB flash drives."
 msgstr ""
+"Durchsuche nur Laufwerke außerhalb des Computers nach Bildern und Videos,\n"
+"einschließlich Kameras, Speicherkarten, externer Laufwerke und USB-"
+"Speichermedien."
 
-#: ../raphodo/preferencedialog.py:102
-msgid "Scan non-camera devices lacking a DCIM folder"
+#: ../raphodo/preferencedialog.py:153
+msgid "Scan only specific folders on devices"
+msgstr "Durchsuche nur spezifische Ordner auf Geräten"
+
+#: ../raphodo/preferencedialog.py:155
+msgid ""
+"Scan for photos and videos only in the folders specified below (except "
+"paths\n"
+"specified in Ignored Paths).\n"
+"\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+"Durchsuche die unten angegebenen Ordner nach Fotos und Videos (mit\n"
+"Ausnahme der zu ignorierenden Pfade).\n"
+"\n"
+"Änderung dieser Einstellung führt zum erneuten Durchsuchen aller Geräte."
+
+#: ../raphodo/preferencedialog.py:161
+msgid "Folders to scan:"
+msgstr "Ordner, die durchsucht werden sollen:"
+
+#: ../raphodo/preferencedialog.py:164
+msgid ""
+"Folders at the base level of device file systems that will be scanned\n"
+"for photos and videos."
 msgstr ""
+"Ordner auf Wurzelebene von Dateisystemen der Geräte, die nach\n"
+"Fotos und Videos durchsucht werden."
+
+#: ../raphodo/preferencedialog.py:167 ../raphodo/preferencedialog.py:219
+msgid "Add..."
+msgstr "Hinzufügen …"
 
-#: ../raphodo/preferencedialog.py:104
+#: ../raphodo/preferencedialog.py:169
 msgid ""
-"Scan the entirety of a device for photos and videos, irrespective of whether "
-"it contains a DCIM folder,\n"
-"as opposed to only scanning within a DCIM folder.\n"
+"Add a folder to the list of folders to scan for photos and videos.\n"
 "\n"
-"Changing this setting causes all devices to be scanned again.\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+"Füge einen Ordner zur Liste der Ordner hinzu, die nach Fotos und Videos "
+"durchsucht werden.\n"
 "\n"
-"Note: With cameras, only the DCIM folder is scanned."
+"Änderung dieser Einstellung führt zum erneuten Durchsuchen aller Geräte."
+
+#: ../raphodo/preferencedialog.py:172 ../raphodo/preferencedialog.py:198
+#: ../raphodo/preferencedialog.py:224 ../raphodo/preferencedialog.py:529
+msgid "Remove"
+msgstr "Entfernen"
+
+#: ../raphodo/preferencedialog.py:174
+msgid ""
+"Remove a folder from the list of folders to scan for photos and videos.\n"
+"\n"
+"Changing this setting causes all devices to be scanned again."
 msgstr ""
+"Entferne einen Ordner aus der Liste der Ordner, die nach Fotos und Videos "
+"durchsucht werden.\n"
+"\n"
+"Änderung dieser Einstellung führt zum erneuten Durchsuchen aller Geräte."
 
-#: ../raphodo/preferencedialog.py:116
+#: ../raphodo/preferencedialog.py:191
 msgid "Devices that have been set to automatically ignore or download from."
-msgstr ""
+msgstr "Geräte, die automatisch ignoriert oder berücksichtigt werden sollen."
 
-#: ../raphodo/preferencedialog.py:117
+#: ../raphodo/preferencedialog.py:192
 msgid "Remembered Devices"
-msgstr ""
+msgstr "Gemerkte Geräte"
 
-#: ../raphodo/preferencedialog.py:121
+#: ../raphodo/preferencedialog.py:196
 msgid ""
 "Remove a device from the list of devices to automatically ignore or download "
 "from."
 msgstr ""
+"Gerät entfernen aus der Liste von Geräten, die automatisch ignoriert oder "
+"berücksichtigt werden sollen."
 
-#: ../raphodo/preferencedialog.py:123 ../raphodo/preferencedialog.py:149
-#: ../raphodo/preferencedialog.py:431
-msgid "Remove"
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:127
+#: ../raphodo/preferencedialog.py:202
 msgid ""
 "Clear the list of devices from which to automatically ignore or download "
 "from.\n"
 "\n"
 "Note: Changes take effect when the computer is next scanned for devices."
 msgstr ""
+"Bereinigen der Liste von Geräten, die automatisch ignoriert oder "
+"berücksichtigt werden sollen.\n"
+"\n"
+"Hinweis: Änderungen werden wirksam beim nächsten Durchsuchen des Rechners "
+"nach Geräten."
 
-#: ../raphodo/preferencedialog.py:140
+#: ../raphodo/preferencedialog.py:215
 msgid "Ignored Paths"
 msgstr "Pfade ignorieren"
 
-#: ../raphodo/preferencedialog.py:141
+#: ../raphodo/preferencedialog.py:216
 msgid ""
 "The end part of a path that should never be scanned for photos or videos."
 msgstr ""
+"Letzter Teil eines Pfades, der niemals nach Fotos oder Videos durchsucht "
+"werden soll."
 
-#: ../raphodo/preferencedialog.py:144
-msgid "Add..."
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:146
+#: ../raphodo/preferencedialog.py:221
 msgid ""
 "Add a path to the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
+"Pfad zur Liste der ignorierten Pfade hinzufügen.\n"
+"\n"
+"Änderung dieser Einstellung erfordert ein erneutes Durchsuchen aller Geräte."
 
-#: ../raphodo/preferencedialog.py:151
+#: ../raphodo/preferencedialog.py:226
 msgid ""
 "Remove a path from the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
+"Pfad aus der Liste der ignorierten Pfade entfernen.\n"
+"\n"
+"Änderung dieser Einstellung erfordert ein erneutes Durchsuchen aller Geräte."
 
-#: ../raphodo/preferencedialog.py:156
+#: ../raphodo/preferencedialog.py:231
 msgid ""
 "Clear the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
+"Liste der ignorierten Pfade bereinigen.\n"
+"\n"
+"Änderung dieser Einstellung erfordert ein erneutes Durchsuchen aller Geräte."
 
-#: ../raphodo/preferencedialog.py:164
+#: ../raphodo/preferencedialog.py:239
 msgid ""
-"Use python-style <a href=\"http://damonlynch.net/rapid/documentation/"
-"#regularexpressions\">regular expressions</a>"
+"Use python-style <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">regula"
+"r expressions</a>"
 msgstr ""
+"Verwende <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">regula"
+"r expressions</a> im Python-Stil"
 
-#: ../raphodo/preferencedialog.py:168
+#: ../raphodo/preferencedialog.py:243
 msgid ""
 "Use regular expressions in the list of ignored paths.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
+"Verwende reguläre Ausdrücke in der Liste der ignorierten Pfade.\n"
+"\n"
+"Änderung dieser Einstellung erfordert ein erneutes Durchsuchen aller Geräte."
 
-#: ../raphodo/preferencedialog.py:208
+#: ../raphodo/preferencedialog.py:283
 msgid "Program Automation"
-msgstr ""
+msgstr "Programmautomatisierung"
 
-#: ../raphodo/preferencedialog.py:209
+#: ../raphodo/preferencedialog.py:284
 msgid "Start downloading at program startup"
 msgstr "Herunterladen beim Programmstart beginnen"
 
-#: ../raphodo/preferencedialog.py:210
+#: ../raphodo/preferencedialog.py:285
 msgid "Start downloading upon device insertion"
 msgstr "Mit dem Herunterladen beginnen, sobald ein Geräte verfügbar ist"
 
-#: ../raphodo/preferencedialog.py:211
+#: ../raphodo/preferencedialog.py:286
 msgid "Unmount (eject) device upon download completion"
-msgstr ""
+msgstr "Gerät nach Abschluss der Übertragung aushängen"
 
-#: ../raphodo/preferencedialog.py:212
+#: ../raphodo/preferencedialog.py:287
 msgid "Exit program when download completes"
-msgstr "Programm beenden wenn alles Übertragungen abgeschlossen sind"
+msgstr "Programm beenden wenn alle Übertragungen abgeschlossen sind"
 
-#: ../raphodo/preferencedialog.py:213
+#: ../raphodo/preferencedialog.py:288
 msgid "Exit program even if download had warnings or errors"
 msgstr "Programm beenden auch wenn Fehler oder Warnungen aufgetreten sind"
 
-#: ../raphodo/preferencedialog.py:240
+#: ../raphodo/preferencedialog.py:315
 msgid "Thumbnail Generation"
-msgstr ""
+msgstr "Vorschaubildgenerierung"
 
-#: ../raphodo/preferencedialog.py:241
+#: ../raphodo/preferencedialog.py:316
 msgid "Generate thumbnails"
-msgstr ""
+msgstr "Vorschaubilder generieren"
 
-#: ../raphodo/preferencedialog.py:242
+#: ../raphodo/preferencedialog.py:318
 msgid "Generate thumbnails to show in the main program window"
-msgstr ""
+msgstr "Erzeuge Vorschaubilder zur Anzeige im Hauptfenster"
 
-#: ../raphodo/preferencedialog.py:244
+#: ../raphodo/preferencedialog.py:320
 msgid "Cache thumbnails"
-msgstr ""
+msgstr "Vorschaubilder zwischenspeichern"
 
-#: ../raphodo/preferencedialog.py:245
+#: ../raphodo/preferencedialog.py:323
 msgid ""
 "Save thumbnails shown in the main program window in a thumbnail cache unique "
 "to Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:247
+#: ../raphodo/preferencedialog.py:327
 msgid "Generate system thumbnails"
-msgstr ""
+msgstr "Systemvorschaubilder generieren"
 
-#: ../raphodo/preferencedialog.py:248
+#: ../raphodo/preferencedialog.py:330
 msgid ""
 "While downloading, save thumbnails that can be used by desktop file managers "
 "and other programs"
 msgstr ""
+"Speichere während der Übertragung Vorschaubilder, die von Desktop-"
+"Dateimanagern und anderen Programmen verwendet werden können"
 
-#: ../raphodo/preferencedialog.py:255
+#: ../raphodo/preferencedialog.py:339
 msgid "Number of CPU cores used to generate thumbnails."
 msgstr ""
+"Anzahl der CPU-Kerne, die zur Generierung von Vorschaubildern verwendet "
+"werden."
 
-#: ../raphodo/preferencedialog.py:256
+#: ../raphodo/preferencedialog.py:340
 msgid "CPU cores:"
-msgstr ""
+msgstr "CPU-Kerne:"
 
 #. Translators: the * acts as an asterisk to denote a reference to an annotation
 #. such as '* Takes effect upon program restart'
-#: ../raphodo/preferencedialog.py:271 ../raphodo/preferencedialog.py:317
+#: ../raphodo/preferencedialog.py:355 ../raphodo/preferencedialog.py:401
 msgid "*"
-msgstr ""
+msgstr "*"
 
-#: ../raphodo/preferencedialog.py:294
+#: ../raphodo/preferencedialog.py:378
 msgid "Thumbnail Cache"
-msgstr ""
+msgstr "Vorschaubildzwischenspeicher"
 
-#: ../raphodo/preferencedialog.py:296
+#: ../raphodo/preferencedialog.py:380
 msgid "Calculating..."
-msgstr ""
+msgstr "Wird berechnet …"
 
-#: ../raphodo/preferencedialog.py:302
+#: ../raphodo/preferencedialog.py:386
 msgid "days"
-msgstr ""
+msgstr "Tage"
 
-#: ../raphodo/preferencedialog.py:303
+#: ../raphodo/preferencedialog.py:387
 msgid "forever"
-msgstr ""
+msgstr "für immer"
 
-#: ../raphodo/preferencedialog.py:308
+#: ../raphodo/preferencedialog.py:392
 msgid "Cache size:"
-msgstr ""
+msgstr "Zwischenspeichergröße:"
 
-#: ../raphodo/preferencedialog.py:310
+#: ../raphodo/preferencedialog.py:394
 msgid "Number of thumbnails:"
-msgstr ""
+msgstr "Anzahl der Vorschaubilder:"
 
-#: ../raphodo/preferencedialog.py:312
+#: ../raphodo/preferencedialog.py:396
 msgid "Database size:"
-msgstr ""
+msgstr "Datenbankgröße:"
 
-#: ../raphodo/preferencedialog.py:314
+#: ../raphodo/preferencedialog.py:398
 msgid "Cache unaccessed thumbnails for:"
-msgstr ""
+msgstr "Speichere nichtverwendete Vorschaubilder für:"
 
-#: ../raphodo/preferencedialog.py:322
+#: ../raphodo/preferencedialog.py:406
 msgid "Purge Cache..."
-msgstr ""
+msgstr "Zwischenspeicher bereinigen …"
 
-#: ../raphodo/preferencedialog.py:323
+#: ../raphodo/preferencedialog.py:408
 msgid "Optimize Cache..."
-msgstr ""
+msgstr "Zwischenspeicher optimieren …"
 
-#: ../raphodo/preferencedialog.py:336
+#: ../raphodo/preferencedialog.py:421
 msgid "* Takes effect upon program restart"
-msgstr ""
+msgstr "* Werden beim Programmneustart wirksam"
 
-#: ../raphodo/preferencedialog.py:346
+#: ../raphodo/preferencedialog.py:431
 msgid "Skip download"
 msgstr "Herunterladen überspringen"
 
-#: ../raphodo/preferencedialog.py:347
+#: ../raphodo/preferencedialog.py:432
 msgid "Don't download the file, and issue an error message"
-msgstr ""
+msgstr "Übertrage die Datei nicht, und erzeuge eine Fehlermeldung"
 
-#: ../raphodo/preferencedialog.py:348
+#: ../raphodo/preferencedialog.py:433
 msgid "Add unique identifier"
 msgstr "Eine eindeutige Identifizierung hinzufügen"
 
-#: ../raphodo/preferencedialog.py:349
+#: ../raphodo/preferencedialog.py:436
 msgid ""
 "Add an identifier like _1 or _2 to the end of the filename, immediately "
 "before the file's extension"
 msgstr ""
+"Ergänze einen Zusatz wie _1 oder _2 am Ende des Dateinamens, direkt vor der "
+"Dateinamenserweiterung"
 
-#: ../raphodo/preferencedialog.py:355
+#: ../raphodo/preferencedialog.py:444
 msgid "Overwrite"
 msgstr "Überschreiben"
 
-#: ../raphodo/preferencedialog.py:356
+#: ../raphodo/preferencedialog.py:445
 msgid "Overwrite the previously backed up file"
-msgstr ""
+msgstr "Zuvor gesicherte Datei überschreiben"
 
-#: ../raphodo/preferencedialog.py:357
+#: ../raphodo/preferencedialog.py:446
 msgid "Skip"
 msgstr "Überspringen"
 
-#: ../raphodo/preferencedialog.py:358
+#: ../raphodo/preferencedialog.py:448
 msgid "Don't overwrite the backup file, and issue an error message"
 msgstr ""
+"Überschreibe die Sicherungsdatei nicht, und erzeuge eine Fehlermeldung"
 
-#: ../raphodo/preferencedialog.py:364
+#: ../raphodo/preferencedialog.py:455
 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 identifier:"
 msgstr ""
+"Wenn ein Foto oder Video gleichen Namens bereits heruntergeladen wurde, "
+"wähle zwischen <i>Herunterladen überspringen</i> und <i>Eine eindeutige "
+"Identifizierung hinzufügen</i>:"
 
-#: ../raphodo/preferencedialog.py:378
+#: ../raphodo/preferencedialog.py:464
+msgid ""
+"Using sequence numbers to automatically generate unique filenames is "
+"strongly recommended. Configure file renaming in the Rename panel in the "
+"main window."
+msgstr ""
+"Es wird dringend empfohlen, 'Sequenznummern' zu verwenden, um eindeutige "
+"Dateinamen automatisch zu erzeugen. Das Verhalten beim Umbenennen wird im "
+"gleichnamigen Panel des Hauptfensters eingestellt."
+
+#: ../raphodo/preferencedialog.py:473
 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 ""
+"Auf dem Backup-Medium vorhandene, gleichnamige Datei beim Backup "
+"<i>Überschreiben</i> oder <i>Überspringen</i>:"
 
-#: ../raphodo/preferencedialog.py:398
+#: ../raphodo/preferencedialog.py:494
 msgid "Program Warnings"
-msgstr ""
+msgstr "Programmwarnungen"
 
-#: ../raphodo/preferencedialog.py:399
+#: ../raphodo/preferencedialog.py:495
 msgid "Show a warning when:"
-msgstr ""
+msgstr "Eine Warnung anzeigen, wenn:"
 
-#: ../raphodo/preferencedialog.py:402
+#: ../raphodo/preferencedialog.py:498
 msgid "Downloading files currently not displayed"
-msgstr ""
+msgstr "Dateien, die derzeit nicht angezeigt werden, werden heruntergeladen"
 
-#: ../raphodo/preferencedialog.py:403
+#: ../raphodo/preferencedialog.py:499
 msgid ""
 "Warn when about to download files that are not displayed in the main window."
 msgstr ""
+"Warne, falls Dateien übertragen werden würden, die nicht im Hauptfenster "
+"angezeigt werden."
 
-#: ../raphodo/preferencedialog.py:405
+#: ../raphodo/preferencedialog.py:501
 msgid "Backup destinations are missing"
-msgstr ""
+msgstr "Sicherungsziele fehlen"
 
-#: ../raphodo/preferencedialog.py:406
-msgid "Warn before starting a download if it is not possible to back up files."
+#: ../raphodo/preferencedialog.py:502
+msgid ""
+"Warn before starting a download if it is not possible to back up files."
 msgstr ""
+"Vor dem Start einer Übertragung warnen, falls eine Datensicherung nicht "
+"möglich ist."
 
-#: ../raphodo/preferencedialog.py:408
+#: ../raphodo/preferencedialog.py:504
 msgid "Program libraries are missing or broken"
-msgstr ""
+msgstr "Programmbibliotheken fehlen oder sind defekt"
 
-#: ../raphodo/preferencedialog.py:409
+#: ../raphodo/preferencedialog.py:505
 msgid ""
 "Warn if a software library used by Rapid Photo Downloader is missing or not "
 "functioning."
 msgstr ""
+"Warnung bei fehlenden oder nicht funktionierenden Software-Bibliotheken, die "
+"Rapid Photo Downloader verwendet"
 
-#: ../raphodo/preferencedialog.py:412
+#: ../raphodo/preferencedialog.py:508
 msgid "Filesystem metadata cannot be set"
-msgstr ""
+msgstr "Dateisystemmetadaten können nicht festgelegt werden"
 
-#: ../raphodo/preferencedialog.py:413
+#: ../raphodo/preferencedialog.py:509
 msgid ""
 "Warn if there is an error setting a file's filesystem metadata, such as its "
 "modification time."
 msgstr ""
+"Warnen bei Fehlern während der Änderung von Metadaten einer Datei, wie "
+"Änderungsdatum."
 
-#: ../raphodo/preferencedialog.py:416
+#: ../raphodo/preferencedialog.py:512
 msgid "Encountering unhandled files"
-msgstr ""
+msgstr "Auffinden unbehandelter Dateien"
 
-#: ../raphodo/preferencedialog.py:417
+#: ../raphodo/preferencedialog.py:513
 msgid ""
 "Warn after scanning a device or this computer if there are unrecognized "
 "files that will not be included in the download."
 msgstr ""
+"Warnen nach dem Durchsuchen eines Geräts oder DIeses Rechners, falls dabei "
+"unbehandelte Dateien gefunden wurden, die nicht bei der  bevorstehenden "
+"Übertragung berücksichtigt werden."
 
-#: ../raphodo/preferencedialog.py:420
+#: ../raphodo/preferencedialog.py:517
 msgid "Do not warn about unhandled files with extensions:"
-msgstr ""
+msgstr "Nicht warnen bei unbehandelten Dateien mit diesen Dateiendungen:"
 
-#: ../raphodo/preferencedialog.py:424
+#: ../raphodo/preferencedialog.py:522
 msgid ""
 "File extensions are case insensitive and do not need to include the leading "
 "dot."
 msgstr ""
+"Dateinamenserweiterungen sind unabhängig von GROSS- und kleinschreibung und "
+"müssen den führenden Punkt nicht beinhalten."
 
-#: ../raphodo/preferencedialog.py:427
+#: ../raphodo/preferencedialog.py:525
 msgid "Add"
-msgstr ""
+msgstr "Hinzufügen"
 
-#: ../raphodo/preferencedialog.py:428
+#: ../raphodo/preferencedialog.py:526
 msgid ""
 "Add a file extension to the list of unhandled file types to not warn about."
 msgstr ""
+"Füge eine Dateinamenserweiterung zur Liste unbehandelter Dateitypen hinzu, "
+"vor denen nicht gewarnt werden soll."
 
-#: ../raphodo/preferencedialog.py:430
+#: ../raphodo/preferencedialog.py:528
 msgid ""
 "Remove a file extension from the list of unhandled file types to not warn "
 "about."
 msgstr ""
+"Entferne eine Dateinamenserweiterung aus der Liste unbehandelter Dateitypen, "
+"vor denen nicht gewarnt werden soll."
 
-#: ../raphodo/preferencedialog.py:434
+#: ../raphodo/preferencedialog.py:532
 msgid ""
 "Clear the list of file extensions of unhandled file types to not warn about."
 msgstr ""
+"Bereinige die Liste unbehandelter Dateitypen, vor denen nicht gewarnt werden "
+"soll."
 
-#: ../raphodo/preferencedialog.py:469
-msgid "Version Check"
+#: ../raphodo/preferencedialog.py:568
+msgid "Photo and Video Consolidation"
+msgstr "Foto und Video Zusammenfassung"
+
+#: ../raphodo/preferencedialog.py:571
+msgid "Consolidate files across devices and downloads"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:470
-msgid "Check for new version at startup"
+#: ../raphodo/preferencedialog.py:574
+msgid ""
+"Analyze the results of device scans looking for duplicate files and matching "
+"RAW and JPEG pairs,\n"
+"comparing them across multiple devices and download sessions."
 msgstr ""
+"Analysiere die Durchsuchungsergebnisse von Geräten nach Duplikaten und "
+"passenden RAW- und JPEG-Paarungen;\n"
+"vergleiche sie über mehrere Geräte und Übertragungen hinweg."
 
-#: ../raphodo/preferencedialog.py:471
-msgid "Check for a new version of the program each time the program starts."
+#: ../raphodo/preferencedialog.py:580
+msgid "Treat matching RAW and JPEG files as:"
+msgstr "Behandle übereinstimmende RAW- und JPEG-Dateien als:"
+
+#: ../raphodo/preferencedialog.py:581
+msgid "One photo"
+msgstr "Ein Foto"
+
+#: ../raphodo/preferencedialog.py:582
+msgid "Two photos"
+msgstr "Zwei Fotos"
+
+#: ../raphodo/preferencedialog.py:584
+msgid ""
+"Display matching pairs of RAW and JPEG photos as one photo, and if marked, "
+"download both."
 msgstr ""
+"Zeige übereinstimmende Paarungen von RAW- und JPEG-Fotos als ein Foto und, "
+"falls markiert, übertrage beide."
 
-#: ../raphodo/preferencedialog.py:473
-msgid "Include development releases"
+#: ../raphodo/preferencedialog.py:589
+msgid ""
+"Display matching pairs of RAW and JPEG photos as two different photos. You "
+"can still synchronize their sequence numbers."
+msgstr ""
+"Zeige übereinstimmende Paarungen von RAW- und JPEG-Fotos als zwei "
+"verschiedene Fotos. Sie können immer noch deren Sequenznummern "
+"synchronisieren."
+
+#: ../raphodo/preferencedialog.py:598
+msgid "With matching RAW and JPEG photos:"
+msgstr "Mit übereinstimmende RAW- und JPEG-Fotos:"
+
+#: ../raphodo/preferencedialog.py:600
+msgid "Do not mark JPEG for download"
+msgstr "JPEG nicht zum Übertragen markieren"
+
+#: ../raphodo/preferencedialog.py:601
+msgid "Do not mark RAW for download"
+msgstr "RAW nicht zum Übertragen markieren"
+
+#: ../raphodo/preferencedialog.py:602
+msgid "Mark both for download"
+msgstr "Beide zum Übertragen markieren"
+
+#: ../raphodo/preferencedialog.py:609
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"JPEG for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+"Falls übereinstimmende RAW- und JPEG-Fotos gefunden werden, JPEG nicht "
+"automatisch\n"
+"für die Übertragung vormerken. Sie können es immer noch selbst zum "
+"Übertragen markieren."
+
+#: ../raphodo/preferencedialog.py:614
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"RAW for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+"Wenn übereinstimmende RAW- und JPEG-Fotos gefunden werden, RAW nicht "
+"automatisch\n"
+"für die Übertragung vormerken. SIe können es immer noch selbst für die "
+"Übertragung markieren."
+
+#: ../raphodo/preferencedialog.py:619
+msgid ""
+"When matching RAW and JPEG photos are found, automatically mark both for "
+"download."
+msgstr ""
+"Wenn übereinstimmende RAW- und JPEG-Fotos gefunden werden, automatisch beide "
+"für die Übertragung markieren."
+
+#: ../raphodo/preferencedialog.py:625
+msgid ""
+"If you disable file consolidation, choose what to do when a download device "
+"is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:631
+msgid ""
+"When a download device is inserted while completed downloads are displayed:"
+msgstr ""
+"Beim Einstecken eines Geräts bei bestehender Anzeige abgeschlossener "
+"Übertragungen:"
+
+#: ../raphodo/preferencedialog.py:642
+msgid "Clear completed downloads"
+msgstr "Abgeschlossene Übertragungen bereinigen"
+
+#: ../raphodo/preferencedialog.py:643
+msgid "Keep displaying completed downloads"
+msgstr "Abgeschlossene Übertragungen weiterhin anzeigen"
+
+#: ../raphodo/preferencedialog.py:644
+msgid "Prompt for what to do"
+msgstr "Nachfragen, was getan werden soll"
+
+#: ../raphodo/preferencedialog.py:649
+msgid ""
+"Automatically clear the display of completed downloads whenever a new "
+"download device is inserted."
+msgstr ""
+"Bereinige die Anzeige abgeschlossener Übertragungen automatisch, wenn ein "
+"neues Gerät angeschlossen wird."
+
+#: ../raphodo/preferencedialog.py:654
+msgid ""
+"Keep displaying completed downloads whenever a new download device is "
+"inserted."
+msgstr ""
+"Zeige abgeschlossene Übertragungen weiterhin an, wenn ein neues Gerät "
+"angeschlossen wird."
+
+#: ../raphodo/preferencedialog.py:658
+msgid ""
+"Prompt whether to keep displaying completed downloads or clear them whenever "
+"a new download device is inserted."
 msgstr ""
+"Nachfragen, ob abgeschlossene Übertragungen weiterhin angezeigt oder "
+"bereinigt werden sollen, wenn ein neues Gerät angeschlossen wird."
+
+#: ../raphodo/preferencedialog.py:702
+msgid "Version Check"
+msgstr "Versionsüberprüfung"
+
+#: ../raphodo/preferencedialog.py:703
+msgid "Check for new version at startup"
+msgstr "Beim Start auf neue Version prüfen"
+
+#: ../raphodo/preferencedialog.py:705
+msgid "Check for a new version of the program each time the program starts."
+msgstr "Bei jedem Programmstart auf neue Version prüfen."
 
-#: ../raphodo/preferencedialog.py:474
+#: ../raphodo/preferencedialog.py:707
+msgid "Include development releases"
+msgstr "Aktualisierungen für Entwickler einbeziehen"
+
+#: ../raphodo/preferencedialog.py:709
 msgid ""
 "Include alpha, beta and other development releases when checking for a new "
 "version of the program.\n"
@@ -2128,12 +3213,17 @@ msgid ""
 "If you are currently running a development version, the check will always "
 "occur."
 msgstr ""
+"Alpha, beta und andere Bereitstellungen für Entwickler beim Prüfen auf neue "
+"Programmversionen berücksichtigen.\n"
+"\n"
+"Sollten Sie gerade eine Entwicklerversion einsetzen, so findet die "
+"Überprüfung immer statt."
 
-#: ../raphodo/preferencedialog.py:489
+#: ../raphodo/preferencedialog.py:725
 msgid "Ignore DNG date/time metadata on MTP devices"
-msgstr ""
+msgstr "DNG-Datum/Zeit-Metadaten auf MTP-Geräten ignorieren"
 
-#: ../raphodo/preferencedialog.py:490
+#: ../raphodo/preferencedialog.py:727
 msgid ""
 "Ignore date/time metadata in DNG files located on MTP devices, and use the "
 "file's modification time instead.\n"
@@ -2142,72 +3232,94 @@ msgid ""
 "metadata."
 msgstr ""
 
+#: ../raphodo/preferencedialog.py:741
+msgid "Completed Downloads"
+msgstr "Abgeschlossene Übertragungen"
+
 #. Translators: substituted value is a description for the set of preferences
 #. shown in the preference dialog window, e.g. Devices, Automation, etc.
 #. This string is shown in a tooltip for the "Restore Defaults" button
-#: ../raphodo/preferencedialog.py:710
+#: ../raphodo/preferencedialog.py:1067
 #, python-format
 msgid "Restores default %s preference values"
-msgstr ""
+msgstr "Stellt Standard-Einstellungen von %s wieder her"
 
-#: ../raphodo/preferencedialog.py:832
+#: ../raphodo/preferencedialog.py:1208
 msgid ""
 "Do you want to purge the thumbnail cache? The cache will be purged when the "
 "program is next started."
 msgstr ""
+"Möchten Sie den Zwischenspeicher der Vorschaubilder bereinigen? Der "
+"Zwischenspeicher wird beim nächsten Programmstart gelöscht."
 
-#: ../raphodo/preferencedialog.py:835
+#: ../raphodo/preferencedialog.py:1212
 msgid "Purge Thumbnail Cache"
-msgstr ""
+msgstr "Vorschaubildzwischenspeicher bereinigen"
 
-#: ../raphodo/preferencedialog.py:847
+#: ../raphodo/preferencedialog.py:1225
 msgid ""
 "Do you want to optimize the thumbnail cache? The cache will be optimized "
 "when the program is next started."
 msgstr ""
+"Möchten Sie den Zwischenspeicher der Vorschaubilder optimieren? Der "
+"Zwischenspeicher wird beim nächsten Programmstart optimiert."
 
-#: ../raphodo/preferencedialog.py:850
+#: ../raphodo/preferencedialog.py:1229
 msgid "Optimize Thumbnail Cache"
-msgstr ""
+msgstr "Vorschaubildzwischenspeicher optimieren"
+
+#: ../raphodo/preferencedialog.py:1481
+msgid "Enter a Folder to Scan"
+msgstr "Geben Sie einen Ordner an, der durchsucht werden soll"
+
+#: ../raphodo/preferencedialog.py:1482
+msgid "Specify a folder that will be scanned for photos and videos"
+msgstr "Geben Sie einen Ordner an, der nach Fotos und Videos durchsucht wird"
 
-#: ../raphodo/preferencedialog.py:1045
+#: ../raphodo/preferencedialog.py:1483
+msgid "Folder:"
+msgstr "Ordner:"
+
+#: ../raphodo/preferencedialog.py:1497
 msgid "Enter a Path to Ignore"
 msgstr "Geben Sie einen Pfad ein, welcher ignoriert werden sollen"
 
-#: ../raphodo/preferencedialog.py:1046
+#: ../raphodo/preferencedialog.py:1498
 msgid "Specify a path that will never be scanned for photos or videos"
 msgstr ""
 "Geben Sie einen Pfad ein, welcher nie nach Bildern oder Filmen durchsucht "
 "werden soll"
 
-#: ../raphodo/preferencedialog.py:1047
+#: ../raphodo/preferencedialog.py:1499
 msgid "Path:"
 msgstr "Pfad:"
 
-#: ../raphodo/preferencedialog.py:1061
+#: ../raphodo/preferencedialog.py:1513
 msgid "Enter a File Extension"
-msgstr ""
+msgstr "Dateiendung eingeben"
 
-#: ../raphodo/preferencedialog.py:1062
+#: ../raphodo/preferencedialog.py:1514
 msgid "Specify a file extension (without the leading dot)"
-msgstr ""
+msgstr "Geben Sie eine Dateiendung an (ohne den führenden Punkt)"
 
-#: ../raphodo/preferencedialog.py:1063 ../raphodo/renamepanel.py:122
+#: ../raphodo/preferencedialog.py:1515 ../raphodo/renamepanel.py:122
 msgid "Extension:"
-msgstr ""
+msgstr "Endung:"
 
-#: ../raphodo/preferencedialog.py:1078
+#: ../raphodo/preferencedialog.py:1530
 msgid "Invalid File Extension"
-msgstr ""
+msgstr "Ungültige Dateiendung"
 
-#: ../raphodo/preferencedialog.py:1079
+#: ../raphodo/preferencedialog.py:1531
 #, python-format
 msgid ""
 "The file extension <b>%s</b> is recognized by Rapid Photo Downloader, so it "
 "makes no sense to warn about its presence."
 msgstr ""
+"Die Dateinamenserweiterung <b>%s</b> wird von Rapid Photo Downloader "
+"erkannt. Deshalb ist ein Warnhinweis unnötig."
 
-#: ../raphodo/preferencedialog.py:1081
+#: ../raphodo/preferencedialog.py:1533
 #, python-format
 msgid ""
 "Recognized file types:\n"
@@ -2224,193 +3336,223 @@ msgid ""
 "Other:\n"
 "%(other)s"
 msgstr ""
+"Erkannte Dateitypen:\n"
+"\n"
+"Fotos:\n"
+"%(photos)s\n"
+"\n"
+"Videos:\n"
+"%(videos)s\n"
+"\n"
+"Audio:\n"
+"%(audio)s\n"
+"\n"
+"Andere:\n"
+"%(other)s"
 
 #: ../raphodo/preferences.py:286
 msgid "Wedding"
-msgstr ""
+msgstr "Hochzeit"
 
 #: ../raphodo/preferences.py:286
 msgid "Birthday"
-msgstr ""
+msgstr "Geburtstag"
 
-#: ../raphodo/preferences.py:614
+#: ../raphodo/preferences.py:624
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Die Unterordnervoreinstellungen sollten nicht mit %s beginnen"
 
-#: ../raphodo/preferences.py:617
+#: ../raphodo/preferences.py:627
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Die Unterordnervoreinstellungen sollten nicht mit %s enden"
 
-#: ../raphodo/preferences.py:622
+#: ../raphodo/preferences.py:632
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
 "Die Unterordnervoreinstellungen sollten nicht zwei %s nacheinander enthalten"
 
-#. self.setFlat(True)
 #: ../raphodo/primarybutton.py:72
 msgid "Download 8 Photos and 10 Videos"
-msgstr ""
+msgstr "8 Fotos und 10 Videos übertragen"
 
-#: ../raphodo/problemnotification.py:86 ../raphodo/problemnotification.py:208
+#: ../raphodo/problemnotification.py:87 ../raphodo/problemnotification.py:209
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
-msgstr ""
+msgstr "Fehler: %(errno)s %(strerror)s"
 
-#: ../raphodo/problemnotification.py:89
+#: ../raphodo/problemnotification.py:90
 #, python-format
 msgid "Error: %s"
-msgstr ""
+msgstr "Fehler: %s"
 
-#: ../raphodo/problemnotification.py:116
+#: ../raphodo/problemnotification.py:117
 #, python-format
 msgid "GPhoto2 Error: %s"
-msgstr ""
+msgstr "GPhoto2-Fehler: %s"
 
-#: ../raphodo/problemnotification.py:124
+#: ../raphodo/problemnotification.py:125
 msgid ""
 "Unable to initialize the camera, probably because another program is using "
 "it. No files were copied from it."
 msgstr ""
+"Initialisieren der Kamera nicht möglich, vermutlich wird diese von einem "
+"anderen Programm verwendet. Es wurden keine Dateien vom Gerät kopiert."
 
-#: ../raphodo/problemnotification.py:134
+#: ../raphodo/problemnotification.py:135
 #, python-format
 msgid "Unable to read directory %s"
-msgstr ""
+msgstr "Verzeichnis %s kann nicht gelesen werden"
 
-#: ../raphodo/problemnotification.py:140
+#: ../raphodo/problemnotification.py:141
 #, python-format
 msgid "Unable to access modification time or size from %s"
-msgstr ""
+msgstr "Zugriff auf Änderungsdatum oder Größe von %s nicht möglich"
 
-#: ../raphodo/problemnotification.py:146
+#: ../raphodo/problemnotification.py:147
 #, python-format
 msgid "Unable to read file %s"
-msgstr ""
+msgstr "Datei %s kann nicht gelesen werden"
 
-#: ../raphodo/problemnotification.py:152
+#: ../raphodo/problemnotification.py:153
 #, python-format
 msgid "Unable to write file %s"
-msgstr ""
+msgstr "Datei %s kann nicht geschrieben werden"
 
-#: ../raphodo/problemnotification.py:158
+#: ../raphodo/problemnotification.py:159
 #, python-format
 msgid "Unable to move file %s"
-msgstr ""
+msgstr "Datei %s kann nicht verschoben werden"
 
-#: ../raphodo/problemnotification.py:164
+#: ../raphodo/problemnotification.py:165
 #, python-format
 msgid "Unable to remove file %s"
-msgstr ""
+msgstr "Datei %s kann nicht entfernt werden"
 
-#: ../raphodo/problemnotification.py:170
+#: ../raphodo/problemnotification.py:171
 #, python-format
 msgid "Unable to copy file %s"
-msgstr ""
+msgstr "Datei %s kann nicht kopiert werden"
 
-#: ../raphodo/problemnotification.py:176
+#: ../raphodo/problemnotification.py:177
 #, python-format
 msgid "Zero length file %s will not be downloaded"
-msgstr ""
+msgstr "Datei %s mit der Größe Null wird nicht übertragen"
 
-#: ../raphodo/problemnotification.py:182
+#: ../raphodo/problemnotification.py:183
 #, python-format
 msgid "Could not determine filesystem modification time for %s"
-msgstr ""
+msgstr "Konnte Änderungsdatum des Dateisystems von %s nicht bestimmen"
 
-#: ../raphodo/problemnotification.py:188
+#: ../raphodo/problemnotification.py:189
 #, python-format
 msgid "Unable to load metadata from %s"
-msgstr ""
+msgstr "Metadaten von %s können nicht geladen werden"
 
-#: ../raphodo/problemnotification.py:194
+#: ../raphodo/problemnotification.py:195
 #, python-format
 msgid ""
 "Unable to load metadata from %(name)s. The %(filetype)s was not downloaded."
 msgstr ""
+"Kann Metadaten von %(name)s nicht laden. %(filetype)s wurde nicht übertragen."
 
-#: ../raphodo/problemnotification.py:202
+#: ../raphodo/problemnotification.py:203
 #, python-format
 msgid ""
 "An error occurred setting a file's filesystem metadata on the filesystem %s. "
 "If this error occurs again on the same filesystem, it will not be reported "
 "again."
 msgstr ""
+"Ein Fehler ist aufgetreten beim Setzen der Metadaten des Dateisystems auf "
+"dem Dateisystem %s. Falls dieser Fehler erneut auftritt, wird er nicht "
+"erneut angezeigt."
 
-#: ../raphodo/problemnotification.py:216
+#: ../raphodo/problemnotification.py:217
 #, python-format
 msgid "Encountered unhandled file %s. It will not be downloaded."
-msgstr ""
+msgstr "Unbehandelte Datei %s gefunden. Sie wird nicht übertragen."
 
-#: ../raphodo/problemnotification.py:223
+#: ../raphodo/problemnotification.py:224
 #, python-format
 msgid "%(filetype)s %(destination)s already exists."
-msgstr ""
+msgstr "%(filetype)s %(destination)s existiert bereits."
 
-#: ../raphodo/problemnotification.py:234 ../raphodo/problemnotification.py:262
+#: ../raphodo/problemnotification.py:235 ../raphodo/problemnotification.py:263
 #, python-format
 msgid ""
 "The existing %(filetype)s %(destination)s was last modified on %(date)s at "
 "%(time)s."
 msgstr ""
+"DIe vorhandene %(filetype)s %(destination)s wurde zuletzt am %(date)s um "
+"%(time)s geändert."
 
-#: ../raphodo/problemnotification.py:245
+#: ../raphodo/problemnotification.py:246
 #, python-format
 msgid "The %(filetype)s %(source)s was not downloaded from %(device)s."
-msgstr ""
+msgstr "Das %(filetype)s %(source)s wurde nicht von %(device)s übertragen."
 
-#: ../raphodo/problemnotification.py:273
+#: ../raphodo/problemnotification.py:274
 #, python-format
 msgid "The %(filetype)s %(source)s was downloaded from %(device)s."
-msgstr ""
+msgstr "Das %(filetype)s %(source)s wurde von %(device)s übertragen."
 
-#: ../raphodo/problemnotification.py:282
+#: ../raphodo/problemnotification.py:283
 #, python-format
 msgid "The unique identifier '%s' was added to the filename."
-msgstr ""
+msgstr "Der eindeutige Bezeichner '%s' wurde zum Dateinamen hinzugefügt."
 
-#: ../raphodo/problemnotification.py:298
+#: ../raphodo/problemnotification.py:299
 #, python-format
 msgid ""
 "The existing backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
+"DIe vorhandene Sicherung %(filetype)s %(destination)s wurde zuletzt am "
+"%(date)s um %(time)s geändert."
 
-#: ../raphodo/problemnotification.py:309
+#: ../raphodo/problemnotification.py:310
 #, python-format
 msgid "The %(filetype)s %(source)s was not backed up from %(device)s."
-msgstr ""
+msgstr "Die %(filetype)s %(source)s wurde nicht gesichert von %(device)s."
 
-#: ../raphodo/problemnotification.py:326
+#: ../raphodo/problemnotification.py:327
 #, python-format
 msgid ""
 "The previous backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
+"DIe vorherige Sicherung %(filetype)s %(destination)s wurde zuletzt geändert "
+"am %(date)s um %(time)s."
 
-#: ../raphodo/problemnotification.py:337
+#: ../raphodo/problemnotification.py:338
 #, python-format
 msgid ""
 "The %(filetype)s %(source)s from %(device)s was backed up, overwriting the "
 "previous backup %(filetype)s."
 msgstr ""
+"Die %(filetype)s %(source)s von %(device)s wurde gesichert, die vorherige "
+"Sicherung %(filetype)s wird überschrieben."
 
-#: ../raphodo/problemnotification.py:356
+#: ../raphodo/problemnotification.py:357
 #, python-format
 msgid ""
 "When synchronizing RAW + JPEG sequence values, a duplicate %(filetype)s "
 "%(file)s was encountered, and was not downloaded."
 msgstr ""
+"Beim Synchronisieren der RAW + JPEG Sequenzwerte wurde ein Duplikat "
+"%(filetype)s %(file)s entdeckt und nicht übertragen."
 
-#: ../raphodo/problemnotification.py:366
+#: ../raphodo/problemnotification.py:367
 msgid ""
 "When synchronizing RAW + JPEG sequence values, photos were detected with the "
 "same filenames, but taken at different times:"
 msgstr ""
+"Beim Abgleich der RAW + JPEG Sequenzwerte wurden Fotos mit gleichen "
+"Dateinamen, jedoch unterschiedlichen Aufnahmedaten gefunden:"
 
-#: ../raphodo/problemnotification.py:373
+#: ../raphodo/problemnotification.py:374
 #, python-format
 msgid ""
 "%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
@@ -2419,134 +3561,145 @@ msgstr ""
 "%(image1)s wurde am %(image1_date)s um %(image1_time)s aufgenommen und "
 "%(image2)s am %(image2_date)s um %(image2_time)s."
 
-#: ../raphodo/problemnotification.py:389
+#: ../raphodo/problemnotification.py:390
 #, python-format
 msgid "Unable to finalize the filename for %s"
-msgstr ""
+msgstr "Dateiname für %s kann nicht finalisiert werden"
 
-#: ../raphodo/problemnotification.py:424
+#: ../raphodo/problemnotification.py:425
 #, python-format
 msgid ""
 "The filename %(destination)s was not fully generated for %(filetype)s "
 "%(source)s."
 msgstr ""
+"Der Dateiname %(destination)s für %(filetype)s %(source)s wurde nicht "
+"vollständig generiert."
 
-#: ../raphodo/problemnotification.py:433
+#: ../raphodo/problemnotification.py:434
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr "Die %(type)s Metadaten fehlen."
 
-#: ../raphodo/problemnotification.py:439
+#: ../raphodo/problemnotification.py:440
 #, python-format
 msgid "The following metadata is missing: %s."
-msgstr ""
+msgstr "Die folgenden Metadaten fehlen: %s."
 
-#: ../raphodo/problemnotification.py:445
+#: ../raphodo/problemnotification.py:446
 #, python-format
 msgid "Date/time conversion failed: %s."
-msgstr ""
+msgstr "Datum-/Zeitkonvertierung fehlgeschlagen: %s."
 
-#: ../raphodo/problemnotification.py:451
+#: ../raphodo/problemnotification.py:452
 msgid ""
 "Could not extract valid date/time metadata or determine the file "
 "modification time."
 msgstr ""
+"Konnte keine gültigen Metadaten zu Datum/Zeit entnehmen oder das "
+"Änderungsdatum der Datei ermitteln."
 
-#: ../raphodo/problemnotification.py:457
+#: ../raphodo/problemnotification.py:458
 msgid "Filename does not have an extension."
 msgstr "Der Dateinamen enthält keinen Dateitypen."
 
-#: ../raphodo/problemnotification.py:460
+#: ../raphodo/problemnotification.py:461
 msgid "Filename does not have a number component."
 msgstr "Der Dateinamen enthält keine Zahlen."
 
-#: ../raphodo/problemnotification.py:464
+#: ../raphodo/problemnotification.py:465
 #, python-format
 msgid "Error generating component %(component)s. Error: %(error)s"
-msgstr ""
+msgstr "Fehler beim Erzeugen der Komponente %(component)s. Fehler: %(error)s"
 
-#: ../raphodo/problemnotification.py:477
+#: ../raphodo/problemnotification.py:478
 #, python-format
 msgid ""
 "The download subfolders %(folder)s were only partially generated for "
 "%(filetype)s %(source)s."
 msgstr ""
+"Die Unterordner für Übertragungen %(folder)s wurden nur teilweise erstellt "
+"für %(filetype)s %(source)s."
 
-#: ../raphodo/problemnotification.py:486
+#: ../raphodo/problemnotification.py:487
 #, python-format
 msgid ""
 "There is no data with which to generate the %(subfolder_file)s for "
 "%(filename)s. The %(filetype)s was not downloaded."
 msgstr ""
+"Keine Daten zur Erzeugung von %(subfolder_file)s für %(filename)s verfügbar. "
+"Das %(filetype)s wurde nicht übertragen."
 
-#: ../raphodo/problemnotification.py:499
+#: ../raphodo/problemnotification.py:500
 #, python-format
 msgid ""
 "Unable to create the %(filetype)s %(destination)s in %(folder)s. The "
 "download file was %(source)s in %(device)s. It was not downloaded."
 msgstr ""
+"Konnte %(filetype)s %(destination)s in %(folder)s nicht erzeugen. Zu "
+"übertragende Datei war %(source)s in %(device)s. Sie wurde nicht übertragen."
 
-#: ../raphodo/problemnotification.py:514
+#: ../raphodo/problemnotification.py:515
 #, python-format
 msgid "Unable to create the download subfolder %s."
-msgstr ""
+msgstr "Unterordner %s für Übertragung kann nicht erzeugt werden."
 
-#: ../raphodo/problemnotification.py:526
+#: ../raphodo/problemnotification.py:527
 #, python-format
 msgid "Unable to create the backup subfolder %s."
-msgstr ""
+msgstr "Sicherungsunterordner %s kann nicht erstellt werden."
 
-#: ../raphodo/problemnotification.py:577
+#: ../raphodo/problemnotification.py:578
 #, python-format
 msgid "Problems scanning %s"
-msgstr ""
+msgstr "Probleme beim Durchsuchen von %s"
 
-#: ../raphodo/problemnotification.py:584
+#: ../raphodo/problemnotification.py:585
 #, python-format
 msgid "Problems copying from %s"
-msgstr ""
+msgstr "Probleme beim Kopieren von %s"
 
-#: ../raphodo/problemnotification.py:591
+#: ../raphodo/problemnotification.py:592
 msgid "Problems while finalizing filenames and generating subfolders"
 msgstr ""
+"Problem beim Fertigstellen der Dateinamen und dem Erzeugen der Unterordner"
 
-#: ../raphodo/problemnotification.py:598
+#: ../raphodo/problemnotification.py:599
 #, python-format
 msgid "Problems backing up to %s"
-msgstr ""
-
-#. Translators: for example Nov 3 or Dec 31
-#. The start and end dates are on a different day
-#. Translators: for example Nov 3 or Dec 31
-#: ../raphodo/proximity.py:105 ../raphodo/proximity.py:221
-#: ../raphodo/proximity.py:224 ../raphodo/proximity.py:828
-#, python-format
-msgid "%(month)s %(numeric_day)s"
-msgstr ""
-
-#. Translators: for example Nov 15 2015
-#. Translators: for example Nov 3 2015
-#: ../raphodo/proximity.py:109 ../raphodo/proximity.py:230
-#: ../raphodo/proximity.py:231 ../raphodo/proximity.py:831
-#, python-format
-msgid "%(date)s %(year)s"
-msgstr "%(date)s %(year)s"
+msgstr "Probleme beim Sichern nach %s"
 
 #. Translators: for example Nov 3 2015, 11:25 AM
 #. Translators: for example, Nov 3, 12:15 PM
-#: ../raphodo/proximity.py:197 ../raphodo/proximity.py:215
-#: ../raphodo/proximity.py:234 ../raphodo/proximity.py:236
+#: ../raphodo/proximity.py:188 ../raphodo/proximity.py:213
+#: ../raphodo/proximity.py:236 ../raphodo/proximity.py:239
 #, python-format
 msgid "%(date)s, %(time)s"
 msgstr "%(date)s, %(time)s"
 
-#: ../raphodo/proximity.py:209
+#: ../raphodo/proximity.py:204
 #, python-format
 msgid "%(starttime)s - %(endtime)s"
 msgstr "%(starttime)s - %(endtime)s"
 
+#. The start and end dates are on a different day
+#. Translators: for example Nov 3 or Dec 31
+#: ../raphodo/proximity.py:221 ../raphodo/proximity.py:225
+#: ../raphodo/proximity.py:980 ../raphodo/timeutils.py:105
+#, python-format
+msgid "%(month)s %(numeric_day)s"
+msgstr "%(month)s %(numeric_day)s"
+
+#. Translators: for example Nov 3 2015
+#. Translators: for example Nov 2 2015
+#. Translators: for example Nov 15 2015
+#: ../raphodo/proximity.py:232 ../raphodo/proximity.py:233
+#: ../raphodo/proximity.py:985 ../raphodo/timeutils.py:110
+#, python-format
+msgid "%(date)s %(year)s"
+msgstr "%(date)s %(year)s"
+
 #. Translators: for example, Nov 3, 12:15 PM - Nov 4, 1:00 AM
-#: ../raphodo/proximity.py:241
+#: ../raphodo/proximity.py:245
 #, python-format
 msgid "%(earlier_time)s - %(later_time)s"
 msgstr "%(earlier_time)s - %(later_time)s"
@@ -2555,7 +3708,7 @@ msgstr "%(earlier_time)s - %(later_time)s"
 #. Nov 3 2012, 12:15 PM -
 #. Nov 4 2012, 1:00 AM
 #. (please keep the line break signified by \n)
-#: ../raphodo/proximity.py:248
+#: ../raphodo/proximity.py:253
 #, python-format
 msgid ""
 "%(earlier_time)s -\n"
@@ -2564,77 +3717,77 @@ msgstr ""
 "%(earlier_time)s -\n"
 "%(later_time)s"
 
-#: ../raphodo/proximity.py:359
+#: ../raphodo/proximity.py:382
 #, python-format
 msgid "%(month)s  %(year)s"
 msgstr "%(month)s  %(year)s"
 
 #. Translators: for example Nov 2015
-#: ../raphodo/proximity.py:833
+#: ../raphodo/proximity.py:987
 #, python-format
 msgid "%(month)s %(year)s"
 msgstr "%(month)s %(year)s"
 
-#: ../raphodo/proximity.py:1344
+#: ../raphodo/proximity.py:1595
 msgid ""
 "The time elapsed between consecutive photos and videos that is used to build "
 "the Timeline"
 msgstr ""
 "Die Zeit, die zwischen aufeinanderfolgenden Fotos und Videos vergangen ist, "
-"die benutzt wird, um den Zeitstrahl zu erstellen"
+"die benutzt wird, um die Zeitleiste zu erstellen"
 
 #. Translators: e.g. "45m", which is short for 45 minutes.
 #. Replace the very last character (after the d) with the correct
 #. localized value, keeping everything else. In other words, change
 #. only the m character.
-#: ../raphodo/proximity.py:1406
+#: ../raphodo/proximity.py:1652
 #, python-format
 msgid "%(minutes)dm"
 msgstr "%(minutes)dm"
 
 #. Translators: i.e. "1.5h", which is short for 1.5 hours.
 #. Replace the entire string with the correct localized value
-#: ../raphodo/proximity.py:1410
+#: ../raphodo/proximity.py:1656
 msgid "1.5h"
 msgstr "1.5h"
 
 #. Translators: e.g. "5h", which is short for 5 hours.
 #. Replace the very last character (after the d) with the correct localized value,
 #. keeping everything else. In other words, change only the h character.
-#: ../raphodo/proximity.py:1415
+#: ../raphodo/proximity.py:1661
 #, python-format
 msgid "%(hours)dh"
 msgstr "%(hours)dh"
 
-#: ../raphodo/proximity.py:1461
+#: ../raphodo/proximity.py:1710
 msgid ""
 "The Timeline groups photos and videos based on how much time elapsed between "
 "consecutive shots. Use it to identify photos and videos taken at different "
 "periods in a single day or over consecutive days."
 msgstr ""
-"Der Zeitstrahl gruppiert Fotos und Videos basierend auf der Zeit zwischen "
-"aufeinanderfolgenden Aufnahmen. Benutze ihn, um Fotos und Videos zu "
+"Die Zeitleiste gruppiert Fotos und Videos basierend auf der Zeit zwischen "
+"aufeinanderfolgenden Aufnahmen. Benutzen Sie ihn, um Fotos und Videos zu "
 "identifizieren, die zu verschiedenen Zeiten an einem Tag oder an "
 "aufeinanderfolgenden Tagen entstanden sind."
 
-#: ../raphodo/proximity.py:1464
+#: ../raphodo/proximity.py:1715
 msgid ""
 "Use the slider (below) to adjust the time elapsed between consecutive shots "
 "that is used to build the Timeline."
 msgstr ""
-"Benutze den Schieberegler (unten), um die vergangene Zeit zwischen "
-"aufeinanderfolgenden Aufnahmen anzupassen, die benutzt wird, um den "
-"Zeitstrahl zu erzeugen."
+"Benutzen Sie den Schieberegler (unten), um die vergangene Zeit zwischen "
+"aufeinanderfolgenden Aufnahmen anzupassen, die benutzt wird, um die "
+"Zeitleiste zu erzeugen."
 
-#: ../raphodo/proximity.py:1466
+#: ../raphodo/proximity.py:1718
 msgid "Timeline build pending..."
-msgstr "Zeitstrahl wird gleich erstellt …"
+msgstr "Zeitleiste wird gleich erstellt …"
 
-#: ../raphodo/proximity.py:1467
+#: ../raphodo/proximity.py:1719
 msgid "Timeline is building..."
-msgstr "Zeitstrahl wird erstellt …"
+msgstr "Zeitleiste wird erstellt …"
 
-#: ../raphodo/proximity.py:1468
+#: ../raphodo/proximity.py:1721
 msgid ""
 "The Timeline needs to be rebuilt because the file modification time does not "
 "match the time a shot was taken for one or more shots.<br><br>The Timeline "
@@ -2654,229 +3807,246 @@ msgstr ""
 "Datei. Beim Erstellen der Vorschaubilder bzw. beim Übertragen oder Bilder "
 "wird dann die echte Aufnahmezeit aus den Metadaten ausgelesen."
 
-#: ../raphodo/rapid.py:485 ../raphodo/rapid.py:2461 ../raphodo/rapid.py:3728
-#: ../raphodo/rapid.py:3846 ../raphodo/rapid.py:3850 ../raphodo/rapid.py:3870
-#: ../raphodo/rapid.py:3874 ../raphodo/rapid.py:3998 ../raphodo/rapid.py:4007
-#: ../raphodo/rapid.py:4495 ../raphodo/rapid.py:4888 ../raphodo/rapid.py:5722
-#: ../raphodo/rememberthisdialog.py:97
+#: ../raphodo/rapid.py:493 ../raphodo/rapid.py:2555 ../raphodo/rapid.py:3934
+#: ../raphodo/rapid.py:4065 ../raphodo/rapid.py:4069 ../raphodo/rapid.py:4092
+#: ../raphodo/rapid.py:4096 ../raphodo/rapid.py:4226 ../raphodo/rapid.py:4237
+#: ../raphodo/rapid.py:4743 ../raphodo/rapid.py:5195 ../raphodo/rapid.py:5997
+#: ../raphodo/rememberthisdialog.py:99
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:3
 msgid "Rapid Photo Downloader"
 msgstr "Rapid-Fotoübertragung"
 
-#: ../raphodo/rapid.py:1100
+#: ../raphodo/rapid.py:1131
 msgid ""
 "<b>ExifTool has a problem</b><br><br> Rapid Photo Downloader uses ExifTool "
 "to get metadata from videos and photos. The program will run without it, but "
 "installing it is <b>highly</b> recommended."
 msgstr ""
+"<b>ExifTool hat ein Problem</b><br><br> Rapid Photo Downloader nutzt "
+"ExifTool, um Metadaten von Fotos und Videos auszulesen. Das Programm wird "
+"ohne ExifTool funktionieren; es wird jedoch <b>wärmstens</b> empfohlen, "
+"ExifTool zu installieren."
 
-#: ../raphodo/rapid.py:1110 ../raphodo/rapid.py:1130
+#: ../raphodo/rapid.py:1141 ../raphodo/rapid.py:1161
 msgid "Problem with libmediainfo"
-msgstr ""
+msgstr "Problem mit libmediainfo"
 
-#: ../raphodo/rapid.py:1119
+#: ../raphodo/rapid.py:1150
 msgid ""
 "<b>The library libmediainfo appears to be missing</b><br><br> Rapid Photo "
 "Downloader uses libmediainfo to get the date and time a video was shot. The "
 "program will run  without it, but installing it is recommended."
 msgstr ""
+"<b>Die Bibliothek libmediainfo scheint zu fehlen</b><br><br> Rapid Photo "
+"Downloader nutzt libmediainfo, um Aufnahmedatum und -uhrzeit eines Videos zu "
+"ermitteln. Das Programm wird ohne libmediainfo funktionieren; es wird jedoch "
+"empfohlen, libmediainfo zu installieren."
 
-#: ../raphodo/rapid.py:1417
+#: ../raphodo/rapid.py:1448
 msgid "Download failed"
-msgstr ""
+msgstr "Herunterladen fehlgeschlagen"
 
-#: ../raphodo/rapid.py:1419
+#: ../raphodo/rapid.py:1450
 msgid ""
 "Sorry, the download of the new version of Rapid Photo Downloader failed."
 msgstr ""
+"Entschuldigung, das Herunterladen der neuen Version von Rapid Photo "
+"Downloader ist fehlgeschlagen."
 
-#: ../raphodo/rapid.py:1425
+#: ../raphodo/rapid.py:1457
 msgid ""
 "The new version was successfully downloaded. Do you want to close Rapid "
 "Photo Downloader and install it now?"
 msgstr ""
+"Die neue Version wurde erfolgreich heruntergeladen. Möchten Sie Rapid Photo "
+"Downloader schließen und jetzt installieren?"
 
-#: ../raphodo/rapid.py:1428
+#: ../raphodo/rapid.py:1461
 msgid "Update Rapid Photo Downloader"
-msgstr ""
+msgstr "Rapid-Fotoübertragung aktualisieren"
 
-#: ../raphodo/rapid.py:1432
+#: ../raphodo/rapid.py:1465
 msgid "Install"
-msgstr ""
+msgstr "Installieren"
 
-#: ../raphodo/rapid.py:1450
+#: ../raphodo/rapid.py:1483
 msgid "New version saved"
-msgstr ""
+msgstr "Neue Version gespeichert"
 
-#: ../raphodo/rapid.py:1451
+#: ../raphodo/rapid.py:1485
 #, python-format
 msgid ""
 "The tar file and installer script are saved at:\n"
 "\n"
 " %s"
 msgstr ""
+"Die tar-Datei und das Installationsskript sind gespeichert unter:\n"
+"\n"
+" %s"
 
-#: ../raphodo/rapid.py:1468
+#: ../raphodo/rapid.py:1502
 msgid "Upgrade failed"
-msgstr ""
+msgstr "Aktualisierung fehlgeschlagen"
 
-#: ../raphodo/rapid.py:1469
+#: ../raphodo/rapid.py:1505
 msgid ""
 "Sorry, upgrading Rapid Photo Downloader failed because there was an error "
 "opening the installer."
 msgstr ""
+"Entschuldigung, Aktualisierung von Rapid Photo Downloader fehlgeschlagen "
+"wegen eines Fehlers beim Öffnen des Installers."
 
-#: ../raphodo/rapid.py:1667 ../raphodo/rapid.py:2331
+#: ../raphodo/rapid.py:1709 ../raphodo/rapid.py:2425
 msgid "Download"
 msgstr "Herunterladen"
 
-#: ../raphodo/rapid.py:1671
+#: ../raphodo/rapid.py:1713
 msgid "&Refresh..."
-msgstr "&Auffrischen …"
+msgstr "Auff&rischen …"
 
-#: ../raphodo/rapid.py:1675
+#: ../raphodo/rapid.py:1717
 msgid "&Preferences"
 msgstr "&Einstellungen"
 
-#: ../raphodo/rapid.py:1679
+#: ../raphodo/rapid.py:1721
 msgid "&Quit"
 msgstr "&Beenden"
 
-#: ../raphodo/rapid.py:1683
+#: ../raphodo/rapid.py:1725
 msgid "Error &Reports"
-msgstr ""
+msgstr "Fehlerbe&richte"
 
-#: ../raphodo/rapid.py:1687
+#: ../raphodo/rapid.py:1729
 msgid "Clear Completed Downloads"
 msgstr "Abgeschlossene Übertragungen bereinigen"
 
-#: ../raphodo/rapid.py:1691
+#: ../raphodo/rapid.py:1733
 msgid "Get Help Online..."
 msgstr "Im Netz Hilfe erhalten …"
 
-#: ../raphodo/rapid.py:1695
+#: ../raphodo/rapid.py:1737
 msgid "&Tip of the Day..."
-msgstr ""
+msgstr "&Tipp des Tages …"
 
-#: ../raphodo/rapid.py:1699
+#: ../raphodo/rapid.py:1741
 msgid "Report a Problem..."
 msgstr "Ein Problem melden …"
 
-#: ../raphodo/rapid.py:1703
+#: ../raphodo/rapid.py:1745
 msgid "Make a Donation..."
 msgstr "Etwas spenden …"
 
-#: ../raphodo/rapid.py:1707
+#: ../raphodo/rapid.py:1749
 msgid "Translate this Application..."
 msgstr "Diese Anwendung übersetzen …"
 
-#: ../raphodo/rapid.py:1711
+#: ../raphodo/rapid.py:1753
 msgid "&About..."
 msgstr "&Über …"
 
-#: ../raphodo/rapid.py:1715
+#: ../raphodo/rapid.py:1757
 msgid "Check for Updates..."
-msgstr ""
+msgstr "Auf Aktualisierungen prüfen …"
 
-#: ../raphodo/rapid.py:1797
+#: ../raphodo/rapid.py:1840
 msgid "Timeline"
-msgstr "Zeitstrahl"
+msgstr "Zeitleiste"
 
-#: ../raphodo/rapid.py:1807
+#: ../raphodo/rapid.py:1850
 msgid "Destination"
 msgstr "Ziel"
 
-#: ../raphodo/rapid.py:1808
+#: ../raphodo/rapid.py:1851
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: ../raphodo/rapid.py:1810
+#: ../raphodo/rapid.py:1853
 msgid "Back Up"
 msgstr "Sicherung"
 
 #. Devices Header and View
-#: ../raphodo/rapid.py:1926
+#: ../raphodo/rapid.py:1977
 msgid ""
 "Turn on or off the use of devices attached to this computer as download "
 "sources"
 msgstr ""
-"Die Benutzung von Geräten als Quelle zum Herunterladen an diesem Computer "
-"ein- oder ausschalten"
+"Die Benutzung von Geräten als Quelle zum Herunterladen an diesem Rechner ein-"
+" oder ausschalten"
 
 #. This Computer Header and View
-#: ../raphodo/rapid.py:1940
+#: ../raphodo/rapid.py:1994
 msgid ""
 "Turn on or off the use of a folder on this computer as a download source"
 msgstr ""
-"Die Benutzung von Ordnern als Quelle zum Herunterladen an diesem Computer "
-"ein- oder ausschalten"
+"Die Benutzung von Ordnern als Quelle zum Herunterladen an diesem Rechner ein-"
+" oder ausschalten"
 
-#: ../raphodo/rapid.py:1941
+#: ../raphodo/rapid.py:1996
 msgid "This Computer"
 msgstr "Dieser Rechner"
 
-#: ../raphodo/rapid.py:1952
+#: ../raphodo/rapid.py:2009
 msgid "Select a source folder"
 msgstr "Quellordner auswählen"
 
-#: ../raphodo/rapid.py:1975
+#: ../raphodo/rapid.py:2038
 msgid "Projected Storage Use"
-msgstr ""
+msgstr "Prognostizierte Speichernutzung"
 
-#: ../raphodo/rapid.py:1989 ../raphodo/rapid.py:1997
+#: ../raphodo/rapid.py:2056 ../raphodo/rapid.py:2068
 msgid "Select a destination folder"
 msgstr "Zielordner auswählen"
 
-#: ../raphodo/rapid.py:2045
+#: ../raphodo/rapid.py:2117
 msgid "All"
 msgstr "Alle"
 
-#: ../raphodo/rapid.py:2046
+#: ../raphodo/rapid.py:2118
 msgid "New"
 msgstr "Neu"
 
-#: ../raphodo/rapid.py:2048
+#: ../raphodo/rapid.py:2120
 msgid "Show:"
 msgstr "Anzeigen:"
 
-#: ../raphodo/rapid.py:2051
+#: ../raphodo/rapid.py:2123
 msgid "Modification Time"
 msgstr "Änderungszeit"
 
-#: ../raphodo/rapid.py:2052
+#: ../raphodo/rapid.py:2124
 msgid "Checked State"
 msgstr "Zustand geprüft"
 
-#: ../raphodo/rapid.py:2055
+#: ../raphodo/rapid.py:2127
 msgid "File Type"
 msgstr "Dateityp"
 
-#: ../raphodo/rapid.py:2056
+#: ../raphodo/rapid.py:2128
 msgid "Device"
 msgstr "Gerät"
 
-#: ../raphodo/rapid.py:2058
+#: ../raphodo/rapid.py:2130
 msgid "Sort:"
 msgstr "Sortieren:"
 
-#: ../raphodo/rapid.py:2069
+#: ../raphodo/rapid.py:2141
 msgid "Select All:"
 msgstr "Alles auswählen:"
 
-#: ../raphodo/rapid.py:2311
+#: ../raphodo/rapid.py:2405
 #, python-format
 msgid "Download %(files)s"
 msgstr "Lade %(files)s herunter"
 
-#: ../raphodo/rapid.py:2327
+#: ../raphodo/rapid.py:2421
 msgid "Resume Download"
 msgstr "Herunterladen fortsetzen"
 
-#: ../raphodo/rapid.py:2329
+#: ../raphodo/rapid.py:2423
 msgid "Pause"
 msgstr "Anhalten"
 
-#: ../raphodo/rapid.py:2417
+#: ../raphodo/rapid.py:2511
 #, python-brace-format
 msgid ""
 "Please report the problem at <a href=\"{website}\">{website}</a>.<br><br>\n"
@@ -2884,12 +4054,19 @@ msgid ""
 "            <a href=\"{log_path}\">here</a> to open the log directory).\n"
 "            "
 msgstr ""
+"Bitte melden Sie das Verhalten an <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
+"            Hängen Sie die Log-Datei <i>{log_file}</i>an ihren Bericht an "
+"(klicken Sie\n"
+"            <a href=\"{log_path}\">hier</a>, um das Verzeichnis der Log-"
+"Datei zu öffnen).\n"
+"            "
 
-#: ../raphodo/rapid.py:2431
+#: ../raphodo/rapid.py:2525
 msgid "Thank you for reporting a problem in Rapid Photo Downloader"
-msgstr ""
+msgstr "Vielen Dank für die Meldung eines Problems in Rapid Photo Downloader"
 
-#: ../raphodo/rapid.py:2529
+#: ../raphodo/rapid.py:2624
 #, python-format
 msgid ""
 "<b>Changing This Computer source path</b><br><br>Do you really want to "
@@ -2898,39 +4075,41 @@ msgid ""
 "from This Computer will be cancelled."
 msgstr ""
 
-#: ../raphodo/rapid.py:2595
+#: ../raphodo/rapid.py:2694
 msgid "You cannot change the download destination while downloading."
 msgstr ""
-"Du kannst das Ziel zum Herunterladen während des Herunterladens nicht ändern."
+"Sie können das Ziel zum Herunterladen während des Herunterladens nicht "
+"ändern."
 
-#: ../raphodo/rapid.py:2604
+#: ../raphodo/rapid.py:2704
 #, python-format
 msgid ""
 "<b>Confirm Download Destination</b><br><br>Are you sure you want to set the "
 "%(file_type)s download destination to %(path)s?"
 msgstr ""
-"<b>Bestätige Ziel zum Herunterladen</b><br><br>Bist du sicher, dass das Ziel "
-"zum Herunterladen von %(file_type)s auf %(path)s gesetzt werden soll?"
+"<b>Ziel zum Herunterladen bestätigen</b><br><br>Sind Sie sicher, dass das "
+"Ziel zum Herunterladen von %(file_type)s auf %(path)s festgelegt werden soll?"
 
-#: ../raphodo/rapid.py:2682
+#: ../raphodo/rapid.py:2785
 msgid ""
+"\n"
 "<b>Downloading all files</b><br><br>\n"
-"                    A download always includes all files that are checked "
-"for download,\n"
-"                    including those that are not currently displayed because "
-"the Timeline\n"
-"                    is being used or because only new files are being shown."
-"<br><br>\n"
-"                    Do you want to proceed with the download?"
+"A download always includes all files that are checked for download,\n"
+"including those that are not currently displayed because the Timeline\n"
+"is being used or because only new files are being shown.<br><br>\n"
+"Do you want to proceed with the download?\n"
+"                        "
 msgstr ""
-"Das Herunterladen beinhaltet immer alle Dateien, die zum Herunterladen "
-"markiert sind,\n"
-"                    inklusive jener, die momentan nicht angezeigt werden, "
-"weil der Zeitstrahl benutzt wird\n"
-"                    oder weil nur neue Dateien angezeigt werden.<br><br>\n"
-"                    Willst du mit dem Herunterladen fortfahren?"
+"\n"
+"<b>Übertrage alle Dateien</b><br><br>\n"
+"Eine Übertragung beinhaltet stets alle Dateien, die zum Übertragen markiert\n"
+"sind, einschließlich derer, die gerade nicht angezeigt werden, weil die\n"
+"Zeitleiste verwendet wurde, oder weil nur neue Dateien sichtbar "
+"sind.<br><br>\n"
+"Möchten Sie die Übertragung fortsetzen?\n"
+"                        "
 
-#: ../raphodo/rapid.py:2820
+#: ../raphodo/rapid.py:2937
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -2941,7 +4120,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: ../raphodo/rapid.py:2824
+#: ../raphodo/rapid.py:2940
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -2950,176 +4129,184 @@ msgstr ""
 "Dieser Übertragungsordner ist ungültig:\n"
 "%s"
 
-#: ../raphodo/rapid.py:2827
+#: ../raphodo/rapid.py:2943
 msgid "Download Failure"
-msgstr ""
+msgstr "Fehler beim Übertragen"
 
-#: ../raphodo/rapid.py:2828
+#: ../raphodo/rapid.py:2944
 msgid "The download cannot proceed."
-msgstr ""
+msgstr "Die Übertragung kann nicht fortfahren."
 
-#: ../raphodo/rapid.py:2842
+#: ../raphodo/rapid.py:2962
 msgid ""
 "Photos and videos will not be backed up because there is nowhere to back "
 "them up. Do you still want to start the download?"
 msgstr ""
+"Fotos und Videos werden nicht gesichert, weil es keinen Ort zum Sichern "
+"gibt. Möchten SIe dennoch mit der Übertragung beginnen?"
 
-#. Translators: filetype will be replaced with 'photos' or 'videos'
-#: ../raphodo/rapid.py:2847 ../raphodo/rapid.py:2854
+#: ../raphodo/rapid.py:2969 ../raphodo/rapid.py:2979
 #, python-format
 msgid ""
 "No backup device exists for backing up %(filetype)s. Do you still want to "
 "start the download?"
 msgstr ""
+"Es gibt kein Sicherungsgerät zur Sicherung von %(filetype)s. Möchten SIe "
+"dennoch mit der Übertragung beginnen?"
 
-#: ../raphodo/rapid.py:2848 ../raphodo/rpdfile.py:228
+#: ../raphodo/rapid.py:2971 ../raphodo/rpdfile.py:228
 msgid "photos"
 msgstr "Fotos"
 
-#: ../raphodo/rapid.py:2855 ../raphodo/rpdfile.py:223
+#: ../raphodo/rapid.py:2981 ../raphodo/rpdfile.py:223
 msgid "videos"
 msgstr "Filme"
 
-#: ../raphodo/rapid.py:2861
+#: ../raphodo/rapid.py:2989
 msgid ""
 "<b>The photo and video backup destinations do not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
+"<b>Die Ziele der Foto- und Videodatensicherung sind nicht vorhanden oder "
+"können nicht beschrieben werden.</b><br><br>Möchten SIe dennoch mit der "
+"Übertragung beginnen?"
 
-#: ../raphodo/rapid.py:2869 ../raphodo/rapid.py:2876
+#: ../raphodo/rapid.py:2999 ../raphodo/rapid.py:3008
 #, python-format
 msgid ""
 "<b>The %(filetype)s backup destination does not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
+"<b>Das %(filetype)s SIcherungsziel ist nicht vorhanden oder kann nicht "
+"beschrieben werden.</b><br><br>Möchten SIe dennoch mit der Übertragung "
+"beginnen?"
 
-#: ../raphodo/rapid.py:2871 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:818
+#: ../raphodo/rapid.py:3001 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:843
 msgid "photo"
 msgstr "Foto"
 
-#: ../raphodo/rapid.py:2878 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:858
+#: ../raphodo/rapid.py:3010 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:883
 msgid "video"
 msgstr "Film"
 
-#: ../raphodo/rapid.py:2886
+#: ../raphodo/rapid.py:3018
 msgid "Backup problem"
 msgstr "Sicherungsproblem"
 
-#. Translators - in the middle is a unicode em dash - please retain it
-#. This string is displayed in the status bar when the download is running
-#: ../raphodo/rapid.py:3571
+#: ../raphodo/rapid.py:3756
 #, python-format
 msgid "%(downloading_from)s — %(time_left)s left (%(speed)s)"
 msgstr "%(downloading_from)s — %(time_left)s verbleibend (%(speed)s)"
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3640
+#: ../raphodo/rapid.py:3828
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s heruntergeladen"
 
-#. Translators: e.g. 2 videos failed to download
-#: ../raphodo/rapid.py:3645
+#: ../raphodo/rapid.py:3836
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "%(noFiles)s %(filetypes)s konnten nicht heruntergeladen werden"
 
-#: ../raphodo/rapid.py:3650 ../raphodo/rapid.py:3723
+#: ../raphodo/rapid.py:3842 ../raphodo/rapid.py:3927
 msgid "warnings"
 msgstr "Warnungen"
 
-#: ../raphodo/rapid.py:3679
+#: ../raphodo/rapid.py:3873
 msgid "All downloads complete"
 msgstr "Alle Übertragungen wurden abgeschlossen"
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3686 ../raphodo/rapid.py:3695 ../raphodo/rapid.py:3704
-#: ../raphodo/rapid.py:3713 ../raphodo/rapid.py:3721
+#: ../raphodo/rapid.py:3881 ../raphodo/rapid.py:3892 ../raphodo/rapid.py:3903
+#: ../raphodo/rapid.py:3914 ../raphodo/rapid.py:3924
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: ../raphodo/rapid.py:3688 ../raphodo/rapid.py:3706
+#: ../raphodo/rapid.py:3884 ../raphodo/rapid.py:3906
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s heruntergeladen"
 
-#: ../raphodo/rapid.py:3697 ../raphodo/rapid.py:3715
+#: ../raphodo/rapid.py:3895 ../raphodo/rapid.py:3917
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "%(filetype)s konnten nicht heruntergeladen werden"
 
-#: ../raphodo/rapid.py:3742
+#: ../raphodo/rapid.py:3950
 msgid "1 failure"
 msgstr "1 Fehler"
 
-#: ../raphodo/rapid.py:3744
+#: ../raphodo/rapid.py:3952
 #, python-format
 msgid "%d failures"
 msgstr "%d Fehler"
 
-#: ../raphodo/rapid.py:3749
+#: ../raphodo/rapid.py:3957
 msgid "1 warning"
 msgstr "1 Warnung"
 
-#: ../raphodo/rapid.py:3751
+#: ../raphodo/rapid.py:3959
 #, python-format
 msgid "%d warnings"
 msgstr "%d Warnungen"
 
-#: ../raphodo/rapid.py:3771
+#: ../raphodo/rapid.py:3981
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s"
 msgstr "%(no_files_and_types)s von %(devices)s heruntergeladen"
 
-#: ../raphodo/rapid.py:3774
+#: ../raphodo/rapid.py:3985
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s — %(failures)s"
-msgstr "%(no_files_and_types)s von %(devices)s heruntergeladen — %(failures)s"
+msgstr ""
+"%(no_files_and_types)s von %(devices)s heruntergeladen — %(failures)s"
 
-#: ../raphodo/rapid.py:3779
+#: ../raphodo/rapid.py:3989
 #, python-format
 msgid "No files downloaded — %(failures)s"
 msgstr "Keine Dateien heruntergeladen — %(failures)s"
 
-#: ../raphodo/rapid.py:3781
+#: ../raphodo/rapid.py:3991
 msgid "No files downloaded"
 msgstr "Keine Dateien heruntergeladen"
 
-#: ../raphodo/rapid.py:3805
+#: ../raphodo/rapid.py:4021
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s"
 msgstr ""
-"Die Ziel-Unterordner und der Zeitstrahl werden neu generiert, nachdem alle "
+"Die Ziel-Unterordner und die Zeitleiste werden neu generiert, nachdem alle "
 "Vorschaubilder für %(camera)s erstellt wurden"
 
-#: ../raphodo/rapid.py:3809
+#: ../raphodo/rapid.py:4026
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for this computer"
 msgstr ""
-"Die Ziel-Unterordner und der Zeitstrahl werden neu generiert, nachdem alle "
+"Die Ziel-Unterordner und die Zeitleiste werden neu generiert, nachdem alle "
 "Vorschaubilder für diesen Computer erstellt wurden"
 
-#: ../raphodo/rapid.py:3812
+#: ../raphodo/rapid.py:4031
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s"
 msgstr ""
-"Die Ziel-Unterordner und der Zeitstrahl werden neu generiert, nachdem alle "
+"Die Ziel-Unterordner und die Zeitleiste werden neu generiert, nachdem alle "
 "Vorschaubilder für %(device)s erstellt wurden"
 
-#: ../raphodo/rapid.py:3820
+#: ../raphodo/rapid.py:4039
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices and this computer"
 msgstr ""
+"Die Unterordner des Ziels und die Zeitleiste werden erneuert, nachdem alle "
+"Vorschaubilder für %(number_devices)s Geräte und diesen Computer erzeugt "
+"wurden."
 
-#: ../raphodo/rapid.py:3833
+#: ../raphodo/rapid.py:4052
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
@@ -3128,31 +4315,33 @@ msgstr ""
 "die Zielordner und die Zeitleiste werden neu aufgebaut wenn die Vorschau für "
 "dies %(camera)s und diesen Computer neu erstellt wird."
 
-#: ../raphodo/rapid.py:3837
+#: ../raphodo/rapid.py:4056
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s and this computer"
 msgstr ""
+"Die Unterordner des Ziels und die Zeitleiste werden erneuert, nachdem alle "
+"Vorschaubilder für %(device)s und diesen Computer erzeugt wurden."
 
-#: ../raphodo/rapid.py:3841
+#: ../raphodo/rapid.py:4060
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices"
 msgstr ""
-"Die Ziel-Unterordner und der Zeitstrahl werden neu generiert, nachdem alle "
+"Die Ziel-Unterordner und die Zeitleiste werden neu generiert, nachdem alle "
 "Vorschaubilder für %(number_devices)s Geräte erstellt wurden"
 
-#: ../raphodo/rapid.py:3867
+#: ../raphodo/rapid.py:4087
 msgid "The Destination subfolders and Timeline have been rebuilt"
-msgstr "Die Ziel-Unterordner und der Zeitstrahl wurden neu generiert"
+msgstr "Die Ziel-Unterordner und die Zeitleiste wurden neu generiert"
 
-#: ../raphodo/rapid.py:3922
+#: ../raphodo/rapid.py:4144
 msgid "Program preferences are invalid"
 msgstr "Die Benutzervoreinstellungen sind ungültig"
 
-#: ../raphodo/rapid.py:3999
+#: ../raphodo/rapid.py:4228
 #, python-format
 msgid ""
 "<b>All files on the %(camera)s are inaccessible</b>.<br><br>It may be locked "
@@ -3161,197 +4350,248 @@ msgid ""
 "charging</i> to <i>USB for file transfers</i>.<br><br>Alternatively, you can "
 "ignore this device."
 msgstr ""
-"<b>Auf alle Dateien auf %(camera)s kann nicht zugegriffen werden.</"
-"b><br><br>Möglicherweise ist sie gesperrt oder nicht für die "
-"Dateiübertragung per MTP konfiguriert. Du kannst sie entsperren und es noch "
-"einmal versuchen.<br><br>Bei manchen Modellen musst du die Einstellung "
-"<i>USB zum Laden</i> auf <i>USB zur Dateiübertragung</i> ändern."
-"<br><br>Alternativ kannst du dieses Gerät ignorieren."
+"<b>Auf alle Dateien auf %(camera)s kann nicht zugegriffen "
+"werden.</b><br><br>Möglicherweise ist sie gesperrt oder nicht für die "
+"Dateiübertragung per MTP konfiguriert. Sie können sie entsperren und es noch "
+"einmal versuchen.<br><br>Bei manchen Modellen müssen Sie die Einstellung "
+"<i>USB zum Laden</i> auf <i>USB zur Dateiübertragung</i> "
+"ändern.<br><br>Alternativ können Sie dieses Gerät ignorieren."
 
-#: ../raphodo/rapid.py:4008
+#: ../raphodo/rapid.py:4239
 #, python-format
 msgid ""
-"<b>The %(camera)s appears to be in use by another application.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again.<br><br>Alternatively, you can ignore this "
-"device."
+"<b>The %(camera)s appears to be in use by another "
+"application.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again.<br><br>Alternatively, you "
+"can ignore this device."
 msgstr ""
-"<b>Die %(camera)s scheint von einem anderen Programm verwendet zu werden.</"
-"b><br><br>Du kannst jedes andere Programm beenden (z.B. einen Datei-"
-"Browser), das sie benutzt und es noch einmal versuchen. Falls das nicht "
-"funktioniert, ziehe die %(camera)s vom Computer ab und stecke sie wieder an."
+"<b>Die %(camera)s scheint von einem anderen Programm verwendet zu "
+"werden.</b><br><br>Sie können jedes andere Programm beenden (z.B. eine "
+"Dateiverwaltung), das sie benutzt und es noch einmal versuchen. Falls das "
+"nicht funktioniert, ziehen Sie die %(camera)s vom Computer ab und stecken "
+"Sie sie wieder an."
 
-#: ../raphodo/rapid.py:4019
+#: ../raphodo/rapid.py:4250
 msgid "&Try Again"
 msgstr "&Erneut versuchen"
 
-#: ../raphodo/rapid.py:4020
+#: ../raphodo/rapid.py:4251
 msgid "&Ignore This Device"
 msgstr "&Dieses Gerät ignorieren"
 
-#: ../raphodo/rapid.py:4086
+#: ../raphodo/rapid.py:4323
 #, python-format
 msgid "Sorry, an unexpected problem occurred while scanning %s."
 msgstr ""
+"Verzeihung, ein unerwartetes Problem ist aufgetreten beim Durchsuchen von %s."
 
-#: ../raphodo/rapid.py:4087
+#: ../raphodo/rapid.py:4324
 msgid "Unfortunately you cannot download from this device."
-msgstr ""
+msgstr "Leider können Sie von diesem Gerät nicht übertragen."
 
-#: ../raphodo/rapid.py:4091
+#: ../raphodo/rapid.py:4328
 msgid ""
 "A possible workaround for the problem might be downloading from the camera's "
 "memory card using a card reader."
 msgstr ""
+"Abhilfe kann möglicherweise die direkte Übertragung von der Speicherkarte "
+"der Kamera mittels Kartenlesegerät schaffen."
 
-#: ../raphodo/rapid.py:4096
+#: ../raphodo/rapid.py:4333
 msgid "Device scan failed"
-msgstr ""
+msgstr "Gerätesuche fehlgeschlagen"
 
-#: ../raphodo/rapid.py:4472
+#: ../raphodo/rapid.py:4720
 #, python-format
 msgid ""
-"<b>The %(camera)s cannot be scanned because it cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again."
+"<b>The %(camera)s cannot be scanned because it cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again."
 msgstr ""
-"<b>Die %(camera)s kann nicht gescannt werden, da sie nicht ausgehangen "
-"werden kann.</b><br><br>Du kannst jedes andere Programm beenden (z.B. einen "
-"Datei-Browser), das sie benutzt und es noch einmal versuchen. Falls das "
-"nicht funktioniert, ziehe die %(camera)s vom Computer ab und stecke sie "
-"wieder an."
+"<b>Die %(camera)s kann nicht durchsucht werden, da sie nicht ausgehangen "
+"werden kann.</b><br><br>Sie können jedes andere Programm beenden (z.B. eine "
+"Dateiverwaltung), das sie benutzt und es noch einmal versuchen. Falls das "
+"nicht funktioniert, ziehen Sie die %(camera)s vom Computer ab und stecken "
+"Sie sie wieder an."
 
-#: ../raphodo/rapid.py:4496
+#: ../raphodo/rapid.py:4745
 #, python-format
 msgid ""
-"<b>The download cannot start because the %(camera)s cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again, and choose which files you want to "
-"download from it."
+"<b>The download cannot start because the %(camera)s cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again, and choose which files "
+"you want to download from it."
+msgstr ""
+"<b>Die Übertragung kann nicht starten, weil  die %(camera)s nicht ausgehängt "
+"werden kann.</b><br><br>Sie können alle anderen Anwendungen (wie z.B. einen "
+"Dateibrowser) schließen, die sie evtl. verwenden, und es erneut versuchen. "
+"Falls das nicht funktioniert, entfernen Sie bitte die %(camera)s vom "
+"Computer und stecken sie erneut ein. Wählen Sie anschließend, welche Dateien "
+"Sie übertragen möchten."
+
+#: ../raphodo/rapid.py:4842
+msgid "Completed Downloads Present"
+msgstr "Aktuelle Übertragungen abgeschlossen"
+
+#: ../raphodo/rapid.py:4844
+#, python-format
+msgid "%s whose download have completed are displayed."
+msgstr "%s, deren Übertragung abgeschlossen ist, werden angezeigt."
+
+#: ../raphodo/rapid.py:4846
+msgid "Do you want to clear the completed downloads?"
+msgstr "Möchten Sie abgeschlossene Übertragungen bereinigen?"
+
+#: ../raphodo/rapid.py:4848
+msgid "Completed Download Present"
 msgstr ""
 
-#: ../raphodo/rapid.py:4635
+#: ../raphodo/rapid.py:4850
+#, python-format
+msgid "%s whose download has completed is displayed."
+msgstr "%s, deren Übertragung abgeschlossen ist, wird angezeigt."
+
+#: ../raphodo/rapid.py:4852
+msgid "Do you want to clear the completed download?"
+msgstr "Möchten Sie die abgeschlossene Übertragung bereinigen?"
+
+#: ../raphodo/rapid.py:4933
 #, python-format
 msgid ""
 "Do you want to download photos and videos from the device <i>%(device)s</i>?"
 msgstr ""
+"Möchten Sie Fotos und Videos von dem Gerät <i>%(device)s</i> übertragen?"
 
-#: ../raphodo/rapid.py:4877
+#: ../raphodo/rapid.py:5183
 #, python-format
 msgid "<b>Do you want to ignore the %s whenever this program is run?</b>"
 msgstr ""
+"<b>Möchten Sie %s immer ignorieren, wenn das Programm gestartet wird?</b>"
 
-#: ../raphodo/rapid.py:4879
+#: ../raphodo/rapid.py:5186
 msgid ""
 "All cameras, phones and tablets with the same model name will be ignored."
 msgstr ""
 "Alle Kameras, Mobiltelefone und Tablets mit demselben Modellnamen werden "
 "ignoriert."
 
-#: ../raphodo/rapid.py:4883
+#: ../raphodo/rapid.py:5190
 #, python-format
 msgid ""
 "<b>Do you want to ignore the device %s whenever this program is run?</b>"
 msgstr ""
+"<b>Möchten Sie das Gerät %s immer ignorieren, wenn das Programm gestartet "
+"wird?</b>"
 
-#: ../raphodo/rapid.py:4885
+#: ../raphodo/rapid.py:5192
 msgid "Any device with the same name will be ignored."
-msgstr ""
+msgstr "Jedes Gerät mit dem gleichen Namen wird ignoriert."
 
-#: ../raphodo/rapid.py:5178
+#: ../raphodo/rapid.py:5492
 #, python-format
 msgid "Downloading from %(location)s on This Computer."
-msgstr ""
+msgstr "Von %(location)s wird auf diesen Rechner übertragen."
 
-#: ../raphodo/rapid.py:5180
+#: ../raphodo/rapid.py:5496
 msgid ""
 "Do you really want to download from here?<br><br>On some systems, scanning "
 "this location can take a very long time."
 msgstr ""
+"Möchten Sie wirklich von hier übertragen?<br><br>Auf manchen Systemen kann "
+"das Durchsuchen dieses Ortes sehr lange dauern."
 
-#: ../raphodo/rapid.py:5224
+#: ../raphodo/rapid.py:5537
 #, python-format
 msgid "Generating thumbnails for %s"
 msgstr "Vorschaubilder für %s werden erstellt"
 
-#: ../raphodo/rapid.py:5227
+#: ../raphodo/rapid.py:5540
 #, python-format
 msgid "Scanning %s"
 msgstr "%s wird eingelesen"
 
-#: ../raphodo/rapid.py:5237
+#: ../raphodo/rapid.py:5551
 #, python-format
 msgid ""
 "%(number)s of %(available files)s checked for download (%(hidden)s hidden)"
 msgstr ""
+"%(number)s von %(available files)s zur Übertragung angehakt (%(hidden)s "
+"versteckt)"
 
-#: ../raphodo/rapid.py:5243
+#: ../raphodo/rapid.py:5559
 #, python-format
 msgid "%(number)s of %(available files)s checked for download"
-msgstr ""
+msgstr "%(number)s von %(available files)s zur Übertragung angehakt"
 
-#: ../raphodo/rapid.py:5494
+#: ../raphodo/rapid.py:5764
 msgid "Display program information when run from the command line."
-msgstr ""
+msgstr "Zeige Programminformation beim Start via Kommandozeile"
 
-#: ../raphodo/rapid.py:5496
+#: ../raphodo/rapid.py:5766
 msgid "Display debugging information when run from the command line."
-msgstr ""
+msgstr "Zeige Debugging-Informationen beim Start via Kommandozeile"
 
-#: ../raphodo/rapid.py:5499
+#: ../raphodo/rapid.py:5769
 msgid "List photo and video file extensions the program recognizes and exit."
 msgstr ""
+"Zeige Foto- und Video-Dateinamenserweiterung, die das Programm kennt, und "
+"beende."
 
-#: ../raphodo/rapid.py:5502
+#: ../raphodo/rapid.py:5772
 msgid "Turn on or off the the renaming of photos."
-msgstr ""
+msgstr "Schalte das Umbenennen von Fotos an oder aus."
 
-#: ../raphodo/rapid.py:5504
+#: ../raphodo/rapid.py:5774
 msgid "turn on or off the the renaming of videos."
-msgstr ""
+msgstr "Schalte das Umbenennen von Videos an oder aus."
 
-#: ../raphodo/rapid.py:5506
+#: ../raphodo/rapid.py:5776
 msgid ""
 "Turn on or off the automatic detection of devices from which to download."
 msgstr ""
+"Schalte die automatische Erkennung von Geräten, von denen heruntergeladen "
+"werden soll, an oder aus."
 
-#: ../raphodo/rapid.py:5510
+#: ../raphodo/rapid.py:5780
 msgid "Turn on or off downloading from this computer."
-msgstr ""
+msgstr "Das Übertragen von diesem Rechner an- oder ausschalten."
 
-#: ../raphodo/rapid.py:5512 ../raphodo/rapid.py:5515 ../raphodo/rapid.py:5518
-#: ../raphodo/rapid.py:5539 ../raphodo/rapid.py:5543
+#: ../raphodo/rapid.py:5782 ../raphodo/rapid.py:5785 ../raphodo/rapid.py:5788
+#: ../raphodo/rapid.py:5809 ../raphodo/rapid.py:5813
 msgid "PATH"
 msgstr "PFAD"
 
-#: ../raphodo/rapid.py:5513
+#: ../raphodo/rapid.py:5783
 msgid "The PATH on this computer from which to download."
-msgstr ""
+msgstr "Der PFAD auf diesem Rechner, von dem übertragen wird."
 
-#: ../raphodo/rapid.py:5516
+#: ../raphodo/rapid.py:5786
 msgid "The PATH where photos will be downloaded to."
-msgstr ""
+msgstr "Der PFAD, auf den Fotos übertragen werden."
 
-#: ../raphodo/rapid.py:5519
+#: ../raphodo/rapid.py:5789
 msgid "The PATH where videos will be downloaded to."
-msgstr ""
+msgstr "Der PFAD, auf den Videos übertragen werden."
 
-#: ../raphodo/rapid.py:5521
+#: ../raphodo/rapid.py:5791
 msgid "Turn on or off the backing up of photos and videos while downloading."
 msgstr ""
+"Schalte die Sicherung von Fotos und Videos während der Übertragung an oder "
+"aus."
 
-#: ../raphodo/rapid.py:5525
+#: ../raphodo/rapid.py:5795
 msgid "Turn on or off the automatic detection of backup devices."
 msgstr ""
+"Schalte die automatische Erkennung von Sicherungsgeräten an oder aus."
 
-#: ../raphodo/rapid.py:5527 ../raphodo/rapid.py:5533
+#: ../raphodo/rapid.py:5797 ../raphodo/rapid.py:5803
 msgid "FOLDER"
 msgstr "ORDNER"
 
-#: ../raphodo/rapid.py:5528
+#: ../raphodo/rapid.py:5798
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected photo "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3359,7 +4599,7 @@ msgid ""
 "photos up to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5534
+#: ../raphodo/rapid.py:5804
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected video "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3367,145 +4607,177 @@ msgid ""
 "up videos to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5540
+#: ../raphodo/rapid.py:5810
 msgid ""
 "The PATH where photos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
+"Der PFAD, auf den Fotos gesichert werden, wenn die automatische Erkennung "
+"von Sicherungsgeräten abgeschaltet ist."
 
-#: ../raphodo/rapid.py:5544
+#: ../raphodo/rapid.py:5814
 msgid ""
 "The PATH where videos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
+"Der PFAD, auf den Videos gesichert werden, wenn die automatische Erkennung "
+"von Sicherungsgeräten abgeschaltet ist."
 
-#: ../raphodo/rapid.py:5547
+#: ../raphodo/rapid.py:5817
 #, python-format
 msgid "Ignore photos with the following extensions: %s"
 msgstr "Fotos mit folgender Erweiterung auslassen: %s"
 
-#: ../raphodo/rapid.py:5551
-msgid "Turn on or off starting downloads as soon as the program itself starts."
-msgstr ""
+#: ../raphodo/rapid.py:5821
+msgid ""
+"Turn on or off starting downloads as soon as the program itself starts."
+msgstr "Sofortige Übertragung bei Programmstart an- oder ausschalten."
 
-#: ../raphodo/rapid.py:5554
+#: ../raphodo/rapid.py:5824
 msgid "Turn on or off starting downloads as soon as a device is inserted."
 msgstr ""
+"Sofortige Übertragung beim Einstecken eines Gerätes an- oder ausschalten."
 
-#: ../raphodo/rapid.py:5557
+#: ../raphodo/rapid.py:5827
 msgid ""
 "Turn on or off use of the Rapid Photo Downloader Thumbnail Cache. Turning it "
 "off does not delete existing cache contents."
 msgstr ""
 
-#: ../raphodo/rapid.py:5561
+#: ../raphodo/rapid.py:5831
 msgid ""
 "Delete all thumbnails in the Rapid Photo Downloader Thumbnail Cache, and "
 "exit."
 msgstr ""
+"Lösche alle Vorschaubilder des Rapid Photo Downloader-eigenen "
+"Zwischenspeichers, und schließe."
 
-#: ../raphodo/rapid.py:5565
+#: ../raphodo/rapid.py:5835
 msgid "Forget which files have been previously downloaded, and exit."
-msgstr ""
+msgstr "Zuvor heruntergeladene Dateien vergessen und beenden."
 
-#: ../raphodo/rapid.py:5568
+#: ../raphodo/rapid.py:5838
 msgid ""
 "Import preferences from an old program version and exit. Requires the "
 "command line program gconftool-2."
 msgstr ""
+"Importiere Voreinstellungen einer älteren Programmversion und schließe. "
+"Erfordert das Kommandozeilen-Programm gconftool-2."
 
-#: ../raphodo/rapid.py:5571
+#: ../raphodo/rapid.py:5841
 msgid ""
 "Reset all program settings to their default values, delete all thumbnails in "
 "the Thumbnail cache, forget which files have been previously downloaded, and "
 "exit."
 msgstr ""
+"Setze alle Programmeinstellungen auf ihre Voreinstellungen zurück, lösche "
+"alle Vorschaubilder aus dem Zwischenspeicher, vergesse, welche Dateien "
+"bereits übertragen wurden, und schließe das Programm."
 
-#: ../raphodo/rapid.py:5575
+#: ../raphodo/rapid.py:5845
 msgid "Include gphoto2 debugging information in log files."
-msgstr ""
+msgstr "gphoto2-Fehlerinformationen in Protokolldateien einschließen."
 
-#: ../raphodo/rapid.py:5579
+#: ../raphodo/rapid.py:5849
 msgid "Print information to the terminal about attached cameras and exit."
 msgstr ""
+"Informationen über angeschlossene Kameras auf dem Terminal ausgeben und "
+"beenden."
 
-#: ../raphodo/rapid.py:5640
+#: ../raphodo/rapid.py:5911
 msgid ""
 "To import preferences from the old version of Rapid Photo Downloader, you "
 "must install the program gconftool-2."
 msgstr ""
+"Um Voreinstellungen von der alten Version des Rapid Photo Downloader zu "
+"importieren, müssen Sie das Programm gconftool-2 installieren."
 
-#: ../raphodo/rapid.py:5649
+#: ../raphodo/rapid.py:5920
 msgid "No prior program preferences detected: exiting"
-msgstr ""
+msgstr "Keine früheren Programm-Voreinstellungen gefunden: Schließe"
 
-#: ../raphodo/rapid.py:5652
+#: ../raphodo/rapid.py:5923
 #, python-format
 msgid "Importing preferences from Rapid Photo Downloader %(version)s"
-msgstr ""
+msgstr "Importiere Voreinstellungen von Rapid Photo Downloader %(version)s"
 
-#: ../raphodo/rapid.py:5714
+#: ../raphodo/rapid.py:5989
 #, python-format
-msgid "Do you want to copy the stored sequence number, which has the value %d?"
-msgstr ""
+msgid ""
+"Do you want to copy the stored sequence number, which has the value %d?"
+msgstr "Möchten Sie die gespeicherte Sequenznummer mit dem Wert %d kopieren?"
 
-#: ../raphodo/rapid.py:5726
+#: ../raphodo/rapid.py:6000
 msgid "Program aborting."
-msgstr ""
+msgstr "Programmabbruch."
 
-#: ../raphodo/rapid.py:5736
+#: ../raphodo/rapid.py:6010
 msgid "Never run this program as the sudo / root user."
-msgstr ""
+msgstr "Starten Sie dieses Programm niemals als sudo- oder root-Benutzer."
 
-#: ../raphodo/rapid.py:5740
+#: ../raphodo/rapid.py:6014
 msgid "You must install ExifTool to run Rapid Photo Downloader."
 msgstr ""
+"Sie müssen ExifTool installieren, um Rapid Photo Downloader ausführen zu "
+"können."
 
-#: ../raphodo/rapid.py:5794
+#: ../raphodo/rapid.py:6026
+msgid ""
+"Rapid Photo Downloader is installed in multiple locations.\n"
+"\n"
+"Uninstall all copies except the version you want to run."
+msgstr ""
+"Rapid Photo Downloader ist an mehreren Stellen installiert.\n"
+"\n"
+"Entfernen Sie alle Kopien mit Ausnahme derjenigen, die Sie verwenden möchten."
+
+#: ../raphodo/rapid.py:6083
 msgid ""
 "When specifying a path on the command line, do not also specify an\n"
 "option for device auto detection or a path on \"This Computer\"."
 msgstr ""
 
-#: ../raphodo/rapid.py:5950
+#: ../raphodo/rapid.py:6243
 msgid "All settings and caches have been reset"
-msgstr ""
+msgstr "Alle Einstellungen und Zwischenspeicher wurden zurückgesetzt"
 
-#: ../raphodo/rapid.py:5958
+#: ../raphodo/rapid.py:6251
 msgid "Thumbnail Cache has been reset"
 msgstr "Vorschaubildpuffer wurde zurückgesetzt"
 
-#: ../raphodo/rapid.py:5964
+#: ../raphodo/rapid.py:6257
 msgid "Remembered files have been forgotten"
-msgstr ""
+msgstr "Gemerkte Dateien wurden vergessen"
 
 #: ../raphodo/rememberthisdialog.py:70
 msgid "&Don't ask me about this again"
-msgstr ""
+msgstr "Mich nicht mehr erneut &danach fragen"
 
 #: ../raphodo/rememberthisdialog.py:72
 msgid "&Don't warn me about this again"
-msgstr ""
+msgstr "Mich nicht mehr erneut &darüber warnen"
 
 #: ../raphodo/rememberthisdialog.py:75
 msgid "&Don't warn me again about missing or broken program libraries"
 msgstr ""
+"Mich nicht mehr erneut über fehlen&de oder kaputte Programmbibliotheken "
+"warnen"
 
-#: ../raphodo/renameandmovefile.py:546
+#: ../raphodo/renameandmovefile.py:554
 msgid "subfolder and filename"
 msgstr "Unterordner und Dateiname"
 
-#: ../raphodo/renameandmovefile.py:548
+#: ../raphodo/renameandmovefile.py:556
 msgid "filename"
 msgstr "Dateiname"
 
-#: ../raphodo/renameandmovefile.py:550
+#: ../raphodo/renameandmovefile.py:558
 msgid "subfolder"
 msgstr "Unterordner"
 
 #: ../raphodo/renamepanel.py:290
 msgid "A counter for how many downloads occur on each day"
-msgstr ""
+msgstr "Ein Zähler für die Anzahl der täglichen Übertragungen"
 
 #: ../raphodo/renamepanel.py:291
 msgid "Downloads today:"
@@ -3523,6 +4795,8 @@ msgstr "Gespeicherte Nummer"
 msgid ""
 "The time at which the <i>Downloads today</i> sequence number should be reset"
 msgstr ""
+"Zeitpunkt, zu dem die Sequenznummer <i>Übertragungen heute</i> zurückgesetzt "
+"werden soll"
 
 #: ../raphodo/renamepanel.py:332
 msgid "Day start:"
@@ -3532,7 +4806,7 @@ msgstr "Beginn des Tages:"
 #. self.dayStart.setDisplayFormat('HH:mm:ss')
 #: ../raphodo/renamepanel.py:342
 msgid "Synchronize RAW + JPEG"
-msgstr ""
+msgstr "RAW + JPEG synchronisieren"
 
 #: ../raphodo/renamepanel.py:345
 msgid ""
@@ -3540,10 +4814,13 @@ msgid ""
 "\n"
 "See the online documentation for more details."
 msgstr ""
+"Synchronisiere Sequenznummern übereinstimmender RAW- und JPEG-Paarungen.\n"
+"\n"
+"SIehe Online-Dokumentation für mehr Details."
 
 #: ../raphodo/renamepanel.py:349
 msgid "Sequence Numbers"
-msgstr ""
+msgstr "Sequenznummern"
 
 #: ../raphodo/renamepanel.py:360
 msgid "Strip incompatible characters"
@@ -3554,22 +4831,24 @@ msgid ""
 "Whether photo, video and folder names should have any characters removed "
 "that are not allowed by other operating systems"
 msgstr ""
+"Legt fest, ob Sonderzeichen, die auf anderen Betriebssystemen verboten sind, "
+"aus den Bezeichnungen der Foto- und Videoordner entfernt werden sollen."
 
 #: ../raphodo/renamepanel.py:365
 msgid "Compatibility"
-msgstr ""
+msgstr "Kompatibilität"
 
 #: ../raphodo/renamepanel.py:433
 msgid "Photo Renaming"
-msgstr ""
+msgstr "Fotoumbenennung"
 
 #: ../raphodo/renamepanel.py:436
 msgid "Video Renaming"
-msgstr ""
+msgstr "Videoumbenennung"
 
 #: ../raphodo/renamepanel.py:439
 msgid "Renaming Options"
-msgstr ""
+msgstr "Umbenennungsoptionen"
 
 #: ../raphodo/rpdfile.py:218
 msgid "photos and videos"
@@ -3579,159 +4858,237 @@ msgstr "Fotos und Filme"
 msgid "photos or videos"
 msgstr "Fotos oder Filme"
 
-#: ../raphodo/rpdfile.py:306
+#: ../raphodo/rpdfile.py:315
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: ../raphodo/rpdfile.py:318
+#. translators: natural language expression signifying a single video
+#: ../raphodo/rpdfile.py:337
+msgid "a video"
+msgstr "ein Video"
+
+#: ../raphodo/rpdfile.py:339
 msgid "1 Video"
 msgstr "1 Video"
 
-#: ../raphodo/rpdfile.py:323
+#. translators: natural language expression signifying a single photo
+#: ../raphodo/rpdfile.py:346
+msgid "a photo"
+msgstr "ein Foto"
+
+#: ../raphodo/rpdfile.py:348
 msgid "1 Photo"
 msgstr "1 Foto"
 
-#: ../raphodo/rpdfile.py:803
+#: ../raphodo/rpdfile.py:828
 #, python-format
 msgid "%(path)s on %(camera)s"
-msgstr ""
+msgstr "%(path)s auf %(camera)s"
 
-#: ../raphodo/rpdfile.py:819
+#: ../raphodo/rpdfile.py:844
 msgid "Photo"
 msgstr "Foto"
 
-#: ../raphodo/rpdfile.py:859
+#: ../raphodo/rpdfile.py:884
 msgid "Video"
 msgstr "Film"
 
-#: ../raphodo/storage.py:138
+#: ../raphodo/storage.py:141
 msgid "File system root"
-msgstr ""
+msgstr "Dateisystem-Root"
 
 #. translators: the name of the Pictures folder
-#: ../raphodo/storage.py:433
+#: ../raphodo/storage.py:437
 msgid "Pictures"
-msgstr ""
+msgstr "Bilder"
 
-#: ../raphodo/thumbnaildisplay.py:426
+#: ../raphodo/thumbnaildisplay.py:432
 #, python-format
 msgid "Taken on %(date_time)s (%(human_readable)s)"
-msgstr ""
+msgstr "Aufgenommen am %(date_time)s (%(human_readable)s)"
 
-#: ../raphodo/thumbnaildisplay.py:431
+#: ../raphodo/thumbnaildisplay.py:439
 #, python-format
 msgid "Modified on %(date_time)s (%(human_readable)s)"
-msgstr ""
+msgstr "Geändert am %(date_time)s (%(human_readable)s)"
 
-#: ../raphodo/thumbnaildisplay.py:437 ../raphodo/thumbnaildisplay.py:466
+#: ../raphodo/thumbnaildisplay.py:447 ../raphodo/thumbnaildisplay.py:481
 #, python-format
 msgid "%(date_time)s (%(human_readable)s)"
-msgstr ""
+msgstr "%(date_time)s (%(human_readable)s)"
 
-#: ../raphodo/thumbnaildisplay.py:451
+#: ../raphodo/thumbnaildisplay.py:464
 #, python-format
 msgid "Memory cards: %s"
 msgstr "Speicherkarten: %s"
 
-#: ../raphodo/thumbnaildisplay.py:457
+#: ../raphodo/thumbnaildisplay.py:468
+#, python-format
+msgid "Memory card: %s"
+msgstr "Speicherkarte: %s"
+
+#: ../raphodo/thumbnaildisplay.py:473
 msgid "Downloaded as:"
 msgstr "Heruntergelaen als:"
 
-#: ../raphodo/thumbnaildisplay.py:472
+#: ../raphodo/thumbnaildisplay.py:489
 #, python-format
 msgid "<br><br>Previous download:<br>%(filename)s<br>%(path)s<br>%(date)s"
 msgstr ""
+"<br><br>Vorherige Übertragung:<br>%(filename)s<br>%(path)s<br>%(date)s"
 
-#: ../raphodo/thumbnaildisplay.py:1603
+#: ../raphodo/thumbnaildisplay.py:1645
 msgid "Copy Path"
 msgstr "Pfad kopieren"
 
+#. Translators: these values are file size suffixes like B representing bytes, KB representing
+#. kilobytes, etc.
+#: ../raphodo/utilities.py:170
+msgid "B"
+msgstr "B"
+
+#: ../raphodo/utilities.py:170
+msgid "KB"
+msgstr "KB"
+
+#: ../raphodo/utilities.py:170
+msgid "MB"
+msgstr "MB"
+
+#: ../raphodo/utilities.py:170
+msgid "GB"
+msgstr "GB"
+
+#: ../raphodo/utilities.py:170
+msgid "TB"
+msgstr "TB"
+
+#: ../raphodo/utilities.py:170
+msgid "PB"
+msgstr "PB"
+
+#: ../raphodo/utilities.py:170
+msgid "EB"
+msgstr "EB"
+
+#: ../raphodo/utilities.py:170
+msgid "ZB"
+msgstr "ZB"
+
+#: ../raphodo/utilities.py:170
+msgid "YB"
+msgstr "YB"
+
 #. two things in a list e.g. "device1 and device2"
-#: ../raphodo/utilities.py:391
+#: ../raphodo/utilities.py:394
 #, python-format
 msgid "%(first_item)s and %(last_item)s"
 msgstr "%(first_item)s und %(last_item)s"
 
-#: ../raphodo/utilities.py:464
+#: ../raphodo/utilities.py:468
 msgid "one"
-msgstr ""
+msgstr "eins"
 
-#: ../raphodo/utilities.py:465
+#: ../raphodo/utilities.py:469
 msgid "two"
-msgstr ""
+msgstr "zwei"
 
-#: ../raphodo/utilities.py:466
+#: ../raphodo/utilities.py:470
 msgid "three"
-msgstr ""
+msgstr "drei"
 
-#: ../raphodo/utilities.py:467
+#: ../raphodo/utilities.py:471
 msgid "four"
-msgstr ""
+msgstr "vier"
 
-#: ../raphodo/utilities.py:468
+#: ../raphodo/utilities.py:472
 msgid "five"
-msgstr ""
+msgstr "fünf"
 
-#: ../raphodo/utilities.py:469
+#: ../raphodo/utilities.py:473
 msgid "six"
-msgstr ""
+msgstr "sechs"
 
-#: ../raphodo/utilities.py:470
+#: ../raphodo/utilities.py:474
 msgid "seven"
-msgstr ""
+msgstr "sieben"
 
-#: ../raphodo/utilities.py:471
+#: ../raphodo/utilities.py:475
 msgid "eight"
-msgstr ""
+msgstr "acht"
 
-#: ../raphodo/utilities.py:472
+#: ../raphodo/utilities.py:476
 msgid "nine"
-msgstr ""
+msgstr "neun"
 
-#: ../raphodo/utilities.py:473
+#: ../raphodo/utilities.py:477
 msgid "ten"
-msgstr ""
+msgstr "zehn"
 
-#: ../raphodo/utilities.py:474
+#: ../raphodo/utilities.py:478
 msgid "eleven"
-msgstr ""
+msgstr "elf"
 
-#: ../raphodo/utilities.py:475
+#: ../raphodo/utilities.py:479
 msgid "twelve"
-msgstr ""
+msgstr "zwölf"
 
-#: ../raphodo/utilities.py:476
+#: ../raphodo/utilities.py:480
 msgid "thirteen"
-msgstr ""
+msgstr "dreizehn"
 
-#: ../raphodo/utilities.py:477
+#: ../raphodo/utilities.py:481
 msgid "fourteen"
-msgstr ""
+msgstr "vierzehn"
 
-#: ../raphodo/utilities.py:478
+#: ../raphodo/utilities.py:482
 msgid "fifteen"
-msgstr ""
+msgstr "fünfzehn"
 
-#: ../raphodo/utilities.py:479
+#: ../raphodo/utilities.py:483
 msgid "sixteen"
-msgstr ""
+msgstr "sechzehn"
 
-#: ../raphodo/utilities.py:480
+#: ../raphodo/utilities.py:484
 msgid "seventeen"
-msgstr ""
+msgstr "siebzehn"
 
-#: ../raphodo/utilities.py:481
+#: ../raphodo/utilities.py:485
 msgid "eighteen"
-msgstr ""
+msgstr "achtzehn"
 
-#: ../raphodo/utilities.py:482
+#: ../raphodo/utilities.py:486
 msgid "ninenteen"
-msgstr ""
+msgstr "neunzehn"
 
-#: ../raphodo/utilities.py:483
+#: ../raphodo/utilities.py:487
 msgid "twenty"
-msgstr ""
+msgstr "zwanzig"
+
+#: ../raphodo/viewutils.py:240
+msgid "&OK"
+msgstr "&OK"
+
+#: ../raphodo/viewutils.py:243
+msgid "&Save"
+msgstr "&Speichern"
+
+#: ../raphodo/viewutils.py:244
+msgid "&Help"
+msgstr "&Hilfe"
+
+#: ../raphodo/viewutils.py:245
+msgid "Restore Defaults"
+msgstr "Standardeinstellungen wiederherstellen"
+
+#: ../raphodo/viewutils.py:246
+msgid "&Yes"
+msgstr "&Ja"
+
+#: ../raphodo/viewutils.py:247
+msgid "&No"
+msgstr "&Nein"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:1
 msgid ""
@@ -3741,6 +5098,12 @@ msgid ""
 "photos and videos as they are downloaded. It downloads from and backs up to "
 "multiple devices simultaneously."
 msgstr ""
+"Rapid Photo Downloader importiert Fotos und Videos von Kameras, Telefonen, "
+"Speicherkarten und anderen Geräten mit hoher Geschwindigkeit. Es erlaubt das "
+"Umbenennen von Fotos und Videos in von Ihnen festgelegte, sprechende "
+"Dateinamen. Außerdem kann es Fotos und Videos bereits während der "
+"Übertragung sichern. Es überträgt von und sichert nach mehreren Geräten "
+"gleichzeitig."
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:2
 msgid ""
@@ -3749,6 +5112,11 @@ msgid ""
 "identify photos and videos taken at different periods in a single day or "
 "over consecutive days."
 msgstr ""
+"Einzigartig an Rapid Photo Downloader ist seine Zeitleiste, die Fotos und "
+"Videos in Abhängigkeit von der Zeitspanne, die zwischen den Aufnahmen "
+"vergangen ist, gruppiert. Verwenden Sie sie, um Fotos und Videos zuzuordnen, "
+"die über einen Tag verteilt oder an aufeinanderfolgenden Tagen aufgenommen "
+"wurden."
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:3
 msgid ""
@@ -3757,43 +5125,53 @@ msgid ""
 "configured without the need for complicated codes. Common tasks can be "
 "automated, such as unmounting a memory card when the download is complete."
 msgstr ""
+"Von einem Fotografen entwickelt ist Rapid Photo Downloader für "
+"professionelle und Amateur-Fotografen gleichermaßen einfach einzurichten und "
+"zu verwenden. Voreinstellungen des Programms werden ohne komplizierte Codes "
+"konfiguriert. Häufige Aufgaben lassen sich automatisieren, beispielsweise "
+"das Aushängen einer Speicherkarte nach erfolgreicher Übertragung."
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:4
 msgid "The main window"
-msgstr ""
+msgstr "Das Hauptfenster"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:5
 msgid "Downloading"
-msgstr ""
+msgstr "Wird heruntergeladen"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:6
 msgid "The Timeline"
-msgstr ""
+msgstr "Die Zeitleiste"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:7
 msgid "Right-clicking on a device"
-msgstr ""
+msgstr "Gerät mit Rechtsklick auswählen"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:1
 msgid ""
 "Download, rename and back up photos and videos from cameras and other devices"
 msgstr ""
+"Fotos und Videos von Kameras oder anderen Geräten und Speichermedien "
+"übertragen und/oder umbenennen sowie Sicherheitskopien erstellen"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:2
 msgid "Photo Downloader"
-msgstr "Fotoübertragung"
+msgstr "Photo Downloader"
 
 #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:5
 msgid ""
-"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;"
-"memory;card;"
+"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;memory"
+";card;"
 msgstr ""
+"Foto;übertragen;Fotografie;Import;Video;RAW;Kamera;Smartphone;Laden;Sicherung"
+";Speicher;Speicherkarte;"
 
 #: ../data/kde/net.damonlynch.rapid-photo-downloader.desktop.in.h:1
 msgid "Download Photos and Videos with Rapid Photo Downloader"
-msgstr ""
+msgstr "Fotos und Videos mit Rapid-Fotoübertragung übertragen"
 
+#, python-format
 #~ msgid "<i>Example: %s</i>"
 #~ msgstr "<i>Beispiel: %s</i>"
 
@@ -3806,6 +5184,7 @@ msgstr ""
 #~ msgid "Backing up error"
 #~ msgstr "Fehler beim Erstellen der Sicherungskopie"
 
+#, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
 #~ "Destination: %(destination)s"
@@ -3819,6 +5198,7 @@ msgstr ""
 #~ msgid "MB/s"
 #~ msgstr "MB/s"
 
+#, python-format
 #~ msgid "and %s"
 #~ msgstr "und %s"
 
@@ -3870,12 +5250,14 @@ msgstr ""
 #~ msgid "_Help"
 #~ msgstr "_Hilfe"
 
+#, python-format
 #~ msgid "About %i seconds remaining"
 #~ msgstr "Etwa %i Sekunden verbleibend"
 
 #~ msgid "About 1 second remaining"
 #~ msgstr "Etwa 1 Sekunde verbleibend"
 
+#, python-format
 #~ msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 #~ msgstr "Etwa %(minutes)i:%(seconds)02i Minuten verbleibend"
 
@@ -3969,12 +5351,14 @@ msgstr ""
 #~ msgid "R_emove All"
 #~ msgstr "_Alle entfernen"
 
+#, python-format
 #~ msgid "Source: %(source)s"
 #~ msgstr "Quelle: %(source)s"
 
 #~ msgid "Remove all Job Codes?"
 #~ msgstr "Alle Auftragsbezeichnungen entfernen?"
 
+#, python-format
 #~ msgid "Destination directory could not be created: %(directory)s\n"
 #~ msgstr "Das Zielverzeichnis konnte nicht erstellt werden: %(directory)s\n"
 
@@ -3999,9 +5383,10 @@ msgstr ""
 #~ msgid ""
 #~ "Should this device or partition be used to download photos or videos from?"
 #~ msgstr ""
-#~ "Soll dieses Laufwerk oder diese Partition zum Herunterladen von Bildern "
-#~ "oder Filmen verwendet werden?"
+#~ "Soll dieses Laufwerk oder diese Partition zum Herunterladen von Bildern oder "
+#~ "Filmen verwendet werden?"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s"
 #~ msgstr "%(number)s von %(total)s %(filetypes)s"
 
@@ -4010,8 +5395,8 @@ msgstr ""
 
 #~ 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"
+#~ "Anzeigen der Dateitypen für Bilder und Filme anzeigen, welche das Programm "
+#~ "erkennt und beenden"
 
 #~ msgid "All settings and preferences have been reset"
 #~ msgstr "Alle Einstellungen wurden zurückgesetzt"
@@ -4026,13 +5411,14 @@ msgstr ""
 #~ "When backing up, choose whether to overwrite a file on the backup device "
 #~ "that has the same name, or skip backing it up."
 #~ msgstr ""
-#~ "Bitte geben Sie an was geschehen soll, falls bei der Sicherung bereits "
-#~ "eine Datei mit demselben Namen vorhanden ist, Überspringen oder "
-#~ "Überschreiben."
+#~ "Bitte geben Sie an was geschehen soll, falls bei der Sicherung bereits eine "
+#~ "Datei mit demselben Namen vorhanden ist, Überspringen oder Überschreiben."
 
+#, python-format
 #~ msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
+#, python-format
 #~ msgid ""
 #~ "%(date)s\n"
 #~ "%(time)s"
@@ -4040,20 +5426,21 @@ msgstr ""
 #~ "%(date)s\n"
 #~ "%(time)s"
 
+#, python-format
 #~ msgid "%(date)s %(time)s"
 #~ msgstr "%(date)s %(time)s"
 
+#, python-format
 #~ msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
+#, python-format
 #~ msgid "Error: %(inst)s"
 #~ msgstr "Fehler: %(inst)s"
 
-#~ msgid ""
-#~ "Photos detected with the same filenames, but taken at different times"
+#~ msgid "Photos detected with the same filenames, but taken at different times"
 #~ msgstr ""
-#~ "Bilder mit gleichem Dateinamen aber unterschiedlichen Aufnahmezeiten "
-#~ "gefunden"
+#~ "Bilder mit gleichem Dateinamen aber unterschiedlichen Aufnahmezeiten gefunden"
 
 #~ msgid "Select All Without _Job Code"
 #~ msgstr "Alle ohne Auftragsbezeichnung auswählen"
@@ -4062,9 +5449,8 @@ msgstr ""
 #~ msgstr "Alle mit Auftragsbezeichnung auswählen"
 
 #~ 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."
+#~ "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 ""
 #~ "Bitte wählen Sie aus, was zu tun ist, wenn ein Bild oder ein Film bereits "
 #~ "heruntergeladen wurde, entweder Datei überspringen oder eine eindeutige "
@@ -4076,6 +5462,7 @@ msgstr ""
 #~ msgid "_Select"
 #~ msgstr "_Auswahl"
 
+#, python-format
 #~ msgid "%(freespace)s. %(backuppaths)s."
 #~ msgstr "%(freespace)s. %(backuppaths)s."
 
@@ -4088,24 +5475,31 @@ msgstr ""
 #~ msgid "."
 #~ msgstr "."
 
+#, python-format
 #~ msgid "(%(file_type)s)"
 #~ msgstr "(%(file_type)s)"
 
+#, python-format
 #~ msgid "%(free)s %(file_type)s"
 #~ msgstr "%(free)s %(file_type)s"
 
+#, python-format
 #~ msgid "%(free)s free"
 #~ msgstr "%(free)s verfügbar"
 
+#, python-format
 #~ msgid "%(filetype)s metadata cannot be read"
 #~ msgstr "%(filetype)s Metadaten können nicht gelesen werden"
 
+#, python-format
 #~ msgid "Error generating component %s."
 #~ msgstr "Fehler beim Erstellen von %s."
 
+#, python-format
 #~ msgid "%(filetype)s %(area)s could not be generated"
 #~ msgstr "%(filetype)s %(area)s können nicht erstellt werden"
 
+#, python-format
 #~ msgid ""
 #~ "%(problem)s\n"
 #~ "File: %(file)s"
@@ -4113,6 +5507,7 @@ msgstr ""
 #~ "%(problem)s\n"
 #~ "Datei: %(file)s"
 
+#, python-format
 #~ msgid ""
 #~ "%(filetype)s could not be backed up because no suitable backup locations "
 #~ "were found."
@@ -4120,46 +5515,55 @@ msgstr ""
 #~ "Von %(filetype)s konnte keine Sicherungskopie erstellt werden, da kein "
 #~ "entsprechenden Verzeichnis gefunden wurde."
 
+#, python-format
 #~ msgid "%(filetype)s already exists"
 #~ msgstr "%(filetype)s existiert bereits"
 
+#, python-format
 #~ msgid "%(filetype)s was already downloaded"
 #~ msgstr "%(filetype)s wurde bereits heruntergeladen"
 
+#, python-format
 #~ msgid "An error occurred when copying the %(filetype)s"
 #~ msgstr "Beim Kopieren von %(filetype)s ist ein Fehler aufgetreten"
 
+#, 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."
 
+#, python-format
 #~ msgid ""
-#~ "The existing %(filetype)s was last modified on %(date)s at %(time)s. "
-#~ "Unique identifier '%(identifier)s' added."
+#~ "The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
+#~ "identifier '%(identifier)s' added."
 #~ msgstr ""
 #~ "Die existierende Datei %(filetype)s wurde zuletzt am %(date)s um %(time)s "
 #~ "modifiziert. Eine eindeutige Kennung '%(identifier)s' wurde angefügt."
 
+#, python-format
 #~ msgid "Error: %(errorno)s %(strerror)s"
 #~ msgstr "Fehler: %(errorno)s %(strerror)s"
 
 #~ msgid "The metadata might be corrupt."
 #~ msgstr "Die Metadaten scheinen korrupt zu sein."
 
+#, python-format
 #~ msgid "%(volume)s (%(inst)s), "
 #~ msgstr "%(volume)s (%(inst)s), "
 
 #~ msgid "Errors occurred when backing up on the following backup devices: "
 #~ msgstr ""
-#~ "Fehler traten auf beim beim Erstellen der Sicherungskopien auf die "
-#~ "folgenden Laufwerke: "
+#~ "Fehler traten auf beim beim Erstellen der Sicherungskopien auf die folgenden "
+#~ "Laufwerke: "
 
+#, 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."
 
+#, python-format
 #~ msgid ""
 #~ "Photos detected with the same filenames, but taken at different times: "
 #~ "%(details)s"
@@ -4171,21 +5575,25 @@ msgstr ""
 #~ "The filename, extension and Exif information indicate it has already been "
 #~ "downloaded."
 #~ msgstr ""
-#~ "Dateiname, Erweiterung und EXIF-Informationen zeigen an, dass das Bild "
-#~ "schon heruntergeladen wurde."
+#~ "Dateiname, Erweiterung und EXIF-Informationen zeigen an, dass das Bild schon "
+#~ "heruntergeladen wurde."
 
+#, python-format
 #~ msgid " It was backed up to %(volume)s"
 #~ msgstr " Es wurde auf %(volume)s gesichert"
 
 #~ msgid " It was backed up to these devices: "
 #~ msgstr " Es wurde auf diese Laufwerke gesichert: "
 
+#, python-format
 #~ msgid "%s, "
 #~ msgstr "%s, "
 
+#, python-format
 #~ msgid "%(volumes)s and %(final_volume)s."
 #~ msgstr "%(volumes)s und %(final_volume)s."
 
+#, 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 "
@@ -4194,33 +5602,39 @@ msgstr ""
 #~ msgid "Backups overwritten on these devices: "
 #~ msgstr "Sicherungskopien überschrieben auf den folgenden Laufwerken: "
 
+#, python-format
 #~ msgid "Backup overwritten on %(volume)s."
 #~ msgstr "Sicherungskopie überschrieben auf %(volume)s."
 
+#, python-format
 #~ msgid "%(volume)s, "
 #~ msgstr "%(volume)s, "
 
 #~ msgid "Backups already exist in these locations: "
 #~ msgstr "Sicherungskopien existieren bereits auf den folgenden Laufwerken: "
 
+#, python-format
 #~ msgid "Backup already exists on %(volume)s."
 #~ msgstr "Sicherungskopie existiert bereits auf %(volume)s."
 
+#, python-format
 #~ msgid "%(volumes)s and %(volume)s."
 #~ msgstr "%(volumes)s und %(volume)s."
 
+#, python-format
 #~ msgid "%(volumes)s and %(volume)s (%(inst)s)."
 #~ msgstr "%(volumes)s und %(volume)s (%(inst)s)."
 
+#, python-format
 #~ msgid "%(previousproblem)s Additionally, %(newproblem)s"
 #~ msgstr "%(previousproblem)s zusätzlich, %(newproblem)s"
 
+#, 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."
 
 #~ msgid ""
-#~ "Errors occurred when creating directories on the following backup "
-#~ "devices: "
+#~ "Errors occurred when creating directories on the following backup devices: "
 #~ msgstr ""
 #~ "Fehler beim Erstellen der Verzeichnisse auf den folgenden "
 #~ "Sicherungslaufwerken: "
@@ -4228,36 +5642,42 @@ msgstr ""
 #~ msgid "The following metadata is missing: "
 #~ msgstr "Die folgenden Metadaten fehlen: "
 
+#, 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."
 
-#~ msgid ""
-#~ "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
+#, python-format
+#~ msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
 #~ msgstr ""
 #~ "%(missing_metadata_elements)s und %(final_missing_metadata_element)s."
 
+#, python-format
 #~ msgid " Furthermore, there were %(problems)s."
 #~ msgstr " Zustätzlich sind folgende Probleme aufgetreten %(problems)s."
 
-#~ msgid ""
-#~ "An error occurred when copying the %(filetype)s, but it was backed up"
+#, 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"
 
+#, python-format
 #~ msgid "%(filetype)s already exists, but it was backed up"
 #~ msgstr "%(filetype)s existiert bereits, wurde aber gesichert"
 
 #~ msgid "Multiple problems were encountered"
 #~ msgstr "Mehrere Probleme sind aufgetreten"
 
+#, python-format
 #~ msgid "%(previousproblem)s, and %(backinguperror)s"
 #~ msgstr "%(previousproblem)s, und %(backinguperror)s"
 
+#, python-format
 #~ msgid " Furthermore, there was a %(problem)s."
 #~ msgstr " Zustätzlich ist folgendes Problem aufgetreten %(problem)s."
 
+#, python-format
 #~ msgid "Path: %s"
 #~ msgstr "Pfad: %s"
 
@@ -4304,38 +5724,40 @@ msgstr ""
 #~ msgstr "Gespeicherte Pfade"
 
 #~ 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."
+#~ "Remembered paths are those associated with devices that you have chosen to "
+#~ "always scan or ignore when automatic detection of Portable Storage Devices "
+#~ "is enabled."
 #~ msgstr ""
-#~ "Gespeicherte Pfade sind Geräten zugeordnet, welche nach Ihren Vorgaben "
-#~ "immer durchsucht oder immer ignoriert werden, sobald die automatische "
-#~ "Erkennung von transportablen Speichergeräten eingeschaltet ist."
+#~ "Gespeicherte Pfade sind Geräten zugeordnet, welche nach Ihren Vorgaben immer "
+#~ "durchsucht oder immer ignoriert werden, sobald die automatische Erkennung "
+#~ "von transportablen Speichergeräten eingeschaltet ist."
 
 #~ 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."
+#~ "devices for photos or videos. Any path ending with the values below will not "
+#~ "be scanned."
 #~ msgstr ""
-#~ "Spezifizieren Sie den letzten Teil eines Pfades an, welcher beim "
-#~ "Durchsuchen von Geräten nach Bildern oder Filmen ignoriert werden soll. "
-#~ "Jegliche Pfade welche mit diesen Werten enden, werden nicht durchsucht."
+#~ "Spezifizieren Sie den letzten Teil eines Pfades an, welcher beim Durchsuchen "
+#~ "von Geräten nach Bildern oder Filmen ignoriert werden soll. Jegliche Pfade "
+#~ "welche mit diesen Werten enden, werden nicht durchsucht."
 
 #~ msgid "Invalid regular expression"
 #~ msgstr "Ungültiger regulärer Ausdruck"
 
+#, python-format
 #~ msgid ""
 #~ "The following regular expressions are invalid, and will be removed unless "
 #~ "you correct them:\n"
 #~ " %s"
 #~ msgstr ""
-#~ "Die folgenden regulären Ausdrücke sind ungültig und werden entfernt, "
-#~ "sofern Sie sie nicht korrigieren:\n"
+#~ "Die folgenden regulären Ausdrücke sind ungültig und werden entfernt, sofern "
+#~ "Sie sie nicht korrigieren:\n"
 #~ " %s"
 
+#, python-format
 #~ msgid ""
-#~ "This regular expression is invalid, and will be removed unless you "
-#~ "correct it:\n"
+#~ "This regular expression is invalid, and will be removed unless you correct "
+#~ "it:\n"
 #~ " %s"
 #~ msgstr ""
 #~ "Der folgende reguläre Ausdruck ist ungültig und wird entfernt, sofern Sie "
@@ -4346,8 +5768,8 @@ msgstr ""
 #~ "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."
+#~ "When this option is enabled, and a potential device is detected, you will be "
+#~ "prompted to determine if it should be scanned or not."
 #~ msgstr ""
 #~ "Wenn Sie die automatische Erkennung von transportablen Speichergeräten "
 #~ "einschalten, wird das ganze Gerät durchsucht. Dies kann je nach Grösse "
@@ -4368,12 +5790,15 @@ msgstr ""
 #~ msgid "scanning..."
 #~ msgstr "Laufwerk wird durchsucht …"
 
+#, python-format
 #~ msgid "Date time value %s appears invalid."
 #~ msgstr "Die Werte für Datum und Uhrzeit %s scheinen ungültig zu sein."
 
+#, python-format
 #~ msgid "Problems in %s generation"
 #~ msgstr "Probleme bei der Erstellung von %s"
 
+#, python-format
 #~ msgid "Problem in %s generation"
 #~ msgstr "Problem bei der Erstellung von %s"
 
@@ -4383,6 +5808,7 @@ msgstr ""
 #~ msgid "From"
 #~ msgstr "Von"
 
+#, python-format
 #~ msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
 #~ msgstr "Suche läuft (%(photos)s Fotos und %(videos)s Videos gefunden) …"
 
@@ -4404,12 +5830,15 @@ msgstr ""
 #~ msgid "Download cannot proceed"
 #~ msgstr "Das Herunterladen kann nicht weitergeführt werden"
 
+#, python-format
 #~ msgid "%(file_type)s download folder is not writable"
 #~ msgstr "%(file_type)s Übertragungsordner ist schreibgeschützt"
 
+#, python-format
 #~ msgid "%(file_type)s download folder is invalid"
 #~ msgstr "%(file_type)s Übertragungsordner ist ungültig"
 
+#, python-format
 #~ msgid "%(file_type)s download folder does not exist"
 #~ msgstr "%(file_type)s Übertragungsordner existiert nicht"
 
@@ -4422,6 +5851,7 @@ msgstr ""
 #~ msgid "Error in Photo Download Subfolders preferences"
 #~ msgstr "Fehler in den Vorgaben für Bilderübertragsunterordner"
 
+#, python-format
 #~ msgid "The %(filetype)s did not download correctly"
 #~ msgstr "Der %(filetype)s wurde nicht richtig heruntergeladen"
 
@@ -4446,8 +5876,7 @@ msgstr ""
 #~ "<i>Übertragungen heute</i> zurückgesetzt werden soll."
 
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Filmübertragungsordner</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Filmübertragungsordner</span>"
 
 #~ msgid "<b>Download Folder</b>"
 #~ msgstr "<b>Übertragungsordner</b>"
@@ -4468,6 +5897,7 @@ msgstr ""
 #~ msgid "Auto Detect"
 #~ msgstr "Automatisch erkennen"
 
+#, python-format
 #~ msgid "Select a folder containing %(file_types)s"
 #~ msgstr "Bitte einen Ordner auswählen, welcher %(file_types)s enthält"
 
@@ -4489,18 +5919,21 @@ msgstr ""
 #~ msgid "<b>Program Automation</b>"
 #~ msgstr "<b>Programmautomatisierung</b>"
 
+#, python-format
 #~ msgid "%(device)s did not unmount"
 #~ msgstr "%(device)s konnte nicht ausgehängt werden"
 
 #~ msgid "Photos:"
 #~ msgstr "Fotos:"
 
+#, python-format
 #~ msgid "Backing up photos and videos to %(path)s"
 #~ msgstr "Eine Sicherungskopie von Fotos und Filmen nach %(path)s erstellen"
 
 #~ msgid "Select a folder to download photos to"
 #~ msgstr "Bitte einen Ordner zum Herunterladen der Fotos auswählen"
 
+#, python-format
 #~ msgid "Folder: %s"
 #~ msgstr "Ordner: %s"
 
@@ -4526,8 +5959,8 @@ msgstr ""
 #~ "Choose the download folder. Subfolders for the downloaded photos will be "
 #~ "automatically created in this folder using the structure specified below."
 #~ msgstr ""
-#~ "Bitte den Übertragungsordner auswählen. Unterordner werden je nach "
-#~ "gewählten Voreinstellungen automatisch erzeugt."
+#~ "Bitte den Übertragungsordner auswählen. Unterordner werden je nach gewählten "
+#~ "Voreinstellungen automatisch erzeugt."
 
 #~ msgid ""
 #~ "Choose the download folder. Subfolders for the downloaded videos will be "
@@ -4549,16 +5982,16 @@ msgstr ""
 #~ "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>"
+#~ "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 ""
 #~ "Bitte den Ordner angeben, in dem die Sicherungskopien gespeichert werden "
 #~ "sollen.  \n"
 #~ "\n"
-#~ "<i>Hinweis: Dies wird auch für den Entscheid verwendet, ob das Laufwerk "
-#~ "für Sicherungskopien verwendet wird. Bitte erstellen Sie auf jedem "
-#~ "Laufwerk, welches für Sicherungskopien verwendet wird, einen Ordner mit "
-#~ "diesem Namen.</i>"
+#~ "<i>Hinweis: Dies wird auch für den Entscheid verwendet, ob das Laufwerk für "
+#~ "Sicherungskopien verwendet wird. Bitte erstellen Sie auf jedem Laufwerk, "
+#~ "welches für Sicherungskopien verwendet wird, einen Ordner mit diesem "
+#~ "Namen.</i>"
 
 #~ msgid ""
 #~ "Specify whether photo, video and folder names should have any characters "
@@ -4577,8 +6010,7 @@ msgstr ""
 #~ msgstr "Einstellungen: Rapid-Fotoübertragung"
 
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Fotoübertragungsordner</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Fotoübertragungsordner</span>"
 
 #~ msgid "Photo Rename"
 #~ msgstr "Fotoumbenennen"
@@ -4587,24 +6019,24 @@ msgstr ""
 #~ "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"
+#~ "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>"
+#~ "<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 ""
-#~ "Laufwerke von denen Fotos und Filme heruntergeladen werden, zum Beispiel "
-#~ "von Kameras, Speicherkarten oder externen Festplatten.\n"
+#~ "Laufwerke von denen Fotos und Filme heruntergeladen werden, zum Beispiel von "
+#~ "Kameras, Speicherkarten oder externen Festplatten.\n"
 #~ "\n"
 #~ "Sie können von mehreren Laufwerken gleichzeitig herunterladen, oder sie "
 #~ "können einen Ort auf Ihrer lokalen Festplatte festlegen.\n"
 #~ "\n"
-#~ "<i>Die Übertragung direkt von Kameras ist momentan experimentell. Falls "
-#~ "die Übertragung von Ihrer Kamera nur sehr schlecht oder gar nicht "
-#~ "funktioniert, stellen sie Ihrer Kamera bitte auf den PTP-Modus um. Falls "
-#~ "das nicht möglich ist, müssen sie ein Kartenlesegerät verwenden.</i>"
+#~ "<i>Die Übertragung direkt von Kameras ist momentan experimentell. Falls die "
+#~ "Übertragung von Ihrer Kamera nur sehr schlecht oder gar nicht funktioniert, "
+#~ "stellen sie Ihrer Kamera bitte auf den PTP-Modus um. Falls das nicht möglich "
+#~ "ist, müssen sie ein Kartenlesegerät verwenden.</i>"
 
 #~ msgid "<b>Photo and Video Name Conflicts</b>"
 #~ msgstr "<b>Foto- und Filmenamenskonflikte</b>"
@@ -4616,21 +6048,22 @@ msgstr ""
 #~ msgstr "Das Foto wurde bereits heruntergeladen"
 
 #~ msgid ""
-#~ "If you disable automatic detection, choose the exact location of the "
-#~ "photos and videos."
+#~ "If you disable automatic detection, choose the exact location of the photos "
+#~ "and videos."
 #~ msgstr ""
-#~ "Wenn Sie die automatische Erkennung ausschalten, bitte den genauen Ort "
-#~ "der Fotos und Filme auswählen."
+#~ "Wenn Sie die automatische Erkennung ausschalten, bitte den genauen Ort der "
+#~ "Fotos und Filme auswählen."
 
 #~ 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>."
+#~ "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 ""
 #~ "Entschuldigung, das Herunterladen von Filmen ist deaktiviert. Bitte "
 #~ "installieren Sie zum Herunterladen von Filmen entweder die »<i>hachoir "
 #~ "metadata</i>«- und »<i>kaa metadata</i>«-Pakete oder »<i>exiftool</i>«."
 
+#, python-format
 #~ msgid "%(file_type)s not backed up"
 #~ msgstr "%(file_type)s nicht gesichert"
 
@@ -4644,9 +6077,9 @@ msgstr ""
 #~ "Error: specify device auto-detection or manually specify a device's path "
 #~ "from which to download, but do not do both."
 #~ msgstr ""
-#~ "Fehler: Wählen Sie entweder »Geräte zum Herunterladen automatisch "
-#~ "erkennen« oder »PFAD zum Geräte für das Herunterladen manuell angeben«, "
-#~ "aber nicht beides gleichzeitig."
+#~ "Fehler: Wählen Sie entweder »Geräte zum Herunterladen automatisch erkennen« "
+#~ "oder »PFAD zum Geräte für das Herunterladen manuell angeben«, aber nicht "
+#~ "beides gleichzeitig."
 
 #~ msgid "Using backup device"
 #~ msgstr "Sicherungsgerät wird verwendet"
@@ -4655,8 +6088,8 @@ msgstr ""
 #~ msgstr "Sicherungsgeräte werden verwendet"
 
 #~ msgid ""
-#~ "manually specify the PATH of the device from which to download, "
-#~ "overwriting existing program preferences"
+#~ "manually specify the PATH of the device from which to download, overwriting "
+#~ "existing program preferences"
 #~ msgstr ""
 #~ "PFAD zum Geräte für das Herunterladen manuell angeben, bestehende "
 #~ "Programmeinstellungen übergehen"
@@ -4677,33 +6110,39 @@ msgstr ""
 #~ msgid "Size"
 #~ msgstr "Größe"
 
+#, python-format
 #~ msgid "Backup %(file_type)s overwritten"
 #~ msgstr "Sicherung %(file_type)s überschrieben"
 
+#, python-format
 #~ msgid "Backup of %(file_type)s already exists"
 #~ msgstr "Sicherung of %(file_type)s bereits vorhanden"
 
 #~ msgid "File verification failed on these devices: "
 #~ msgstr "Dateiüberprüfung ist auf folgenden Geräten fehlgeschlagen: "
 
+#, python-format
 #~ msgid ""
-#~ "File verification failed on %(volume)s. The backed up version is "
-#~ "different from the downloaded version."
+#~ "File verification failed on %(volume)s. The backed up version is different "
+#~ "from the downloaded version."
 #~ msgstr ""
-#~ "Dateiüberprüfung ist auf %(volume)s fehlgeschlagen. Die gesicherte "
-#~ "Version ist unterschiedlich zu der heruntergeladenen Version."
+#~ "Dateiüberprüfung ist auf %(volume)s fehlgeschlagen. Die gesicherte Version "
+#~ "ist unterschiedlich zu der heruntergeladenen Version."
 
+#, python-format
 #~ msgid "No backup device contains a valid folder for backing up %(filetype)s"
 #~ msgstr ""
 #~ "Kein Sicherungsgerät enthält einen gültigen Ordner zum sichern von "
 #~ "%(filetype)s"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 #~ msgstr "%(number)s von %(total)s %(filetypes)s (%(remaining)s verbleibend)"
 
 #~ msgid "Download Progress"
 #~ msgstr "Übertragungsfortschritt"
 
+#, python-format
 #~ msgid "Downloading from %(location)s."
 #~ msgstr "Aus %(location)s wird heruntergeladen."
 
@@ -4719,11 +6158,13 @@ msgstr ""
 #~ msgid "Automatically rotate JPEG images"
 #~ msgstr "JPEG-Dateien automatisch drehen"
 
+#, python-format
 #~ msgid "Backing up photos to %(path)s and videos to %(path2)s"
 #~ msgstr ""
 #~ "Eine Sicherungskopie von Fotos in %(path)s und von Filmen in %(path2)s "
 #~ "erstellen"
 
+#, python-format
 #~ msgid "Backing up to %(path)s"
 #~ msgstr "Sicherung in %(path)s erstellen"
 
@@ -4739,17 +6180,17 @@ msgstr ""
 #~ msgid "There was an error backing up"
 #~ msgstr "Beim Erstellen der Sicherung ist ein Fehler aufgetreten"
 
+#, python-format
 #~ msgid ""
 #~ "display program information on the command line as the program runs "
 #~ "(default: %default)"
 #~ msgstr ""
-#~ "Die Programminformationen anzeigen, wenn das Programm aus der "
-#~ "Befehlszeile aufgerufen wurde (Voreinstellung: %default)"
+#~ "Die Programminformationen anzeigen, wenn das Programm aus der Befehlszeile "
+#~ "aufgerufen wurde (Voreinstellung: %default)"
 
 #~ msgid "display debugging information when run from the command line"
 #~ msgstr ""
-#~ "Während des Ausführens von der Befehlszeile Fehlersuchinformationen "
-#~ "anzeigen"
+#~ "Während des Ausführens von der Befehlszeile Fehlersuchinformationen anzeigen"
 
 #~ msgid "only output errors to the command line"
 #~ msgstr "Fehlermeldungen nur auf der Befehlszeile anzeigen"
@@ -4765,10 +6206,11 @@ msgstr ""
 #~ "<i><b>Warning:</b> There is insufficient metadata to fully generate "
 #~ "subfolders. Please use other subfolder naming options.</i>"
 #~ msgstr ""
-#~ "<i><b>Achtung:</b> Die Metadaten sind unvollständig, die Unterordner "
-#~ "können nicht erstellt werden. Bitte andere Unterordnerbenennungsoptionen "
+#~ "<i><b>Achtung:</b> Die Metadaten sind unvollständig, die Unterordner können "
+#~ "nicht erstellt werden. Bitte andere Unterordnerbenennungsoptionen "
 #~ "verwenden.</i>"
 
+#, python-format
 #~ msgid ""
 #~ "The %(filetype)s subfolder preferences entered are invalid and cannot be "
 #~ "used.\n"
@@ -4780,8 +6222,8 @@ msgstr ""
 
 #~ msgid "Unmount (\"eject\") device upon download completion"
 #~ msgstr ""
-#~ "Das Gerät aushängen (»auswerfen«), sobald das Herunterladen "
-#~ "fertiggestellt ist"
+#~ "Das Gerät aushängen (»auswerfen«), sobald das Herunterladen fertiggestellt "
+#~ "ist"
 
 #~ msgid "Should all Job Codes be removed?"
 #~ msgstr "Sollen alle Auftragsbezeichnungen entfernt werden?"
diff --git a/po/el.po b/po/el.po
index 672d8d5..df50c67 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,136 +7,509 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: damonlynch@gmail.com\n"
-"POT-Creation-Date: 2017-07-08 19:16-0500\n"
-"PO-Revision-Date: 2017-07-04 11:06+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2017-09-12 17:01-0400\n"
+"PO-Revision-Date: 2017-09-13 18:41+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: Greek <el@li.org>\n"
-"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-07-05 23:04+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-09-26 22:04+0000\n"
+"X-Generator: Launchpad (build 18463)\n"
+"Language: el\n"
 
-#. type: QPushButton
-#: ../raphodo/aboutdialog.py:217
-msgid "Credits"
+#: ../install.py:65
+msgid "Rapid Photo Downloader installer"
+msgstr "Πρόγραμμα εγκατάστασης Rapid Photo Downloader"
+
+#: ../install.py:66
+msgid "Download and install latest version of Rapid Photo Downloader."
+msgstr ""
+"Κατεβάστε και εγκαταστήστε την τελευταία έκδοση του Rapid Photo Downloader."
+
+#: ../install.py:236 ../install.py:1732
+msgid "Installer not found:"
+msgstr "Δεν βρέθηκε το πρόγραμμα εγκατάστασης:"
+
+#. Translators: do not translate the term tar.gz
+#: ../install.py:240 ../install.py:1736
+msgid "Installer not in tar.gz format:"
+msgstr "Δεν βρέθηκε το πρόγραμμα εγκατάστασης σε μορφή tar.gz:"
+
+#: ../install.py:465
+msgid ""
+"Incorrect folder ownership detected. Changing ownership of and resetting "
+"permissions for"
+msgstr ""
+"Εντοπίσθηκε λανθασμένη κυριότητα στον φάκελο. Γίνεται αλλαγή κυριότητας και "
+"ρύθμιση δικαιωμάτων για"
+
+#: ../install.py:540
+msgid "The following command will be run:"
+msgstr "Η παρακάτω εντολή θα εκτελεσθεί:"
+
+#: ../install.py:543 ../install.py:1479 ../install.py:1484
+msgid "sudo may prompt you for the sudo password."
+msgstr "η εντολή sudo ενδέχεται να σας ζητήσει τον κωδικό για sudo."
+
+#: ../install.py:547
+msgid "Would you like to run the command now?"
+msgstr "Θέλετε να εκτελεσθεί η εντολή τώρα;"
+
+#: ../install.py:549
+msgid "Answer is not yes, exiting."
+msgstr "Η απάντηση δεν είναι θετική, έξοδος."
+
+#: ../install.py:559 ../install.py:751 ../install.py:966
+msgid "Command failed"
+msgstr "Η εντολή απέτυχε"
+
+#: ../install.py:561 ../install.py:752 ../install.py:967
+msgid "Exiting"
+msgstr "Κλείσιμο"
+
+#: ../install.py:582
+msgid "The Universe repository must be enabled."
+msgstr "Το αποθετήριο Universe πρέπει να είναι ενεργοποιημένο"
+
+#: ../install.py:606
+msgid ""
+"Do you want to to uninstall the previous version of Rapid Photo Downloader:"
+msgstr ""
+"Θέλετε να απεγκαταστήσετε την προηγούμενη έκδοση  του Rapid Photo Downloader:"
+
+#: ../install.py:715 ../install.py:740
+msgid ""
+"Querying package system to see if an older version of Rapid Photo Downloader "
+"is installed (this may take a while)..."
+msgstr ""
+
+#: ../install.py:726
+msgid ""
+"Unable to query package system. Please check your Internet connection and "
+"try again"
+msgstr ""
+
+#: ../install.py:756
+msgid "Checking if previous version installed with pip..."
+msgstr "Έλεγχος αν η προηγούμενη έκδοση είναι εγκατεστημένη με pip..."
+
+#: ../install.py:850
+msgid "The following package is unknown on your system: {}\n"
+msgstr ""
+
+#: ../install.py:857 ../install.py:929 ../install.py:974
+msgid ""
+"To continue, some packages required to run the application will be installed."
+msgstr ""
+
+#: ../install.py:886
+msgid "Querying installed and available packages (this may take a while)"
+msgstr ""
+
+#: ../install.py:958
+msgid ""
+"Querying zypper to see if any required packages are already installed (this "
+"may take a while)... "
+msgstr ""
+
+#: ../install.py:1004
+msgid "Query to confirm action at each step."
+msgstr ""
+
+#: ../install.py:1011
+msgid ""
+"When downloading the latest version, install the development version if it "
+"is newer than the stable version."
+msgstr ""
+
+#: ../install.py:1020
+msgid ""
+"Optional tar.gz Rapid Photo Downloader installer archive. If not specified, "
+"the latest version is downloaded from the Internet."
+msgstr ""
+
+#: ../install.py:1043
+msgid ""
+"Do not run the installer in the tar.gz Rapid Photo Downloader installer "
+"archive if it is newer than this version ({}). The default is to run "
+"whichever installer is newer."
+msgstr ""
+
+#: ../install.py:1050
+msgid ""
+"Uninstall Rapid Photo Downloader that was installed with pip, keeping its "
+"dependencies."
+msgstr ""
+
+#: ../install.py:1054
+msgid ""
+"Uninstall the dependencies installed by pip during Rapid Photo Downloader's "
+"installation, and Rapid Photo Downloader itself, then exit."
+msgstr ""
+
+#: ../install.py:1059
+msgid ""
+"Note: this will not uninstall any version of Rapid Photo Downloader "
+"installed by your Linux distribution's package manager."
 msgstr ""
 
-#: ../raphodo/backuppanel.py:239
+#: ../install.py:1066
+msgid ""
+"Dependencies will only be removed if they are not required by other programs."
+msgstr ""
+
+#: ../install.py:1072
+msgid ""
+"Note: this option will remove the dependencies regardless of whether they "
+"are required by another program pip has installed. Upgrade to pip 9.0 or "
+"above if you want to avoid this behavior. You can do so using the command "
+"'python3 -m pip install pip -U --user'. Also note that any version of Rapid "
+"Photo Downloader installed by your Linux distribution's package manager will "
+"not be uninstalled."
+msgstr ""
+
+#: ../install.py:1122
+msgid "Failed to download versions file"
+msgstr ""
+
+#: ../install.py:1126
+msgid "Got error code {} while accessing versions file"
+msgstr ""
+
+#: ../install.py:1234
+msgid ""
+"Sorry, could not locate installer. Please check your Internet connection and "
+"verify if you can reach https://www.damonlynch.net\n"
+"\n"
+"Exiting.\n"
+msgstr ""
+"Συγγνώμη αλλά δεν εντοπίσθηκε το πρόγραμμα εγκατάστασης. Παρακαλώ ελέγξτε "
+"την σύνδεσή σας στο διαδίκτυο και επιβεβαιώστε αν έχετε πρόσβαση στο "
+"https://www.damonlynch.net\n"
+"\n"
+"Έξοδος\n"
+
+#: ../install.py:1408
+msgid "Installing application requirements..."
+msgstr ""
+
+#: ../install.py:1424
+msgid "Received error code"
+msgstr ""
+
+#: ../install.py:1425
+msgid "Failed to install application requirements: exiting"
+msgstr ""
+
+#: ../install.py:1428
+msgid "Installing application..."
+msgstr "Γίνεται εγκατάσταση της εφαρμογής..."
+
+#: ../install.py:1441
+msgid "Failed to install application: exiting..."
+msgstr "Αποτυχία εγκατάστασης της εφαρμογής: Έξοδος..."
+
+#: ../install.py:1465
+msgid ""
+"You may have to restart the computer to be able to run the program from the "
+"commmand line or application launcher."
+msgstr ""
+
+#: ../install.py:1476
+msgid "Do you want to install the application's man pages?"
+msgstr "Θέλετε να εγκαταστήσετε τις σελίδες βοήθειας για το πρόγραμμα;"
+
+#: ../install.py:1477
+msgid "They will be installed into {}"
+msgstr "Θα εγκατασταθούν στο {}"
+
+#: ../install.py:1478 ../install.py:1483
+msgid "If you uninstall the application, remove these manpages yourself."
+msgstr ""
+
+#: ../install.py:1480
+msgid "Do want to install the man pages?"
+msgstr ""
+
+#: ../install.py:1482
+msgid "Installing man pages into {}"
+msgstr ""
+
+#: ../install.py:1499
+msgid "Failed to create man page directory: exiting"
+msgstr ""
+
+#: ../install.py:1511
+msgid "Failed to copy man page."
+msgstr ""
+
+#: ../install.py:1521
+msgid "(If a segmentation fault occurs at exit, you can ignore it...)"
+msgstr ""
+
+#: ../install.py:1534
+msgid ""
+"The python3 tool pip is required to uninstall a version of Rapid Photo "
+"Downloader that was installed with pip.\n"
+"Cannot continue. Exiting."
+msgstr ""
+
+#: ../install.py:1575
+msgid ""
+"Do not run this installer script as sudo / root user.\n"
+"Run it using the user who will run the program.\n"
+msgstr ""
+
+#: ../install.py:1585 ../install.py:1599
+msgid "Do not include any other command line arguments when specifying"
+msgstr ""
+
+#: ../install.py:1614
+msgid ""
+"Sorry, this installer does not support a custom python installation.\n"
+"Exiting..."
+msgstr ""
+
+#: ../install.py:1620
+msgid "Restarting script using system python..."
+msgstr ""
+
+#: ../install.py:1651
+msgid "Exiting..."
+msgstr "Έξοδος..."
+
+#. Translators: do not translate the term python3-apt
+#: ../install.py:1670
+msgid "To continue, the package python3-apt must be installed."
+msgstr ""
+
+#: ../install.py:1689
+msgid ""
+"Install the following packages using your Linux distribution's standard "
+"package manager, and then rerun this installer"
+msgstr ""
+
+#: ../install.py:1698
+msgid ""
+"To run this program, programs to assist Python 3 and its package management "
+"must be installed."
+msgstr ""
+
+#. Translators: do not translate the terms Python 3, pip and setuptools
+#: ../install.py:1713
+msgid "Python 3's pip and setuptools must be upgraded for your user."
+msgstr ""
+
+#. Translators: do not translate the term python or requests
+#: ../install.py:1726
+msgid "Installing python requests"
+msgstr ""
+
+#: ../upgrade.py:79
+msgid "Upgrade Rapid Photo Downloader"
+msgstr ""
+
+#: ../upgrade.py:401 ../raphodo/viewutils.py:242
+msgid "&Cancel"
+msgstr "&Ακύρωση"
+
+#: ../upgrade.py:405
+msgid "&Upgrade"
+msgstr "&Αναβάθμιση"
+
+#: ../upgrade.py:410
+#, python-format
+msgid "Click the Upgrade button to upgrade to version %s."
+msgstr ""
+
+#: ../upgrade.py:413
+msgid "Click the Upgrade button to start the upgrade."
+msgstr "Πατήστε το κουμπί Αναβάθμιση για να ξεκινήσει η αναβάθμιση."
+
+#: ../upgrade.py:416 ../upgrade.py:422 ../raphodo/viewutils.py:241
+msgid "&Close"
+msgstr "&Κλείσιμο"
+
+#: ../upgrade.py:417
+msgid "&Run"
+msgstr "&Εκτέλεση"
+
+#: ../upgrade.py:447
+msgid "Close Rapid Photo Downloader before running this upgrade"
+msgstr ""
+
+#: ../upgrade.py:450
+msgid "Upgrade running..."
+msgstr ""
+
+#: ../upgrade.py:486
+#, python-format
+msgid ""
+"Successfully upgraded to %s. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+"Επιτυχής αναβάθμιση σε %s. Πατήστε Κλείσιμο για έξοδο, ή Εκκίνηση για να "
+"ξεκινήσετε την εφαρμογή."
+
+#: ../upgrade.py:491
+msgid ""
+"Upgrade finished successfully. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+"Επιτυχής αναβάθμιση. Πατήστε Κλείσιμο για έξοδο, ή Εκκίνηση για να "
+"ξεκινήσετε την εφαρμογή."
+
+#: ../upgrade.py:495
+msgid "Upgrade failed. Click Close to exit."
+msgstr "Αποτυχία αναβάθμισης. Πατήστε Κλείσιμο για έξοδο."
+
+#: ../upgrade.py:6967
+#, python-format
+msgid "Upgrading %s..."
+msgstr ""
+
+#: ../upgrade.py:6969
+msgid "Press any key to continue..."
+msgstr ""
+
+#: ../upgrade.py:6982
+msgid "Rapid Photo Downloader upgrade failed"
+msgstr ""
+
+#: ../upgrade.py:6984
+#, python-format
+msgid ""
+"The python package %s could not be updated. The upgrade cannot continue."
+msgstr ""
+
+#: ../raphodo/aboutdialog.py:225
+msgid "Credits"
+msgstr "Συντελεστές"
+
+#: ../raphodo/backuppanel.py:240
 msgid "Backups are not configured"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:241
+#: ../raphodo/backuppanel.py:242
 msgid "No backup devices detected"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:243
+#: ../raphodo/backuppanel.py:244
 msgid "Valid backup locations not yet specified"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:401
+#: ../raphodo/backuppanel.py:404
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
 msgstr ""
 
-#: ../raphodo/backuppanel.py:407
+#: ../raphodo/backuppanel.py:412
 msgid "Back up photos and videos when downloading"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:413
+#: ../raphodo/backuppanel.py:418
 msgid "Automatically detect backup devices"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:417
+#: ../raphodo/backuppanel.py:424
 msgid ""
-"Specify the folder in which backups are stored on the device."
-"<br><br><i>Note: the presence of a folder with this name is used to "
+"Specify the folder in which backups are stored on the "
+"device.<br><br><i>Note: the presence of a folder with this name is used to "
 "determine if 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 folder names. By "
 "adding both folders, the same device can be used to back up both photos and "
 "videos.</i>"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:428
+#: ../raphodo/backuppanel.py:439
 msgid "Photo folder name:"
-msgstr ""
+msgstr "Φάκελος για φωτογραφίες:"
 
-#: ../raphodo/backuppanel.py:433
+#: ../raphodo/backuppanel.py:444
 msgid "Video folder name:"
-msgstr ""
+msgstr "Φάκελος για βίντεο:"
 
-#: ../raphodo/backuppanel.py:438 ../raphodo/nameeditor.py:883
+#: ../raphodo/backuppanel.py:449 ../raphodo/nameeditor.py:890
 #: ../raphodo/renamepanel.py:123
 msgid "Example:"
-msgstr ""
+msgstr "Παράδειγμα:"
 
-#: ../raphodo/backuppanel.py:448
-msgid "If you disable automatic detection, choose the exact backup locations."
+#: ../raphodo/backuppanel.py:460
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
 
-#: ../raphodo/backuppanel.py:452
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:468
 msgid "Photo backup location:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:454
+#: ../raphodo/backuppanel.py:474
 msgid "Select Photo Backup Location"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:460
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:485
 msgid "Video backup location:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:462
+#: ../raphodo/backuppanel.py:491
 msgid "Select Video Backup Location"
 msgstr ""
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:564
+#: ../raphodo/backuppanel.py:595
 msgid "drive1"
-msgstr ""
+msgstr "δίσκος1"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:567
+#: ../raphodo/backuppanel.py:598
 msgid "drive2"
-msgstr ""
+msgstr "δίσκος2"
 
-#: ../raphodo/backuppanel.py:628
+#: ../raphodo/backuppanel.py:663
 msgid "Projected Backup Storage Use"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:632
+#: ../raphodo/backuppanel.py:669
 msgid "Backup Options"
 msgstr ""
 
 #. translators: refers to the video thumbnail file that some
 #. cameras generate -- it has a .THM file extension
-#: ../raphodo/copyfiles.py:476
+#: ../raphodo/copyfiles.py:491
 msgid "video THM"
-msgstr ""
+msgstr "βίντεο THM"
 
-#: ../raphodo/copyfiles.py:482
+#: ../raphodo/copyfiles.py:497
 msgid "audio"
-msgstr ""
+msgstr "ήχος"
 
 #: ../raphodo/destinationdisplay.py:78 ../raphodo/devicedisplay.py:1079
-#: ../raphodo/rpdfile.py:321
+#: ../raphodo/rpdfile.py:342
 #, python-format
 msgid "%(no_photos)s Photos"
 msgstr "%(no_photos)s Φωτογραφίες"
 
 #: ../raphodo/destinationdisplay.py:82 ../raphodo/devicedisplay.py:1081
-#: ../raphodo/rpdfile.py:316
+#: ../raphodo/rpdfile.py:333
 #, python-format
 msgid "%(no_videos)s Videos"
 msgstr "%(no_videos)s Βίντεο"
 
 #: ../raphodo/destinationdisplay.py:92
 msgid "Used"
-msgstr ""
+msgstr "Χρησιμοποιείται"
 
 #: ../raphodo/destinationdisplay.py:93
 msgid "Excess"
@@ -144,7 +517,7 @@ msgstr ""
 
 #: ../raphodo/destinationdisplay.py:102
 msgid "Device size unknown"
-msgstr ""
+msgstr "Άγνωστη χωρητικότητα συσκευής"
 
 #: ../raphodo/destinationdisplay.py:112
 #, python-format
@@ -154,18 +527,18 @@ msgstr ""
 #: ../raphodo/destinationdisplay.py:119
 #, python-format
 msgid "%(size_free)s free of %(size_total)s"
-msgstr ""
+msgstr "%(size_free)s ελεύθερα από %(size_total)s"
 
 #: ../raphodo/destinationdisplay.py:190 ../raphodo/devicedisplay.py:993
-#: ../raphodo/rapid.py:1964 ../raphodo/rapid.py:2079 ../raphodo/rapid.py:5753
-#: ../raphodo/rpdfile.py:905
+#: ../raphodo/rapid.py:2023 ../raphodo/rapid.py:2151 ../raphodo/rapid.py:6043
+#: ../raphodo/rpdfile.py:930
 msgid "Photos"
 msgstr "Φωτογραφίες"
 
 #. translators: the name of the Videos folder
 #: ../raphodo/destinationdisplay.py:191 ../raphodo/devicedisplay.py:994
-#: ../raphodo/rapid.py:1967 ../raphodo/rapid.py:2080 ../raphodo/rapid.py:5754
-#: ../raphodo/rpdfile.py:933 ../raphodo/storage.py:445
+#: ../raphodo/rapid.py:2028 ../raphodo/rapid.py:2152 ../raphodo/rapid.py:6044
+#: ../raphodo/rpdfile.py:958 ../raphodo/storage.py:449
 msgid "Videos"
 msgstr "Βίντεο"
 
@@ -173,17 +546,17 @@ msgstr "Βίντεο"
 msgid "Projected storage use after download"
 msgstr ""
 
-#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:516
+#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:521
 msgid "Custom..."
-msgstr ""
+msgstr "Προσαρμοσμένο..."
 
 #: ../raphodo/destinationdisplay.py:678
 msgid "Configure photo subfolder creation"
-msgstr ""
+msgstr "Ρύθμιση δημιουργίας υποφάκελου φωτογραφιών"
 
 #: ../raphodo/destinationdisplay.py:680
 msgid "Configure video subfolder creation"
-msgstr ""
+msgstr "Ρύθμιση δημιουργίας υποφάκελου βίντεο"
 
 #: ../raphodo/devicedisplay.py:983
 msgid "Other"
@@ -209,59 +582,62 @@ msgstr "Επανασάρωση"
 #: ../raphodo/devicedisplay.py:1093
 #, python-format
 msgid "%s full"
-msgstr ""
+msgstr "%s πλήρης"
 
-#: ../raphodo/devices.py:459
+#: ../raphodo/devices.py:463
 msgid "Cameras"
 msgstr "Κάμερες"
 
-#: ../raphodo/devices.py:460 ../raphodo/devices.py:920
-#: ../raphodo/preferencedialog.py:85 ../raphodo/rapid.py:1927
+#: ../raphodo/devices.py:464 ../raphodo/devices.py:927
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/rapid.py:1979
 msgid "Devices"
 msgstr "Συσκευές"
 
-#: ../raphodo/devices.py:720
+#: ../raphodo/devices.py:724
 #, python-format
 msgid "Downloading from %(device_names)s"
 msgstr "Κατέβασμα από %(device_names)s"
 
 #. Translators: e.g. Three Devices
-#: ../raphodo/devices.py:780
+#: ../raphodo/devices.py:784
 #, python-format
 msgid "%(no_devices)s %(device_type)s"
 msgstr "%(no_devices)s %(device_type)s"
 
-#: ../raphodo/devices.py:905 ../raphodo/rapid.py:1764
+#: ../raphodo/devices.py:912 ../raphodo/rapid.py:1807
 msgid "Select Source"
 msgstr "Επιλογή πηγής"
 
-#: ../raphodo/devices.py:936 ../raphodo/devices.py:947
+#: ../raphodo/devices.py:943 ../raphodo/devices.py:954
 #, python-format
 msgid "%(device1)s + %(device2)s"
 msgstr "%(device1)s + %(device2)s"
 
 #. Number of cameras e.g. 3 Cameras
-#: ../raphodo/devices.py:958
+#: ../raphodo/devices.py:965
 #, python-format
 msgid "%(no_cameras)s Cameras"
 msgstr "%(no_cameras)s Κάμερες"
 
-#: ../raphodo/devices.py:963
+#: ../raphodo/devices.py:970
 #, python-format
 msgid "%(no_devices)s Devices"
 msgstr "%(no_devices)s Συσκευές"
 
 #. Translators: two folder names, separated by a plus sign
-#: ../raphodo/devices.py:1258
+#: ../raphodo/devices.py:1265
 #, python-format
 msgid "%s + %s"
 msgstr "%s + %s"
 
-#: ../raphodo/didyouknow.py:44
+#: ../raphodo/didyouknow.py:45
 msgid "Click on a file's checkbox to mark or unmark it for download."
 msgstr ""
+"Πατήστε στο πλαίσιο ελέγχου του αρχείου για να επιλέξετε ή αποεπιλέξετε για "
+"κατέβασμα."
 
-#: ../raphodo/didyouknow.py:50
+#: ../raphodo/didyouknow.py:51
 msgid ""
 "Files that have already been downloaded are remembered. You can still mark "
 "previously downloaded files to download again, but they are unchecked by "
@@ -269,34 +645,67 @@ msgid ""
 "files that are yet to be downloaded."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:59
+#: ../raphodo/didyouknow.py:60
 msgid ""
 "If more than one file is selected, they'll all take the mark of the file "
 "whose checkbox was clicked, regardless of whether they previously had a "
 "checkmark or not."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:67
+#: ../raphodo/didyouknow.py:68
 msgid ""
 "Click on a device's checkbox to quickly mark or unmark all its files for "
 "downloading."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:74
+#: ../raphodo/didyouknow.py:75
+msgid ""
+"After a download finishes, an icon replaces the thumbnail's checkbox. The "
+"icon's color indicates whether the download was successful (green), had file "
+"renaming problems (yellow/orange), or failed (red)."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:83
+msgid ""
+"\n"
+"            In case of any problems, a red icon will appear at the bottom of "
+"the window\n"
+"            indicating how many error reports there are. Clicking on it "
+"opens the Error Report \n"
+"            window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:91
+msgid ""
+"\n"
+"            The Error Report window lists any problems encountered before, "
+"during or after the \n"
+"            download. An orange triangle represents a warning, a red circle "
+"indicates a failure, \n"
+"            and a black circle indicates more serious failures. You can "
+"click on the hyperlinks to \n"
+"            open its file or device in a file manager. You can also search "
+"the reports using the \n"
+"            search box in the lower left of the Error Report window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:103
 msgid ""
 "You can simultaneously download from multiple cameras, smartphones, memory "
 "cards, and hard drives&mdash;as many devices as your computer can handle at "
 "one time."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:81
+#: ../raphodo/didyouknow.py:110
 msgid ""
 "The <b>Timeline</b> groups photos and videos based on how much time elapsed "
 "between consecutive shots. Use it to identify photos and videos taken at "
 "different periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:88
+#: ../raphodo/didyouknow.py:117
 msgid ""
 "\n"
 "<p>In the illustration above, the first row of the Timeline is black because "
@@ -308,7 +717,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:99
+#: ../raphodo/didyouknow.py:128
 msgid ""
 "To view photos and videos for a particular time range, use the mouse "
 "(optionally in combination with the <tt>Shift</tt> or <tt>Ctrl</tt> keys) to "
@@ -316,20 +725,20 @@ msgid ""
 "the left side of the main window will be highlighted."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:106
+#: ../raphodo/didyouknow.py:135
 msgid ""
 "A download always includes all files that are checked for download, "
 "including those that are not currently displayed because the Timeline is "
 "being used."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:113
+#: ../raphodo/didyouknow.py:142
 msgid ""
 "You can hide or display the download sources by clicking on the name of the "
 "device you're downloading from at the top left of the program window."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:120
+#: ../raphodo/didyouknow.py:149
 msgid ""
 "\n"
 "          Thumbnails can be sorted using a variety of criteria:\n"
@@ -348,33 +757,33 @@ msgid ""
 "</ol> "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:137
+#: ../raphodo/didyouknow.py:166
 msgid ""
 "One of Rapid Photo Downloader's most useful features is its ability to "
 "automatically generate download subfolders and rename files as it downloads, "
 "using a scheme of your choosing."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:143
+#: ../raphodo/didyouknow.py:172
 msgid ""
 "To specify where you want your files downloaded and how you want them named, "
 "open the appropriate panel on the right-side of the application window: "
 "<b>Destination</b>, <b>Rename</b>, or <b>Job Code</b>."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:150
+#: ../raphodo/didyouknow.py:179
 msgid ""
 "\n"
 "When thinking about your download directory structure, keep in mind two "
 "different types\n"
 "of directory:\n"
 "<ol>\n"
-"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, &quot;"
-"Photos&quot;, or\n"
+"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, "
+"&quot;Photos&quot;, or\n"
 "&quot;Videos&quot;. This directory should already exist on your computer. In "
 "the illustration \n"
-"below, the destination folders are &quot;Pictures&quot; and &quot;"
-"Videos&quot;. The\n"
+"below, the destination folders are &quot;Pictures&quot; and "
+"&quot;Videos&quot;. The\n"
 "name of the destination folder is displayed in the grey bar directly above "
 "the folder tree, \n"
 "with a folder icon to its left and a gear icon to its far right.</li>\n"
@@ -387,7 +796,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:167
+#: ../raphodo/didyouknow.py:196
 msgid ""
 "\n"
 "You can download photos and videos to the same destination folder, or "
@@ -400,14 +809,14 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:177
+#: ../raphodo/didyouknow.py:206
 msgid ""
 "Automatically generated download subfolders can contain further "
 "automatically generated subfolders if need be. A common scheme is to create "
 "a year subfolder and then a series of year-month-day subfolders within it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:186
+#: ../raphodo/didyouknow.py:215
 msgid ""
 "\n"
 "Whenever possible, the program previews the download subfolders of photos "
@@ -425,7 +834,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:201
+#: ../raphodo/didyouknow.py:230
 msgid ""
 "\n"
 "Download subfolder names are typically generated using some or all of the "
@@ -449,7 +858,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:219
+#: ../raphodo/didyouknow.py:248
 msgid ""
 "\n"
 "To automatically create download subfolders as you download, \n"
@@ -459,7 +868,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:227
+#: ../raphodo/didyouknow.py:256
 msgid ""
 "\n"
 "Using the drop-down menu, select a built-in preset or click on <b>Custom</b> "
@@ -469,20 +878,20 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:237
+#: ../raphodo/didyouknow.py:266
 msgid ""
 "It's easy to download raw images into one folder, and jpeg images into "
 "another. Simply use the <b>Filename Extension</b> as part of your download "
 "subfolder generation scheme:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:242
+#: ../raphodo/didyouknow.py:271
 msgid ""
 "This illustration shows a saved custom preset named &quot;My custom "
 "preset&quot;."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:246
+#: ../raphodo/didyouknow.py:275
 msgid ""
 "\n"
 "You do not have to create nested download subfolders. This illustration "
@@ -493,7 +902,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:256
+#: ../raphodo/didyouknow.py:285
 msgid ""
 "\n"
 "Although there are many built-in date/time naming options, you may find that "
@@ -507,7 +916,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:265
+#: ../raphodo/didyouknow.py:294
 msgid ""
 "\n"
 "Read more about all the ways you can generate download subfolder names and "
@@ -517,7 +926,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:273
+#: ../raphodo/didyouknow.py:302
 msgid ""
 "\n"
 "<b>Job Codes</b> let you easily enter text that describes sets of photos and "
@@ -529,7 +938,7 @@ msgid ""
 "&quot;Green Bazaar&quot;: \n"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:282
+#: ../raphodo/didyouknow.py:311
 msgid ""
 "\n"
 "You can apply new or existing Job Codes before you start a download. If "
@@ -540,36 +949,36 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:291
+#: ../raphodo/didyouknow.py:320
 msgid "Look for hints to guide you when working with Job Codes:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:295
+#: ../raphodo/didyouknow.py:324
 msgid ""
 "Hints will vary depending on the context, such as when the mouse is hovering "
 "over a button."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:301
+#: ../raphodo/didyouknow.py:330
 msgid ""
 "\n"
 "When you give your photos and videos unique filenames, you'll never be "
 "confused as to \n"
 "which file is which. Using <b>sequence numbers</b> to make filenames unique "
 "is highly \n"
-"recommended!.\n"
+"recommended!\n"
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:309
+#: ../raphodo/didyouknow.py:338
 msgid ""
 "\n"
 "<p>Four types of sequence values are available to help you assign unique "
 "names to your photos and \n"
 "videos:\n"
 "<ol>\n"
-"<li><b>Downloads today</b>: tracks downloads completed during that day.</"
-"li>\n"
+"<li><b>Downloads today</b>: tracks downloads completed during that "
+"day.</li>\n"
 "<li><b>Stored number</b>: similar to Downloads today, but it is remembered "
 "from the last time the  \n"
 "program was run.</li>\n"
@@ -583,7 +992,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:327
+#: ../raphodo/didyouknow.py:356
 msgid ""
 "\n"
 "The <b>Rename</b> panel allows you to configure file renaming. To rename "
@@ -592,7 +1001,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:334
+#: ../raphodo/didyouknow.py:363
 msgid ""
 "\n"
 "<p>The <b>Synchronize RAW + JPEG</b> option is useful if you use the RAW + "
@@ -611,7 +1020,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:348
+#: ../raphodo/didyouknow.py:377
 msgid ""
 "\n"
 "You can have your photos and videos backed up to multiple locations as they "
@@ -622,13 +1031,13 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:356
+#: ../raphodo/didyouknow.py:385
 msgid ""
 "In this example, the drive <b>photobackup</b> does not contain a folder "
 "named <tt>Videos</tt>, so videos will not be backed up to it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:362
+#: ../raphodo/didyouknow.py:391
 msgid ""
 "\n"
 "Several of the program's preferences can be set from the command line, "
@@ -639,7 +1048,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:372
+#: ../raphodo/didyouknow.py:396
+msgid "You can also import program preferences from the older 0.4 version."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:401
 msgid ""
 "\n"
 "Rapid Photo Downloader deals with three types of cache:\n"
@@ -649,8 +1062,8 @@ msgid ""
 "memory cards, and other devices.</li>\n"
 "<li>A <b>temporary cache</b> of files downloaded from a camera, one for "
 "photos and another for \n"
-"videos. They are located in temporary subfolders in the download destination."
-"</li>\n"
+"videos. They are located in temporary subfolders in the download "
+"destination.</li>\n"
 "<li>The <b>desktop's thumbnail cache</b>, in which Rapid Photo Downloader "
 "stores thumbnails of \n"
 "RAW and TIFF photos once they have been downloaded. File browsers like Gnome "
@@ -665,23 +1078,23 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:431
+#: ../raphodo/didyouknow.py:460
 msgid "Tip of the Day"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:439
+#: ../raphodo/didyouknow.py:468
 msgid "Did you know...?"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:466
+#: ../raphodo/didyouknow.py:495
 msgid "Show tips on startup"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:470
+#: ../raphodo/didyouknow.py:499
 msgid "&Next"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:471
+#: ../raphodo/didyouknow.py:500
 msgid "&Previous"
 msgstr ""
 
@@ -788,68 +1201,68 @@ msgstr "%d ημέρες, 1 ώρα"
 msgid "%(days)d days, %(hours)d hours"
 msgstr ""
 
-#: ../raphodo/errorlog.py:65
+#: ../raphodo/errorlog.py:66
 msgid "Find"
 msgstr ""
 
-#: ../raphodo/errorlog.py:135
+#: ../raphodo/errorlog.py:136
 msgid "Error Reports - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/errorlog.py:170
+#: ../raphodo/errorlog.py:171
 msgid "Find in reports"
 msgstr ""
 
-#: ../raphodo/errorlog.py:187
+#: ../raphodo/errorlog.py:188
 msgid "Find the previous occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:192
+#: ../raphodo/errorlog.py:193
 msgid "Find the next occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:194
+#: ../raphodo/errorlog.py:195
 msgid "&Highlight All"
 msgstr ""
 
-#: ../raphodo/errorlog.py:195
+#: ../raphodo/errorlog.py:196
 msgid "Highlight all occurrences of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:196
+#: ../raphodo/errorlog.py:197
 msgid "&Match Case"
 msgstr ""
 
-#: ../raphodo/errorlog.py:197
+#: ../raphodo/errorlog.py:198
 msgid "Search with case sensitivity"
 msgstr ""
 
-#: ../raphodo/errorlog.py:198
+#: ../raphodo/errorlog.py:199
 msgid "&Whole Words"
 msgstr ""
 
-#: ../raphodo/errorlog.py:199
+#: ../raphodo/errorlog.py:200
 msgid "Search whole words only"
 msgstr ""
 
-#: ../raphodo/errorlog.py:209 ../raphodo/errorlog.py:341
+#: ../raphodo/errorlog.py:210 ../raphodo/errorlog.py:345
 #, python-format
 msgid "%s of %s matches"
 msgstr ""
 
-#: ../raphodo/errorlog.py:228
+#: ../raphodo/errorlog.py:232
 msgid "Clear"
 msgstr ""
 
-#: ../raphodo/errorlog.py:328
+#: ../raphodo/errorlog.py:332
 msgid "Phrase not found"
 msgstr ""
 
-#: ../raphodo/errorlog.py:487
+#: ../raphodo/errorlog.py:491
 msgid "Search pending..."
 msgstr ""
 
-#: ../raphodo/errorlog.py:535
+#: ../raphodo/errorlog.py:539
 msgid ""
 "The number of new entries added to the Error Report since it was last open. "
 "Click to open the Error Report."
@@ -863,8 +1276,8 @@ msgstr ""
 #, python-brace-format
 msgid ""
 "<b>A problem occurred in Rapid Photo Downloader</b><br><br>\n"
-"    Please report the problem at <a href=\"{website}\">{website}</a>."
-"<br><br>\n"
+"    Please report the problem at <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
 "    Attach the log file <i>{log_file}</i> to your bug report (click\n"
 "    <a href=\"{log_path}\">here</a> to open the log directory).<br><br>If "
 "the same problem occurs\n"
@@ -885,7 +1298,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1601
+#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1643
 msgid "Open in File Browser..."
 msgstr ""
 
@@ -903,531 +1316,531 @@ msgstr ""
 msgid "%s (location does not exist)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:186
+#: ../raphodo/generatenameconfig.py:190
 msgid "Date time"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:187
+#: ../raphodo/generatenameconfig.py:191
 msgid "Text"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:188 ../raphodo/rapid.py:2053
+#: ../raphodo/generatenameconfig.py:192 ../raphodo/rapid.py:2125
 msgid "Filename"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:189 ../raphodo/preferencedialog.py:488
+#: ../raphodo/generatenameconfig.py:193 ../raphodo/preferencedialog.py:724
 msgid "Metadata"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:190
+#: ../raphodo/generatenameconfig.py:194
 msgid "Sequences"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: ../raphodo/generatenameconfig.py:193
+#: ../raphodo/generatenameconfig.py:197
 msgid "Job code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:194
+#: ../raphodo/generatenameconfig.py:198
 msgid "Image date"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:195
+#: ../raphodo/generatenameconfig.py:199
 msgid "Video date"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:196
+#: ../raphodo/generatenameconfig.py:200
 msgid "Today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:197
+#: ../raphodo/generatenameconfig.py:201
 msgid "Yesterday"
 msgstr "Εχθές"
 
 #. Translators: Download time is the time and date that the download started (when the
 #. user clicked the Download button)
-#: ../raphodo/generatenameconfig.py:200
+#: ../raphodo/generatenameconfig.py:204
 msgid "Download time"
 msgstr "Ώρα κατεβάσματος"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:203
+#: ../raphodo/generatenameconfig.py:207
 msgid "Name"
 msgstr "Όνομα"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:206 ../raphodo/rapid.py:2054
+#: ../raphodo/generatenameconfig.py:210 ../raphodo/rapid.py:2126
 msgid "Extension"
 msgstr "Επέκταση"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:209
+#: ../raphodo/generatenameconfig.py:213
 msgid "Image number"
 msgstr "Αριθμός εικόνας"
 
-#: ../raphodo/generatenameconfig.py:210
+#: ../raphodo/generatenameconfig.py:214
 msgid "Video number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:213
+#: ../raphodo/generatenameconfig.py:217
 msgid "Aperture"
 msgstr "Διάφραγμα"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:216
+#: ../raphodo/generatenameconfig.py:220
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:219
+#: ../raphodo/generatenameconfig.py:223
 msgid "Exposure time"
 msgstr "Χρόνος έκθεσης"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:222
+#: ../raphodo/generatenameconfig.py:226
 msgid "Focal length"
 msgstr "Εστιακή απόσταση"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:225
+#: ../raphodo/generatenameconfig.py:229
 msgid "Camera make"
 msgstr "Κατασκευαστής κάμερας"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:228
+#: ../raphodo/generatenameconfig.py:232
 msgid "Camera model"
 msgstr "Μοντέλο κάμερας"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:231
+#: ../raphodo/generatenameconfig.py:235
 msgid "Short camera model"
 msgstr "Συντομογραφία μοντέλου κάμερας"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:234
+#: ../raphodo/generatenameconfig.py:238
 msgid "Hyphenated short camera model"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:237
+#: ../raphodo/generatenameconfig.py:241
 msgid "Serial number"
 msgstr "Σειριακός αριθμός"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:240
+#: ../raphodo/generatenameconfig.py:244
 msgid "Shutter count"
 msgstr ""
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: ../raphodo/generatenameconfig.py:242
+#: ../raphodo/generatenameconfig.py:246
 msgid "File number"
 msgstr "Αριθμός αρχείου"
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:244
+#: ../raphodo/generatenameconfig.py:248
 msgid "Folder only"
 msgstr ""
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:246
+#: ../raphodo/generatenameconfig.py:250
 msgid "Folder and file"
 msgstr "Φάκελος και αρχείο"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:249
+#: ../raphodo/generatenameconfig.py:253
 msgid "Owner name"
 msgstr "Όνομα κατόχου"
 
-#: ../raphodo/generatenameconfig.py:250
+#: ../raphodo/generatenameconfig.py:254
 msgid "Codec"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:251
+#: ../raphodo/generatenameconfig.py:255
 msgid "Width"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:252
+#: ../raphodo/generatenameconfig.py:256
 msgid "Height"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:253
+#: ../raphodo/generatenameconfig.py:257
 msgid "Length"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:254
+#: ../raphodo/generatenameconfig.py:258
 msgid "Frames Per Second"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:255
+#: ../raphodo/generatenameconfig.py:259
 msgid "Artist"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:256
+#: ../raphodo/generatenameconfig.py:260
 msgid "Copyright"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:259
+#: ../raphodo/generatenameconfig.py:263
 msgid "Downloads today"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:262
+#: ../raphodo/generatenameconfig.py:266
 msgid "Session number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:265
+#: ../raphodo/generatenameconfig.py:269
 msgid "Subfolder number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:268
+#: ../raphodo/generatenameconfig.py:272
 msgid "Stored number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: ../raphodo/generatenameconfig.py:271
+#: ../raphodo/generatenameconfig.py:275
 msgid "Sequence letter"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:274
+#: ../raphodo/generatenameconfig.py:278
 msgid "All digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:277
+#: ../raphodo/generatenameconfig.py:281
 msgid "Last digit"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:280
+#: ../raphodo/generatenameconfig.py:284
 msgid "Last 2 digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:283
+#: ../raphodo/generatenameconfig.py:287
 msgid "Last 3 digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:286
+#: ../raphodo/generatenameconfig.py:290
 msgid "Last 4 digits"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:289
+#: ../raphodo/generatenameconfig.py:293
 msgid "Original Case"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:292
+#: ../raphodo/generatenameconfig.py:296
 msgid "UPPERCASE"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:295
+#: ../raphodo/generatenameconfig.py:299
 msgid "lowercase"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:296
+#: ../raphodo/generatenameconfig.py:300
 msgid "One digit"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:297
+#: ../raphodo/generatenameconfig.py:301
 msgid "Two digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:298
+#: ../raphodo/generatenameconfig.py:302
 msgid "Three digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:299
+#: ../raphodo/generatenameconfig.py:303
 msgid "Four digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:300
+#: ../raphodo/generatenameconfig.py:304
 msgid "Five digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:301
+#: ../raphodo/generatenameconfig.py:305
 msgid "Six digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:302
+#: ../raphodo/generatenameconfig.py:306
 msgid "Seven digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:305
+#: ../raphodo/generatenameconfig.py:309
 msgid "Subseconds"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:308 ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:312 ../raphodo/generatenameconfig.py:393
 msgid "YYYYMMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:311 ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:315 ../raphodo/generatenameconfig.py:394
 msgid "YYYY-MM-DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:314 ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:318 ../raphodo/generatenameconfig.py:395
 msgid "YYYY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:317
+#: ../raphodo/generatenameconfig.py:321
 msgid "YYMMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:320
+#: ../raphodo/generatenameconfig.py:324
 msgid "YY-MM-DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:323
+#: ../raphodo/generatenameconfig.py:327
 msgid "YY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:326
+#: ../raphodo/generatenameconfig.py:330
 msgid "MMDDYYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:329
+#: ../raphodo/generatenameconfig.py:333
 msgid "MMDDYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:332
+#: ../raphodo/generatenameconfig.py:336
 msgid "MMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:335
+#: ../raphodo/generatenameconfig.py:339
 msgid "DDMMYYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:338
+#: ../raphodo/generatenameconfig.py:342
 msgid "DDMMYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:341 ../raphodo/generatenameconfig.py:389
-#: ../raphodo/generatenameconfig.py:390 ../raphodo/generatenameconfig.py:391
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:345 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:394 ../raphodo/generatenameconfig.py:395
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:397
 msgid "YYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:344
+#: ../raphodo/generatenameconfig.py:348
 msgid "YY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:347
+#: ../raphodo/generatenameconfig.py:351
 msgid "MM"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:350
+#: ../raphodo/generatenameconfig.py:354
 msgid "DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:353
+#: ../raphodo/generatenameconfig.py:357
 msgid "Month (full)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:356
+#: ../raphodo/generatenameconfig.py:360
 msgid "Month (abbreviated)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:359
+#: ../raphodo/generatenameconfig.py:363
 msgid "HHMMSS"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:362
+#: ../raphodo/generatenameconfig.py:366
 msgid "HHMM"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:365
+#: ../raphodo/generatenameconfig.py:369
 msgid "HH-MM-SS"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:368
+#: ../raphodo/generatenameconfig.py:372
 msgid "HH-MM"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:371
+#: ../raphodo/generatenameconfig.py:375
 msgid "HH"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:374
+#: ../raphodo/generatenameconfig.py:378
 msgid "MM (minutes)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:377
+#: ../raphodo/generatenameconfig.py:381
 msgid "SS"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:393
 msgid "Date"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:394
 msgid "Date (hyphens)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:395
 msgid "Date (underscores)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:438
-#: ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:442
+#: ../raphodo/generatenameconfig.py:537
 msgid "Date and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392
+#: ../raphodo/generatenameconfig.py:396
 msgid "YYYYMM_Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "Date and Job Code Subfolder"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "YYYYMM"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393 ../raphodo/jobcodepanel.py:198
-#: ../raphodo/nameeditor.py:827 ../raphodo/rapid.py:1809
+#: ../raphodo/generatenameconfig.py:397 ../raphodo/jobcodepanel.py:199
+#: ../raphodo/nameeditor.py:833 ../raphodo/rapid.py:1852
 #: ../raphodo/renamepanel.py:83 ../raphodo/renamepanel.py:241
 msgid "Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:433 ../raphodo/generatenameconfig.py:512
+#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:532
 msgid "Original Filename"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "Date-Time and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "YYYYMMDD-HHMM-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "Date and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "YYYYMMDD-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "Date-Time and Image number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "YYYYMMDD-1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "Date-Time and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "YYYYMMDD-HHMM-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:442 ../raphodo/generatenameconfig.py:537
 msgid "YYYYMMDD-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "Date-Time and Video number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "YYYYMMDD_1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "Resolution"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "YYYYMMDD-HHMM-1-1920x1080"
 msgstr ""
 
@@ -1486,76 +1899,77 @@ msgstr ""
 msgid "&Remember this choice"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:185
+#: ../raphodo/jobcodepanel.py:186
 msgid ""
 "Select photos and videos to be able to apply a new or existing Job Code to "
 "them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:186
-msgid "The new Job Code will be applied to all selected photos and/or videos."
+#: ../raphodo/jobcodepanel.py:187
+msgid ""
+"The new Job Code will be applied to all selected photos and/or videos."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:187
+#: ../raphodo/jobcodepanel.py:188
 msgid ""
 "Click the Apply button to apply the current Job Code to all selected photos "
 "and/or videos. You can also simply double click the Job Code."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:189
+#: ../raphodo/jobcodepanel.py:190
 msgid ""
 "Removing a Job Code removes it only from the list of saved Job Codes, not "
 "from any photos or videos that it may have been applied to."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:191
+#: ../raphodo/jobcodepanel.py:192
 msgid ""
 "If you want to use Job Codes, configure file renaming or destination "
 "subfolder names to use them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:197
+#: ../raphodo/jobcodepanel.py:198
 msgid "Last Used"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:202
+#: ../raphodo/jobcodepanel.py:203
 msgid "Job Code Sort:"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:205 ../raphodo/rapid.py:2061
+#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2133
 msgid "Ascending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2062
+#: ../raphodo/jobcodepanel.py:207 ../raphodo/rapid.py:2134
 msgid "Descending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:216
+#: ../raphodo/jobcodepanel.py:217
 msgid "&New..."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:220
+#: ../raphodo/jobcodepanel.py:221
 msgid "&Apply"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:224
+#: ../raphodo/jobcodepanel.py:225
 msgid "&Remove"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:228 ../raphodo/preferencedialog.py:125
-#: ../raphodo/preferencedialog.py:154 ../raphodo/preferencedialog.py:433
+#: ../raphodo/jobcodepanel.py:229 ../raphodo/preferencedialog.py:200
+#: ../raphodo/preferencedialog.py:229 ../raphodo/preferencedialog.py:531
 msgid "Remove All"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:427
+#: ../raphodo/jobcodepanel.py:428
 msgid "Do you really want to remove all the Job Codes?"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:429
+#: ../raphodo/jobcodepanel.py:430
 msgid "Remove all Job Codes"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:492
+#: ../raphodo/jobcodepanel.py:493
 msgid "Job Codes"
 msgstr ""
 
@@ -1566,42 +1980,58 @@ msgstr ""
 msgid "<i><b>Hint:</b> %(message)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:418 ../raphodo/nameeditor.py:432
+#: ../raphodo/nameeditor.py:423 ../raphodo/nameeditor.py:437
 #, python-format
 msgid "%(description)s - %(elements)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:512
+#: ../raphodo/nameeditor.py:517
 msgid "Save New Custom Preset..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:513
+#: ../raphodo/nameeditor.py:518
 msgid "Remove All Custom Presets..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:559
+#: ../raphodo/nameeditor.py:564
 msgid "(New Custom Preset)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:576
+#: ../raphodo/nameeditor.py:581
 #, python-format
 msgid "%s (edited)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:579 ../raphodo/nameeditor.py:1370
+#: ../raphodo/nameeditor.py:584 ../raphodo/nameeditor.py:1379
 #, python-format
 msgid "Update Custom Preset \"%s\""
 msgstr ""
 
-#: ../raphodo/nameeditor.py:667
+#: ../raphodo/nameeditor.py:672
 msgid "Save New Custom Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:675
+#: ../raphodo/nameeditor.py:680
 msgid "Preset Name:"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:836
+#: ../raphodo/nameeditor.py:799
+msgid "Photo Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:805
+msgid "Video Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:811
+msgid "Photo Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:817
+msgid "Video Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:842
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>There is insufficient data to "
 "fully generate the name. Please use other renaming options.</i>"
@@ -1610,7 +2040,7 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees.
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:846
+#: ../raphodo/nameeditor.py:853
 #, python-format
 msgid "The character</i> %(separator)s <i>creates a new subfolder level."
 msgstr ""
@@ -1618,50 +2048,50 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:851
+#: ../raphodo/nameeditor.py:858
 #, python-format
 msgid ""
 "There is no need start or end with the folder separator </i> "
 "%(separator)s<i>, because it is added automatically."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:859
+#: ../raphodo/nameeditor.py:866
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>Unique filenames may not be "
 "generated. Make filenames unique by using Sequence values.</i>"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:882 ../raphodo/renamepanel.py:121
+#: ../raphodo/nameeditor.py:889 ../raphodo/renamepanel.py:121
 msgid "Preset:"
 msgstr ""
 
 #. Translators: appears in a combobox, e.g. Image Date (YYYY)
-#: ../raphodo/nameeditor.py:959 ../raphodo/nameeditor.py:980
+#: ../raphodo/nameeditor.py:966 ../raphodo/nameeditor.py:987
 #, python-brace-format
 msgid "{choice} ({variant})"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1005 ../raphodo/preferencedialog.py:530
+#: ../raphodo/nameeditor.py:1012 ../raphodo/preferencedialog.py:783
 msgid "Get help online..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1025
+#: ../raphodo/nameeditor.py:1034
 msgid "Insert"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1351
+#: ../raphodo/nameeditor.py:1360
 msgid "Save Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1356
+#: ../raphodo/nameeditor.py:1365
 msgid ""
-"<b>Do you want to save the changes in a new custom preset?</"
-"b><br><br>Creating a custom preset is not required, but can help you keep "
-"organized.<br><br>The changes to the preferences will still be applied "
-"regardless of whether you create a new custom preset or not."
+"<b>Do you want to save the changes in a new custom "
+"preset?</b><br><br>Creating a custom preset is not required, but can help "
+"you keep organized.<br><br>The changes to the preferences will still be "
+"applied regardless of whether you create a new custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1365
+#: ../raphodo/nameeditor.py:1374
 msgid ""
 "<b>Do you want to save the changes in a custom preset?</b><br><br>If you "
 "like, you can create a new custom preset or update the existing custom "
@@ -1669,136 +2099,167 @@ msgid ""
 "regardless of whether you save a custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1372
+#: ../raphodo/nameeditor.py:1381
 msgid "Save New Custom Preset"
 msgstr ""
 
-#: ../raphodo/newversion.py:306
+#: ../raphodo/newversion.py:312
 msgid "Checking for new version..."
 msgstr ""
 
-#: ../raphodo/newversion.py:307
+#: ../raphodo/newversion.py:313
 msgid "You are running the latest version."
 msgstr ""
 
-#: ../raphodo/newversion.py:308
+#: ../raphodo/newversion.py:314
 msgid "Failed to contact the update server."
 msgstr ""
 
-#: ../raphodo/newversion.py:310
+#: ../raphodo/newversion.py:316
 #, python-format
 msgid "A new version of Rapid Photo Downloader (%s) is available."
 msgstr ""
 
-#: ../raphodo/newversion.py:312
+#: ../raphodo/newversion.py:318
 msgid "Do you want to download the new version?"
 msgstr ""
 
-#: ../raphodo/newversion.py:313
+#: ../raphodo/newversion.py:319
 #, python-format
 msgid "Changes in the new release can be viewed <a href=\"%s\">here</a>."
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the s key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:340 ../raphodo/newversion.py:353
+#: ../raphodo/newversion.py:348 ../raphodo/newversion.py:363
 msgid "&Skip this release"
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the o key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:356
+#: ../raphodo/newversion.py:366
 msgid "&Open Download Page"
 msgstr ""
 
-#: ../raphodo/newversion.py:376
+#: ../raphodo/newversion.py:386
 msgid "Rapid Photo Downloader updates"
 msgstr ""
 
 #. Translators: shows how much of a file has been downloaded e.g  123 KB of 1.3 MB
-#: ../raphodo/newversion.py:478
+#: ../raphodo/newversion.py:488
 #, python-format
 msgid "%(downloaded)s of %(total)s"
 msgstr ""
 
-#: ../raphodo/newversion.py:495
+#: ../raphodo/newversion.py:507
 msgid "Downloading..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:76
+#: ../raphodo/preferencedialog.py:86
 msgid "Preferences"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Automation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85 ../raphodo/preferencedialog.py:343
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/preferencedialog.py:428
 msgid "Error Handling"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:109
+msgid "Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:109 ../raphodo/preferencedialog.py:119
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:94
+#: ../raphodo/preferencedialog.py:147
 msgid "Device Scanning"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:96
+#: ../raphodo/preferencedialog.py:148
 msgid "Scan only external devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:98
+#: ../raphodo/preferencedialog.py:150
 msgid ""
 "Scan for photos and videos only on devices that are external to the "
 "computer,\n"
 "including cameras, memory cards, external hard drives, and USB flash drives."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:102
-msgid "Scan non-camera devices lacking a DCIM folder"
+#: ../raphodo/preferencedialog.py:153
+msgid "Scan only specific folders on devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:104
+#: ../raphodo/preferencedialog.py:155
 msgid ""
-"Scan the entirety of a device for photos and videos, irrespective of whether "
-"it contains a DCIM folder,\n"
-"as opposed to only scanning within a DCIM folder.\n"
+"Scan for photos and videos only in the folders specified below (except "
+"paths\n"
+"specified in Ignored Paths).\n"
 "\n"
-"Changing this setting causes all devices to be scanned again.\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:161
+msgid "Folders to scan:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:164
+msgid ""
+"Folders at the base level of device file systems that will be scanned\n"
+"for photos and videos."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:167 ../raphodo/preferencedialog.py:219
+msgid "Add..."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:169
+msgid ""
+"Add a folder to the list of folders to scan for photos and videos.\n"
+"\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:172 ../raphodo/preferencedialog.py:198
+#: ../raphodo/preferencedialog.py:224 ../raphodo/preferencedialog.py:529
+msgid "Remove"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:174
+msgid ""
+"Remove a folder from the list of folders to scan for photos and videos.\n"
 "\n"
-"Note: With cameras, only the DCIM folder is scanned."
+"Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:116
+#: ../raphodo/preferencedialog.py:191
 msgid "Devices that have been set to automatically ignore or download from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:117
+#: ../raphodo/preferencedialog.py:192
 msgid "Remembered Devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:121
+#: ../raphodo/preferencedialog.py:196
 msgid ""
 "Remove a device from the list of devices to automatically ignore or download "
 "from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:123 ../raphodo/preferencedialog.py:149
-#: ../raphodo/preferencedialog.py:431
-msgid "Remove"
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:127
+#: ../raphodo/preferencedialog.py:202
 msgid ""
 "Clear the list of devices from which to automatically ignore or download "
 "from.\n"
@@ -1806,315 +2267,436 @@ msgid ""
 "Note: Changes take effect when the computer is next scanned for devices."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:140
+#: ../raphodo/preferencedialog.py:215
 msgid "Ignored Paths"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:141
+#: ../raphodo/preferencedialog.py:216
 msgid ""
 "The end part of a path that should never be scanned for photos or videos."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:144
-msgid "Add..."
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:146
+#: ../raphodo/preferencedialog.py:221
 msgid ""
 "Add a path to the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:151
+#: ../raphodo/preferencedialog.py:226
 msgid ""
 "Remove a path from the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:156
+#: ../raphodo/preferencedialog.py:231
 msgid ""
 "Clear the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:164
+#: ../raphodo/preferencedialog.py:239
 msgid ""
-"Use python-style <a href=\"http://damonlynch.net/rapid/documentation/"
-"#regularexpressions\">regular expressions</a>"
+"Use python-style <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">regula"
+"r expressions</a>"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:168
+#: ../raphodo/preferencedialog.py:243
 msgid ""
 "Use regular expressions in the list of ignored paths.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:208
+#: ../raphodo/preferencedialog.py:283
 msgid "Program Automation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:209
+#: ../raphodo/preferencedialog.py:284
 msgid "Start downloading at program startup"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:210
+#: ../raphodo/preferencedialog.py:285
 msgid "Start downloading upon device insertion"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:211
+#: ../raphodo/preferencedialog.py:286
 msgid "Unmount (eject) device upon download completion"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:212
+#: ../raphodo/preferencedialog.py:287
 msgid "Exit program when download completes"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:213
+#: ../raphodo/preferencedialog.py:288
 msgid "Exit program even if download had warnings or errors"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:240
+#: ../raphodo/preferencedialog.py:315
 msgid "Thumbnail Generation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:241
+#: ../raphodo/preferencedialog.py:316
 msgid "Generate thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:242
+#: ../raphodo/preferencedialog.py:318
 msgid "Generate thumbnails to show in the main program window"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:244
+#: ../raphodo/preferencedialog.py:320
 msgid "Cache thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:245
+#: ../raphodo/preferencedialog.py:323
 msgid ""
 "Save thumbnails shown in the main program window in a thumbnail cache unique "
 "to Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:247
+#: ../raphodo/preferencedialog.py:327
 msgid "Generate system thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:248
+#: ../raphodo/preferencedialog.py:330
 msgid ""
 "While downloading, save thumbnails that can be used by desktop file managers "
 "and other programs"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:255
+#: ../raphodo/preferencedialog.py:339
 msgid "Number of CPU cores used to generate thumbnails."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:256
+#: ../raphodo/preferencedialog.py:340
 msgid "CPU cores:"
 msgstr ""
 
 #. Translators: the * acts as an asterisk to denote a reference to an annotation
 #. such as '* Takes effect upon program restart'
-#: ../raphodo/preferencedialog.py:271 ../raphodo/preferencedialog.py:317
+#: ../raphodo/preferencedialog.py:355 ../raphodo/preferencedialog.py:401
 msgid "*"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:294
+#: ../raphodo/preferencedialog.py:378
 msgid "Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:296
+#: ../raphodo/preferencedialog.py:380
 msgid "Calculating..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:302
+#: ../raphodo/preferencedialog.py:386
 msgid "days"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:303
+#: ../raphodo/preferencedialog.py:387
 msgid "forever"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:308
+#: ../raphodo/preferencedialog.py:392
 msgid "Cache size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:310
+#: ../raphodo/preferencedialog.py:394
 msgid "Number of thumbnails:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:312
+#: ../raphodo/preferencedialog.py:396
 msgid "Database size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:314
+#: ../raphodo/preferencedialog.py:398
 msgid "Cache unaccessed thumbnails for:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:322
+#: ../raphodo/preferencedialog.py:406
 msgid "Purge Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:323
+#: ../raphodo/preferencedialog.py:408
 msgid "Optimize Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:336
+#: ../raphodo/preferencedialog.py:421
 msgid "* Takes effect upon program restart"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:346
+#: ../raphodo/preferencedialog.py:431
 msgid "Skip download"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:347
+#: ../raphodo/preferencedialog.py:432
 msgid "Don't download the file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:348
+#: ../raphodo/preferencedialog.py:433
 msgid "Add unique identifier"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:349
+#: ../raphodo/preferencedialog.py:436
 msgid ""
 "Add an identifier like _1 or _2 to the end of the filename, immediately "
 "before the file's extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:355
+#: ../raphodo/preferencedialog.py:444
 msgid "Overwrite"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:356
+#: ../raphodo/preferencedialog.py:445
 msgid "Overwrite the previously backed up file"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:357
+#: ../raphodo/preferencedialog.py:446
 msgid "Skip"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:358
+#: ../raphodo/preferencedialog.py:448
 msgid "Don't overwrite the backup file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:364
+#: ../raphodo/preferencedialog.py:455
 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 identifier:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:378
+#: ../raphodo/preferencedialog.py:464
+msgid ""
+"Using sequence numbers to automatically generate unique filenames is "
+"strongly recommended. Configure file renaming in the Rename panel in the "
+"main window."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:473
 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 ""
 
-#: ../raphodo/preferencedialog.py:398
+#: ../raphodo/preferencedialog.py:494
 msgid "Program Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:399
+#: ../raphodo/preferencedialog.py:495
 msgid "Show a warning when:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:402
+#: ../raphodo/preferencedialog.py:498
 msgid "Downloading files currently not displayed"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:403
+#: ../raphodo/preferencedialog.py:499
 msgid ""
 "Warn when about to download files that are not displayed in the main window."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:405
+#: ../raphodo/preferencedialog.py:501
 msgid "Backup destinations are missing"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:406
-msgid "Warn before starting a download if it is not possible to back up files."
+#: ../raphodo/preferencedialog.py:502
+msgid ""
+"Warn before starting a download if it is not possible to back up files."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:408
+#: ../raphodo/preferencedialog.py:504
 msgid "Program libraries are missing or broken"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:409
+#: ../raphodo/preferencedialog.py:505
 msgid ""
 "Warn if a software library used by Rapid Photo Downloader is missing or not "
 "functioning."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:412
+#: ../raphodo/preferencedialog.py:508
 msgid "Filesystem metadata cannot be set"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:413
+#: ../raphodo/preferencedialog.py:509
 msgid ""
 "Warn if there is an error setting a file's filesystem metadata, such as its "
 "modification time."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:416
+#: ../raphodo/preferencedialog.py:512
 msgid "Encountering unhandled files"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:417
+#: ../raphodo/preferencedialog.py:513
 msgid ""
 "Warn after scanning a device or this computer if there are unrecognized "
 "files that will not be included in the download."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:420
+#: ../raphodo/preferencedialog.py:517
 msgid "Do not warn about unhandled files with extensions:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:424
+#: ../raphodo/preferencedialog.py:522
 msgid ""
 "File extensions are case insensitive and do not need to include the leading "
 "dot."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:427
+#: ../raphodo/preferencedialog.py:525
 msgid "Add"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:428
+#: ../raphodo/preferencedialog.py:526
 msgid ""
 "Add a file extension to the list of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:430
+#: ../raphodo/preferencedialog.py:528
 msgid ""
 "Remove a file extension from the list of unhandled file types to not warn "
 "about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:434
+#: ../raphodo/preferencedialog.py:532
 msgid ""
 "Clear the list of file extensions of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:469
+#: ../raphodo/preferencedialog.py:568
+msgid "Photo and Video Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:571
+msgid "Consolidate files across devices and downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:574
+msgid ""
+"Analyze the results of device scans looking for duplicate files and matching "
+"RAW and JPEG pairs,\n"
+"comparing them across multiple devices and download sessions."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:580
+msgid "Treat matching RAW and JPEG files as:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:581
+msgid "One photo"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:582
+msgid "Two photos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:584
+msgid ""
+"Display matching pairs of RAW and JPEG photos as one photo, and if marked, "
+"download both."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:589
+msgid ""
+"Display matching pairs of RAW and JPEG photos as two different photos. You "
+"can still synchronize their sequence numbers."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:598
+msgid "With matching RAW and JPEG photos:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:600
+msgid "Do not mark JPEG for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:601
+msgid "Do not mark RAW for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:602
+msgid "Mark both for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:609
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"JPEG for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:614
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"RAW for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:619
+msgid ""
+"When matching RAW and JPEG photos are found, automatically mark both for "
+"download."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:625
+msgid ""
+"If you disable file consolidation, choose what to do when a download device "
+"is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:631
+msgid ""
+"When a download device is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:642
+msgid "Clear completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:643
+msgid "Keep displaying completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:644
+msgid "Prompt for what to do"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:649
+msgid ""
+"Automatically clear the display of completed downloads whenever a new "
+"download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:654
+msgid ""
+"Keep displaying completed downloads whenever a new download device is "
+"inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:658
+msgid ""
+"Prompt whether to keep displaying completed downloads or clear them whenever "
+"a new download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:702
 msgid "Version Check"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:470
+#: ../raphodo/preferencedialog.py:703
 msgid "Check for new version at startup"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:471
+#: ../raphodo/preferencedialog.py:705
 msgid "Check for a new version of the program each time the program starts."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:473
+#: ../raphodo/preferencedialog.py:707
 msgid "Include development releases"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:474
+#: ../raphodo/preferencedialog.py:709
 msgid ""
 "Include alpha, beta and other development releases when checking for a new "
 "version of the program.\n"
@@ -2123,11 +2705,11 @@ msgid ""
 "occur."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:489
+#: ../raphodo/preferencedialog.py:725
 msgid "Ignore DNG date/time metadata on MTP devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:490
+#: ../raphodo/preferencedialog.py:727
 msgid ""
 "Ignore date/time metadata in DNG files located on MTP devices, and use the "
 "file's modification time instead.\n"
@@ -2136,70 +2718,86 @@ msgid ""
 "metadata."
 msgstr ""
 
+#: ../raphodo/preferencedialog.py:741
+msgid "Completed Downloads"
+msgstr ""
+
 #. Translators: substituted value is a description for the set of preferences
 #. shown in the preference dialog window, e.g. Devices, Automation, etc.
 #. This string is shown in a tooltip for the "Restore Defaults" button
-#: ../raphodo/preferencedialog.py:710
+#: ../raphodo/preferencedialog.py:1067
 #, python-format
 msgid "Restores default %s preference values"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:832
+#: ../raphodo/preferencedialog.py:1208
 msgid ""
 "Do you want to purge the thumbnail cache? The cache will be purged when the "
 "program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:835
+#: ../raphodo/preferencedialog.py:1212
 msgid "Purge Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:847
+#: ../raphodo/preferencedialog.py:1225
 msgid ""
 "Do you want to optimize the thumbnail cache? The cache will be optimized "
 "when the program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:850
+#: ../raphodo/preferencedialog.py:1229
 msgid "Optimize Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1045
+#: ../raphodo/preferencedialog.py:1481
+msgid "Enter a Folder to Scan"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1482
+msgid "Specify a folder that will be scanned for photos and videos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1483
+msgid "Folder:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1497
 msgid "Enter a Path to Ignore"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1046
+#: ../raphodo/preferencedialog.py:1498
 msgid "Specify a path that will never be scanned for photos or videos"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1047
+#: ../raphodo/preferencedialog.py:1499
 msgid "Path:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1061
+#: ../raphodo/preferencedialog.py:1513
 msgid "Enter a File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1062
+#: ../raphodo/preferencedialog.py:1514
 msgid "Specify a file extension (without the leading dot)"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1063 ../raphodo/renamepanel.py:122
+#: ../raphodo/preferencedialog.py:1515 ../raphodo/renamepanel.py:122
 msgid "Extension:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1078
+#: ../raphodo/preferencedialog.py:1530
 msgid "Invalid File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1079
+#: ../raphodo/preferencedialog.py:1531
 #, python-format
 msgid ""
 "The file extension <b>%s</b> is recognized by Rapid Photo Downloader, so it "
 "makes no sense to warn about its presence."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1081
+#: ../raphodo/preferencedialog.py:1533
 #, python-format
 msgid ""
 "Recognized file types:\n"
@@ -2225,104 +2823,103 @@ msgstr ""
 msgid "Birthday"
 msgstr ""
 
-#: ../raphodo/preferences.py:614
+#: ../raphodo/preferences.py:624
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr ""
 
-#: ../raphodo/preferences.py:617
+#: ../raphodo/preferences.py:627
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr ""
 
-#: ../raphodo/preferences.py:622
+#: ../raphodo/preferences.py:632
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
 
-#. self.setFlat(True)
 #: ../raphodo/primarybutton.py:72
 msgid "Download 8 Photos and 10 Videos"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:86 ../raphodo/problemnotification.py:208
+#: ../raphodo/problemnotification.py:87 ../raphodo/problemnotification.py:209
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:89
+#: ../raphodo/problemnotification.py:90
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:116
+#: ../raphodo/problemnotification.py:117
 #, python-format
 msgid "GPhoto2 Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:124
+#: ../raphodo/problemnotification.py:125
 msgid ""
 "Unable to initialize the camera, probably because another program is using "
 "it. No files were copied from it."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:134
+#: ../raphodo/problemnotification.py:135
 #, python-format
 msgid "Unable to read directory %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:140
+#: ../raphodo/problemnotification.py:141
 #, python-format
 msgid "Unable to access modification time or size from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:146
+#: ../raphodo/problemnotification.py:147
 #, python-format
 msgid "Unable to read file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:152
+#: ../raphodo/problemnotification.py:153
 #, python-format
 msgid "Unable to write file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:158
+#: ../raphodo/problemnotification.py:159
 #, python-format
 msgid "Unable to move file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:164
+#: ../raphodo/problemnotification.py:165
 #, python-format
 msgid "Unable to remove file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:170
+#: ../raphodo/problemnotification.py:171
 #, python-format
 msgid "Unable to copy file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:176
+#: ../raphodo/problemnotification.py:177
 #, python-format
 msgid "Zero length file %s will not be downloaded"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:182
+#: ../raphodo/problemnotification.py:183
 #, python-format
 msgid "Could not determine filesystem modification time for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:188
+#: ../raphodo/problemnotification.py:189
 #, python-format
 msgid "Unable to load metadata from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:194
+#: ../raphodo/problemnotification.py:195
 #, python-format
 msgid ""
 "Unable to load metadata from %(name)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:202
+#: ../raphodo/problemnotification.py:203
 #, python-format
 msgid ""
 "An error occurred setting a file's filesystem metadata on the filesystem %s. "
@@ -2330,212 +2927,212 @@ msgid ""
 "again."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:216
+#: ../raphodo/problemnotification.py:217
 #, python-format
 msgid "Encountered unhandled file %s. It will not be downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:223
+#: ../raphodo/problemnotification.py:224
 #, python-format
 msgid "%(filetype)s %(destination)s already exists."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:234 ../raphodo/problemnotification.py:262
+#: ../raphodo/problemnotification.py:235 ../raphodo/problemnotification.py:263
 #, python-format
 msgid ""
 "The existing %(filetype)s %(destination)s was last modified on %(date)s at "
 "%(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:245
+#: ../raphodo/problemnotification.py:246
 #, python-format
 msgid "The %(filetype)s %(source)s was not downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:273
+#: ../raphodo/problemnotification.py:274
 #, python-format
 msgid "The %(filetype)s %(source)s was downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:282
+#: ../raphodo/problemnotification.py:283
 #, python-format
 msgid "The unique identifier '%s' was added to the filename."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:298
+#: ../raphodo/problemnotification.py:299
 #, python-format
 msgid ""
 "The existing backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:309
+#: ../raphodo/problemnotification.py:310
 #, python-format
 msgid "The %(filetype)s %(source)s was not backed up from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:326
+#: ../raphodo/problemnotification.py:327
 #, python-format
 msgid ""
 "The previous backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:337
+#: ../raphodo/problemnotification.py:338
 #, python-format
 msgid ""
 "The %(filetype)s %(source)s from %(device)s was backed up, overwriting the "
 "previous backup %(filetype)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:356
+#: ../raphodo/problemnotification.py:357
 #, python-format
 msgid ""
 "When synchronizing RAW + JPEG sequence values, a duplicate %(filetype)s "
 "%(file)s was encountered, and was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:366
+#: ../raphodo/problemnotification.py:367
 msgid ""
 "When synchronizing RAW + JPEG sequence values, photos were detected with the "
 "same filenames, but taken at different times:"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:373
+#: ../raphodo/problemnotification.py:374
 #, 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 ""
 
-#: ../raphodo/problemnotification.py:389
+#: ../raphodo/problemnotification.py:390
 #, python-format
 msgid "Unable to finalize the filename for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:424
+#: ../raphodo/problemnotification.py:425
 #, python-format
 msgid ""
 "The filename %(destination)s was not fully generated for %(filetype)s "
 "%(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:433
+#: ../raphodo/problemnotification.py:434
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:439
+#: ../raphodo/problemnotification.py:440
 #, python-format
 msgid "The following metadata is missing: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:445
+#: ../raphodo/problemnotification.py:446
 #, python-format
 msgid "Date/time conversion failed: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:451
+#: ../raphodo/problemnotification.py:452
 msgid ""
 "Could not extract valid date/time metadata or determine the file "
 "modification time."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:457
+#: ../raphodo/problemnotification.py:458
 msgid "Filename does not have an extension."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:460
+#: ../raphodo/problemnotification.py:461
 msgid "Filename does not have a number component."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:464
+#: ../raphodo/problemnotification.py:465
 #, python-format
 msgid "Error generating component %(component)s. Error: %(error)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:477
+#: ../raphodo/problemnotification.py:478
 #, python-format
 msgid ""
 "The download subfolders %(folder)s were only partially generated for "
 "%(filetype)s %(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:486
+#: ../raphodo/problemnotification.py:487
 #, python-format
 msgid ""
 "There is no data with which to generate the %(subfolder_file)s for "
 "%(filename)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:499
+#: ../raphodo/problemnotification.py:500
 #, python-format
 msgid ""
 "Unable to create the %(filetype)s %(destination)s in %(folder)s. The "
 "download file was %(source)s in %(device)s. It was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:514
+#: ../raphodo/problemnotification.py:515
 #, python-format
 msgid "Unable to create the download subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:526
+#: ../raphodo/problemnotification.py:527
 #, python-format
 msgid "Unable to create the backup subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:577
+#: ../raphodo/problemnotification.py:578
 #, python-format
 msgid "Problems scanning %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:584
+#: ../raphodo/problemnotification.py:585
 #, python-format
 msgid "Problems copying from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:591
+#: ../raphodo/problemnotification.py:592
 msgid "Problems while finalizing filenames and generating subfolders"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:598
+#: ../raphodo/problemnotification.py:599
 #, python-format
 msgid "Problems backing up to %s"
 msgstr ""
 
-#. Translators: for example Nov 3 or Dec 31
-#. The start and end dates are on a different day
-#. Translators: for example Nov 3 or Dec 31
-#: ../raphodo/proximity.py:105 ../raphodo/proximity.py:221
-#: ../raphodo/proximity.py:224 ../raphodo/proximity.py:828
+#. Translators: for example Nov 3 2015, 11:25 AM
+#. Translators: for example, Nov 3, 12:15 PM
+#: ../raphodo/proximity.py:188 ../raphodo/proximity.py:213
+#: ../raphodo/proximity.py:236 ../raphodo/proximity.py:239
 #, python-format
-msgid "%(month)s %(numeric_day)s"
+msgid "%(date)s, %(time)s"
 msgstr ""
 
-#. Translators: for example Nov 15 2015
-#. Translators: for example Nov 3 2015
-#: ../raphodo/proximity.py:109 ../raphodo/proximity.py:230
-#: ../raphodo/proximity.py:231 ../raphodo/proximity.py:831
+#: ../raphodo/proximity.py:204
 #, python-format
-msgid "%(date)s %(year)s"
+msgid "%(starttime)s - %(endtime)s"
 msgstr ""
 
-#. Translators: for example Nov 3 2015, 11:25 AM
-#. Translators: for example, Nov 3, 12:15 PM
-#: ../raphodo/proximity.py:197 ../raphodo/proximity.py:215
-#: ../raphodo/proximity.py:234 ../raphodo/proximity.py:236
+#. The start and end dates are on a different day
+#. Translators: for example Nov 3 or Dec 31
+#: ../raphodo/proximity.py:221 ../raphodo/proximity.py:225
+#: ../raphodo/proximity.py:980 ../raphodo/timeutils.py:105
 #, python-format
-msgid "%(date)s, %(time)s"
+msgid "%(month)s %(numeric_day)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:209
+#. Translators: for example Nov 3 2015
+#. Translators: for example Nov 2 2015
+#. Translators: for example Nov 15 2015
+#: ../raphodo/proximity.py:232 ../raphodo/proximity.py:233
+#: ../raphodo/proximity.py:985 ../raphodo/timeutils.py:110
 #, python-format
-msgid "%(starttime)s - %(endtime)s"
+msgid "%(date)s %(year)s"
 msgstr ""
 
 #. Translators: for example, Nov 3, 12:15 PM - Nov 4, 1:00 AM
-#: ../raphodo/proximity.py:241
+#: ../raphodo/proximity.py:245
 #, python-format
 msgid "%(earlier_time)s - %(later_time)s"
 msgstr ""
@@ -2544,25 +3141,25 @@ msgstr ""
 #. Nov 3 2012, 12:15 PM -
 #. Nov 4 2012, 1:00 AM
 #. (please keep the line break signified by \n)
-#: ../raphodo/proximity.py:248
+#: ../raphodo/proximity.py:253
 #, python-format
 msgid ""
 "%(earlier_time)s -\n"
 "%(later_time)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:359
+#: ../raphodo/proximity.py:382
 #, python-format
 msgid "%(month)s  %(year)s"
 msgstr ""
 
 #. Translators: for example Nov 2015
-#: ../raphodo/proximity.py:833
+#: ../raphodo/proximity.py:987
 #, python-format
 msgid "%(month)s %(year)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:1344
+#: ../raphodo/proximity.py:1595
 msgid ""
 "The time elapsed between consecutive photos and videos that is used to build "
 "the Timeline"
@@ -2572,47 +3169,47 @@ msgstr ""
 #. Replace the very last character (after the d) with the correct
 #. localized value, keeping everything else. In other words, change
 #. only the m character.
-#: ../raphodo/proximity.py:1406
+#: ../raphodo/proximity.py:1652
 #, python-format
 msgid "%(minutes)dm"
 msgstr ""
 
 #. Translators: i.e. "1.5h", which is short for 1.5 hours.
 #. Replace the entire string with the correct localized value
-#: ../raphodo/proximity.py:1410
+#: ../raphodo/proximity.py:1656
 msgid "1.5h"
 msgstr ""
 
 #. Translators: e.g. "5h", which is short for 5 hours.
 #. Replace the very last character (after the d) with the correct localized value,
 #. keeping everything else. In other words, change only the h character.
-#: ../raphodo/proximity.py:1415
+#: ../raphodo/proximity.py:1661
 #, python-format
 msgid "%(hours)dh"
 msgstr ""
 
-#: ../raphodo/proximity.py:1461
+#: ../raphodo/proximity.py:1710
 msgid ""
 "The Timeline groups photos and videos based on how much time elapsed between "
 "consecutive shots. Use it to identify photos and videos taken at different "
 "periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/proximity.py:1464
+#: ../raphodo/proximity.py:1715
 msgid ""
 "Use the slider (below) to adjust the time elapsed between consecutive shots "
 "that is used to build the Timeline."
 msgstr ""
 
-#: ../raphodo/proximity.py:1466
+#: ../raphodo/proximity.py:1718
 msgid "Timeline build pending..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1467
+#: ../raphodo/proximity.py:1719
 msgid "Timeline is building..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1468
+#: ../raphodo/proximity.py:1721
 msgid ""
 "The Timeline needs to be rebuilt because the file modification time does not "
 "match the time a shot was taken for one or more shots.<br><br>The Timeline "
@@ -2624,61 +3221,61 @@ msgid ""
 "downloading, which is when the metadata is read."
 msgstr ""
 
-#: ../raphodo/rapid.py:485 ../raphodo/rapid.py:2461 ../raphodo/rapid.py:3728
-#: ../raphodo/rapid.py:3846 ../raphodo/rapid.py:3850 ../raphodo/rapid.py:3870
-#: ../raphodo/rapid.py:3874 ../raphodo/rapid.py:3998 ../raphodo/rapid.py:4007
-#: ../raphodo/rapid.py:4495 ../raphodo/rapid.py:4888 ../raphodo/rapid.py:5722
-#: ../raphodo/rememberthisdialog.py:97
+#: ../raphodo/rapid.py:493 ../raphodo/rapid.py:2555 ../raphodo/rapid.py:3934
+#: ../raphodo/rapid.py:4065 ../raphodo/rapid.py:4069 ../raphodo/rapid.py:4092
+#: ../raphodo/rapid.py:4096 ../raphodo/rapid.py:4226 ../raphodo/rapid.py:4237
+#: ../raphodo/rapid.py:4743 ../raphodo/rapid.py:5195 ../raphodo/rapid.py:5997
+#: ../raphodo/rememberthisdialog.py:99
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:3
 msgid "Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:1100
+#: ../raphodo/rapid.py:1131
 msgid ""
 "<b>ExifTool has a problem</b><br><br> Rapid Photo Downloader uses ExifTool "
 "to get metadata from videos and photos. The program will run without it, but "
 "installing it is <b>highly</b> recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1110 ../raphodo/rapid.py:1130
+#: ../raphodo/rapid.py:1141 ../raphodo/rapid.py:1161
 msgid "Problem with libmediainfo"
 msgstr ""
 
-#: ../raphodo/rapid.py:1119
+#: ../raphodo/rapid.py:1150
 msgid ""
 "<b>The library libmediainfo appears to be missing</b><br><br> Rapid Photo "
 "Downloader uses libmediainfo to get the date and time a video was shot. The "
 "program will run  without it, but installing it is recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1417
+#: ../raphodo/rapid.py:1448
 msgid "Download failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1419
+#: ../raphodo/rapid.py:1450
 msgid ""
 "Sorry, the download of the new version of Rapid Photo Downloader failed."
 msgstr ""
 
-#: ../raphodo/rapid.py:1425
+#: ../raphodo/rapid.py:1457
 msgid ""
 "The new version was successfully downloaded. Do you want to close Rapid "
 "Photo Downloader and install it now?"
 msgstr ""
 
-#: ../raphodo/rapid.py:1428
+#: ../raphodo/rapid.py:1461
 msgid "Update Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:1432
+#: ../raphodo/rapid.py:1465
 msgid "Install"
 msgstr ""
 
-#: ../raphodo/rapid.py:1450
+#: ../raphodo/rapid.py:1483
 msgid "New version saved"
 msgstr ""
 
-#: ../raphodo/rapid.py:1451
+#: ../raphodo/rapid.py:1485
 #, python-format
 msgid ""
 "The tar file and installer script are saved at:\n"
@@ -2686,163 +3283,163 @@ msgid ""
 " %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:1468
+#: ../raphodo/rapid.py:1502
 msgid "Upgrade failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1469
+#: ../raphodo/rapid.py:1505
 msgid ""
 "Sorry, upgrading Rapid Photo Downloader failed because there was an error "
 "opening the installer."
 msgstr ""
 
-#: ../raphodo/rapid.py:1667 ../raphodo/rapid.py:2331
+#: ../raphodo/rapid.py:1709 ../raphodo/rapid.py:2425
 msgid "Download"
 msgstr ""
 
-#: ../raphodo/rapid.py:1671
+#: ../raphodo/rapid.py:1713
 msgid "&Refresh..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1675
+#: ../raphodo/rapid.py:1717
 msgid "&Preferences"
 msgstr ""
 
-#: ../raphodo/rapid.py:1679
+#: ../raphodo/rapid.py:1721
 msgid "&Quit"
 msgstr ""
 
-#: ../raphodo/rapid.py:1683
+#: ../raphodo/rapid.py:1725
 msgid "Error &Reports"
 msgstr ""
 
-#: ../raphodo/rapid.py:1687
+#: ../raphodo/rapid.py:1729
 msgid "Clear Completed Downloads"
 msgstr ""
 
-#: ../raphodo/rapid.py:1691
+#: ../raphodo/rapid.py:1733
 msgid "Get Help Online..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1695
+#: ../raphodo/rapid.py:1737
 msgid "&Tip of the Day..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1699
+#: ../raphodo/rapid.py:1741
 msgid "Report a Problem..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1703
+#: ../raphodo/rapid.py:1745
 msgid "Make a Donation..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1707
+#: ../raphodo/rapid.py:1749
 msgid "Translate this Application..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1711
+#: ../raphodo/rapid.py:1753
 msgid "&About..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1715
+#: ../raphodo/rapid.py:1757
 msgid "Check for Updates..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1797
+#: ../raphodo/rapid.py:1840
 msgid "Timeline"
 msgstr ""
 
-#: ../raphodo/rapid.py:1807
+#: ../raphodo/rapid.py:1850
 msgid "Destination"
 msgstr ""
 
-#: ../raphodo/rapid.py:1808
+#: ../raphodo/rapid.py:1851
 msgid "Rename"
 msgstr ""
 
-#: ../raphodo/rapid.py:1810
+#: ../raphodo/rapid.py:1853
 msgid "Back Up"
 msgstr ""
 
 #. Devices Header and View
-#: ../raphodo/rapid.py:1926
+#: ../raphodo/rapid.py:1977
 msgid ""
 "Turn on or off the use of devices attached to this computer as download "
 "sources"
 msgstr ""
 
 #. This Computer Header and View
-#: ../raphodo/rapid.py:1940
+#: ../raphodo/rapid.py:1994
 msgid ""
 "Turn on or off the use of a folder on this computer as a download source"
 msgstr ""
 
-#: ../raphodo/rapid.py:1941
+#: ../raphodo/rapid.py:1996
 msgid "This Computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:1952
+#: ../raphodo/rapid.py:2009
 msgid "Select a source folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:1975
+#: ../raphodo/rapid.py:2038
 msgid "Projected Storage Use"
 msgstr ""
 
-#: ../raphodo/rapid.py:1989 ../raphodo/rapid.py:1997
+#: ../raphodo/rapid.py:2056 ../raphodo/rapid.py:2068
 msgid "Select a destination folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:2045
+#: ../raphodo/rapid.py:2117
 msgid "All"
 msgstr ""
 
-#: ../raphodo/rapid.py:2046
+#: ../raphodo/rapid.py:2118
 msgid "New"
 msgstr ""
 
-#: ../raphodo/rapid.py:2048
+#: ../raphodo/rapid.py:2120
 msgid "Show:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2051
+#: ../raphodo/rapid.py:2123
 msgid "Modification Time"
 msgstr ""
 
-#: ../raphodo/rapid.py:2052
+#: ../raphodo/rapid.py:2124
 msgid "Checked State"
 msgstr ""
 
-#: ../raphodo/rapid.py:2055
+#: ../raphodo/rapid.py:2127
 msgid "File Type"
 msgstr ""
 
-#: ../raphodo/rapid.py:2056
+#: ../raphodo/rapid.py:2128
 msgid "Device"
 msgstr ""
 
-#: ../raphodo/rapid.py:2058
+#: ../raphodo/rapid.py:2130
 msgid "Sort:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2069
+#: ../raphodo/rapid.py:2141
 msgid "Select All:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2311
+#: ../raphodo/rapid.py:2405
 #, python-format
 msgid "Download %(files)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2327
+#: ../raphodo/rapid.py:2421
 msgid "Resume Download"
 msgstr ""
 
-#: ../raphodo/rapid.py:2329
+#: ../raphodo/rapid.py:2423
 msgid "Pause"
 msgstr ""
 
-#: ../raphodo/rapid.py:2417
+#: ../raphodo/rapid.py:2511
 #, python-brace-format
 msgid ""
 "Please report the problem at <a href=\"{website}\">{website}</a>.<br><br>\n"
@@ -2851,11 +3448,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/rapid.py:2431
+#: ../raphodo/rapid.py:2525
 msgid "Thank you for reporting a problem in Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:2529
+#: ../raphodo/rapid.py:2624
 #, python-format
 msgid ""
 "<b>Changing This Computer source path</b><br><br>Do you really want to "
@@ -2864,30 +3461,29 @@ msgid ""
 "from This Computer will be cancelled."
 msgstr ""
 
-#: ../raphodo/rapid.py:2595
+#: ../raphodo/rapid.py:2694
 msgid "You cannot change the download destination while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:2604
+#: ../raphodo/rapid.py:2704
 #, python-format
 msgid ""
 "<b>Confirm Download Destination</b><br><br>Are you sure you want to set the "
 "%(file_type)s download destination to %(path)s?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2682
+#: ../raphodo/rapid.py:2785
 msgid ""
+"\n"
 "<b>Downloading all files</b><br><br>\n"
-"                    A download always includes all files that are checked "
-"for download,\n"
-"                    including those that are not currently displayed because "
-"the Timeline\n"
-"                    is being used or because only new files are being shown."
-"<br><br>\n"
-"                    Do you want to proceed with the download?"
+"A download always includes all files that are checked for download,\n"
+"including those that are not currently displayed because the Timeline\n"
+"is being used or because only new files are being shown.<br><br>\n"
+"Do you want to proceed with the download?\n"
+"                        "
 msgstr ""
 
-#: ../raphodo/rapid.py:2820
+#: ../raphodo/rapid.py:2937
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -2895,206 +3491,200 @@ msgid ""
 "%(folder2)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2824
+#: ../raphodo/rapid.py:2940
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
 "%s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2827
+#: ../raphodo/rapid.py:2943
 msgid "Download Failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:2828
+#: ../raphodo/rapid.py:2944
 msgid "The download cannot proceed."
 msgstr ""
 
-#: ../raphodo/rapid.py:2842
+#: ../raphodo/rapid.py:2962
 msgid ""
 "Photos and videos will not be backed up because there is nowhere to back "
 "them up. Do you still want to start the download?"
 msgstr ""
 
-#. Translators: filetype will be replaced with 'photos' or 'videos'
-#: ../raphodo/rapid.py:2847 ../raphodo/rapid.py:2854
+#: ../raphodo/rapid.py:2969 ../raphodo/rapid.py:2979
 #, python-format
 msgid ""
 "No backup device exists for backing up %(filetype)s. Do you still want to "
 "start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2848 ../raphodo/rpdfile.py:228
+#: ../raphodo/rapid.py:2971 ../raphodo/rpdfile.py:228
 msgid "photos"
 msgstr ""
 
-#: ../raphodo/rapid.py:2855 ../raphodo/rpdfile.py:223
+#: ../raphodo/rapid.py:2981 ../raphodo/rpdfile.py:223
 msgid "videos"
 msgstr ""
 
-#: ../raphodo/rapid.py:2861
+#: ../raphodo/rapid.py:2989
 msgid ""
 "<b>The photo and video backup destinations do not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2869 ../raphodo/rapid.py:2876
+#: ../raphodo/rapid.py:2999 ../raphodo/rapid.py:3008
 #, python-format
 msgid ""
 "<b>The %(filetype)s backup destination does not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2871 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:818
+#: ../raphodo/rapid.py:3001 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:843
 msgid "photo"
 msgstr ""
 
-#: ../raphodo/rapid.py:2878 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:858
+#: ../raphodo/rapid.py:3010 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:883
 msgid "video"
 msgstr ""
 
-#: ../raphodo/rapid.py:2886
+#: ../raphodo/rapid.py:3018
 msgid "Backup problem"
 msgstr ""
 
-#. Translators - in the middle is a unicode em dash - please retain it
-#. This string is displayed in the status bar when the download is running
-#: ../raphodo/rapid.py:3571
+#: ../raphodo/rapid.py:3756
 #, python-format
 msgid "%(downloading_from)s — %(time_left)s left (%(speed)s)"
 msgstr ""
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3640
+#: ../raphodo/rapid.py:3828
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr ""
 
-#. Translators: e.g. 2 videos failed to download
-#: ../raphodo/rapid.py:3645
+#: ../raphodo/rapid.py:3836
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr ""
 
-#: ../raphodo/rapid.py:3650 ../raphodo/rapid.py:3723
+#: ../raphodo/rapid.py:3842 ../raphodo/rapid.py:3927
 msgid "warnings"
 msgstr ""
 
-#: ../raphodo/rapid.py:3679
+#: ../raphodo/rapid.py:3873
 msgid "All downloads complete"
 msgstr ""
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3686 ../raphodo/rapid.py:3695 ../raphodo/rapid.py:3704
-#: ../raphodo/rapid.py:3713 ../raphodo/rapid.py:3721
+#: ../raphodo/rapid.py:3881 ../raphodo/rapid.py:3892 ../raphodo/rapid.py:3903
+#: ../raphodo/rapid.py:3914 ../raphodo/rapid.py:3924
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3688 ../raphodo/rapid.py:3706
+#: ../raphodo/rapid.py:3884 ../raphodo/rapid.py:3906
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr ""
 
-#: ../raphodo/rapid.py:3697 ../raphodo/rapid.py:3715
+#: ../raphodo/rapid.py:3895 ../raphodo/rapid.py:3917
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr ""
 
-#: ../raphodo/rapid.py:3742
+#: ../raphodo/rapid.py:3950
 msgid "1 failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:3744
+#: ../raphodo/rapid.py:3952
 #, python-format
 msgid "%d failures"
 msgstr ""
 
-#: ../raphodo/rapid.py:3749
+#: ../raphodo/rapid.py:3957
 msgid "1 warning"
 msgstr ""
 
-#: ../raphodo/rapid.py:3751
+#: ../raphodo/rapid.py:3959
 #, python-format
 msgid "%d warnings"
 msgstr ""
 
-#: ../raphodo/rapid.py:3771
+#: ../raphodo/rapid.py:3981
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3774
+#: ../raphodo/rapid.py:3985
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3779
+#: ../raphodo/rapid.py:3989
 #, python-format
 msgid "No files downloaded — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3781
+#: ../raphodo/rapid.py:3991
 msgid "No files downloaded"
 msgstr ""
 
-#: ../raphodo/rapid.py:3805
+#: ../raphodo/rapid.py:4021
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3809
+#: ../raphodo/rapid.py:4026
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3812
+#: ../raphodo/rapid.py:4031
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3820
+#: ../raphodo/rapid.py:4039
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3833
+#: ../raphodo/rapid.py:4052
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3837
+#: ../raphodo/rapid.py:4056
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3841
+#: ../raphodo/rapid.py:4060
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices"
 msgstr ""
 
-#: ../raphodo/rapid.py:3867
+#: ../raphodo/rapid.py:4087
 msgid "The Destination subfolders and Timeline have been rebuilt"
 msgstr ""
 
-#: ../raphodo/rapid.py:3922
+#: ../raphodo/rapid.py:4144
 msgid "Program preferences are invalid"
 msgstr ""
 
-#: ../raphodo/rapid.py:3999
+#: ../raphodo/rapid.py:4228
 #, python-format
 msgid ""
 "<b>All files on the %(camera)s are inaccessible</b>.<br><br>It may be locked "
@@ -3104,179 +3694,205 @@ msgid ""
 "ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4008
+#: ../raphodo/rapid.py:4239
 #, python-format
 msgid ""
-"<b>The %(camera)s appears to be in use by another application.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again.<br><br>Alternatively, you can ignore this "
-"device."
+"<b>The %(camera)s appears to be in use by another "
+"application.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again.<br><br>Alternatively, you "
+"can ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4019
+#: ../raphodo/rapid.py:4250
 msgid "&Try Again"
 msgstr ""
 
-#: ../raphodo/rapid.py:4020
+#: ../raphodo/rapid.py:4251
 msgid "&Ignore This Device"
 msgstr ""
 
-#: ../raphodo/rapid.py:4086
+#: ../raphodo/rapid.py:4323
 #, python-format
 msgid "Sorry, an unexpected problem occurred while scanning %s."
 msgstr ""
 
-#: ../raphodo/rapid.py:4087
+#: ../raphodo/rapid.py:4324
 msgid "Unfortunately you cannot download from this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4091
+#: ../raphodo/rapid.py:4328
 msgid ""
 "A possible workaround for the problem might be downloading from the camera's "
 "memory card using a card reader."
 msgstr ""
 
-#: ../raphodo/rapid.py:4096
+#: ../raphodo/rapid.py:4333
 msgid "Device scan failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:4472
+#: ../raphodo/rapid.py:4720
 #, python-format
 msgid ""
-"<b>The %(camera)s cannot be scanned because it cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again."
+"<b>The %(camera)s cannot be scanned because it cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again."
 msgstr ""
 
-#: ../raphodo/rapid.py:4496
+#: ../raphodo/rapid.py:4745
 #, python-format
 msgid ""
-"<b>The download cannot start because the %(camera)s cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again, and choose which files you want to "
-"download from it."
+"<b>The download cannot start because the %(camera)s cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again, and choose which files "
+"you want to download from it."
+msgstr ""
+
+#: ../raphodo/rapid.py:4842
+msgid "Completed Downloads Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4844
+#, python-format
+msgid "%s whose download have completed are displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4846
+msgid "Do you want to clear the completed downloads?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4848
+msgid "Completed Download Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4850
+#, python-format
+msgid "%s whose download has completed is displayed."
 msgstr ""
 
-#: ../raphodo/rapid.py:4635
+#: ../raphodo/rapid.py:4852
+msgid "Do you want to clear the completed download?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4933
 #, python-format
 msgid ""
 "Do you want to download photos and videos from the device <i>%(device)s</i>?"
 msgstr ""
 
-#: ../raphodo/rapid.py:4877
+#: ../raphodo/rapid.py:5183
 #, python-format
 msgid "<b>Do you want to ignore the %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4879
+#: ../raphodo/rapid.py:5186
 msgid ""
 "All cameras, phones and tablets with the same model name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:4883
+#: ../raphodo/rapid.py:5190
 #, python-format
 msgid ""
 "<b>Do you want to ignore the device %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4885
+#: ../raphodo/rapid.py:5192
 msgid "Any device with the same name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:5178
+#: ../raphodo/rapid.py:5492
 #, python-format
 msgid "Downloading from %(location)s on This Computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5180
+#: ../raphodo/rapid.py:5496
 msgid ""
 "Do you really want to download from here?<br><br>On some systems, scanning "
 "this location can take a very long time."
 msgstr ""
 
-#: ../raphodo/rapid.py:5224
+#: ../raphodo/rapid.py:5537
 #, python-format
 msgid "Generating thumbnails for %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5227
+#: ../raphodo/rapid.py:5540
 #, python-format
 msgid "Scanning %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5237
+#: ../raphodo/rapid.py:5551
 #, python-format
 msgid ""
 "%(number)s of %(available files)s checked for download (%(hidden)s hidden)"
 msgstr ""
 
-#: ../raphodo/rapid.py:5243
+#: ../raphodo/rapid.py:5559
 #, python-format
 msgid "%(number)s of %(available files)s checked for download"
 msgstr ""
 
-#: ../raphodo/rapid.py:5494
+#: ../raphodo/rapid.py:5764
 msgid "Display program information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5496
+#: ../raphodo/rapid.py:5766
 msgid "Display debugging information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5499
+#: ../raphodo/rapid.py:5769
 msgid "List photo and video file extensions the program recognizes and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5502
+#: ../raphodo/rapid.py:5772
 msgid "Turn on or off the the renaming of photos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5504
+#: ../raphodo/rapid.py:5774
 msgid "turn on or off the the renaming of videos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5506
+#: ../raphodo/rapid.py:5776
 msgid ""
 "Turn on or off the automatic detection of devices from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5510
+#: ../raphodo/rapid.py:5780
 msgid "Turn on or off downloading from this computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5512 ../raphodo/rapid.py:5515 ../raphodo/rapid.py:5518
-#: ../raphodo/rapid.py:5539 ../raphodo/rapid.py:5543
+#: ../raphodo/rapid.py:5782 ../raphodo/rapid.py:5785 ../raphodo/rapid.py:5788
+#: ../raphodo/rapid.py:5809 ../raphodo/rapid.py:5813
 msgid "PATH"
 msgstr ""
 
-#: ../raphodo/rapid.py:5513
+#: ../raphodo/rapid.py:5783
 msgid "The PATH on this computer from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5516
+#: ../raphodo/rapid.py:5786
 msgid "The PATH where photos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5519
+#: ../raphodo/rapid.py:5789
 msgid "The PATH where videos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5521
+#: ../raphodo/rapid.py:5791
 msgid "Turn on or off the backing up of photos and videos while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:5525
+#: ../raphodo/rapid.py:5795
 msgid "Turn on or off the automatic detection of backup devices."
 msgstr ""
 
-#: ../raphodo/rapid.py:5527 ../raphodo/rapid.py:5533
+#: ../raphodo/rapid.py:5797 ../raphodo/rapid.py:5803
 msgid "FOLDER"
 msgstr ""
 
-#: ../raphodo/rapid.py:5528
+#: ../raphodo/rapid.py:5798
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected photo "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3284,7 +3900,7 @@ msgid ""
 "photos up to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5534
+#: ../raphodo/rapid.py:5804
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected video "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3292,115 +3908,124 @@ msgid ""
 "up videos to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5540
+#: ../raphodo/rapid.py:5810
 msgid ""
 "The PATH where photos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5544
+#: ../raphodo/rapid.py:5814
 msgid ""
 "The PATH where videos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5547
+#: ../raphodo/rapid.py:5817
 #, python-format
 msgid "Ignore photos with the following extensions: %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5551
-msgid "Turn on or off starting downloads as soon as the program itself starts."
+#: ../raphodo/rapid.py:5821
+msgid ""
+"Turn on or off starting downloads as soon as the program itself starts."
 msgstr ""
 
-#: ../raphodo/rapid.py:5554
+#: ../raphodo/rapid.py:5824
 msgid "Turn on or off starting downloads as soon as a device is inserted."
 msgstr ""
 
-#: ../raphodo/rapid.py:5557
+#: ../raphodo/rapid.py:5827
 msgid ""
 "Turn on or off use of the Rapid Photo Downloader Thumbnail Cache. Turning it "
 "off does not delete existing cache contents."
 msgstr ""
 
-#: ../raphodo/rapid.py:5561
+#: ../raphodo/rapid.py:5831
 msgid ""
 "Delete all thumbnails in the Rapid Photo Downloader Thumbnail Cache, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5565
+#: ../raphodo/rapid.py:5835
 msgid "Forget which files have been previously downloaded, and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5568
+#: ../raphodo/rapid.py:5838
 msgid ""
 "Import preferences from an old program version and exit. Requires the "
 "command line program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5571
+#: ../raphodo/rapid.py:5841
 msgid ""
 "Reset all program settings to their default values, delete all thumbnails in "
 "the Thumbnail cache, forget which files have been previously downloaded, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5575
+#: ../raphodo/rapid.py:5845
 msgid "Include gphoto2 debugging information in log files."
 msgstr ""
 
-#: ../raphodo/rapid.py:5579
+#: ../raphodo/rapid.py:5849
 msgid "Print information to the terminal about attached cameras and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5640
+#: ../raphodo/rapid.py:5911
 msgid ""
 "To import preferences from the old version of Rapid Photo Downloader, you "
 "must install the program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5649
+#: ../raphodo/rapid.py:5920
 msgid "No prior program preferences detected: exiting"
 msgstr ""
 
-#: ../raphodo/rapid.py:5652
+#: ../raphodo/rapid.py:5923
 #, python-format
 msgid "Importing preferences from Rapid Photo Downloader %(version)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5714
+#: ../raphodo/rapid.py:5989
 #, python-format
-msgid "Do you want to copy the stored sequence number, which has the value %d?"
+msgid ""
+"Do you want to copy the stored sequence number, which has the value %d?"
 msgstr ""
 
-#: ../raphodo/rapid.py:5726
+#: ../raphodo/rapid.py:6000
 msgid "Program aborting."
 msgstr ""
 
-#: ../raphodo/rapid.py:5736
+#: ../raphodo/rapid.py:6010
 msgid "Never run this program as the sudo / root user."
 msgstr ""
 
-#: ../raphodo/rapid.py:5740
+#: ../raphodo/rapid.py:6014
 msgid "You must install ExifTool to run Rapid Photo Downloader."
 msgstr ""
 
-#: ../raphodo/rapid.py:5794
+#: ../raphodo/rapid.py:6026
+msgid ""
+"Rapid Photo Downloader is installed in multiple locations.\n"
+"\n"
+"Uninstall all copies except the version you want to run."
+msgstr ""
+
+#: ../raphodo/rapid.py:6083
 msgid ""
 "When specifying a path on the command line, do not also specify an\n"
 "option for device auto detection or a path on \"This Computer\"."
 msgstr ""
 
-#: ../raphodo/rapid.py:5950
+#: ../raphodo/rapid.py:6243
 msgid "All settings and caches have been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5958
+#: ../raphodo/rapid.py:6251
 msgid "Thumbnail Cache has been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5964
+#: ../raphodo/rapid.py:6257
 msgid "Remembered files have been forgotten"
 msgstr ""
 
@@ -3416,15 +4041,15 @@ msgstr ""
 msgid "&Don't warn me again about missing or broken program libraries"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:546
+#: ../raphodo/renameandmovefile.py:554
 msgid "subfolder and filename"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:548
+#: ../raphodo/renameandmovefile.py:556
 msgid "filename"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:550
+#: ../raphodo/renameandmovefile.py:558
 msgid "subfolder"
 msgstr ""
 
@@ -3498,165 +4123,242 @@ msgstr ""
 
 #: ../raphodo/rpdfile.py:218
 msgid "photos and videos"
-msgstr ""
+msgstr "φωτογραφίες και βίντεο"
 
 #: ../raphodo/rpdfile.py:220
 msgid "photos or videos"
-msgstr ""
+msgstr "φωτογραφίες ή βίντεο"
 
-#: ../raphodo/rpdfile.py:306
+#: ../raphodo/rpdfile.py:315
 #, python-format
 msgid "%(number)s %(filetypes)s"
-msgstr ""
+msgstr "%(number)s %(filetypes)s"
 
-#: ../raphodo/rpdfile.py:318
+#. translators: natural language expression signifying a single video
+#: ../raphodo/rpdfile.py:337
+msgid "a video"
+msgstr "ένα βίντεο"
+
+#: ../raphodo/rpdfile.py:339
 msgid "1 Video"
-msgstr ""
+msgstr "1 βίντεο"
+
+#. translators: natural language expression signifying a single photo
+#: ../raphodo/rpdfile.py:346
+msgid "a photo"
+msgstr "μία φωτογραφία"
 
-#: ../raphodo/rpdfile.py:323
+#: ../raphodo/rpdfile.py:348
 msgid "1 Photo"
-msgstr ""
+msgstr "1 φωτογραφία"
 
-#: ../raphodo/rpdfile.py:803
+#: ../raphodo/rpdfile.py:828
 #, python-format
 msgid "%(path)s on %(camera)s"
-msgstr ""
+msgstr "%(path)s στις %(camera)s"
 
-#: ../raphodo/rpdfile.py:819
+#: ../raphodo/rpdfile.py:844
 msgid "Photo"
-msgstr ""
+msgstr "Φωτογραφία"
 
-#: ../raphodo/rpdfile.py:859
+#: ../raphodo/rpdfile.py:884
 msgid "Video"
-msgstr ""
+msgstr "Βίντεο"
 
-#: ../raphodo/storage.py:138
+#: ../raphodo/storage.py:141
 msgid "File system root"
-msgstr ""
+msgstr "Ρίζα συστήματος αρχείων"
 
 #. translators: the name of the Pictures folder
-#: ../raphodo/storage.py:433
+#: ../raphodo/storage.py:437
 msgid "Pictures"
-msgstr ""
+msgstr "Εικόνες"
 
-#: ../raphodo/thumbnaildisplay.py:426
+#: ../raphodo/thumbnaildisplay.py:432
 #, python-format
 msgid "Taken on %(date_time)s (%(human_readable)s)"
-msgstr ""
+msgstr "Λήψη την %(date_time)s (%(human_readable)s)"
 
-#: ../raphodo/thumbnaildisplay.py:431
+#: ../raphodo/thumbnaildisplay.py:439
 #, python-format
 msgid "Modified on %(date_time)s (%(human_readable)s)"
-msgstr ""
+msgstr "Τροποποίηση την %(date_time)s (%(human_readable)s)"
 
-#: ../raphodo/thumbnaildisplay.py:437 ../raphodo/thumbnaildisplay.py:466
+#: ../raphodo/thumbnaildisplay.py:447 ../raphodo/thumbnaildisplay.py:481
 #, python-format
 msgid "%(date_time)s (%(human_readable)s)"
-msgstr ""
+msgstr "%(date_time)s (%(human_readable)s)"
 
-#: ../raphodo/thumbnaildisplay.py:451
+#: ../raphodo/thumbnaildisplay.py:464
 #, python-format
 msgid "Memory cards: %s"
-msgstr ""
+msgstr "Κάρτες μνήμης: %s"
+
+#: ../raphodo/thumbnaildisplay.py:468
+#, python-format
+msgid "Memory card: %s"
+msgstr "Κάρτα μνήμης: %s"
 
-#: ../raphodo/thumbnaildisplay.py:457
+#: ../raphodo/thumbnaildisplay.py:473
 msgid "Downloaded as:"
-msgstr ""
+msgstr "Έγινε λήψη ως:"
 
-#: ../raphodo/thumbnaildisplay.py:472
+#: ../raphodo/thumbnaildisplay.py:489
 #, python-format
 msgid "<br><br>Previous download:<br>%(filename)s<br>%(path)s<br>%(date)s"
-msgstr ""
+msgstr "<br><br>Προηγούμενη λήψη:<br>%(filename)s<br>%(path)s<br>%(date)s"
 
-#: ../raphodo/thumbnaildisplay.py:1603
+#: ../raphodo/thumbnaildisplay.py:1645
 msgid "Copy Path"
-msgstr ""
+msgstr "Αντιγραφή Διαδρομής"
+
+#. Translators: these values are file size suffixes like B representing bytes, KB representing
+#. kilobytes, etc.
+#: ../raphodo/utilities.py:170
+msgid "B"
+msgstr "B"
+
+#: ../raphodo/utilities.py:170
+msgid "KB"
+msgstr "KB"
+
+#: ../raphodo/utilities.py:170
+msgid "MB"
+msgstr "MB"
+
+#: ../raphodo/utilities.py:170
+msgid "GB"
+msgstr "GB"
+
+#: ../raphodo/utilities.py:170
+msgid "TB"
+msgstr "TB"
+
+#: ../raphodo/utilities.py:170
+msgid "PB"
+msgstr "PB"
+
+#: ../raphodo/utilities.py:170
+msgid "EB"
+msgstr "EB"
+
+#: ../raphodo/utilities.py:170
+msgid "ZB"
+msgstr "ZB"
+
+#: ../raphodo/utilities.py:170
+msgid "YB"
+msgstr "YB"
 
 #. two things in a list e.g. "device1 and device2"
-#: ../raphodo/utilities.py:391
+#: ../raphodo/utilities.py:394
 #, python-format
 msgid "%(first_item)s and %(last_item)s"
-msgstr ""
+msgstr "%(first_item)s και %(last_item)s"
 
-#: ../raphodo/utilities.py:464
+#: ../raphodo/utilities.py:468
 msgid "one"
-msgstr ""
+msgstr "ένα"
 
-#: ../raphodo/utilities.py:465
+#: ../raphodo/utilities.py:469
 msgid "two"
-msgstr ""
+msgstr "δύο"
 
-#: ../raphodo/utilities.py:466
+#: ../raphodo/utilities.py:470
 msgid "three"
-msgstr ""
+msgstr "τρία"
 
-#: ../raphodo/utilities.py:467
+#: ../raphodo/utilities.py:471
 msgid "four"
-msgstr ""
+msgstr "τέσσερα"
 
-#: ../raphodo/utilities.py:468
+#: ../raphodo/utilities.py:472
 msgid "five"
-msgstr ""
+msgstr "πέντε"
 
-#: ../raphodo/utilities.py:469
+#: ../raphodo/utilities.py:473
 msgid "six"
-msgstr ""
+msgstr "έξι"
 
-#: ../raphodo/utilities.py:470
+#: ../raphodo/utilities.py:474
 msgid "seven"
-msgstr ""
+msgstr "επτά"
 
-#: ../raphodo/utilities.py:471
+#: ../raphodo/utilities.py:475
 msgid "eight"
-msgstr ""
+msgstr "οκτώ"
 
-#: ../raphodo/utilities.py:472
+#: ../raphodo/utilities.py:476
 msgid "nine"
-msgstr ""
+msgstr "εννέα"
 
-#: ../raphodo/utilities.py:473
+#: ../raphodo/utilities.py:477
 msgid "ten"
-msgstr ""
+msgstr "δέκα"
 
-#: ../raphodo/utilities.py:474
+#: ../raphodo/utilities.py:478
 msgid "eleven"
-msgstr ""
+msgstr "έντεκα"
 
-#: ../raphodo/utilities.py:475
+#: ../raphodo/utilities.py:479
 msgid "twelve"
-msgstr ""
+msgstr "δώδεκα"
 
-#: ../raphodo/utilities.py:476
+#: ../raphodo/utilities.py:480
 msgid "thirteen"
-msgstr ""
+msgstr "δεκατρία"
 
-#: ../raphodo/utilities.py:477
+#: ../raphodo/utilities.py:481
 msgid "fourteen"
-msgstr ""
+msgstr "δεκατέσσερα"
 
-#: ../raphodo/utilities.py:478
+#: ../raphodo/utilities.py:482
 msgid "fifteen"
-msgstr ""
+msgstr "δεκαπέντε"
 
-#: ../raphodo/utilities.py:479
+#: ../raphodo/utilities.py:483
 msgid "sixteen"
-msgstr ""
+msgstr "δεκαέξι"
 
-#: ../raphodo/utilities.py:480
+#: ../raphodo/utilities.py:484
 msgid "seventeen"
-msgstr ""
+msgstr "δεκαεπτά"
 
-#: ../raphodo/utilities.py:481
+#: ../raphodo/utilities.py:485
 msgid "eighteen"
-msgstr ""
+msgstr "δεκαοκτώ"
 
-#: ../raphodo/utilities.py:482
+#: ../raphodo/utilities.py:486
 msgid "ninenteen"
-msgstr ""
+msgstr "δεκαεννέα"
 
-#: ../raphodo/utilities.py:483
+#: ../raphodo/utilities.py:487
 msgid "twenty"
-msgstr ""
+msgstr "είκοσι"
+
+#: ../raphodo/viewutils.py:240
+msgid "&OK"
+msgstr "&ΟΚ"
+
+#: ../raphodo/viewutils.py:243
+msgid "&Save"
+msgstr "Απο&θήκευση"
+
+#: ../raphodo/viewutils.py:244
+msgid "&Help"
+msgstr "&Βοήθεια"
+
+#: ../raphodo/viewutils.py:245
+msgid "Restore Defaults"
+msgstr "Επαναφορά Προεπιλογών"
+
+#: ../raphodo/viewutils.py:246
+msgid "&Yes"
+msgstr "&Ναι"
+
+#: ../raphodo/viewutils.py:247
+msgid "&No"
+msgstr "&Όχι"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:1
 msgid ""
@@ -3685,55 +4387,64 @@ msgstr ""
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:4
 msgid "The main window"
-msgstr ""
+msgstr "Το κύριο παράθυρο"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:5
 msgid "Downloading"
-msgstr ""
+msgstr "Λήψη"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:6
 msgid "The Timeline"
-msgstr ""
+msgstr "Το χρονοδιάγραμμα"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:7
 msgid "Right-clicking on a device"
-msgstr ""
+msgstr "Δεξί-κλικ σε συσκευή"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:1
 msgid ""
 "Download, rename and back up photos and videos from cameras and other devices"
 msgstr ""
+"Κατεβάστε, αλλάξτε όνομα και κάνετε αντίγραφα ασφαλείας φωτογραφιών και "
+"βίντεο από κάμερες και άλλες συσκευές"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:2
 msgid "Photo Downloader"
-msgstr ""
+msgstr "Photo Downloader"
 
 #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:5
 msgid ""
-"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;"
-"memory;card;"
+"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;memory"
+";card;"
 msgstr ""
+"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;memory"
+";card;φωτογραφία;φωτό;βίντεο;κάμερα;εισαγωγή;τηλέφωνο;μνήμη;κάρτα;"
 
 #: ../data/kde/net.damonlynch.rapid-photo-downloader.desktop.in.h:1
 msgid "Download Photos and Videos with Rapid Photo Downloader"
-msgstr ""
+msgstr "Κατεβάστε φωτογραφίες και βίντεο με τον Rapid Photo Downloader"
 
+#, python-format
 #~ msgid "Backup of %(file_type)s already exists"
 #~ msgstr "Υπάρχει αντίγραφο ασφαλείας του %(file_type)s"
 
+#, python-format
 #~ msgid "Backup %(file_type)s overwritten"
 #~ msgstr "Το αντίγραφο ασφαλείας %(file_type)s αντικαταστάθηκε"
 
+#, python-format
 #~ msgid "%(file_type)s not backed up"
 #~ msgstr "%(file_type)s δεν έχουν αντιγραφεί"
 
 #~ msgid "Backing up error"
 #~ msgstr "Σφάλμα κατά την δημιουργία αντίγραφου ασφαλείας"
 
+#, python-format
 #~ msgid "Destination directory could not be created: %(directory)s\n"
 #~ msgstr "Αδυναμία δημιουργίας φακέλου προορισμού: %(directory)s\n"
 
+#, python-format
 #~ msgid ""
 #~ "%(problem)s\n"
 #~ "File: %(file)s"
@@ -3741,6 +4452,7 @@ msgstr ""
 #~ "%(problem)s\n"
 #~ "Αρχείο: %(file)s"
 
+#, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
 #~ "Destination: %(destination)s"
@@ -3748,5 +4460,6 @@ msgstr ""
 #~ "Πηγή: %(source)s\n"
 #~ "Προορισμός: %(destination)s"
 
+#, python-format
 #~ msgid "Error: %(inst)s"
 #~ msgstr "Σφάλμα: %(inst)s"
diff --git a/po/en_AU.po b/po/en_AU.po
index 7b1040e..80ee199 100644
--- a/po/en_AU.po
+++ b/po/en_AU.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: damonlynch@gmail.com\n"
-"POT-Creation-Date: 2017-07-08 19:16-0500\n"
+"POT-Creation-Date: 2017-09-12 17:01-0400\n"
 "PO-Revision-Date: 2009-05-19 11:02+0000\n"
 "Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: English (Australia) <en_AU@li.org>\n"
@@ -18,38 +18,389 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-19 11:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. type: QPushButton
-#: ../raphodo/aboutdialog.py:217
+#: ../install.py:65
+msgid "Rapid Photo Downloader installer"
+msgstr ""
+
+#: ../install.py:66
+msgid "Download and install latest version of Rapid Photo Downloader."
+msgstr ""
+
+#: ../install.py:236 ../install.py:1732
+msgid "Installer not found:"
+msgstr ""
+
+#. Translators: do not translate the term tar.gz
+#: ../install.py:240 ../install.py:1736
+msgid "Installer not in tar.gz format:"
+msgstr ""
+
+#: ../install.py:465
+msgid ""
+"Incorrect folder ownership detected. Changing ownership of and resetting "
+"permissions for"
+msgstr ""
+
+#: ../install.py:540
+msgid "The following command will be run:"
+msgstr ""
+
+#: ../install.py:543 ../install.py:1479 ../install.py:1484
+msgid "sudo may prompt you for the sudo password."
+msgstr ""
+
+#: ../install.py:547
+msgid "Would you like to run the command now?"
+msgstr ""
+
+#: ../install.py:549
+msgid "Answer is not yes, exiting."
+msgstr ""
+
+#: ../install.py:559 ../install.py:751 ../install.py:966
+msgid "Command failed"
+msgstr ""
+
+#: ../install.py:561 ../install.py:752 ../install.py:967
+msgid "Exiting"
+msgstr ""
+
+#: ../install.py:582
+msgid "The Universe repository must be enabled."
+msgstr ""
+
+#: ../install.py:606
+msgid ""
+"Do you want to to uninstall the previous version of Rapid Photo Downloader:"
+msgstr ""
+
+#: ../install.py:715 ../install.py:740
+msgid ""
+"Querying package system to see if an older version of Rapid Photo Downloader "
+"is installed (this may take a while)..."
+msgstr ""
+
+#: ../install.py:726
+msgid ""
+"Unable to query package system. Please check your Internet connection and "
+"try again"
+msgstr ""
+
+#: ../install.py:756
+msgid "Checking if previous version installed with pip..."
+msgstr ""
+
+#: ../install.py:850
+msgid "The following package is unknown on your system: {}\n"
+msgstr ""
+
+#: ../install.py:857 ../install.py:929 ../install.py:974
+msgid ""
+"To continue, some packages required to run the application will be installed."
+msgstr ""
+
+#: ../install.py:886
+msgid "Querying installed and available packages (this may take a while)"
+msgstr ""
+
+#: ../install.py:958
+msgid ""
+"Querying zypper to see if any required packages are already installed (this "
+"may take a while)... "
+msgstr ""
+
+#: ../install.py:1004
+msgid "Query to confirm action at each step."
+msgstr ""
+
+#: ../install.py:1011
+msgid ""
+"When downloading the latest version, install the development version if it "
+"is newer than the stable version."
+msgstr ""
+
+#: ../install.py:1020
+msgid ""
+"Optional tar.gz Rapid Photo Downloader installer archive. If not specified, "
+"the latest version is downloaded from the Internet."
+msgstr ""
+
+#: ../install.py:1043
+msgid ""
+"Do not run the installer in the tar.gz Rapid Photo Downloader installer "
+"archive if it is newer than this version ({}). The default is to run "
+"whichever installer is newer."
+msgstr ""
+
+#: ../install.py:1050
+msgid ""
+"Uninstall Rapid Photo Downloader that was installed with pip, keeping its "
+"dependencies."
+msgstr ""
+
+#: ../install.py:1054
+msgid ""
+"Uninstall the dependencies installed by pip during Rapid Photo Downloader's "
+"installation, and Rapid Photo Downloader itself, then exit."
+msgstr ""
+
+#: ../install.py:1059
+msgid ""
+"Note: this will not uninstall any version of Rapid Photo Downloader "
+"installed by your Linux distribution's package manager."
+msgstr ""
+
+#: ../install.py:1066
+msgid ""
+"Dependencies will only be removed if they are not required by other programs."
+msgstr ""
+
+#: ../install.py:1072
+msgid ""
+"Note: this option will remove the dependencies regardless of whether they "
+"are required by another program pip has installed. Upgrade to pip 9.0 or "
+"above if you want to avoid this behavior. You can do so using the command "
+"'python3 -m pip install pip -U --user'. Also note that any version of Rapid "
+"Photo Downloader installed by your Linux distribution's package manager will "
+"not be uninstalled."
+msgstr ""
+
+#: ../install.py:1122
+msgid "Failed to download versions file"
+msgstr ""
+
+#: ../install.py:1126
+msgid "Got error code {} while accessing versions file"
+msgstr ""
+
+#: ../install.py:1234
+msgid ""
+"Sorry, could not locate installer. Please check your Internet connection and "
+"verify if you can reach https://www.damonlynch.net\n"
+"\n"
+"Exiting.\n"
+msgstr ""
+
+#: ../install.py:1408
+msgid "Installing application requirements..."
+msgstr ""
+
+#: ../install.py:1424
+msgid "Received error code"
+msgstr ""
+
+#: ../install.py:1425
+msgid "Failed to install application requirements: exiting"
+msgstr ""
+
+#: ../install.py:1428
+msgid "Installing application..."
+msgstr ""
+
+#: ../install.py:1441
+msgid "Failed to install application: exiting..."
+msgstr ""
+
+#: ../install.py:1465
+msgid ""
+"You may have to restart the computer to be able to run the program from the "
+"commmand line or application launcher."
+msgstr ""
+
+#: ../install.py:1476
+msgid "Do you want to install the application's man pages?"
+msgstr ""
+
+#: ../install.py:1477
+msgid "They will be installed into {}"
+msgstr ""
+
+#: ../install.py:1478 ../install.py:1483
+msgid "If you uninstall the application, remove these manpages yourself."
+msgstr ""
+
+#: ../install.py:1480
+msgid "Do want to install the man pages?"
+msgstr ""
+
+#: ../install.py:1482
+msgid "Installing man pages into {}"
+msgstr ""
+
+#: ../install.py:1499
+msgid "Failed to create man page directory: exiting"
+msgstr ""
+
+#: ../install.py:1511
+msgid "Failed to copy man page."
+msgstr ""
+
+#: ../install.py:1521
+msgid "(If a segmentation fault occurs at exit, you can ignore it...)"
+msgstr ""
+
+#: ../install.py:1534
+msgid ""
+"The python3 tool pip is required to uninstall a version of Rapid Photo "
+"Downloader that was installed with pip.\n"
+"Cannot continue. Exiting."
+msgstr ""
+
+#: ../install.py:1575
+msgid ""
+"Do not run this installer script as sudo / root user.\n"
+"Run it using the user who will run the program.\n"
+msgstr ""
+
+#: ../install.py:1585 ../install.py:1599
+msgid "Do not include any other command line arguments when specifying"
+msgstr ""
+
+#: ../install.py:1614
+msgid ""
+"Sorry, this installer does not support a custom python installation.\n"
+"Exiting..."
+msgstr ""
+
+#: ../install.py:1620
+msgid "Restarting script using system python..."
+msgstr ""
+
+#: ../install.py:1651
+msgid "Exiting..."
+msgstr ""
+
+#. Translators: do not translate the term python3-apt
+#: ../install.py:1670
+msgid "To continue, the package python3-apt must be installed."
+msgstr ""
+
+#: ../install.py:1689
+msgid ""
+"Install the following packages using your Linux distribution's standard "
+"package manager, and then rerun this installer"
+msgstr ""
+
+#: ../install.py:1698
+msgid ""
+"To run this program, programs to assist Python 3 and its package management "
+"must be installed."
+msgstr ""
+
+#. Translators: do not translate the terms Python 3, pip and setuptools
+#: ../install.py:1713
+msgid "Python 3's pip and setuptools must be upgraded for your user."
+msgstr ""
+
+#. Translators: do not translate the term python or requests
+#: ../install.py:1726
+msgid "Installing python requests"
+msgstr ""
+
+#: ../upgrade.py:79
+msgid "Upgrade Rapid Photo Downloader"
+msgstr ""
+
+#: ../upgrade.py:401 ../raphodo/viewutils.py:242
+msgid "&Cancel"
+msgstr ""
+
+#: ../upgrade.py:405
+msgid "&Upgrade"
+msgstr ""
+
+#: ../upgrade.py:410
+#, python-format
+msgid "Click the Upgrade button to upgrade to version %s."
+msgstr ""
+
+#: ../upgrade.py:413
+msgid "Click the Upgrade button to start the upgrade."
+msgstr ""
+
+#: ../upgrade.py:416 ../upgrade.py:422 ../raphodo/viewutils.py:241
+msgid "&Close"
+msgstr ""
+
+#: ../upgrade.py:417
+msgid "&Run"
+msgstr ""
+
+#: ../upgrade.py:447
+msgid "Close Rapid Photo Downloader before running this upgrade"
+msgstr ""
+
+#: ../upgrade.py:450
+msgid "Upgrade running..."
+msgstr ""
+
+#: ../upgrade.py:486
+#, python-format
+msgid ""
+"Successfully upgraded to %s. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:491
+msgid ""
+"Upgrade finished successfully. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:495
+msgid "Upgrade failed. Click Close to exit."
+msgstr ""
+
+#: ../upgrade.py:6967
+#, python-format
+msgid "Upgrading %s..."
+msgstr ""
+
+#: ../upgrade.py:6969
+msgid "Press any key to continue..."
+msgstr ""
+
+#: ../upgrade.py:6982
+msgid "Rapid Photo Downloader upgrade failed"
+msgstr ""
+
+#: ../upgrade.py:6984
+#, python-format
+msgid ""
+"The python package %s could not be updated. The upgrade cannot continue."
+msgstr ""
+
+#: ../raphodo/aboutdialog.py:225
 msgid "Credits"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:239
+#: ../raphodo/backuppanel.py:240
 msgid "Backups are not configured"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:241
+#: ../raphodo/backuppanel.py:242
 msgid "No backup devices detected"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:243
+#: ../raphodo/backuppanel.py:244
 msgid "Valid backup locations not yet specified"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:401
+#: ../raphodo/backuppanel.py:404
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
 msgstr ""
 
-#: ../raphodo/backuppanel.py:407
+#: ../raphodo/backuppanel.py:412
 msgid "Back up photos and videos when downloading"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:413
+#: ../raphodo/backuppanel.py:418
 msgid "Automatically detect backup devices"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:417
+#: ../raphodo/backuppanel.py:424
 msgid ""
 "Specify the folder in which backups are stored on the device."
 "<br><br><i>Note: the presence of a folder with this name is used to "
@@ -59,77 +410,85 @@ msgid ""
 "videos.</i>"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:428
+#: ../raphodo/backuppanel.py:439
 msgid "Photo folder name:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:433
+#: ../raphodo/backuppanel.py:444
 msgid "Video folder name:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:438 ../raphodo/nameeditor.py:883
+#: ../raphodo/backuppanel.py:449 ../raphodo/nameeditor.py:890
 #: ../raphodo/renamepanel.py:123
 msgid "Example:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:448
+#: ../raphodo/backuppanel.py:460
 msgid "If you disable automatic detection, choose the exact backup locations."
 msgstr ""
 
-#: ../raphodo/backuppanel.py:452
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:468
 msgid "Photo backup location:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:454
+#: ../raphodo/backuppanel.py:474
 msgid "Select Photo Backup Location"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:460
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:485
 msgid "Video backup location:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:462
+#: ../raphodo/backuppanel.py:491
 msgid "Select Video Backup Location"
 msgstr ""
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:564
+#: ../raphodo/backuppanel.py:595
 msgid "drive1"
 msgstr ""
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:567
+#: ../raphodo/backuppanel.py:598
 msgid "drive2"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:628
+#: ../raphodo/backuppanel.py:663
 msgid "Projected Backup Storage Use"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:632
+#: ../raphodo/backuppanel.py:669
 msgid "Backup Options"
 msgstr ""
 
 #. translators: refers to the video thumbnail file that some
 #. cameras generate -- it has a .THM file extension
-#: ../raphodo/copyfiles.py:476
+#: ../raphodo/copyfiles.py:491
 msgid "video THM"
 msgstr ""
 
-#: ../raphodo/copyfiles.py:482
+#: ../raphodo/copyfiles.py:497
 msgid "audio"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:78 ../raphodo/devicedisplay.py:1079
-#: ../raphodo/rpdfile.py:321
+#: ../raphodo/rpdfile.py:342
 #, python-format
 msgid "%(no_photos)s Photos"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:82 ../raphodo/devicedisplay.py:1081
-#: ../raphodo/rpdfile.py:316
+#: ../raphodo/rpdfile.py:333
 #, python-format
 msgid "%(no_videos)s Videos"
 msgstr ""
@@ -157,15 +516,15 @@ msgid "%(size_free)s free of %(size_total)s"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:190 ../raphodo/devicedisplay.py:993
-#: ../raphodo/rapid.py:1964 ../raphodo/rapid.py:2079 ../raphodo/rapid.py:5753
-#: ../raphodo/rpdfile.py:905
+#: ../raphodo/rapid.py:2023 ../raphodo/rapid.py:2151 ../raphodo/rapid.py:6043
+#: ../raphodo/rpdfile.py:930
 msgid "Photos"
 msgstr ""
 
 #. translators: the name of the Videos folder
 #: ../raphodo/destinationdisplay.py:191 ../raphodo/devicedisplay.py:994
-#: ../raphodo/rapid.py:1967 ../raphodo/rapid.py:2080 ../raphodo/rapid.py:5754
-#: ../raphodo/rpdfile.py:933 ../raphodo/storage.py:445
+#: ../raphodo/rapid.py:2028 ../raphodo/rapid.py:2152 ../raphodo/rapid.py:6044
+#: ../raphodo/rpdfile.py:958 ../raphodo/storage.py:449
 msgid "Videos"
 msgstr ""
 
@@ -173,7 +532,7 @@ msgstr ""
 msgid "Projected storage use after download"
 msgstr ""
 
-#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:516
+#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:521
 msgid "Custom..."
 msgstr ""
 
@@ -211,57 +570,58 @@ msgstr ""
 msgid "%s full"
 msgstr ""
 
-#: ../raphodo/devices.py:459
+#: ../raphodo/devices.py:463
 msgid "Cameras"
 msgstr ""
 
-#: ../raphodo/devices.py:460 ../raphodo/devices.py:920
-#: ../raphodo/preferencedialog.py:85 ../raphodo/rapid.py:1927
+#: ../raphodo/devices.py:464 ../raphodo/devices.py:927
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/rapid.py:1979
 msgid "Devices"
 msgstr ""
 
-#: ../raphodo/devices.py:720
+#: ../raphodo/devices.py:724
 #, python-format
 msgid "Downloading from %(device_names)s"
 msgstr ""
 
 #. Translators: e.g. Three Devices
-#: ../raphodo/devices.py:780
+#: ../raphodo/devices.py:784
 #, python-format
 msgid "%(no_devices)s %(device_type)s"
 msgstr ""
 
-#: ../raphodo/devices.py:905 ../raphodo/rapid.py:1764
+#: ../raphodo/devices.py:912 ../raphodo/rapid.py:1807
 msgid "Select Source"
 msgstr ""
 
-#: ../raphodo/devices.py:936 ../raphodo/devices.py:947
+#: ../raphodo/devices.py:943 ../raphodo/devices.py:954
 #, python-format
 msgid "%(device1)s + %(device2)s"
 msgstr ""
 
 #. Number of cameras e.g. 3 Cameras
-#: ../raphodo/devices.py:958
+#: ../raphodo/devices.py:965
 #, python-format
 msgid "%(no_cameras)s Cameras"
 msgstr ""
 
-#: ../raphodo/devices.py:963
+#: ../raphodo/devices.py:970
 #, python-format
 msgid "%(no_devices)s Devices"
 msgstr ""
 
 #. Translators: two folder names, separated by a plus sign
-#: ../raphodo/devices.py:1258
+#: ../raphodo/devices.py:1265
 #, python-format
 msgid "%s + %s"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:44
+#: ../raphodo/didyouknow.py:45
 msgid "Click on a file's checkbox to mark or unmark it for download."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:50
+#: ../raphodo/didyouknow.py:51
 msgid ""
 "Files that have already been downloaded are remembered. You can still mark "
 "previously downloaded files to download again, but they are unchecked by "
@@ -269,34 +629,67 @@ msgid ""
 "files that are yet to be downloaded."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:59
+#: ../raphodo/didyouknow.py:60
 msgid ""
 "If more than one file is selected, they'll all take the mark of the file "
 "whose checkbox was clicked, regardless of whether they previously had a "
 "checkmark or not."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:67
+#: ../raphodo/didyouknow.py:68
 msgid ""
 "Click on a device's checkbox to quickly mark or unmark all its files for "
 "downloading."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:74
+#: ../raphodo/didyouknow.py:75
+msgid ""
+"After a download finishes, an icon replaces the thumbnail's checkbox. The "
+"icon's color indicates whether the download was successful (green), had file "
+"renaming problems (yellow/orange), or failed (red)."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:83
+msgid ""
+"\n"
+"            In case of any problems, a red icon will appear at the bottom of "
+"the window\n"
+"            indicating how many error reports there are. Clicking on it "
+"opens the Error Report \n"
+"            window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:91
+msgid ""
+"\n"
+"            The Error Report window lists any problems encountered before, "
+"during or after the \n"
+"            download. An orange triangle represents a warning, a red circle "
+"indicates a failure, \n"
+"            and a black circle indicates more serious failures. You can "
+"click on the hyperlinks to \n"
+"            open its file or device in a file manager. You can also search "
+"the reports using the \n"
+"            search box in the lower left of the Error Report window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:103
 msgid ""
 "You can simultaneously download from multiple cameras, smartphones, memory "
 "cards, and hard drives&mdash;as many devices as your computer can handle at "
 "one time."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:81
+#: ../raphodo/didyouknow.py:110
 msgid ""
 "The <b>Timeline</b> groups photos and videos based on how much time elapsed "
 "between consecutive shots. Use it to identify photos and videos taken at "
 "different periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:88
+#: ../raphodo/didyouknow.py:117
 msgid ""
 "\n"
 "<p>In the illustration above, the first row of the Timeline is black because "
@@ -308,7 +701,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:99
+#: ../raphodo/didyouknow.py:128
 msgid ""
 "To view photos and videos for a particular time range, use the mouse "
 "(optionally in combination with the <tt>Shift</tt> or <tt>Ctrl</tt> keys) to "
@@ -316,20 +709,20 @@ msgid ""
 "the left side of the main window will be highlighted."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:106
+#: ../raphodo/didyouknow.py:135
 msgid ""
 "A download always includes all files that are checked for download, "
 "including those that are not currently displayed because the Timeline is "
 "being used."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:113
+#: ../raphodo/didyouknow.py:142
 msgid ""
 "You can hide or display the download sources by clicking on the name of the "
 "device you're downloading from at the top left of the program window."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:120
+#: ../raphodo/didyouknow.py:149
 msgid ""
 "\n"
 "          Thumbnails can be sorted using a variety of criteria:\n"
@@ -348,21 +741,21 @@ msgid ""
 "</ol> "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:137
+#: ../raphodo/didyouknow.py:166
 msgid ""
 "One of Rapid Photo Downloader's most useful features is its ability to "
 "automatically generate download subfolders and rename files as it downloads, "
 "using a scheme of your choosing."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:143
+#: ../raphodo/didyouknow.py:172
 msgid ""
 "To specify where you want your files downloaded and how you want them named, "
 "open the appropriate panel on the right-side of the application window: "
 "<b>Destination</b>, <b>Rename</b>, or <b>Job Code</b>."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:150
+#: ../raphodo/didyouknow.py:179
 msgid ""
 "\n"
 "When thinking about your download directory structure, keep in mind two "
@@ -387,7 +780,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:167
+#: ../raphodo/didyouknow.py:196
 msgid ""
 "\n"
 "You can download photos and videos to the same destination folder, or "
@@ -400,14 +793,14 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:177
+#: ../raphodo/didyouknow.py:206
 msgid ""
 "Automatically generated download subfolders can contain further "
 "automatically generated subfolders if need be. A common scheme is to create "
 "a year subfolder and then a series of year-month-day subfolders within it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:186
+#: ../raphodo/didyouknow.py:215
 msgid ""
 "\n"
 "Whenever possible, the program previews the download subfolders of photos "
@@ -425,7 +818,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:201
+#: ../raphodo/didyouknow.py:230
 msgid ""
 "\n"
 "Download subfolder names are typically generated using some or all of the "
@@ -449,7 +842,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:219
+#: ../raphodo/didyouknow.py:248
 msgid ""
 "\n"
 "To automatically create download subfolders as you download, \n"
@@ -459,7 +852,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:227
+#: ../raphodo/didyouknow.py:256
 msgid ""
 "\n"
 "Using the drop-down menu, select a built-in preset or click on <b>Custom</b> "
@@ -469,20 +862,20 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:237
+#: ../raphodo/didyouknow.py:266
 msgid ""
 "It's easy to download raw images into one folder, and jpeg images into "
 "another. Simply use the <b>Filename Extension</b> as part of your download "
 "subfolder generation scheme:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:242
+#: ../raphodo/didyouknow.py:271
 msgid ""
 "This illustration shows a saved custom preset named &quot;My custom "
 "preset&quot;."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:246
+#: ../raphodo/didyouknow.py:275
 msgid ""
 "\n"
 "You do not have to create nested download subfolders. This illustration "
@@ -493,7 +886,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:256
+#: ../raphodo/didyouknow.py:285
 msgid ""
 "\n"
 "Although there are many built-in date/time naming options, you may find that "
@@ -507,7 +900,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:265
+#: ../raphodo/didyouknow.py:294
 msgid ""
 "\n"
 "Read more about all the ways you can generate download subfolder names and "
@@ -517,7 +910,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:273
+#: ../raphodo/didyouknow.py:302
 msgid ""
 "\n"
 "<b>Job Codes</b> let you easily enter text that describes sets of photos and "
@@ -529,7 +922,7 @@ msgid ""
 "&quot;Green Bazaar&quot;: \n"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:282
+#: ../raphodo/didyouknow.py:311
 msgid ""
 "\n"
 "You can apply new or existing Job Codes before you start a download. If "
@@ -540,28 +933,28 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:291
+#: ../raphodo/didyouknow.py:320
 msgid "Look for hints to guide you when working with Job Codes:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:295
+#: ../raphodo/didyouknow.py:324
 msgid ""
 "Hints will vary depending on the context, such as when the mouse is hovering "
 "over a button."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:301
+#: ../raphodo/didyouknow.py:330
 msgid ""
 "\n"
 "When you give your photos and videos unique filenames, you'll never be "
 "confused as to \n"
 "which file is which. Using <b>sequence numbers</b> to make filenames unique "
 "is highly \n"
-"recommended!.\n"
+"recommended!\n"
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:309
+#: ../raphodo/didyouknow.py:338
 msgid ""
 "\n"
 "<p>Four types of sequence values are available to help you assign unique "
@@ -583,7 +976,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:327
+#: ../raphodo/didyouknow.py:356
 msgid ""
 "\n"
 "The <b>Rename</b> panel allows you to configure file renaming. To rename "
@@ -592,7 +985,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:334
+#: ../raphodo/didyouknow.py:363
 msgid ""
 "\n"
 "<p>The <b>Synchronize RAW + JPEG</b> option is useful if you use the RAW + "
@@ -611,7 +1004,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:348
+#: ../raphodo/didyouknow.py:377
 msgid ""
 "\n"
 "You can have your photos and videos backed up to multiple locations as they "
@@ -622,13 +1015,13 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:356
+#: ../raphodo/didyouknow.py:385
 msgid ""
 "In this example, the drive <b>photobackup</b> does not contain a folder "
 "named <tt>Videos</tt>, so videos will not be backed up to it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:362
+#: ../raphodo/didyouknow.py:391
 msgid ""
 "\n"
 "Several of the program's preferences can be set from the command line, "
@@ -639,7 +1032,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:372
+#: ../raphodo/didyouknow.py:396
+msgid "You can also import program preferences from the older 0.4 version."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:401
 msgid ""
 "\n"
 "Rapid Photo Downloader deals with three types of cache:\n"
@@ -665,23 +1062,23 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:431
+#: ../raphodo/didyouknow.py:460
 msgid "Tip of the Day"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:439
+#: ../raphodo/didyouknow.py:468
 msgid "Did you know...?"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:466
+#: ../raphodo/didyouknow.py:495
 msgid "Show tips on startup"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:470
+#: ../raphodo/didyouknow.py:499
 msgid "&Next"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:471
+#: ../raphodo/didyouknow.py:500
 msgid "&Previous"
 msgstr ""
 
@@ -788,68 +1185,68 @@ msgstr ""
 msgid "%(days)d days, %(hours)d hours"
 msgstr ""
 
-#: ../raphodo/errorlog.py:65
+#: ../raphodo/errorlog.py:66
 msgid "Find"
 msgstr ""
 
-#: ../raphodo/errorlog.py:135
+#: ../raphodo/errorlog.py:136
 msgid "Error Reports - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/errorlog.py:170
+#: ../raphodo/errorlog.py:171
 msgid "Find in reports"
 msgstr ""
 
-#: ../raphodo/errorlog.py:187
+#: ../raphodo/errorlog.py:188
 msgid "Find the previous occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:192
+#: ../raphodo/errorlog.py:193
 msgid "Find the next occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:194
+#: ../raphodo/errorlog.py:195
 msgid "&Highlight All"
 msgstr ""
 
-#: ../raphodo/errorlog.py:195
+#: ../raphodo/errorlog.py:196
 msgid "Highlight all occurrences of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:196
+#: ../raphodo/errorlog.py:197
 msgid "&Match Case"
 msgstr ""
 
-#: ../raphodo/errorlog.py:197
+#: ../raphodo/errorlog.py:198
 msgid "Search with case sensitivity"
 msgstr ""
 
-#: ../raphodo/errorlog.py:198
+#: ../raphodo/errorlog.py:199
 msgid "&Whole Words"
 msgstr ""
 
-#: ../raphodo/errorlog.py:199
+#: ../raphodo/errorlog.py:200
 msgid "Search whole words only"
 msgstr ""
 
-#: ../raphodo/errorlog.py:209 ../raphodo/errorlog.py:341
+#: ../raphodo/errorlog.py:210 ../raphodo/errorlog.py:345
 #, python-format
 msgid "%s of %s matches"
 msgstr ""
 
-#: ../raphodo/errorlog.py:228
+#: ../raphodo/errorlog.py:232
 msgid "Clear"
 msgstr ""
 
-#: ../raphodo/errorlog.py:328
+#: ../raphodo/errorlog.py:332
 msgid "Phrase not found"
 msgstr ""
 
-#: ../raphodo/errorlog.py:487
+#: ../raphodo/errorlog.py:491
 msgid "Search pending..."
 msgstr ""
 
-#: ../raphodo/errorlog.py:535
+#: ../raphodo/errorlog.py:539
 msgid ""
 "The number of new entries added to the Error Report since it was last open. "
 "Click to open the Error Report."
@@ -885,7 +1282,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1601
+#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1643
 msgid "Open in File Browser..."
 msgstr ""
 
@@ -903,531 +1300,531 @@ msgstr ""
 msgid "%s (location does not exist)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:186
+#: ../raphodo/generatenameconfig.py:190
 msgid "Date time"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:187
+#: ../raphodo/generatenameconfig.py:191
 msgid "Text"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:188 ../raphodo/rapid.py:2053
+#: ../raphodo/generatenameconfig.py:192 ../raphodo/rapid.py:2125
 msgid "Filename"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:189 ../raphodo/preferencedialog.py:488
+#: ../raphodo/generatenameconfig.py:193 ../raphodo/preferencedialog.py:724
 msgid "Metadata"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:190
+#: ../raphodo/generatenameconfig.py:194
 msgid "Sequences"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: ../raphodo/generatenameconfig.py:193
+#: ../raphodo/generatenameconfig.py:197
 msgid "Job code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:194
+#: ../raphodo/generatenameconfig.py:198
 msgid "Image date"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:195
+#: ../raphodo/generatenameconfig.py:199
 msgid "Video date"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:196
+#: ../raphodo/generatenameconfig.py:200
 msgid "Today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:197
+#: ../raphodo/generatenameconfig.py:201
 msgid "Yesterday"
 msgstr ""
 
 #. Translators: Download time is the time and date that the download started (when the
 #. user clicked the Download button)
-#: ../raphodo/generatenameconfig.py:200
+#: ../raphodo/generatenameconfig.py:204
 msgid "Download time"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:203
+#: ../raphodo/generatenameconfig.py:207
 msgid "Name"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:206 ../raphodo/rapid.py:2054
+#: ../raphodo/generatenameconfig.py:210 ../raphodo/rapid.py:2126
 msgid "Extension"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:209
+#: ../raphodo/generatenameconfig.py:213
 msgid "Image number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:210
+#: ../raphodo/generatenameconfig.py:214
 msgid "Video number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:213
+#: ../raphodo/generatenameconfig.py:217
 msgid "Aperture"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:216
+#: ../raphodo/generatenameconfig.py:220
 msgid "ISO"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:219
+#: ../raphodo/generatenameconfig.py:223
 msgid "Exposure time"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:222
+#: ../raphodo/generatenameconfig.py:226
 msgid "Focal length"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:225
+#: ../raphodo/generatenameconfig.py:229
 msgid "Camera make"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:228
+#: ../raphodo/generatenameconfig.py:232
 msgid "Camera model"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:231
+#: ../raphodo/generatenameconfig.py:235
 msgid "Short camera model"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:234
+#: ../raphodo/generatenameconfig.py:238
 msgid "Hyphenated short camera model"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:237
+#: ../raphodo/generatenameconfig.py:241
 msgid "Serial number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:240
+#: ../raphodo/generatenameconfig.py:244
 msgid "Shutter count"
 msgstr ""
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: ../raphodo/generatenameconfig.py:242
+#: ../raphodo/generatenameconfig.py:246
 msgid "File number"
 msgstr ""
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:244
+#: ../raphodo/generatenameconfig.py:248
 msgid "Folder only"
 msgstr ""
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:246
+#: ../raphodo/generatenameconfig.py:250
 msgid "Folder and file"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:249
+#: ../raphodo/generatenameconfig.py:253
 msgid "Owner name"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:250
+#: ../raphodo/generatenameconfig.py:254
 msgid "Codec"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:251
+#: ../raphodo/generatenameconfig.py:255
 msgid "Width"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:252
+#: ../raphodo/generatenameconfig.py:256
 msgid "Height"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:253
+#: ../raphodo/generatenameconfig.py:257
 msgid "Length"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:254
+#: ../raphodo/generatenameconfig.py:258
 msgid "Frames Per Second"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:255
+#: ../raphodo/generatenameconfig.py:259
 msgid "Artist"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:256
+#: ../raphodo/generatenameconfig.py:260
 msgid "Copyright"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:259
+#: ../raphodo/generatenameconfig.py:263
 msgid "Downloads today"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:262
+#: ../raphodo/generatenameconfig.py:266
 msgid "Session number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:265
+#: ../raphodo/generatenameconfig.py:269
 msgid "Subfolder number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:268
+#: ../raphodo/generatenameconfig.py:272
 msgid "Stored number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: ../raphodo/generatenameconfig.py:271
+#: ../raphodo/generatenameconfig.py:275
 msgid "Sequence letter"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:274
+#: ../raphodo/generatenameconfig.py:278
 msgid "All digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:277
+#: ../raphodo/generatenameconfig.py:281
 msgid "Last digit"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:280
+#: ../raphodo/generatenameconfig.py:284
 msgid "Last 2 digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:283
+#: ../raphodo/generatenameconfig.py:287
 msgid "Last 3 digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:286
+#: ../raphodo/generatenameconfig.py:290
 msgid "Last 4 digits"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:289
+#: ../raphodo/generatenameconfig.py:293
 msgid "Original Case"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:292
+#: ../raphodo/generatenameconfig.py:296
 msgid "UPPERCASE"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:295
+#: ../raphodo/generatenameconfig.py:299
 msgid "lowercase"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:296
+#: ../raphodo/generatenameconfig.py:300
 msgid "One digit"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:297
+#: ../raphodo/generatenameconfig.py:301
 msgid "Two digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:298
+#: ../raphodo/generatenameconfig.py:302
 msgid "Three digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:299
+#: ../raphodo/generatenameconfig.py:303
 msgid "Four digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:300
+#: ../raphodo/generatenameconfig.py:304
 msgid "Five digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:301
+#: ../raphodo/generatenameconfig.py:305
 msgid "Six digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:302
+#: ../raphodo/generatenameconfig.py:306
 msgid "Seven digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:305
+#: ../raphodo/generatenameconfig.py:309
 msgid "Subseconds"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:308 ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:312 ../raphodo/generatenameconfig.py:393
 msgid "YYYYMMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:311 ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:315 ../raphodo/generatenameconfig.py:394
 msgid "YYYY-MM-DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:314 ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:318 ../raphodo/generatenameconfig.py:395
 msgid "YYYY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:317
+#: ../raphodo/generatenameconfig.py:321
 msgid "YYMMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:320
+#: ../raphodo/generatenameconfig.py:324
 msgid "YY-MM-DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:323
+#: ../raphodo/generatenameconfig.py:327
 msgid "YY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:326
+#: ../raphodo/generatenameconfig.py:330
 msgid "MMDDYYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:329
+#: ../raphodo/generatenameconfig.py:333
 msgid "MMDDYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:332
+#: ../raphodo/generatenameconfig.py:336
 msgid "MMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:335
+#: ../raphodo/generatenameconfig.py:339
 msgid "DDMMYYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:338
+#: ../raphodo/generatenameconfig.py:342
 msgid "DDMMYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:341 ../raphodo/generatenameconfig.py:389
-#: ../raphodo/generatenameconfig.py:390 ../raphodo/generatenameconfig.py:391
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:345 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:394 ../raphodo/generatenameconfig.py:395
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:397
 msgid "YYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:344
+#: ../raphodo/generatenameconfig.py:348
 msgid "YY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:347
+#: ../raphodo/generatenameconfig.py:351
 msgid "MM"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:350
+#: ../raphodo/generatenameconfig.py:354
 msgid "DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:353
+#: ../raphodo/generatenameconfig.py:357
 msgid "Month (full)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:356
+#: ../raphodo/generatenameconfig.py:360
 msgid "Month (abbreviated)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:359
+#: ../raphodo/generatenameconfig.py:363
 msgid "HHMMSS"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:362
+#: ../raphodo/generatenameconfig.py:366
 msgid "HHMM"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:365
+#: ../raphodo/generatenameconfig.py:369
 msgid "HH-MM-SS"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:368
+#: ../raphodo/generatenameconfig.py:372
 msgid "HH-MM"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:371
+#: ../raphodo/generatenameconfig.py:375
 msgid "HH"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:374
+#: ../raphodo/generatenameconfig.py:378
 msgid "MM (minutes)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:377
+#: ../raphodo/generatenameconfig.py:381
 msgid "SS"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:393
 msgid "Date"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:394
 msgid "Date (hyphens)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:395
 msgid "Date (underscores)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:438
-#: ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:442
+#: ../raphodo/generatenameconfig.py:537
 msgid "Date and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392
+#: ../raphodo/generatenameconfig.py:396
 msgid "YYYYMM_Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "Date and Job Code Subfolder"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "YYYYMM"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393 ../raphodo/jobcodepanel.py:198
-#: ../raphodo/nameeditor.py:827 ../raphodo/rapid.py:1809
+#: ../raphodo/generatenameconfig.py:397 ../raphodo/jobcodepanel.py:199
+#: ../raphodo/nameeditor.py:833 ../raphodo/rapid.py:1852
 #: ../raphodo/renamepanel.py:83 ../raphodo/renamepanel.py:241
 msgid "Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:433 ../raphodo/generatenameconfig.py:512
+#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:532
 msgid "Original Filename"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "Date-Time and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "YYYYMMDD-HHMM-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "Date and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "YYYYMMDD-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "Date-Time and Image number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "YYYYMMDD-1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "Date-Time and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "YYYYMMDD-HHMM-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:442 ../raphodo/generatenameconfig.py:537
 msgid "YYYYMMDD-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "Date-Time and Video number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "YYYYMMDD_1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "Resolution"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "YYYYMMDD-HHMM-1-1920x1080"
 msgstr ""
 
@@ -1486,76 +1883,76 @@ msgstr ""
 msgid "&Remember this choice"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:185
+#: ../raphodo/jobcodepanel.py:186
 msgid ""
 "Select photos and videos to be able to apply a new or existing Job Code to "
 "them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:186
+#: ../raphodo/jobcodepanel.py:187
 msgid "The new Job Code will be applied to all selected photos and/or videos."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:187
+#: ../raphodo/jobcodepanel.py:188
 msgid ""
 "Click the Apply button to apply the current Job Code to all selected photos "
 "and/or videos. You can also simply double click the Job Code."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:189
+#: ../raphodo/jobcodepanel.py:190
 msgid ""
 "Removing a Job Code removes it only from the list of saved Job Codes, not "
 "from any photos or videos that it may have been applied to."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:191
+#: ../raphodo/jobcodepanel.py:192
 msgid ""
 "If you want to use Job Codes, configure file renaming or destination "
 "subfolder names to use them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:197
+#: ../raphodo/jobcodepanel.py:198
 msgid "Last Used"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:202
+#: ../raphodo/jobcodepanel.py:203
 msgid "Job Code Sort:"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:205 ../raphodo/rapid.py:2061
+#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2133
 msgid "Ascending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2062
+#: ../raphodo/jobcodepanel.py:207 ../raphodo/rapid.py:2134
 msgid "Descending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:216
+#: ../raphodo/jobcodepanel.py:217
 msgid "&New..."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:220
+#: ../raphodo/jobcodepanel.py:221
 msgid "&Apply"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:224
+#: ../raphodo/jobcodepanel.py:225
 msgid "&Remove"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:228 ../raphodo/preferencedialog.py:125
-#: ../raphodo/preferencedialog.py:154 ../raphodo/preferencedialog.py:433
+#: ../raphodo/jobcodepanel.py:229 ../raphodo/preferencedialog.py:200
+#: ../raphodo/preferencedialog.py:229 ../raphodo/preferencedialog.py:531
 msgid "Remove All"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:427
+#: ../raphodo/jobcodepanel.py:428
 msgid "Do you really want to remove all the Job Codes?"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:429
+#: ../raphodo/jobcodepanel.py:430
 msgid "Remove all Job Codes"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:492
+#: ../raphodo/jobcodepanel.py:493
 msgid "Job Codes"
 msgstr ""
 
@@ -1566,42 +1963,58 @@ msgstr ""
 msgid "<i><b>Hint:</b> %(message)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:418 ../raphodo/nameeditor.py:432
+#: ../raphodo/nameeditor.py:423 ../raphodo/nameeditor.py:437
 #, python-format
 msgid "%(description)s - %(elements)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:512
+#: ../raphodo/nameeditor.py:517
 msgid "Save New Custom Preset..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:513
+#: ../raphodo/nameeditor.py:518
 msgid "Remove All Custom Presets..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:559
+#: ../raphodo/nameeditor.py:564
 msgid "(New Custom Preset)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:576
+#: ../raphodo/nameeditor.py:581
 #, python-format
 msgid "%s (edited)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:579 ../raphodo/nameeditor.py:1370
+#: ../raphodo/nameeditor.py:584 ../raphodo/nameeditor.py:1379
 #, python-format
 msgid "Update Custom Preset \"%s\""
 msgstr ""
 
-#: ../raphodo/nameeditor.py:667
+#: ../raphodo/nameeditor.py:672
 msgid "Save New Custom Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:675
+#: ../raphodo/nameeditor.py:680
 msgid "Preset Name:"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:836
+#: ../raphodo/nameeditor.py:799
+msgid "Photo Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:805
+msgid "Video Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:811
+msgid "Photo Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:817
+msgid "Video Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:842
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>There is insufficient data to "
 "fully generate the name. Please use other renaming options.</i>"
@@ -1610,7 +2023,7 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees.
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:846
+#: ../raphodo/nameeditor.py:853
 #, python-format
 msgid "The character</i> %(separator)s <i>creates a new subfolder level."
 msgstr ""
@@ -1618,42 +2031,42 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:851
+#: ../raphodo/nameeditor.py:858
 #, python-format
 msgid ""
 "There is no need start or end with the folder separator </i> "
 "%(separator)s<i>, because it is added automatically."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:859
+#: ../raphodo/nameeditor.py:866
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>Unique filenames may not be "
 "generated. Make filenames unique by using Sequence values.</i>"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:882 ../raphodo/renamepanel.py:121
+#: ../raphodo/nameeditor.py:889 ../raphodo/renamepanel.py:121
 msgid "Preset:"
 msgstr ""
 
 #. Translators: appears in a combobox, e.g. Image Date (YYYY)
-#: ../raphodo/nameeditor.py:959 ../raphodo/nameeditor.py:980
+#: ../raphodo/nameeditor.py:966 ../raphodo/nameeditor.py:987
 #, python-brace-format
 msgid "{choice} ({variant})"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1005 ../raphodo/preferencedialog.py:530
+#: ../raphodo/nameeditor.py:1012 ../raphodo/preferencedialog.py:783
 msgid "Get help online..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1025
+#: ../raphodo/nameeditor.py:1034
 msgid "Insert"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1351
+#: ../raphodo/nameeditor.py:1360
 msgid "Save Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1356
+#: ../raphodo/nameeditor.py:1365
 msgid ""
 "<b>Do you want to save the changes in a new custom preset?</"
 "b><br><br>Creating a custom preset is not required, but can help you keep "
@@ -1661,7 +2074,7 @@ msgid ""
 "regardless of whether you create a new custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1365
+#: ../raphodo/nameeditor.py:1374
 msgid ""
 "<b>Do you want to save the changes in a custom preset?</b><br><br>If you "
 "like, you can create a new custom preset or update the existing custom "
@@ -1669,136 +2082,167 @@ msgid ""
 "regardless of whether you save a custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1372
+#: ../raphodo/nameeditor.py:1381
 msgid "Save New Custom Preset"
 msgstr ""
 
-#: ../raphodo/newversion.py:306
+#: ../raphodo/newversion.py:312
 msgid "Checking for new version..."
 msgstr ""
 
-#: ../raphodo/newversion.py:307
+#: ../raphodo/newversion.py:313
 msgid "You are running the latest version."
 msgstr ""
 
-#: ../raphodo/newversion.py:308
+#: ../raphodo/newversion.py:314
 msgid "Failed to contact the update server."
 msgstr ""
 
-#: ../raphodo/newversion.py:310
+#: ../raphodo/newversion.py:316
 #, python-format
 msgid "A new version of Rapid Photo Downloader (%s) is available."
 msgstr ""
 
-#: ../raphodo/newversion.py:312
+#: ../raphodo/newversion.py:318
 msgid "Do you want to download the new version?"
 msgstr ""
 
-#: ../raphodo/newversion.py:313
+#: ../raphodo/newversion.py:319
 #, python-format
 msgid "Changes in the new release can be viewed <a href=\"%s\">here</a>."
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the s key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:340 ../raphodo/newversion.py:353
+#: ../raphodo/newversion.py:348 ../raphodo/newversion.py:363
 msgid "&Skip this release"
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the o key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:356
+#: ../raphodo/newversion.py:366
 msgid "&Open Download Page"
 msgstr ""
 
-#: ../raphodo/newversion.py:376
+#: ../raphodo/newversion.py:386
 msgid "Rapid Photo Downloader updates"
 msgstr ""
 
 #. Translators: shows how much of a file has been downloaded e.g  123 KB of 1.3 MB
-#: ../raphodo/newversion.py:478
+#: ../raphodo/newversion.py:488
 #, python-format
 msgid "%(downloaded)s of %(total)s"
 msgstr ""
 
-#: ../raphodo/newversion.py:495
+#: ../raphodo/newversion.py:507
 msgid "Downloading..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:76
+#: ../raphodo/preferencedialog.py:86
 msgid "Preferences"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Automation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85 ../raphodo/preferencedialog.py:343
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/preferencedialog.py:428
 msgid "Error Handling"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:109
+msgid "Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:109 ../raphodo/preferencedialog.py:119
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:94
+#: ../raphodo/preferencedialog.py:147
 msgid "Device Scanning"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:96
+#: ../raphodo/preferencedialog.py:148
 msgid "Scan only external devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:98
+#: ../raphodo/preferencedialog.py:150
 msgid ""
 "Scan for photos and videos only on devices that are external to the "
 "computer,\n"
 "including cameras, memory cards, external hard drives, and USB flash drives."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:102
-msgid "Scan non-camera devices lacking a DCIM folder"
+#: ../raphodo/preferencedialog.py:153
+msgid "Scan only specific folders on devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:104
+#: ../raphodo/preferencedialog.py:155
 msgid ""
-"Scan the entirety of a device for photos and videos, irrespective of whether "
-"it contains a DCIM folder,\n"
-"as opposed to only scanning within a DCIM folder.\n"
+"Scan for photos and videos only in the folders specified below (except "
+"paths\n"
+"specified in Ignored Paths).\n"
 "\n"
-"Changing this setting causes all devices to be scanned again.\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:161
+msgid "Folders to scan:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:164
+msgid ""
+"Folders at the base level of device file systems that will be scanned\n"
+"for photos and videos."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:167 ../raphodo/preferencedialog.py:219
+msgid "Add..."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:169
+msgid ""
+"Add a folder to the list of folders to scan for photos and videos.\n"
 "\n"
-"Note: With cameras, only the DCIM folder is scanned."
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:172 ../raphodo/preferencedialog.py:198
+#: ../raphodo/preferencedialog.py:224 ../raphodo/preferencedialog.py:529
+msgid "Remove"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:174
+msgid ""
+"Remove a folder from the list of folders to scan for photos and videos.\n"
+"\n"
+"Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:116
+#: ../raphodo/preferencedialog.py:191
 msgid "Devices that have been set to automatically ignore or download from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:117
+#: ../raphodo/preferencedialog.py:192
 msgid "Remembered Devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:121
+#: ../raphodo/preferencedialog.py:196
 msgid ""
 "Remove a device from the list of devices to automatically ignore or download "
 "from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:123 ../raphodo/preferencedialog.py:149
-#: ../raphodo/preferencedialog.py:431
-msgid "Remove"
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:127
+#: ../raphodo/preferencedialog.py:202
 msgid ""
 "Clear the list of devices from which to automatically ignore or download "
 "from.\n"
@@ -1806,315 +2250,434 @@ msgid ""
 "Note: Changes take effect when the computer is next scanned for devices."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:140
+#: ../raphodo/preferencedialog.py:215
 msgid "Ignored Paths"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:141
+#: ../raphodo/preferencedialog.py:216
 msgid ""
 "The end part of a path that should never be scanned for photos or videos."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:144
-msgid "Add..."
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:146
+#: ../raphodo/preferencedialog.py:221
 msgid ""
 "Add a path to the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:151
+#: ../raphodo/preferencedialog.py:226
 msgid ""
 "Remove a path from the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:156
+#: ../raphodo/preferencedialog.py:231
 msgid ""
 "Clear the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:164
+#: ../raphodo/preferencedialog.py:239
 msgid ""
 "Use python-style <a href=\"http://damonlynch.net/rapid/documentation/"
 "#regularexpressions\">regular expressions</a>"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:168
+#: ../raphodo/preferencedialog.py:243
 msgid ""
 "Use regular expressions in the list of ignored paths.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:208
+#: ../raphodo/preferencedialog.py:283
 msgid "Program Automation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:209
+#: ../raphodo/preferencedialog.py:284
 msgid "Start downloading at program startup"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:210
+#: ../raphodo/preferencedialog.py:285
 msgid "Start downloading upon device insertion"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:211
+#: ../raphodo/preferencedialog.py:286
 msgid "Unmount (eject) device upon download completion"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:212
+#: ../raphodo/preferencedialog.py:287
 msgid "Exit program when download completes"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:213
+#: ../raphodo/preferencedialog.py:288
 msgid "Exit program even if download had warnings or errors"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:240
+#: ../raphodo/preferencedialog.py:315
 msgid "Thumbnail Generation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:241
+#: ../raphodo/preferencedialog.py:316
 msgid "Generate thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:242
+#: ../raphodo/preferencedialog.py:318
 msgid "Generate thumbnails to show in the main program window"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:244
+#: ../raphodo/preferencedialog.py:320
 msgid "Cache thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:245
+#: ../raphodo/preferencedialog.py:323
 msgid ""
 "Save thumbnails shown in the main program window in a thumbnail cache unique "
 "to Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:247
+#: ../raphodo/preferencedialog.py:327
 msgid "Generate system thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:248
+#: ../raphodo/preferencedialog.py:330
 msgid ""
 "While downloading, save thumbnails that can be used by desktop file managers "
 "and other programs"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:255
+#: ../raphodo/preferencedialog.py:339
 msgid "Number of CPU cores used to generate thumbnails."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:256
+#: ../raphodo/preferencedialog.py:340
 msgid "CPU cores:"
 msgstr ""
 
 #. Translators: the * acts as an asterisk to denote a reference to an annotation
 #. such as '* Takes effect upon program restart'
-#: ../raphodo/preferencedialog.py:271 ../raphodo/preferencedialog.py:317
+#: ../raphodo/preferencedialog.py:355 ../raphodo/preferencedialog.py:401
 msgid "*"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:294
+#: ../raphodo/preferencedialog.py:378
 msgid "Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:296
+#: ../raphodo/preferencedialog.py:380
 msgid "Calculating..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:302
+#: ../raphodo/preferencedialog.py:386
 msgid "days"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:303
+#: ../raphodo/preferencedialog.py:387
 msgid "forever"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:308
+#: ../raphodo/preferencedialog.py:392
 msgid "Cache size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:310
+#: ../raphodo/preferencedialog.py:394
 msgid "Number of thumbnails:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:312
+#: ../raphodo/preferencedialog.py:396
 msgid "Database size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:314
+#: ../raphodo/preferencedialog.py:398
 msgid "Cache unaccessed thumbnails for:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:322
+#: ../raphodo/preferencedialog.py:406
 msgid "Purge Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:323
+#: ../raphodo/preferencedialog.py:408
 msgid "Optimize Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:336
+#: ../raphodo/preferencedialog.py:421
 msgid "* Takes effect upon program restart"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:346
+#: ../raphodo/preferencedialog.py:431
 msgid "Skip download"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:347
+#: ../raphodo/preferencedialog.py:432
 msgid "Don't download the file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:348
+#: ../raphodo/preferencedialog.py:433
 msgid "Add unique identifier"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:349
+#: ../raphodo/preferencedialog.py:436
 msgid ""
 "Add an identifier like _1 or _2 to the end of the filename, immediately "
 "before the file's extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:355
+#: ../raphodo/preferencedialog.py:444
 msgid "Overwrite"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:356
+#: ../raphodo/preferencedialog.py:445
 msgid "Overwrite the previously backed up file"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:357
+#: ../raphodo/preferencedialog.py:446
 msgid "Skip"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:358
+#: ../raphodo/preferencedialog.py:448
 msgid "Don't overwrite the backup file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:364
+#: ../raphodo/preferencedialog.py:455
 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 identifier:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:378
+#: ../raphodo/preferencedialog.py:464
+msgid ""
+"Using sequence numbers to automatically generate unique filenames is "
+"strongly recommended. Configure file renaming in the Rename panel in the "
+"main window."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:473
 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 ""
 
-#: ../raphodo/preferencedialog.py:398
+#: ../raphodo/preferencedialog.py:494
 msgid "Program Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:399
+#: ../raphodo/preferencedialog.py:495
 msgid "Show a warning when:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:402
+#: ../raphodo/preferencedialog.py:498
 msgid "Downloading files currently not displayed"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:403
+#: ../raphodo/preferencedialog.py:499
 msgid ""
 "Warn when about to download files that are not displayed in the main window."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:405
+#: ../raphodo/preferencedialog.py:501
 msgid "Backup destinations are missing"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:406
+#: ../raphodo/preferencedialog.py:502
 msgid "Warn before starting a download if it is not possible to back up files."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:408
+#: ../raphodo/preferencedialog.py:504
 msgid "Program libraries are missing or broken"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:409
+#: ../raphodo/preferencedialog.py:505
 msgid ""
 "Warn if a software library used by Rapid Photo Downloader is missing or not "
 "functioning."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:412
+#: ../raphodo/preferencedialog.py:508
 msgid "Filesystem metadata cannot be set"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:413
+#: ../raphodo/preferencedialog.py:509
 msgid ""
 "Warn if there is an error setting a file's filesystem metadata, such as its "
 "modification time."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:416
+#: ../raphodo/preferencedialog.py:512
 msgid "Encountering unhandled files"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:417
+#: ../raphodo/preferencedialog.py:513
 msgid ""
 "Warn after scanning a device or this computer if there are unrecognized "
 "files that will not be included in the download."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:420
+#: ../raphodo/preferencedialog.py:517
 msgid "Do not warn about unhandled files with extensions:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:424
+#: ../raphodo/preferencedialog.py:522
 msgid ""
 "File extensions are case insensitive and do not need to include the leading "
 "dot."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:427
+#: ../raphodo/preferencedialog.py:525
 msgid "Add"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:428
+#: ../raphodo/preferencedialog.py:526
 msgid ""
 "Add a file extension to the list of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:430
+#: ../raphodo/preferencedialog.py:528
 msgid ""
 "Remove a file extension from the list of unhandled file types to not warn "
 "about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:434
+#: ../raphodo/preferencedialog.py:532
 msgid ""
 "Clear the list of file extensions of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:469
+#: ../raphodo/preferencedialog.py:568
+msgid "Photo and Video Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:571
+msgid "Consolidate files across devices and downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:574
+msgid ""
+"Analyze the results of device scans looking for duplicate files and matching "
+"RAW and JPEG pairs,\n"
+"comparing them across multiple devices and download sessions."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:580
+msgid "Treat matching RAW and JPEG files as:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:581
+msgid "One photo"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:582
+msgid "Two photos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:584
+msgid ""
+"Display matching pairs of RAW and JPEG photos as one photo, and if marked, "
+"download both."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:589
+msgid ""
+"Display matching pairs of RAW and JPEG photos as two different photos. You "
+"can still synchronize their sequence numbers."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:598
+msgid "With matching RAW and JPEG photos:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:600
+msgid "Do not mark JPEG for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:601
+msgid "Do not mark RAW for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:602
+msgid "Mark both for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:609
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"JPEG for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:614
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"RAW for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:619
+msgid ""
+"When matching RAW and JPEG photos are found, automatically mark both for "
+"download."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:625
+msgid ""
+"If you disable file consolidation, choose what to do when a download device "
+"is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:631
+msgid ""
+"When a download device is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:642
+msgid "Clear completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:643
+msgid "Keep displaying completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:644
+msgid "Prompt for what to do"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:649
+msgid ""
+"Automatically clear the display of completed downloads whenever a new "
+"download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:654
+msgid ""
+"Keep displaying completed downloads whenever a new download device is "
+"inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:658
+msgid ""
+"Prompt whether to keep displaying completed downloads or clear them whenever "
+"a new download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:702
 msgid "Version Check"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:470
+#: ../raphodo/preferencedialog.py:703
 msgid "Check for new version at startup"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:471
+#: ../raphodo/preferencedialog.py:705
 msgid "Check for a new version of the program each time the program starts."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:473
+#: ../raphodo/preferencedialog.py:707
 msgid "Include development releases"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:474
+#: ../raphodo/preferencedialog.py:709
 msgid ""
 "Include alpha, beta and other development releases when checking for a new "
 "version of the program.\n"
@@ -2123,11 +2686,11 @@ msgid ""
 "occur."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:489
+#: ../raphodo/preferencedialog.py:725
 msgid "Ignore DNG date/time metadata on MTP devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:490
+#: ../raphodo/preferencedialog.py:727
 msgid ""
 "Ignore date/time metadata in DNG files located on MTP devices, and use the "
 "file's modification time instead.\n"
@@ -2136,70 +2699,86 @@ msgid ""
 "metadata."
 msgstr ""
 
+#: ../raphodo/preferencedialog.py:741
+msgid "Completed Downloads"
+msgstr ""
+
 #. Translators: substituted value is a description for the set of preferences
 #. shown in the preference dialog window, e.g. Devices, Automation, etc.
 #. This string is shown in a tooltip for the "Restore Defaults" button
-#: ../raphodo/preferencedialog.py:710
+#: ../raphodo/preferencedialog.py:1067
 #, python-format
 msgid "Restores default %s preference values"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:832
+#: ../raphodo/preferencedialog.py:1208
 msgid ""
 "Do you want to purge the thumbnail cache? The cache will be purged when the "
 "program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:835
+#: ../raphodo/preferencedialog.py:1212
 msgid "Purge Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:847
+#: ../raphodo/preferencedialog.py:1225
 msgid ""
 "Do you want to optimize the thumbnail cache? The cache will be optimized "
 "when the program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:850
+#: ../raphodo/preferencedialog.py:1229
 msgid "Optimize Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1045
+#: ../raphodo/preferencedialog.py:1481
+msgid "Enter a Folder to Scan"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1482
+msgid "Specify a folder that will be scanned for photos and videos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1483
+msgid "Folder:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1497
 msgid "Enter a Path to Ignore"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1046
+#: ../raphodo/preferencedialog.py:1498
 msgid "Specify a path that will never be scanned for photos or videos"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1047
+#: ../raphodo/preferencedialog.py:1499
 msgid "Path:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1061
+#: ../raphodo/preferencedialog.py:1513
 msgid "Enter a File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1062
+#: ../raphodo/preferencedialog.py:1514
 msgid "Specify a file extension (without the leading dot)"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1063 ../raphodo/renamepanel.py:122
+#: ../raphodo/preferencedialog.py:1515 ../raphodo/renamepanel.py:122
 msgid "Extension:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1078
+#: ../raphodo/preferencedialog.py:1530
 msgid "Invalid File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1079
+#: ../raphodo/preferencedialog.py:1531
 #, python-format
 msgid ""
 "The file extension <b>%s</b> is recognized by Rapid Photo Downloader, so it "
 "makes no sense to warn about its presence."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1081
+#: ../raphodo/preferencedialog.py:1533
 #, python-format
 msgid ""
 "Recognized file types:\n"
@@ -2225,104 +2804,103 @@ msgstr ""
 msgid "Birthday"
 msgstr ""
 
-#: ../raphodo/preferences.py:614
+#: ../raphodo/preferences.py:624
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr ""
 
-#: ../raphodo/preferences.py:617
+#: ../raphodo/preferences.py:627
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr ""
 
-#: ../raphodo/preferences.py:622
+#: ../raphodo/preferences.py:632
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
 
-#. self.setFlat(True)
 #: ../raphodo/primarybutton.py:72
 msgid "Download 8 Photos and 10 Videos"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:86 ../raphodo/problemnotification.py:208
+#: ../raphodo/problemnotification.py:87 ../raphodo/problemnotification.py:209
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:89
+#: ../raphodo/problemnotification.py:90
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:116
+#: ../raphodo/problemnotification.py:117
 #, python-format
 msgid "GPhoto2 Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:124
+#: ../raphodo/problemnotification.py:125
 msgid ""
 "Unable to initialize the camera, probably because another program is using "
 "it. No files were copied from it."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:134
+#: ../raphodo/problemnotification.py:135
 #, python-format
 msgid "Unable to read directory %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:140
+#: ../raphodo/problemnotification.py:141
 #, python-format
 msgid "Unable to access modification time or size from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:146
+#: ../raphodo/problemnotification.py:147
 #, python-format
 msgid "Unable to read file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:152
+#: ../raphodo/problemnotification.py:153
 #, python-format
 msgid "Unable to write file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:158
+#: ../raphodo/problemnotification.py:159
 #, python-format
 msgid "Unable to move file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:164
+#: ../raphodo/problemnotification.py:165
 #, python-format
 msgid "Unable to remove file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:170
+#: ../raphodo/problemnotification.py:171
 #, python-format
 msgid "Unable to copy file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:176
+#: ../raphodo/problemnotification.py:177
 #, python-format
 msgid "Zero length file %s will not be downloaded"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:182
+#: ../raphodo/problemnotification.py:183
 #, python-format
 msgid "Could not determine filesystem modification time for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:188
+#: ../raphodo/problemnotification.py:189
 #, python-format
 msgid "Unable to load metadata from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:194
+#: ../raphodo/problemnotification.py:195
 #, python-format
 msgid ""
 "Unable to load metadata from %(name)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:202
+#: ../raphodo/problemnotification.py:203
 #, python-format
 msgid ""
 "An error occurred setting a file's filesystem metadata on the filesystem %s. "
@@ -2330,212 +2908,212 @@ msgid ""
 "again."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:216
+#: ../raphodo/problemnotification.py:217
 #, python-format
 msgid "Encountered unhandled file %s. It will not be downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:223
+#: ../raphodo/problemnotification.py:224
 #, python-format
 msgid "%(filetype)s %(destination)s already exists."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:234 ../raphodo/problemnotification.py:262
+#: ../raphodo/problemnotification.py:235 ../raphodo/problemnotification.py:263
 #, python-format
 msgid ""
 "The existing %(filetype)s %(destination)s was last modified on %(date)s at "
 "%(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:245
+#: ../raphodo/problemnotification.py:246
 #, python-format
 msgid "The %(filetype)s %(source)s was not downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:273
+#: ../raphodo/problemnotification.py:274
 #, python-format
 msgid "The %(filetype)s %(source)s was downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:282
+#: ../raphodo/problemnotification.py:283
 #, python-format
 msgid "The unique identifier '%s' was added to the filename."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:298
+#: ../raphodo/problemnotification.py:299
 #, python-format
 msgid ""
 "The existing backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:309
+#: ../raphodo/problemnotification.py:310
 #, python-format
 msgid "The %(filetype)s %(source)s was not backed up from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:326
+#: ../raphodo/problemnotification.py:327
 #, python-format
 msgid ""
 "The previous backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:337
+#: ../raphodo/problemnotification.py:338
 #, python-format
 msgid ""
 "The %(filetype)s %(source)s from %(device)s was backed up, overwriting the "
 "previous backup %(filetype)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:356
+#: ../raphodo/problemnotification.py:357
 #, python-format
 msgid ""
 "When synchronizing RAW + JPEG sequence values, a duplicate %(filetype)s "
 "%(file)s was encountered, and was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:366
+#: ../raphodo/problemnotification.py:367
 msgid ""
 "When synchronizing RAW + JPEG sequence values, photos were detected with the "
 "same filenames, but taken at different times:"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:373
+#: ../raphodo/problemnotification.py:374
 #, 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 ""
 
-#: ../raphodo/problemnotification.py:389
+#: ../raphodo/problemnotification.py:390
 #, python-format
 msgid "Unable to finalize the filename for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:424
+#: ../raphodo/problemnotification.py:425
 #, python-format
 msgid ""
 "The filename %(destination)s was not fully generated for %(filetype)s "
 "%(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:433
+#: ../raphodo/problemnotification.py:434
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:439
+#: ../raphodo/problemnotification.py:440
 #, python-format
 msgid "The following metadata is missing: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:445
+#: ../raphodo/problemnotification.py:446
 #, python-format
 msgid "Date/time conversion failed: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:451
+#: ../raphodo/problemnotification.py:452
 msgid ""
 "Could not extract valid date/time metadata or determine the file "
 "modification time."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:457
+#: ../raphodo/problemnotification.py:458
 msgid "Filename does not have an extension."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:460
+#: ../raphodo/problemnotification.py:461
 msgid "Filename does not have a number component."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:464
+#: ../raphodo/problemnotification.py:465
 #, python-format
 msgid "Error generating component %(component)s. Error: %(error)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:477
+#: ../raphodo/problemnotification.py:478
 #, python-format
 msgid ""
 "The download subfolders %(folder)s were only partially generated for "
 "%(filetype)s %(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:486
+#: ../raphodo/problemnotification.py:487
 #, python-format
 msgid ""
 "There is no data with which to generate the %(subfolder_file)s for "
 "%(filename)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:499
+#: ../raphodo/problemnotification.py:500
 #, python-format
 msgid ""
 "Unable to create the %(filetype)s %(destination)s in %(folder)s. The "
 "download file was %(source)s in %(device)s. It was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:514
+#: ../raphodo/problemnotification.py:515
 #, python-format
 msgid "Unable to create the download subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:526
+#: ../raphodo/problemnotification.py:527
 #, python-format
 msgid "Unable to create the backup subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:577
+#: ../raphodo/problemnotification.py:578
 #, python-format
 msgid "Problems scanning %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:584
+#: ../raphodo/problemnotification.py:585
 #, python-format
 msgid "Problems copying from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:591
+#: ../raphodo/problemnotification.py:592
 msgid "Problems while finalizing filenames and generating subfolders"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:598
+#: ../raphodo/problemnotification.py:599
 #, python-format
 msgid "Problems backing up to %s"
 msgstr ""
 
-#. Translators: for example Nov 3 or Dec 31
-#. The start and end dates are on a different day
-#. Translators: for example Nov 3 or Dec 31
-#: ../raphodo/proximity.py:105 ../raphodo/proximity.py:221
-#: ../raphodo/proximity.py:224 ../raphodo/proximity.py:828
+#. Translators: for example Nov 3 2015, 11:25 AM
+#. Translators: for example, Nov 3, 12:15 PM
+#: ../raphodo/proximity.py:188 ../raphodo/proximity.py:213
+#: ../raphodo/proximity.py:236 ../raphodo/proximity.py:239
 #, python-format
-msgid "%(month)s %(numeric_day)s"
+msgid "%(date)s, %(time)s"
 msgstr ""
 
-#. Translators: for example Nov 15 2015
-#. Translators: for example Nov 3 2015
-#: ../raphodo/proximity.py:109 ../raphodo/proximity.py:230
-#: ../raphodo/proximity.py:231 ../raphodo/proximity.py:831
+#: ../raphodo/proximity.py:204
 #, python-format
-msgid "%(date)s %(year)s"
+msgid "%(starttime)s - %(endtime)s"
 msgstr ""
 
-#. Translators: for example Nov 3 2015, 11:25 AM
-#. Translators: for example, Nov 3, 12:15 PM
-#: ../raphodo/proximity.py:197 ../raphodo/proximity.py:215
-#: ../raphodo/proximity.py:234 ../raphodo/proximity.py:236
+#. The start and end dates are on a different day
+#. Translators: for example Nov 3 or Dec 31
+#: ../raphodo/proximity.py:221 ../raphodo/proximity.py:225
+#: ../raphodo/proximity.py:980 ../raphodo/timeutils.py:105
 #, python-format
-msgid "%(date)s, %(time)s"
+msgid "%(month)s %(numeric_day)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:209
+#. Translators: for example Nov 3 2015
+#. Translators: for example Nov 2 2015
+#. Translators: for example Nov 15 2015
+#: ../raphodo/proximity.py:232 ../raphodo/proximity.py:233
+#: ../raphodo/proximity.py:985 ../raphodo/timeutils.py:110
 #, python-format
-msgid "%(starttime)s - %(endtime)s"
+msgid "%(date)s %(year)s"
 msgstr ""
 
 #. Translators: for example, Nov 3, 12:15 PM - Nov 4, 1:00 AM
-#: ../raphodo/proximity.py:241
+#: ../raphodo/proximity.py:245
 #, python-format
 msgid "%(earlier_time)s - %(later_time)s"
 msgstr ""
@@ -2544,25 +3122,25 @@ msgstr ""
 #. Nov 3 2012, 12:15 PM -
 #. Nov 4 2012, 1:00 AM
 #. (please keep the line break signified by \n)
-#: ../raphodo/proximity.py:248
+#: ../raphodo/proximity.py:253
 #, python-format
 msgid ""
 "%(earlier_time)s -\n"
 "%(later_time)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:359
+#: ../raphodo/proximity.py:382
 #, python-format
 msgid "%(month)s  %(year)s"
 msgstr ""
 
 #. Translators: for example Nov 2015
-#: ../raphodo/proximity.py:833
+#: ../raphodo/proximity.py:987
 #, python-format
 msgid "%(month)s %(year)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:1344
+#: ../raphodo/proximity.py:1595
 msgid ""
 "The time elapsed between consecutive photos and videos that is used to build "
 "the Timeline"
@@ -2572,47 +3150,47 @@ msgstr ""
 #. Replace the very last character (after the d) with the correct
 #. localized value, keeping everything else. In other words, change
 #. only the m character.
-#: ../raphodo/proximity.py:1406
+#: ../raphodo/proximity.py:1652
 #, python-format
 msgid "%(minutes)dm"
 msgstr ""
 
 #. Translators: i.e. "1.5h", which is short for 1.5 hours.
 #. Replace the entire string with the correct localized value
-#: ../raphodo/proximity.py:1410
+#: ../raphodo/proximity.py:1656
 msgid "1.5h"
 msgstr ""
 
 #. Translators: e.g. "5h", which is short for 5 hours.
 #. Replace the very last character (after the d) with the correct localized value,
 #. keeping everything else. In other words, change only the h character.
-#: ../raphodo/proximity.py:1415
+#: ../raphodo/proximity.py:1661
 #, python-format
 msgid "%(hours)dh"
 msgstr ""
 
-#: ../raphodo/proximity.py:1461
+#: ../raphodo/proximity.py:1710
 msgid ""
 "The Timeline groups photos and videos based on how much time elapsed between "
 "consecutive shots. Use it to identify photos and videos taken at different "
 "periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/proximity.py:1464
+#: ../raphodo/proximity.py:1715
 msgid ""
 "Use the slider (below) to adjust the time elapsed between consecutive shots "
 "that is used to build the Timeline."
 msgstr ""
 
-#: ../raphodo/proximity.py:1466
+#: ../raphodo/proximity.py:1718
 msgid "Timeline build pending..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1467
+#: ../raphodo/proximity.py:1719
 msgid "Timeline is building..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1468
+#: ../raphodo/proximity.py:1721
 msgid ""
 "The Timeline needs to be rebuilt because the file modification time does not "
 "match the time a shot was taken for one or more shots.<br><br>The Timeline "
@@ -2624,61 +3202,61 @@ msgid ""
 "downloading, which is when the metadata is read."
 msgstr ""
 
-#: ../raphodo/rapid.py:485 ../raphodo/rapid.py:2461 ../raphodo/rapid.py:3728
-#: ../raphodo/rapid.py:3846 ../raphodo/rapid.py:3850 ../raphodo/rapid.py:3870
-#: ../raphodo/rapid.py:3874 ../raphodo/rapid.py:3998 ../raphodo/rapid.py:4007
-#: ../raphodo/rapid.py:4495 ../raphodo/rapid.py:4888 ../raphodo/rapid.py:5722
-#: ../raphodo/rememberthisdialog.py:97
+#: ../raphodo/rapid.py:493 ../raphodo/rapid.py:2555 ../raphodo/rapid.py:3934
+#: ../raphodo/rapid.py:4065 ../raphodo/rapid.py:4069 ../raphodo/rapid.py:4092
+#: ../raphodo/rapid.py:4096 ../raphodo/rapid.py:4226 ../raphodo/rapid.py:4237
+#: ../raphodo/rapid.py:4743 ../raphodo/rapid.py:5195 ../raphodo/rapid.py:5997
+#: ../raphodo/rememberthisdialog.py:99
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:3
 msgid "Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:1100
+#: ../raphodo/rapid.py:1131
 msgid ""
 "<b>ExifTool has a problem</b><br><br> Rapid Photo Downloader uses ExifTool "
 "to get metadata from videos and photos. The program will run without it, but "
 "installing it is <b>highly</b> recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1110 ../raphodo/rapid.py:1130
+#: ../raphodo/rapid.py:1141 ../raphodo/rapid.py:1161
 msgid "Problem with libmediainfo"
 msgstr ""
 
-#: ../raphodo/rapid.py:1119
+#: ../raphodo/rapid.py:1150
 msgid ""
 "<b>The library libmediainfo appears to be missing</b><br><br> Rapid Photo "
 "Downloader uses libmediainfo to get the date and time a video was shot. The "
 "program will run  without it, but installing it is recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1417
+#: ../raphodo/rapid.py:1448
 msgid "Download failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1419
+#: ../raphodo/rapid.py:1450
 msgid ""
 "Sorry, the download of the new version of Rapid Photo Downloader failed."
 msgstr ""
 
-#: ../raphodo/rapid.py:1425
+#: ../raphodo/rapid.py:1457
 msgid ""
 "The new version was successfully downloaded. Do you want to close Rapid "
 "Photo Downloader and install it now?"
 msgstr ""
 
-#: ../raphodo/rapid.py:1428
+#: ../raphodo/rapid.py:1461
 msgid "Update Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:1432
+#: ../raphodo/rapid.py:1465
 msgid "Install"
 msgstr ""
 
-#: ../raphodo/rapid.py:1450
+#: ../raphodo/rapid.py:1483
 msgid "New version saved"
 msgstr ""
 
-#: ../raphodo/rapid.py:1451
+#: ../raphodo/rapid.py:1485
 #, python-format
 msgid ""
 "The tar file and installer script are saved at:\n"
@@ -2686,163 +3264,163 @@ msgid ""
 " %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:1468
+#: ../raphodo/rapid.py:1502
 msgid "Upgrade failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1469
+#: ../raphodo/rapid.py:1505
 msgid ""
 "Sorry, upgrading Rapid Photo Downloader failed because there was an error "
 "opening the installer."
 msgstr ""
 
-#: ../raphodo/rapid.py:1667 ../raphodo/rapid.py:2331
+#: ../raphodo/rapid.py:1709 ../raphodo/rapid.py:2425
 msgid "Download"
 msgstr ""
 
-#: ../raphodo/rapid.py:1671
+#: ../raphodo/rapid.py:1713
 msgid "&Refresh..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1675
+#: ../raphodo/rapid.py:1717
 msgid "&Preferences"
 msgstr ""
 
-#: ../raphodo/rapid.py:1679
+#: ../raphodo/rapid.py:1721
 msgid "&Quit"
 msgstr ""
 
-#: ../raphodo/rapid.py:1683
+#: ../raphodo/rapid.py:1725
 msgid "Error &Reports"
 msgstr ""
 
-#: ../raphodo/rapid.py:1687
+#: ../raphodo/rapid.py:1729
 msgid "Clear Completed Downloads"
 msgstr ""
 
-#: ../raphodo/rapid.py:1691
+#: ../raphodo/rapid.py:1733
 msgid "Get Help Online..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1695
+#: ../raphodo/rapid.py:1737
 msgid "&Tip of the Day..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1699
+#: ../raphodo/rapid.py:1741
 msgid "Report a Problem..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1703
+#: ../raphodo/rapid.py:1745
 msgid "Make a Donation..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1707
+#: ../raphodo/rapid.py:1749
 msgid "Translate this Application..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1711
+#: ../raphodo/rapid.py:1753
 msgid "&About..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1715
+#: ../raphodo/rapid.py:1757
 msgid "Check for Updates..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1797
+#: ../raphodo/rapid.py:1840
 msgid "Timeline"
 msgstr ""
 
-#: ../raphodo/rapid.py:1807
+#: ../raphodo/rapid.py:1850
 msgid "Destination"
 msgstr ""
 
-#: ../raphodo/rapid.py:1808
+#: ../raphodo/rapid.py:1851
 msgid "Rename"
 msgstr ""
 
-#: ../raphodo/rapid.py:1810
+#: ../raphodo/rapid.py:1853
 msgid "Back Up"
 msgstr ""
 
 #. Devices Header and View
-#: ../raphodo/rapid.py:1926
+#: ../raphodo/rapid.py:1977
 msgid ""
 "Turn on or off the use of devices attached to this computer as download "
 "sources"
 msgstr ""
 
 #. This Computer Header and View
-#: ../raphodo/rapid.py:1940
+#: ../raphodo/rapid.py:1994
 msgid ""
 "Turn on or off the use of a folder on this computer as a download source"
 msgstr ""
 
-#: ../raphodo/rapid.py:1941
+#: ../raphodo/rapid.py:1996
 msgid "This Computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:1952
+#: ../raphodo/rapid.py:2009
 msgid "Select a source folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:1975
+#: ../raphodo/rapid.py:2038
 msgid "Projected Storage Use"
 msgstr ""
 
-#: ../raphodo/rapid.py:1989 ../raphodo/rapid.py:1997
+#: ../raphodo/rapid.py:2056 ../raphodo/rapid.py:2068
 msgid "Select a destination folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:2045
+#: ../raphodo/rapid.py:2117
 msgid "All"
 msgstr ""
 
-#: ../raphodo/rapid.py:2046
+#: ../raphodo/rapid.py:2118
 msgid "New"
 msgstr ""
 
-#: ../raphodo/rapid.py:2048
+#: ../raphodo/rapid.py:2120
 msgid "Show:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2051
+#: ../raphodo/rapid.py:2123
 msgid "Modification Time"
 msgstr ""
 
-#: ../raphodo/rapid.py:2052
+#: ../raphodo/rapid.py:2124
 msgid "Checked State"
 msgstr ""
 
-#: ../raphodo/rapid.py:2055
+#: ../raphodo/rapid.py:2127
 msgid "File Type"
 msgstr ""
 
-#: ../raphodo/rapid.py:2056
+#: ../raphodo/rapid.py:2128
 msgid "Device"
 msgstr ""
 
-#: ../raphodo/rapid.py:2058
+#: ../raphodo/rapid.py:2130
 msgid "Sort:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2069
+#: ../raphodo/rapid.py:2141
 msgid "Select All:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2311
+#: ../raphodo/rapid.py:2405
 #, python-format
 msgid "Download %(files)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2327
+#: ../raphodo/rapid.py:2421
 msgid "Resume Download"
 msgstr ""
 
-#: ../raphodo/rapid.py:2329
+#: ../raphodo/rapid.py:2423
 msgid "Pause"
 msgstr ""
 
-#: ../raphodo/rapid.py:2417
+#: ../raphodo/rapid.py:2511
 #, python-brace-format
 msgid ""
 "Please report the problem at <a href=\"{website}\">{website}</a>.<br><br>\n"
@@ -2851,11 +3429,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/rapid.py:2431
+#: ../raphodo/rapid.py:2525
 msgid "Thank you for reporting a problem in Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:2529
+#: ../raphodo/rapid.py:2624
 #, python-format
 msgid ""
 "<b>Changing This Computer source path</b><br><br>Do you really want to "
@@ -2864,30 +3442,29 @@ msgid ""
 "from This Computer will be cancelled."
 msgstr ""
 
-#: ../raphodo/rapid.py:2595
+#: ../raphodo/rapid.py:2694
 msgid "You cannot change the download destination while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:2604
+#: ../raphodo/rapid.py:2704
 #, python-format
 msgid ""
 "<b>Confirm Download Destination</b><br><br>Are you sure you want to set the "
 "%(file_type)s download destination to %(path)s?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2682
+#: ../raphodo/rapid.py:2785
 msgid ""
+"\n"
 "<b>Downloading all files</b><br><br>\n"
-"                    A download always includes all files that are checked "
-"for download,\n"
-"                    including those that are not currently displayed because "
-"the Timeline\n"
-"                    is being used or because only new files are being shown."
-"<br><br>\n"
-"                    Do you want to proceed with the download?"
+"A download always includes all files that are checked for download,\n"
+"including those that are not currently displayed because the Timeline\n"
+"is being used or because only new files are being shown.<br><br>\n"
+"Do you want to proceed with the download?\n"
+"                        "
 msgstr ""
 
-#: ../raphodo/rapid.py:2820
+#: ../raphodo/rapid.py:2937
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -2895,206 +3472,200 @@ msgid ""
 "%(folder2)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2824
+#: ../raphodo/rapid.py:2940
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
 "%s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2827
+#: ../raphodo/rapid.py:2943
 msgid "Download Failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:2828
+#: ../raphodo/rapid.py:2944
 msgid "The download cannot proceed."
 msgstr ""
 
-#: ../raphodo/rapid.py:2842
+#: ../raphodo/rapid.py:2962
 msgid ""
 "Photos and videos will not be backed up because there is nowhere to back "
 "them up. Do you still want to start the download?"
 msgstr ""
 
-#. Translators: filetype will be replaced with 'photos' or 'videos'
-#: ../raphodo/rapid.py:2847 ../raphodo/rapid.py:2854
+#: ../raphodo/rapid.py:2969 ../raphodo/rapid.py:2979
 #, python-format
 msgid ""
 "No backup device exists for backing up %(filetype)s. Do you still want to "
 "start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2848 ../raphodo/rpdfile.py:228
+#: ../raphodo/rapid.py:2971 ../raphodo/rpdfile.py:228
 msgid "photos"
 msgstr ""
 
-#: ../raphodo/rapid.py:2855 ../raphodo/rpdfile.py:223
+#: ../raphodo/rapid.py:2981 ../raphodo/rpdfile.py:223
 msgid "videos"
 msgstr ""
 
-#: ../raphodo/rapid.py:2861
+#: ../raphodo/rapid.py:2989
 msgid ""
 "<b>The photo and video backup destinations do not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2869 ../raphodo/rapid.py:2876
+#: ../raphodo/rapid.py:2999 ../raphodo/rapid.py:3008
 #, python-format
 msgid ""
 "<b>The %(filetype)s backup destination does not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2871 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:818
+#: ../raphodo/rapid.py:3001 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:843
 msgid "photo"
 msgstr ""
 
-#: ../raphodo/rapid.py:2878 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:858
+#: ../raphodo/rapid.py:3010 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:883
 msgid "video"
 msgstr ""
 
-#: ../raphodo/rapid.py:2886
+#: ../raphodo/rapid.py:3018
 msgid "Backup problem"
 msgstr ""
 
-#. Translators - in the middle is a unicode em dash - please retain it
-#. This string is displayed in the status bar when the download is running
-#: ../raphodo/rapid.py:3571
+#: ../raphodo/rapid.py:3756
 #, python-format
 msgid "%(downloading_from)s — %(time_left)s left (%(speed)s)"
 msgstr ""
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3640
+#: ../raphodo/rapid.py:3828
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr ""
 
-#. Translators: e.g. 2 videos failed to download
-#: ../raphodo/rapid.py:3645
+#: ../raphodo/rapid.py:3836
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr ""
 
-#: ../raphodo/rapid.py:3650 ../raphodo/rapid.py:3723
+#: ../raphodo/rapid.py:3842 ../raphodo/rapid.py:3927
 msgid "warnings"
 msgstr ""
 
-#: ../raphodo/rapid.py:3679
+#: ../raphodo/rapid.py:3873
 msgid "All downloads complete"
 msgstr ""
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3686 ../raphodo/rapid.py:3695 ../raphodo/rapid.py:3704
-#: ../raphodo/rapid.py:3713 ../raphodo/rapid.py:3721
+#: ../raphodo/rapid.py:3881 ../raphodo/rapid.py:3892 ../raphodo/rapid.py:3903
+#: ../raphodo/rapid.py:3914 ../raphodo/rapid.py:3924
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3688 ../raphodo/rapid.py:3706
+#: ../raphodo/rapid.py:3884 ../raphodo/rapid.py:3906
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr ""
 
-#: ../raphodo/rapid.py:3697 ../raphodo/rapid.py:3715
+#: ../raphodo/rapid.py:3895 ../raphodo/rapid.py:3917
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr ""
 
-#: ../raphodo/rapid.py:3742
+#: ../raphodo/rapid.py:3950
 msgid "1 failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:3744
+#: ../raphodo/rapid.py:3952
 #, python-format
 msgid "%d failures"
 msgstr ""
 
-#: ../raphodo/rapid.py:3749
+#: ../raphodo/rapid.py:3957
 msgid "1 warning"
 msgstr ""
 
-#: ../raphodo/rapid.py:3751
+#: ../raphodo/rapid.py:3959
 #, python-format
 msgid "%d warnings"
 msgstr ""
 
-#: ../raphodo/rapid.py:3771
+#: ../raphodo/rapid.py:3981
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3774
+#: ../raphodo/rapid.py:3985
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3779
+#: ../raphodo/rapid.py:3989
 #, python-format
 msgid "No files downloaded — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3781
+#: ../raphodo/rapid.py:3991
 msgid "No files downloaded"
 msgstr ""
 
-#: ../raphodo/rapid.py:3805
+#: ../raphodo/rapid.py:4021
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3809
+#: ../raphodo/rapid.py:4026
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3812
+#: ../raphodo/rapid.py:4031
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3820
+#: ../raphodo/rapid.py:4039
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3833
+#: ../raphodo/rapid.py:4052
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3837
+#: ../raphodo/rapid.py:4056
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3841
+#: ../raphodo/rapid.py:4060
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices"
 msgstr ""
 
-#: ../raphodo/rapid.py:3867
+#: ../raphodo/rapid.py:4087
 msgid "The Destination subfolders and Timeline have been rebuilt"
 msgstr ""
 
-#: ../raphodo/rapid.py:3922
+#: ../raphodo/rapid.py:4144
 msgid "Program preferences are invalid"
 msgstr ""
 
-#: ../raphodo/rapid.py:3999
+#: ../raphodo/rapid.py:4228
 #, python-format
 msgid ""
 "<b>All files on the %(camera)s are inaccessible</b>.<br><br>It may be locked "
@@ -3104,7 +3675,7 @@ msgid ""
 "ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4008
+#: ../raphodo/rapid.py:4239
 #, python-format
 msgid ""
 "<b>The %(camera)s appears to be in use by another application.</"
@@ -3114,34 +3685,34 @@ msgid ""
 "device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4019
+#: ../raphodo/rapid.py:4250
 msgid "&Try Again"
 msgstr ""
 
-#: ../raphodo/rapid.py:4020
+#: ../raphodo/rapid.py:4251
 msgid "&Ignore This Device"
 msgstr ""
 
-#: ../raphodo/rapid.py:4086
+#: ../raphodo/rapid.py:4323
 #, python-format
 msgid "Sorry, an unexpected problem occurred while scanning %s."
 msgstr ""
 
-#: ../raphodo/rapid.py:4087
+#: ../raphodo/rapid.py:4324
 msgid "Unfortunately you cannot download from this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4091
+#: ../raphodo/rapid.py:4328
 msgid ""
 "A possible workaround for the problem might be downloading from the camera's "
 "memory card using a card reader."
 msgstr ""
 
-#: ../raphodo/rapid.py:4096
+#: ../raphodo/rapid.py:4333
 msgid "Device scan failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:4472
+#: ../raphodo/rapid.py:4720
 #, python-format
 msgid ""
 "<b>The %(camera)s cannot be scanned because it cannot be unmounted.</"
@@ -3150,7 +3721,7 @@ msgid ""
 "the computer and plug it in again."
 msgstr ""
 
-#: ../raphodo/rapid.py:4496
+#: ../raphodo/rapid.py:4745
 #, python-format
 msgid ""
 "<b>The download cannot start because the %(camera)s cannot be unmounted.</"
@@ -3160,124 +3731,150 @@ msgid ""
 "download from it."
 msgstr ""
 
-#: ../raphodo/rapid.py:4635
+#: ../raphodo/rapid.py:4842
+msgid "Completed Downloads Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4844
+#, python-format
+msgid "%s whose download have completed are displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4846
+msgid "Do you want to clear the completed downloads?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4848
+msgid "Completed Download Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4850
+#, python-format
+msgid "%s whose download has completed is displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4852
+msgid "Do you want to clear the completed download?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4933
 #, python-format
 msgid ""
 "Do you want to download photos and videos from the device <i>%(device)s</i>?"
 msgstr ""
 
-#: ../raphodo/rapid.py:4877
+#: ../raphodo/rapid.py:5183
 #, python-format
 msgid "<b>Do you want to ignore the %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4879
+#: ../raphodo/rapid.py:5186
 msgid ""
 "All cameras, phones and tablets with the same model name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:4883
+#: ../raphodo/rapid.py:5190
 #, python-format
 msgid ""
 "<b>Do you want to ignore the device %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4885
+#: ../raphodo/rapid.py:5192
 msgid "Any device with the same name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:5178
+#: ../raphodo/rapid.py:5492
 #, python-format
 msgid "Downloading from %(location)s on This Computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5180
+#: ../raphodo/rapid.py:5496
 msgid ""
 "Do you really want to download from here?<br><br>On some systems, scanning "
 "this location can take a very long time."
 msgstr ""
 
-#: ../raphodo/rapid.py:5224
+#: ../raphodo/rapid.py:5537
 #, python-format
 msgid "Generating thumbnails for %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5227
+#: ../raphodo/rapid.py:5540
 #, python-format
 msgid "Scanning %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5237
+#: ../raphodo/rapid.py:5551
 #, python-format
 msgid ""
 "%(number)s of %(available files)s checked for download (%(hidden)s hidden)"
 msgstr ""
 
-#: ../raphodo/rapid.py:5243
+#: ../raphodo/rapid.py:5559
 #, python-format
 msgid "%(number)s of %(available files)s checked for download"
 msgstr ""
 
-#: ../raphodo/rapid.py:5494
+#: ../raphodo/rapid.py:5764
 msgid "Display program information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5496
+#: ../raphodo/rapid.py:5766
 msgid "Display debugging information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5499
+#: ../raphodo/rapid.py:5769
 #, fuzzy
 msgid "List photo and video file extensions the program recognizes and exit."
 msgstr "list image file extensions the program recognises and exit"
 
-#: ../raphodo/rapid.py:5502
+#: ../raphodo/rapid.py:5772
 msgid "Turn on or off the the renaming of photos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5504
+#: ../raphodo/rapid.py:5774
 msgid "turn on or off the the renaming of videos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5506
+#: ../raphodo/rapid.py:5776
 msgid ""
 "Turn on or off the automatic detection of devices from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5510
+#: ../raphodo/rapid.py:5780
 msgid "Turn on or off downloading from this computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5512 ../raphodo/rapid.py:5515 ../raphodo/rapid.py:5518
-#: ../raphodo/rapid.py:5539 ../raphodo/rapid.py:5543
+#: ../raphodo/rapid.py:5782 ../raphodo/rapid.py:5785 ../raphodo/rapid.py:5788
+#: ../raphodo/rapid.py:5809 ../raphodo/rapid.py:5813
 msgid "PATH"
 msgstr ""
 
-#: ../raphodo/rapid.py:5513
+#: ../raphodo/rapid.py:5783
 msgid "The PATH on this computer from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5516
+#: ../raphodo/rapid.py:5786
 msgid "The PATH where photos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5519
+#: ../raphodo/rapid.py:5789
 msgid "The PATH where videos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5521
+#: ../raphodo/rapid.py:5791
 msgid "Turn on or off the backing up of photos and videos while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:5525
+#: ../raphodo/rapid.py:5795
 msgid "Turn on or off the automatic detection of backup devices."
 msgstr ""
 
-#: ../raphodo/rapid.py:5527 ../raphodo/rapid.py:5533
+#: ../raphodo/rapid.py:5797 ../raphodo/rapid.py:5803
 msgid "FOLDER"
 msgstr ""
 
-#: ../raphodo/rapid.py:5528
+#: ../raphodo/rapid.py:5798
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected photo "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3285,7 +3882,7 @@ msgid ""
 "photos up to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5534
+#: ../raphodo/rapid.py:5804
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected video "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3293,115 +3890,122 @@ msgid ""
 "up videos to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5540
+#: ../raphodo/rapid.py:5810
 msgid ""
 "The PATH where photos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5544
+#: ../raphodo/rapid.py:5814
 msgid ""
 "The PATH where videos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5547
+#: ../raphodo/rapid.py:5817
 #, python-format
 msgid "Ignore photos with the following extensions: %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5551
+#: ../raphodo/rapid.py:5821
 msgid "Turn on or off starting downloads as soon as the program itself starts."
 msgstr ""
 
-#: ../raphodo/rapid.py:5554
+#: ../raphodo/rapid.py:5824
 msgid "Turn on or off starting downloads as soon as a device is inserted."
 msgstr ""
 
-#: ../raphodo/rapid.py:5557
+#: ../raphodo/rapid.py:5827
 msgid ""
 "Turn on or off use of the Rapid Photo Downloader Thumbnail Cache. Turning it "
 "off does not delete existing cache contents."
 msgstr ""
 
-#: ../raphodo/rapid.py:5561
+#: ../raphodo/rapid.py:5831
 msgid ""
 "Delete all thumbnails in the Rapid Photo Downloader Thumbnail Cache, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5565
+#: ../raphodo/rapid.py:5835
 msgid "Forget which files have been previously downloaded, and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5568
+#: ../raphodo/rapid.py:5838
 msgid ""
 "Import preferences from an old program version and exit. Requires the "
 "command line program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5571
+#: ../raphodo/rapid.py:5841
 msgid ""
 "Reset all program settings to their default values, delete all thumbnails in "
 "the Thumbnail cache, forget which files have been previously downloaded, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5575
+#: ../raphodo/rapid.py:5845
 msgid "Include gphoto2 debugging information in log files."
 msgstr ""
 
-#: ../raphodo/rapid.py:5579
+#: ../raphodo/rapid.py:5849
 msgid "Print information to the terminal about attached cameras and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5640
+#: ../raphodo/rapid.py:5911
 msgid ""
 "To import preferences from the old version of Rapid Photo Downloader, you "
 "must install the program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5649
+#: ../raphodo/rapid.py:5920
 msgid "No prior program preferences detected: exiting"
 msgstr ""
 
-#: ../raphodo/rapid.py:5652
+#: ../raphodo/rapid.py:5923
 #, python-format
 msgid "Importing preferences from Rapid Photo Downloader %(version)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5714
+#: ../raphodo/rapid.py:5989
 #, python-format
 msgid "Do you want to copy the stored sequence number, which has the value %d?"
 msgstr ""
 
-#: ../raphodo/rapid.py:5726
+#: ../raphodo/rapid.py:6000
 msgid "Program aborting."
 msgstr ""
 
-#: ../raphodo/rapid.py:5736
+#: ../raphodo/rapid.py:6010
 msgid "Never run this program as the sudo / root user."
 msgstr ""
 
-#: ../raphodo/rapid.py:5740
+#: ../raphodo/rapid.py:6014
 msgid "You must install ExifTool to run Rapid Photo Downloader."
 msgstr ""
 
-#: ../raphodo/rapid.py:5794
+#: ../raphodo/rapid.py:6026
+msgid ""
+"Rapid Photo Downloader is installed in multiple locations.\n"
+"\n"
+"Uninstall all copies except the version you want to run."
+msgstr ""
+
+#: ../raphodo/rapid.py:6083
 msgid ""
 "When specifying a path on the command line, do not also specify an\n"
 "option for device auto detection or a path on \"This Computer\"."
 msgstr ""
 
-#: ../raphodo/rapid.py:5950
+#: ../raphodo/rapid.py:6243
 msgid "All settings and caches have been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5958
+#: ../raphodo/rapid.py:6251
 msgid "Thumbnail Cache has been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5964
+#: ../raphodo/rapid.py:6257
 msgid "Remembered files have been forgotten"
 msgstr ""
 
@@ -3417,15 +4021,15 @@ msgstr ""
 msgid "&Don't warn me again about missing or broken program libraries"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:546
+#: ../raphodo/renameandmovefile.py:554
 msgid "subfolder and filename"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:548
+#: ../raphodo/renameandmovefile.py:556
 msgid "filename"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:550
+#: ../raphodo/renameandmovefile.py:558
 msgid "subfolder"
 msgstr ""
 
@@ -3505,160 +4109,237 @@ msgstr ""
 msgid "photos or videos"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:306
+#: ../raphodo/rpdfile.py:315
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:318
+#. translators: natural language expression signifying a single video
+#: ../raphodo/rpdfile.py:337
+msgid "a video"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:339
 msgid "1 Video"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:323
+#. translators: natural language expression signifying a single photo
+#: ../raphodo/rpdfile.py:346
+msgid "a photo"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:348
 msgid "1 Photo"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:803
+#: ../raphodo/rpdfile.py:828
 #, python-format
 msgid "%(path)s on %(camera)s"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:819
+#: ../raphodo/rpdfile.py:844
 msgid "Photo"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:859
+#: ../raphodo/rpdfile.py:884
 msgid "Video"
 msgstr ""
 
-#: ../raphodo/storage.py:138
+#: ../raphodo/storage.py:141
 msgid "File system root"
 msgstr ""
 
 #. translators: the name of the Pictures folder
-#: ../raphodo/storage.py:433
+#: ../raphodo/storage.py:437
 msgid "Pictures"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:426
+#: ../raphodo/thumbnaildisplay.py:432
 #, python-format
 msgid "Taken on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:431
+#: ../raphodo/thumbnaildisplay.py:439
 #, python-format
 msgid "Modified on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:437 ../raphodo/thumbnaildisplay.py:466
+#: ../raphodo/thumbnaildisplay.py:447 ../raphodo/thumbnaildisplay.py:481
 #, python-format
 msgid "%(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:451
+#: ../raphodo/thumbnaildisplay.py:464
 #, python-format
 msgid "Memory cards: %s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:457
+#: ../raphodo/thumbnaildisplay.py:468
+#, python-format
+msgid "Memory card: %s"
+msgstr ""
+
+#: ../raphodo/thumbnaildisplay.py:473
 msgid "Downloaded as:"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:472
+#: ../raphodo/thumbnaildisplay.py:489
 #, python-format
 msgid "<br><br>Previous download:<br>%(filename)s<br>%(path)s<br>%(date)s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:1603
+#: ../raphodo/thumbnaildisplay.py:1645
 msgid "Copy Path"
 msgstr ""
 
+#. Translators: these values are file size suffixes like B representing bytes, KB representing
+#. kilobytes, etc.
+#: ../raphodo/utilities.py:170
+msgid "B"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "KB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "MB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "GB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "TB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "PB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "EB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "ZB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "YB"
+msgstr ""
+
 #. two things in a list e.g. "device1 and device2"
-#: ../raphodo/utilities.py:391
+#: ../raphodo/utilities.py:394
 #, python-format
 msgid "%(first_item)s and %(last_item)s"
 msgstr ""
 
-#: ../raphodo/utilities.py:464
+#: ../raphodo/utilities.py:468
 msgid "one"
 msgstr ""
 
-#: ../raphodo/utilities.py:465
+#: ../raphodo/utilities.py:469
 msgid "two"
 msgstr ""
 
-#: ../raphodo/utilities.py:466
+#: ../raphodo/utilities.py:470
 msgid "three"
 msgstr ""
 
-#: ../raphodo/utilities.py:467
+#: ../raphodo/utilities.py:471
 msgid "four"
 msgstr ""
 
-#: ../raphodo/utilities.py:468
+#: ../raphodo/utilities.py:472
 msgid "five"
 msgstr ""
 
-#: ../raphodo/utilities.py:469
+#: ../raphodo/utilities.py:473
 msgid "six"
 msgstr ""
 
-#: ../raphodo/utilities.py:470
+#: ../raphodo/utilities.py:474
 msgid "seven"
 msgstr ""
 
-#: ../raphodo/utilities.py:471
+#: ../raphodo/utilities.py:475
 msgid "eight"
 msgstr ""
 
-#: ../raphodo/utilities.py:472
+#: ../raphodo/utilities.py:476
 msgid "nine"
 msgstr ""
 
-#: ../raphodo/utilities.py:473
+#: ../raphodo/utilities.py:477
 msgid "ten"
 msgstr ""
 
-#: ../raphodo/utilities.py:474
+#: ../raphodo/utilities.py:478
 msgid "eleven"
 msgstr ""
 
-#: ../raphodo/utilities.py:475
+#: ../raphodo/utilities.py:479
 msgid "twelve"
 msgstr ""
 
-#: ../raphodo/utilities.py:476
+#: ../raphodo/utilities.py:480
 msgid "thirteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:477
+#: ../raphodo/utilities.py:481
 msgid "fourteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:478
+#: ../raphodo/utilities.py:482
 msgid "fifteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:479
+#: ../raphodo/utilities.py:483
 msgid "sixteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:480
+#: ../raphodo/utilities.py:484
 msgid "seventeen"
 msgstr ""
 
-#: ../raphodo/utilities.py:481
+#: ../raphodo/utilities.py:485
 msgid "eighteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:482
+#: ../raphodo/utilities.py:486
 msgid "ninenteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:483
+#: ../raphodo/utilities.py:487
 msgid "twenty"
 msgstr ""
 
+#: ../raphodo/viewutils.py:240
+msgid "&OK"
+msgstr ""
+
+#: ../raphodo/viewutils.py:243
+msgid "&Save"
+msgstr ""
+
+#: ../raphodo/viewutils.py:244
+msgid "&Help"
+msgstr ""
+
+#: ../raphodo/viewutils.py:245
+msgid "Restore Defaults"
+msgstr ""
+
+#: ../raphodo/viewutils.py:246
+msgid "&Yes"
+msgstr ""
+
+#: ../raphodo/viewutils.py:247
+msgid "&No"
+msgstr ""
+
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:1
 msgid ""
 "Rapid Photo Downloader imports photos and videos from cameras, phones, "
diff --git a/po/en_GB.po b/po/en_GB.po
index 06b5593..7821182 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: damonlynch@gmail.com\n"
-"POT-Creation-Date: 2017-07-08 19:16-0500\n"
+"POT-Creation-Date: 2017-09-12 17:01-0400\n"
 "PO-Revision-Date: 2009-11-18 01:30+0000\n"
 "Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -18,38 +18,395 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-11-18 01:36+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#. type: QPushButton
-#: ../raphodo/aboutdialog.py:217
+#: ../install.py:65
+#, fuzzy
+msgid "Rapid Photo Downloader installer"
+msgstr "Rapid Photo Downloader"
+
+#: ../install.py:66
+#, fuzzy
+msgid "Download and install latest version of Rapid Photo Downloader."
+msgstr "Rapid Photo Downloader"
+
+#: ../install.py:236 ../install.py:1732
+msgid "Installer not found:"
+msgstr ""
+
+#. Translators: do not translate the term tar.gz
+#: ../install.py:240 ../install.py:1736
+msgid "Installer not in tar.gz format:"
+msgstr ""
+
+#: ../install.py:465
+msgid ""
+"Incorrect folder ownership detected. Changing ownership of and resetting "
+"permissions for"
+msgstr ""
+
+#: ../install.py:540
+msgid "The following command will be run:"
+msgstr ""
+
+#: ../install.py:543 ../install.py:1479 ../install.py:1484
+msgid "sudo may prompt you for the sudo password."
+msgstr ""
+
+#: ../install.py:547
+msgid "Would you like to run the command now?"
+msgstr ""
+
+#: ../install.py:549
+msgid "Answer is not yes, exiting."
+msgstr ""
+
+#: ../install.py:559 ../install.py:751 ../install.py:966
+msgid "Command failed"
+msgstr ""
+
+#: ../install.py:561 ../install.py:752 ../install.py:967
+msgid "Exiting"
+msgstr ""
+
+#: ../install.py:582
+msgid "The Universe repository must be enabled."
+msgstr ""
+
+#: ../install.py:606
+#, fuzzy
+msgid ""
+"Do you want to to uninstall the previous version of Rapid Photo Downloader:"
+msgstr "Rapid Photo Downloader"
+
+#: ../install.py:715 ../install.py:740
+msgid ""
+"Querying package system to see if an older version of Rapid Photo Downloader "
+"is installed (this may take a while)..."
+msgstr ""
+
+#: ../install.py:726
+msgid ""
+"Unable to query package system. Please check your Internet connection and "
+"try again"
+msgstr ""
+
+#: ../install.py:756
+msgid "Checking if previous version installed with pip..."
+msgstr ""
+
+#: ../install.py:850
+msgid "The following package is unknown on your system: {}\n"
+msgstr ""
+
+#: ../install.py:857 ../install.py:929 ../install.py:974
+msgid ""
+"To continue, some packages required to run the application will be installed."
+msgstr ""
+
+#: ../install.py:886
+msgid "Querying installed and available packages (this may take a while)"
+msgstr ""
+
+#: ../install.py:958
+msgid ""
+"Querying zypper to see if any required packages are already installed (this "
+"may take a while)... "
+msgstr ""
+
+#: ../install.py:1004
+msgid "Query to confirm action at each step."
+msgstr ""
+
+#: ../install.py:1011
+msgid ""
+"When downloading the latest version, install the development version if it "
+"is newer than the stable version."
+msgstr ""
+
+#: ../install.py:1020
+msgid ""
+"Optional tar.gz Rapid Photo Downloader installer archive. If not specified, "
+"the latest version is downloaded from the Internet."
+msgstr ""
+
+#: ../install.py:1043
+msgid ""
+"Do not run the installer in the tar.gz Rapid Photo Downloader installer "
+"archive if it is newer than this version ({}). The default is to run "
+"whichever installer is newer."
+msgstr ""
+
+#: ../install.py:1050
+msgid ""
+"Uninstall Rapid Photo Downloader that was installed with pip, keeping its "
+"dependencies."
+msgstr ""
+
+#: ../install.py:1054
+msgid ""
+"Uninstall the dependencies installed by pip during Rapid Photo Downloader's "
+"installation, and Rapid Photo Downloader itself, then exit."
+msgstr ""
+
+#: ../install.py:1059
+msgid ""
+"Note: this will not uninstall any version of Rapid Photo Downloader "
+"installed by your Linux distribution's package manager."
+msgstr ""
+
+#: ../install.py:1066
+msgid ""
+"Dependencies will only be removed if they are not required by other programs."
+msgstr ""
+
+#: ../install.py:1072
+msgid ""
+"Note: this option will remove the dependencies regardless of whether they "
+"are required by another program pip has installed. Upgrade to pip 9.0 or "
+"above if you want to avoid this behavior. You can do so using the command "
+"'python3 -m pip install pip -U --user'. Also note that any version of Rapid "
+"Photo Downloader installed by your Linux distribution's package manager will "
+"not be uninstalled."
+msgstr ""
+
+#: ../install.py:1122
+msgid "Failed to download versions file"
+msgstr ""
+
+#: ../install.py:1126
+msgid "Got error code {} while accessing versions file"
+msgstr ""
+
+#: ../install.py:1234
+msgid ""
+"Sorry, could not locate installer. Please check your Internet connection and "
+"verify if you can reach https://www.damonlynch.net\n"
+"\n"
+"Exiting.\n"
+msgstr ""
+
+#: ../install.py:1408
+msgid "Installing application requirements..."
+msgstr ""
+
+#: ../install.py:1424
+msgid "Received error code"
+msgstr ""
+
+#: ../install.py:1425
+msgid "Failed to install application requirements: exiting"
+msgstr ""
+
+#: ../install.py:1428
+msgid "Installing application..."
+msgstr ""
+
+#: ../install.py:1441
+msgid "Failed to install application: exiting..."
+msgstr ""
+
+#: ../install.py:1465
+msgid ""
+"You may have to restart the computer to be able to run the program from the "
+"commmand line or application launcher."
+msgstr ""
+
+#: ../install.py:1476
+msgid "Do you want to install the application's man pages?"
+msgstr ""
+
+#: ../install.py:1477
+msgid "They will be installed into {}"
+msgstr ""
+
+#: ../install.py:1478 ../install.py:1483
+msgid "If you uninstall the application, remove these manpages yourself."
+msgstr ""
+
+#: ../install.py:1480
+msgid "Do want to install the man pages?"
+msgstr ""
+
+#: ../install.py:1482
+msgid "Installing man pages into {}"
+msgstr ""
+
+#: ../install.py:1499
+msgid "Failed to create man page directory: exiting"
+msgstr ""
+
+#: ../install.py:1511
+msgid "Failed to copy man page."
+msgstr ""
+
+#: ../install.py:1521
+msgid "(If a segmentation fault occurs at exit, you can ignore it...)"
+msgstr ""
+
+#: ../install.py:1534
+msgid ""
+"The python3 tool pip is required to uninstall a version of Rapid Photo "
+"Downloader that was installed with pip.\n"
+"Cannot continue. Exiting."
+msgstr ""
+
+#: ../install.py:1575
+msgid ""
+"Do not run this installer script as sudo / root user.\n"
+"Run it using the user who will run the program.\n"
+msgstr ""
+
+#: ../install.py:1585 ../install.py:1599
+msgid "Do not include any other command line arguments when specifying"
+msgstr ""
+
+#: ../install.py:1614
+msgid ""
+"Sorry, this installer does not support a custom python installation.\n"
+"Exiting..."
+msgstr ""
+
+#: ../install.py:1620
+msgid "Restarting script using system python..."
+msgstr ""
+
+#: ../install.py:1651
+msgid "Exiting..."
+msgstr ""
+
+#. Translators: do not translate the term python3-apt
+#: ../install.py:1670
+msgid "To continue, the package python3-apt must be installed."
+msgstr ""
+
+#: ../install.py:1689
+msgid ""
+"Install the following packages using your Linux distribution's standard "
+"package manager, and then rerun this installer"
+msgstr ""
+
+#: ../install.py:1698
+msgid ""
+"To run this program, programs to assist Python 3 and its package management "
+"must be installed."
+msgstr ""
+
+#. Translators: do not translate the terms Python 3, pip and setuptools
+#: ../install.py:1713
+msgid "Python 3's pip and setuptools must be upgraded for your user."
+msgstr ""
+
+#. Translators: do not translate the term python or requests
+#: ../install.py:1726
+msgid "Installing python requests"
+msgstr ""
+
+#: ../upgrade.py:79
+#, fuzzy
+msgid "Upgrade Rapid Photo Downloader"
+msgstr "Rapid Photo Downloader"
+
+#: ../upgrade.py:401 ../raphodo/viewutils.py:242
+msgid "&Cancel"
+msgstr ""
+
+#: ../upgrade.py:405
+msgid "&Upgrade"
+msgstr ""
+
+#: ../upgrade.py:410
+#, python-format
+msgid "Click the Upgrade button to upgrade to version %s."
+msgstr ""
+
+#: ../upgrade.py:413
+msgid "Click the Upgrade button to start the upgrade."
+msgstr ""
+
+#: ../upgrade.py:416 ../upgrade.py:422 ../raphodo/viewutils.py:241
+msgid "&Close"
+msgstr ""
+
+#: ../upgrade.py:417
+msgid "&Run"
+msgstr ""
+
+#: ../upgrade.py:447
+#, fuzzy
+msgid "Close Rapid Photo Downloader before running this upgrade"
+msgstr "Rapid Photo Downloader"
+
+#: ../upgrade.py:450
+msgid "Upgrade running..."
+msgstr ""
+
+#: ../upgrade.py:486
+#, python-format
+msgid ""
+"Successfully upgraded to %s. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:491
+msgid ""
+"Upgrade finished successfully. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:495
+msgid "Upgrade failed. Click Close to exit."
+msgstr ""
+
+#: ../upgrade.py:6967
+#, python-format
+msgid "Upgrading %s..."
+msgstr ""
+
+#: ../upgrade.py:6969
+msgid "Press any key to continue..."
+msgstr ""
+
+#: ../upgrade.py:6982
+#, fuzzy
+msgid "Rapid Photo Downloader upgrade failed"
+msgstr "Rapid Photo Downloader"
+
+#: ../upgrade.py:6984
+#, python-format
+msgid ""
+"The python package %s could not be updated. The upgrade cannot continue."
+msgstr ""
+
+#: ../raphodo/aboutdialog.py:225
 msgid "Credits"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:239
+#: ../raphodo/backuppanel.py:240
 msgid "Backups are not configured"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:241
+#: ../raphodo/backuppanel.py:242
 msgid "No backup devices detected"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:243
+#: ../raphodo/backuppanel.py:244
 msgid "Valid backup locations not yet specified"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:401
+#: ../raphodo/backuppanel.py:404
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
 msgstr ""
 
-#: ../raphodo/backuppanel.py:407
+#: ../raphodo/backuppanel.py:412
 msgid "Back up photos and videos when downloading"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:413
+#: ../raphodo/backuppanel.py:418
 msgid "Automatically detect backup devices"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:417
+#: ../raphodo/backuppanel.py:424
 msgid ""
 "Specify the folder in which backups are stored on the device."
 "<br><br><i>Note: the presence of a folder with this name is used to "
@@ -59,78 +416,86 @@ msgid ""
 "videos.</i>"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:428
+#: ../raphodo/backuppanel.py:439
 #, fuzzy
 msgid "Photo folder name:"
 msgstr "Rapid Photo Downloader"
 
-#: ../raphodo/backuppanel.py:433
+#: ../raphodo/backuppanel.py:444
 msgid "Video folder name:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:438 ../raphodo/nameeditor.py:883
+#: ../raphodo/backuppanel.py:449 ../raphodo/nameeditor.py:890
 #: ../raphodo/renamepanel.py:123
 msgid "Example:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:448
+#: ../raphodo/backuppanel.py:460
 msgid "If you disable automatic detection, choose the exact backup locations."
 msgstr ""
 
-#: ../raphodo/backuppanel.py:452
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:468
 msgid "Photo backup location:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:454
+#: ../raphodo/backuppanel.py:474
 msgid "Select Photo Backup Location"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:460
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:485
 msgid "Video backup location:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:462
+#: ../raphodo/backuppanel.py:491
 msgid "Select Video Backup Location"
 msgstr ""
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:564
+#: ../raphodo/backuppanel.py:595
 msgid "drive1"
 msgstr ""
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:567
+#: ../raphodo/backuppanel.py:598
 msgid "drive2"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:628
+#: ../raphodo/backuppanel.py:663
 msgid "Projected Backup Storage Use"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:632
+#: ../raphodo/backuppanel.py:669
 msgid "Backup Options"
 msgstr ""
 
 #. translators: refers to the video thumbnail file that some
 #. cameras generate -- it has a .THM file extension
-#: ../raphodo/copyfiles.py:476
+#: ../raphodo/copyfiles.py:491
 msgid "video THM"
 msgstr ""
 
-#: ../raphodo/copyfiles.py:482
+#: ../raphodo/copyfiles.py:497
 msgid "audio"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:78 ../raphodo/devicedisplay.py:1079
-#: ../raphodo/rpdfile.py:321
+#: ../raphodo/rpdfile.py:342
 #, python-format
 msgid "%(no_photos)s Photos"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:82 ../raphodo/devicedisplay.py:1081
-#: ../raphodo/rpdfile.py:316
+#: ../raphodo/rpdfile.py:333
 #, python-format
 msgid "%(no_videos)s Videos"
 msgstr ""
@@ -158,15 +523,15 @@ msgid "%(size_free)s free of %(size_total)s"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:190 ../raphodo/devicedisplay.py:993
-#: ../raphodo/rapid.py:1964 ../raphodo/rapid.py:2079 ../raphodo/rapid.py:5753
-#: ../raphodo/rpdfile.py:905
+#: ../raphodo/rapid.py:2023 ../raphodo/rapid.py:2151 ../raphodo/rapid.py:6043
+#: ../raphodo/rpdfile.py:930
 msgid "Photos"
 msgstr ""
 
 #. translators: the name of the Videos folder
 #: ../raphodo/destinationdisplay.py:191 ../raphodo/devicedisplay.py:994
-#: ../raphodo/rapid.py:1967 ../raphodo/rapid.py:2080 ../raphodo/rapid.py:5754
-#: ../raphodo/rpdfile.py:933 ../raphodo/storage.py:445
+#: ../raphodo/rapid.py:2028 ../raphodo/rapid.py:2152 ../raphodo/rapid.py:6044
+#: ../raphodo/rpdfile.py:958 ../raphodo/storage.py:449
 msgid "Videos"
 msgstr ""
 
@@ -174,7 +539,7 @@ msgstr ""
 msgid "Projected storage use after download"
 msgstr ""
 
-#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:516
+#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:521
 msgid "Custom..."
 msgstr ""
 
@@ -212,57 +577,58 @@ msgstr ""
 msgid "%s full"
 msgstr ""
 
-#: ../raphodo/devices.py:459
+#: ../raphodo/devices.py:463
 msgid "Cameras"
 msgstr ""
 
-#: ../raphodo/devices.py:460 ../raphodo/devices.py:920
-#: ../raphodo/preferencedialog.py:85 ../raphodo/rapid.py:1927
+#: ../raphodo/devices.py:464 ../raphodo/devices.py:927
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/rapid.py:1979
 msgid "Devices"
 msgstr ""
 
-#: ../raphodo/devices.py:720
+#: ../raphodo/devices.py:724
 #, python-format
 msgid "Downloading from %(device_names)s"
 msgstr ""
 
 #. Translators: e.g. Three Devices
-#: ../raphodo/devices.py:780
+#: ../raphodo/devices.py:784
 #, python-format
 msgid "%(no_devices)s %(device_type)s"
 msgstr ""
 
-#: ../raphodo/devices.py:905 ../raphodo/rapid.py:1764
+#: ../raphodo/devices.py:912 ../raphodo/rapid.py:1807
 msgid "Select Source"
 msgstr ""
 
-#: ../raphodo/devices.py:936 ../raphodo/devices.py:947
+#: ../raphodo/devices.py:943 ../raphodo/devices.py:954
 #, python-format
 msgid "%(device1)s + %(device2)s"
 msgstr ""
 
 #. Number of cameras e.g. 3 Cameras
-#: ../raphodo/devices.py:958
+#: ../raphodo/devices.py:965
 #, python-format
 msgid "%(no_cameras)s Cameras"
 msgstr ""
 
-#: ../raphodo/devices.py:963
+#: ../raphodo/devices.py:970
 #, python-format
 msgid "%(no_devices)s Devices"
 msgstr ""
 
 #. Translators: two folder names, separated by a plus sign
-#: ../raphodo/devices.py:1258
+#: ../raphodo/devices.py:1265
 #, python-format
 msgid "%s + %s"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:44
+#: ../raphodo/didyouknow.py:45
 msgid "Click on a file's checkbox to mark or unmark it for download."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:50
+#: ../raphodo/didyouknow.py:51
 msgid ""
 "Files that have already been downloaded are remembered. You can still mark "
 "previously downloaded files to download again, but they are unchecked by "
@@ -270,34 +636,67 @@ msgid ""
 "files that are yet to be downloaded."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:59
+#: ../raphodo/didyouknow.py:60
 msgid ""
 "If more than one file is selected, they'll all take the mark of the file "
 "whose checkbox was clicked, regardless of whether they previously had a "
 "checkmark or not."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:67
+#: ../raphodo/didyouknow.py:68
 msgid ""
 "Click on a device's checkbox to quickly mark or unmark all its files for "
 "downloading."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:74
+#: ../raphodo/didyouknow.py:75
+msgid ""
+"After a download finishes, an icon replaces the thumbnail's checkbox. The "
+"icon's color indicates whether the download was successful (green), had file "
+"renaming problems (yellow/orange), or failed (red)."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:83
+msgid ""
+"\n"
+"            In case of any problems, a red icon will appear at the bottom of "
+"the window\n"
+"            indicating how many error reports there are. Clicking on it "
+"opens the Error Report \n"
+"            window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:91
+msgid ""
+"\n"
+"            The Error Report window lists any problems encountered before, "
+"during or after the \n"
+"            download. An orange triangle represents a warning, a red circle "
+"indicates a failure, \n"
+"            and a black circle indicates more serious failures. You can "
+"click on the hyperlinks to \n"
+"            open its file or device in a file manager. You can also search "
+"the reports using the \n"
+"            search box in the lower left of the Error Report window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:103
 msgid ""
 "You can simultaneously download from multiple cameras, smartphones, memory "
 "cards, and hard drives&mdash;as many devices as your computer can handle at "
 "one time."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:81
+#: ../raphodo/didyouknow.py:110
 msgid ""
 "The <b>Timeline</b> groups photos and videos based on how much time elapsed "
 "between consecutive shots. Use it to identify photos and videos taken at "
 "different periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:88
+#: ../raphodo/didyouknow.py:117
 msgid ""
 "\n"
 "<p>In the illustration above, the first row of the Timeline is black because "
@@ -309,7 +708,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:99
+#: ../raphodo/didyouknow.py:128
 msgid ""
 "To view photos and videos for a particular time range, use the mouse "
 "(optionally in combination with the <tt>Shift</tt> or <tt>Ctrl</tt> keys) to "
@@ -317,20 +716,20 @@ msgid ""
 "the left side of the main window will be highlighted."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:106
+#: ../raphodo/didyouknow.py:135
 msgid ""
 "A download always includes all files that are checked for download, "
 "including those that are not currently displayed because the Timeline is "
 "being used."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:113
+#: ../raphodo/didyouknow.py:142
 msgid ""
 "You can hide or display the download sources by clicking on the name of the "
 "device you're downloading from at the top left of the program window."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:120
+#: ../raphodo/didyouknow.py:149
 msgid ""
 "\n"
 "          Thumbnails can be sorted using a variety of criteria:\n"
@@ -349,21 +748,21 @@ msgid ""
 "</ol> "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:137
+#: ../raphodo/didyouknow.py:166
 msgid ""
 "One of Rapid Photo Downloader's most useful features is its ability to "
 "automatically generate download subfolders and rename files as it downloads, "
 "using a scheme of your choosing."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:143
+#: ../raphodo/didyouknow.py:172
 msgid ""
 "To specify where you want your files downloaded and how you want them named, "
 "open the appropriate panel on the right-side of the application window: "
 "<b>Destination</b>, <b>Rename</b>, or <b>Job Code</b>."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:150
+#: ../raphodo/didyouknow.py:179
 msgid ""
 "\n"
 "When thinking about your download directory structure, keep in mind two "
@@ -388,7 +787,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:167
+#: ../raphodo/didyouknow.py:196
 msgid ""
 "\n"
 "You can download photos and videos to the same destination folder, or "
@@ -401,14 +800,14 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:177
+#: ../raphodo/didyouknow.py:206
 msgid ""
 "Automatically generated download subfolders can contain further "
 "automatically generated subfolders if need be. A common scheme is to create "
 "a year subfolder and then a series of year-month-day subfolders within it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:186
+#: ../raphodo/didyouknow.py:215
 msgid ""
 "\n"
 "Whenever possible, the program previews the download subfolders of photos "
@@ -426,7 +825,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:201
+#: ../raphodo/didyouknow.py:230
 msgid ""
 "\n"
 "Download subfolder names are typically generated using some or all of the "
@@ -450,7 +849,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:219
+#: ../raphodo/didyouknow.py:248
 msgid ""
 "\n"
 "To automatically create download subfolders as you download, \n"
@@ -460,7 +859,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:227
+#: ../raphodo/didyouknow.py:256
 msgid ""
 "\n"
 "Using the drop-down menu, select a built-in preset or click on <b>Custom</b> "
@@ -470,20 +869,20 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:237
+#: ../raphodo/didyouknow.py:266
 msgid ""
 "It's easy to download raw images into one folder, and jpeg images into "
 "another. Simply use the <b>Filename Extension</b> as part of your download "
 "subfolder generation scheme:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:242
+#: ../raphodo/didyouknow.py:271
 msgid ""
 "This illustration shows a saved custom preset named &quot;My custom "
 "preset&quot;."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:246
+#: ../raphodo/didyouknow.py:275
 msgid ""
 "\n"
 "You do not have to create nested download subfolders. This illustration "
@@ -494,7 +893,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:256
+#: ../raphodo/didyouknow.py:285
 msgid ""
 "\n"
 "Although there are many built-in date/time naming options, you may find that "
@@ -508,7 +907,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:265
+#: ../raphodo/didyouknow.py:294
 msgid ""
 "\n"
 "Read more about all the ways you can generate download subfolder names and "
@@ -518,7 +917,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:273
+#: ../raphodo/didyouknow.py:302
 msgid ""
 "\n"
 "<b>Job Codes</b> let you easily enter text that describes sets of photos and "
@@ -530,7 +929,7 @@ msgid ""
 "&quot;Green Bazaar&quot;: \n"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:282
+#: ../raphodo/didyouknow.py:311
 msgid ""
 "\n"
 "You can apply new or existing Job Codes before you start a download. If "
@@ -541,28 +940,28 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:291
+#: ../raphodo/didyouknow.py:320
 msgid "Look for hints to guide you when working with Job Codes:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:295
+#: ../raphodo/didyouknow.py:324
 msgid ""
 "Hints will vary depending on the context, such as when the mouse is hovering "
 "over a button."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:301
+#: ../raphodo/didyouknow.py:330
 msgid ""
 "\n"
 "When you give your photos and videos unique filenames, you'll never be "
 "confused as to \n"
 "which file is which. Using <b>sequence numbers</b> to make filenames unique "
 "is highly \n"
-"recommended!.\n"
+"recommended!\n"
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:309
+#: ../raphodo/didyouknow.py:338
 msgid ""
 "\n"
 "<p>Four types of sequence values are available to help you assign unique "
@@ -584,7 +983,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:327
+#: ../raphodo/didyouknow.py:356
 msgid ""
 "\n"
 "The <b>Rename</b> panel allows you to configure file renaming. To rename "
@@ -593,7 +992,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:334
+#: ../raphodo/didyouknow.py:363
 msgid ""
 "\n"
 "<p>The <b>Synchronize RAW + JPEG</b> option is useful if you use the RAW + "
@@ -612,7 +1011,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:348
+#: ../raphodo/didyouknow.py:377
 msgid ""
 "\n"
 "You can have your photos and videos backed up to multiple locations as they "
@@ -623,13 +1022,13 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:356
+#: ../raphodo/didyouknow.py:385
 msgid ""
 "In this example, the drive <b>photobackup</b> does not contain a folder "
 "named <tt>Videos</tt>, so videos will not be backed up to it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:362
+#: ../raphodo/didyouknow.py:391
 msgid ""
 "\n"
 "Several of the program's preferences can be set from the command line, "
@@ -640,7 +1039,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:372
+#: ../raphodo/didyouknow.py:396
+msgid "You can also import program preferences from the older 0.4 version."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:401
 msgid ""
 "\n"
 "Rapid Photo Downloader deals with three types of cache:\n"
@@ -666,23 +1069,23 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:431
+#: ../raphodo/didyouknow.py:460
 msgid "Tip of the Day"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:439
+#: ../raphodo/didyouknow.py:468
 msgid "Did you know...?"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:466
+#: ../raphodo/didyouknow.py:495
 msgid "Show tips on startup"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:470
+#: ../raphodo/didyouknow.py:499
 msgid "&Next"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:471
+#: ../raphodo/didyouknow.py:500
 msgid "&Previous"
 msgstr ""
 
@@ -789,69 +1192,69 @@ msgstr ""
 msgid "%(days)d days, %(hours)d hours"
 msgstr ""
 
-#: ../raphodo/errorlog.py:65
+#: ../raphodo/errorlog.py:66
 msgid "Find"
 msgstr ""
 
-#: ../raphodo/errorlog.py:135
+#: ../raphodo/errorlog.py:136
 #, fuzzy
 msgid "Error Reports - Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: ../raphodo/errorlog.py:170
+#: ../raphodo/errorlog.py:171
 msgid "Find in reports"
 msgstr ""
 
-#: ../raphodo/errorlog.py:187
+#: ../raphodo/errorlog.py:188
 msgid "Find the previous occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:192
+#: ../raphodo/errorlog.py:193
 msgid "Find the next occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:194
+#: ../raphodo/errorlog.py:195
 msgid "&Highlight All"
 msgstr ""
 
-#: ../raphodo/errorlog.py:195
+#: ../raphodo/errorlog.py:196
 msgid "Highlight all occurrences of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:196
+#: ../raphodo/errorlog.py:197
 msgid "&Match Case"
 msgstr ""
 
-#: ../raphodo/errorlog.py:197
+#: ../raphodo/errorlog.py:198
 msgid "Search with case sensitivity"
 msgstr ""
 
-#: ../raphodo/errorlog.py:198
+#: ../raphodo/errorlog.py:199
 msgid "&Whole Words"
 msgstr ""
 
-#: ../raphodo/errorlog.py:199
+#: ../raphodo/errorlog.py:200
 msgid "Search whole words only"
 msgstr ""
 
-#: ../raphodo/errorlog.py:209 ../raphodo/errorlog.py:341
+#: ../raphodo/errorlog.py:210 ../raphodo/errorlog.py:345
 #, python-format
 msgid "%s of %s matches"
 msgstr ""
 
-#: ../raphodo/errorlog.py:228
+#: ../raphodo/errorlog.py:232
 msgid "Clear"
 msgstr ""
 
-#: ../raphodo/errorlog.py:328
+#: ../raphodo/errorlog.py:332
 msgid "Phrase not found"
 msgstr ""
 
-#: ../raphodo/errorlog.py:487
+#: ../raphodo/errorlog.py:491
 msgid "Search pending..."
 msgstr ""
 
-#: ../raphodo/errorlog.py:535
+#: ../raphodo/errorlog.py:539
 msgid ""
 "The number of new entries added to the Error Report since it was last open. "
 "Click to open the Error Report."
@@ -889,7 +1292,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1601
+#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1643
 msgid "Open in File Browser..."
 msgstr ""
 
@@ -907,533 +1310,533 @@ msgstr ""
 msgid "%s (location does not exist)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:186
+#: ../raphodo/generatenameconfig.py:190
 msgid "Date time"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:187
+#: ../raphodo/generatenameconfig.py:191
 msgid "Text"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:188 ../raphodo/rapid.py:2053
+#: ../raphodo/generatenameconfig.py:192 ../raphodo/rapid.py:2125
 msgid "Filename"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:189 ../raphodo/preferencedialog.py:488
+#: ../raphodo/generatenameconfig.py:193 ../raphodo/preferencedialog.py:724
 msgid "Metadata"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:190
+#: ../raphodo/generatenameconfig.py:194
 msgid "Sequences"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: ../raphodo/generatenameconfig.py:193
+#: ../raphodo/generatenameconfig.py:197
 msgid "Job code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:194
+#: ../raphodo/generatenameconfig.py:198
 msgid "Image date"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:195
+#: ../raphodo/generatenameconfig.py:199
 msgid "Video date"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:196
+#: ../raphodo/generatenameconfig.py:200
 msgid "Today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:197
+#: ../raphodo/generatenameconfig.py:201
 msgid "Yesterday"
 msgstr ""
 
 #. Translators: Download time is the time and date that the download started (when the
 #. user clicked the Download button)
-#: ../raphodo/generatenameconfig.py:200
+#: ../raphodo/generatenameconfig.py:204
 msgid "Download time"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:203
+#: ../raphodo/generatenameconfig.py:207
 msgid "Name"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:206 ../raphodo/rapid.py:2054
+#: ../raphodo/generatenameconfig.py:210 ../raphodo/rapid.py:2126
 msgid "Extension"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:209
+#: ../raphodo/generatenameconfig.py:213
 msgid "Image number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:210
+#: ../raphodo/generatenameconfig.py:214
 msgid "Video number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:213
+#: ../raphodo/generatenameconfig.py:217
 msgid "Aperture"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:216
+#: ../raphodo/generatenameconfig.py:220
 msgid "ISO"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:219
+#: ../raphodo/generatenameconfig.py:223
 msgid "Exposure time"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:222
+#: ../raphodo/generatenameconfig.py:226
 msgid "Focal length"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:225
+#: ../raphodo/generatenameconfig.py:229
 msgid "Camera make"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:228
+#: ../raphodo/generatenameconfig.py:232
 msgid "Camera model"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:231
+#: ../raphodo/generatenameconfig.py:235
 msgid "Short camera model"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:234
+#: ../raphodo/generatenameconfig.py:238
 msgid "Hyphenated short camera model"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:237
+#: ../raphodo/generatenameconfig.py:241
 msgid "Serial number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:240
+#: ../raphodo/generatenameconfig.py:244
 msgid "Shutter count"
 msgstr ""
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: ../raphodo/generatenameconfig.py:242
+#: ../raphodo/generatenameconfig.py:246
 msgid "File number"
 msgstr ""
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:244
+#: ../raphodo/generatenameconfig.py:248
 msgid "Folder only"
 msgstr ""
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:246
+#: ../raphodo/generatenameconfig.py:250
 msgid "Folder and file"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:249
+#: ../raphodo/generatenameconfig.py:253
 msgid "Owner name"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:250
+#: ../raphodo/generatenameconfig.py:254
 msgid "Codec"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:251
+#: ../raphodo/generatenameconfig.py:255
 msgid "Width"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:252
+#: ../raphodo/generatenameconfig.py:256
 msgid "Height"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:253
+#: ../raphodo/generatenameconfig.py:257
 msgid "Length"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:254
+#: ../raphodo/generatenameconfig.py:258
 msgid "Frames Per Second"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:255
+#: ../raphodo/generatenameconfig.py:259
 msgid "Artist"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:256
+#: ../raphodo/generatenameconfig.py:260
 msgid "Copyright"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:259
+#: ../raphodo/generatenameconfig.py:263
 msgid "Downloads today"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:262
+#: ../raphodo/generatenameconfig.py:266
 msgid "Session number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:265
+#: ../raphodo/generatenameconfig.py:269
 msgid "Subfolder number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:268
+#: ../raphodo/generatenameconfig.py:272
 msgid "Stored number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: ../raphodo/generatenameconfig.py:271
+#: ../raphodo/generatenameconfig.py:275
 msgid "Sequence letter"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:274
+#: ../raphodo/generatenameconfig.py:278
 msgid "All digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:277
+#: ../raphodo/generatenameconfig.py:281
 msgid "Last digit"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:280
+#: ../raphodo/generatenameconfig.py:284
 msgid "Last 2 digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:283
+#: ../raphodo/generatenameconfig.py:287
 msgid "Last 3 digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:286
+#: ../raphodo/generatenameconfig.py:290
 msgid "Last 4 digits"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:289
+#: ../raphodo/generatenameconfig.py:293
 msgid "Original Case"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:292
+#: ../raphodo/generatenameconfig.py:296
 msgid "UPPERCASE"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:295
+#: ../raphodo/generatenameconfig.py:299
 msgid "lowercase"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:296
+#: ../raphodo/generatenameconfig.py:300
 msgid "One digit"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:297
+#: ../raphodo/generatenameconfig.py:301
 msgid "Two digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:298
+#: ../raphodo/generatenameconfig.py:302
 msgid "Three digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:299
+#: ../raphodo/generatenameconfig.py:303
 msgid "Four digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:300
+#: ../raphodo/generatenameconfig.py:304
 msgid "Five digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:301
+#: ../raphodo/generatenameconfig.py:305
 msgid "Six digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:302
+#: ../raphodo/generatenameconfig.py:306
 msgid "Seven digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:305
+#: ../raphodo/generatenameconfig.py:309
 msgid "Subseconds"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:308 ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:312 ../raphodo/generatenameconfig.py:393
 msgid "YYYYMMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:311 ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:315 ../raphodo/generatenameconfig.py:394
 msgid "YYYY-MM-DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:314 ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:318 ../raphodo/generatenameconfig.py:395
 msgid "YYYY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:317
+#: ../raphodo/generatenameconfig.py:321
 msgid "YYMMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:320
+#: ../raphodo/generatenameconfig.py:324
 msgid "YY-MM-DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:323
+#: ../raphodo/generatenameconfig.py:327
 msgid "YY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:326
+#: ../raphodo/generatenameconfig.py:330
 msgid "MMDDYYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:329
+#: ../raphodo/generatenameconfig.py:333
 msgid "MMDDYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:332
+#: ../raphodo/generatenameconfig.py:336
 msgid "MMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:335
+#: ../raphodo/generatenameconfig.py:339
 msgid "DDMMYYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:338
+#: ../raphodo/generatenameconfig.py:342
 msgid "DDMMYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:341 ../raphodo/generatenameconfig.py:389
-#: ../raphodo/generatenameconfig.py:390 ../raphodo/generatenameconfig.py:391
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:345 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:394 ../raphodo/generatenameconfig.py:395
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:397
 msgid "YYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:344
+#: ../raphodo/generatenameconfig.py:348
 msgid "YY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:347
+#: ../raphodo/generatenameconfig.py:351
 msgid "MM"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:350
+#: ../raphodo/generatenameconfig.py:354
 msgid "DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:353
+#: ../raphodo/generatenameconfig.py:357
 msgid "Month (full)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:356
+#: ../raphodo/generatenameconfig.py:360
 msgid "Month (abbreviated)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:359
+#: ../raphodo/generatenameconfig.py:363
 msgid "HHMMSS"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:362
+#: ../raphodo/generatenameconfig.py:366
 msgid "HHMM"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:365
+#: ../raphodo/generatenameconfig.py:369
 msgid "HH-MM-SS"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:368
+#: ../raphodo/generatenameconfig.py:372
 msgid "HH-MM"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:371
+#: ../raphodo/generatenameconfig.py:375
 msgid "HH"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:374
+#: ../raphodo/generatenameconfig.py:378
 msgid "MM (minutes)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:377
+#: ../raphodo/generatenameconfig.py:381
 msgid "SS"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:393
 msgid "Date"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:394
 msgid "Date (hyphens)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:395
 msgid "Date (underscores)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:438
-#: ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:442
+#: ../raphodo/generatenameconfig.py:537
 msgid "Date and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392
+#: ../raphodo/generatenameconfig.py:396
 msgid "YYYYMM_Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "Date and Job Code Subfolder"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "YYYYMM"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393 ../raphodo/jobcodepanel.py:198
-#: ../raphodo/nameeditor.py:827 ../raphodo/rapid.py:1809
+#: ../raphodo/generatenameconfig.py:397 ../raphodo/jobcodepanel.py:199
+#: ../raphodo/nameeditor.py:833 ../raphodo/rapid.py:1852
 #: ../raphodo/renamepanel.py:83 ../raphodo/renamepanel.py:241
 msgid "Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:433 ../raphodo/generatenameconfig.py:512
+#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:532
 msgid "Original Filename"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 #, fuzzy
 msgid "Date-Time and Downloads today"
 msgstr "Invalid Downloads Today value.\n"
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "YYYYMMDD-HHMM-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 #, fuzzy
 msgid "Date and Downloads today"
 msgstr "Invalid Downloads Today value.\n"
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "YYYYMMDD-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "Date-Time and Image number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "YYYYMMDD-1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "Date-Time and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "YYYYMMDD-HHMM-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:442 ../raphodo/generatenameconfig.py:537
 msgid "YYYYMMDD-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "Date-Time and Video number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "YYYYMMDD_1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "Resolution"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "YYYYMMDD-HHMM-1-1920x1080"
 msgstr ""
 
@@ -1492,76 +1895,76 @@ msgstr ""
 msgid "&Remember this choice"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:185
+#: ../raphodo/jobcodepanel.py:186
 msgid ""
 "Select photos and videos to be able to apply a new or existing Job Code to "
 "them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:186
+#: ../raphodo/jobcodepanel.py:187
 msgid "The new Job Code will be applied to all selected photos and/or videos."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:187
+#: ../raphodo/jobcodepanel.py:188
 msgid ""
 "Click the Apply button to apply the current Job Code to all selected photos "
 "and/or videos. You can also simply double click the Job Code."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:189
+#: ../raphodo/jobcodepanel.py:190
 msgid ""
 "Removing a Job Code removes it only from the list of saved Job Codes, not "
 "from any photos or videos that it may have been applied to."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:191
+#: ../raphodo/jobcodepanel.py:192
 msgid ""
 "If you want to use Job Codes, configure file renaming or destination "
 "subfolder names to use them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:197
+#: ../raphodo/jobcodepanel.py:198
 msgid "Last Used"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:202
+#: ../raphodo/jobcodepanel.py:203
 msgid "Job Code Sort:"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:205 ../raphodo/rapid.py:2061
+#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2133
 msgid "Ascending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2062
+#: ../raphodo/jobcodepanel.py:207 ../raphodo/rapid.py:2134
 msgid "Descending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:216
+#: ../raphodo/jobcodepanel.py:217
 msgid "&New..."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:220
+#: ../raphodo/jobcodepanel.py:221
 msgid "&Apply"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:224
+#: ../raphodo/jobcodepanel.py:225
 msgid "&Remove"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:228 ../raphodo/preferencedialog.py:125
-#: ../raphodo/preferencedialog.py:154 ../raphodo/preferencedialog.py:433
+#: ../raphodo/jobcodepanel.py:229 ../raphodo/preferencedialog.py:200
+#: ../raphodo/preferencedialog.py:229 ../raphodo/preferencedialog.py:531
 msgid "Remove All"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:427
+#: ../raphodo/jobcodepanel.py:428
 msgid "Do you really want to remove all the Job Codes?"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:429
+#: ../raphodo/jobcodepanel.py:430
 msgid "Remove all Job Codes"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:492
+#: ../raphodo/jobcodepanel.py:493
 msgid "Job Codes"
 msgstr ""
 
@@ -1572,43 +1975,59 @@ msgstr ""
 msgid "<i><b>Hint:</b> %(message)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:418 ../raphodo/nameeditor.py:432
+#: ../raphodo/nameeditor.py:423 ../raphodo/nameeditor.py:437
 #, python-format
 msgid "%(description)s - %(elements)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:512
+#: ../raphodo/nameeditor.py:517
 msgid "Save New Custom Preset..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:513
+#: ../raphodo/nameeditor.py:518
 msgid "Remove All Custom Presets..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:559
+#: ../raphodo/nameeditor.py:564
 msgid "(New Custom Preset)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:576
+#: ../raphodo/nameeditor.py:581
 #, python-format
 msgid "%s (edited)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:579 ../raphodo/nameeditor.py:1370
+#: ../raphodo/nameeditor.py:584 ../raphodo/nameeditor.py:1379
 #, python-format
 msgid "Update Custom Preset \"%s\""
 msgstr ""
 
-#: ../raphodo/nameeditor.py:667
+#: ../raphodo/nameeditor.py:672
 #, fuzzy
 msgid "Save New Custom Preset - Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: ../raphodo/nameeditor.py:675
+#: ../raphodo/nameeditor.py:680
 msgid "Preset Name:"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:836
+#: ../raphodo/nameeditor.py:799
+msgid "Photo Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:805
+msgid "Video Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:811
+msgid "Photo Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:817
+msgid "Video Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:842
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>There is insufficient data to "
 "fully generate the name. Please use other renaming options.</i>"
@@ -1617,7 +2036,7 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees.
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:846
+#: ../raphodo/nameeditor.py:853
 #, python-format
 msgid "The character</i> %(separator)s <i>creates a new subfolder level."
 msgstr ""
@@ -1625,43 +2044,43 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:851
+#: ../raphodo/nameeditor.py:858
 #, python-format
 msgid ""
 "There is no need start or end with the folder separator </i> "
 "%(separator)s<i>, because it is added automatically."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:859
+#: ../raphodo/nameeditor.py:866
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>Unique filenames may not be "
 "generated. Make filenames unique by using Sequence values.</i>"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:882 ../raphodo/renamepanel.py:121
+#: ../raphodo/nameeditor.py:889 ../raphodo/renamepanel.py:121
 msgid "Preset:"
 msgstr ""
 
 #. Translators: appears in a combobox, e.g. Image Date (YYYY)
-#: ../raphodo/nameeditor.py:959 ../raphodo/nameeditor.py:980
+#: ../raphodo/nameeditor.py:966 ../raphodo/nameeditor.py:987
 #, python-brace-format
 msgid "{choice} ({variant})"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1005 ../raphodo/preferencedialog.py:530
+#: ../raphodo/nameeditor.py:1012 ../raphodo/preferencedialog.py:783
 msgid "Get help online..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1025
+#: ../raphodo/nameeditor.py:1034
 msgid "Insert"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1351
+#: ../raphodo/nameeditor.py:1360
 #, fuzzy
 msgid "Save Preset - Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: ../raphodo/nameeditor.py:1356
+#: ../raphodo/nameeditor.py:1365
 msgid ""
 "<b>Do you want to save the changes in a new custom preset?</"
 "b><br><br>Creating a custom preset is not required, but can help you keep "
@@ -1669,7 +2088,7 @@ msgid ""
 "regardless of whether you create a new custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1365
+#: ../raphodo/nameeditor.py:1374
 msgid ""
 "<b>Do you want to save the changes in a custom preset?</b><br><br>If you "
 "like, you can create a new custom preset or update the existing custom "
@@ -1677,138 +2096,169 @@ msgid ""
 "regardless of whether you save a custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1372
+#: ../raphodo/nameeditor.py:1381
 msgid "Save New Custom Preset"
 msgstr ""
 
-#: ../raphodo/newversion.py:306
+#: ../raphodo/newversion.py:312
 msgid "Checking for new version..."
 msgstr ""
 
-#: ../raphodo/newversion.py:307
+#: ../raphodo/newversion.py:313
 msgid "You are running the latest version."
 msgstr ""
 
-#: ../raphodo/newversion.py:308
+#: ../raphodo/newversion.py:314
 msgid "Failed to contact the update server."
 msgstr ""
 
-#: ../raphodo/newversion.py:310
+#: ../raphodo/newversion.py:316
 #, python-format
 msgid "A new version of Rapid Photo Downloader (%s) is available."
 msgstr ""
 
-#: ../raphodo/newversion.py:312
+#: ../raphodo/newversion.py:318
 msgid "Do you want to download the new version?"
 msgstr ""
 
-#: ../raphodo/newversion.py:313
+#: ../raphodo/newversion.py:319
 #, python-format
 msgid "Changes in the new release can be viewed <a href=\"%s\">here</a>."
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the s key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:340 ../raphodo/newversion.py:353
+#: ../raphodo/newversion.py:348 ../raphodo/newversion.py:363
 msgid "&Skip this release"
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the o key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:356
+#: ../raphodo/newversion.py:366
 #, fuzzy
 msgid "&Open Download Page"
 msgstr "Invalid Downloads Today value.\n"
 
-#: ../raphodo/newversion.py:376
+#: ../raphodo/newversion.py:386
 #, fuzzy
 msgid "Rapid Photo Downloader updates"
 msgstr "Rapid Photo Downloader"
 
 #. Translators: shows how much of a file has been downloaded e.g  123 KB of 1.3 MB
-#: ../raphodo/newversion.py:478
+#: ../raphodo/newversion.py:488
 #, python-format
 msgid "%(downloaded)s of %(total)s"
 msgstr ""
 
-#: ../raphodo/newversion.py:495
+#: ../raphodo/newversion.py:507
 msgid "Downloading..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:76
+#: ../raphodo/preferencedialog.py:86
 msgid "Preferences"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Automation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85 ../raphodo/preferencedialog.py:343
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/preferencedialog.py:428
 msgid "Error Handling"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:109
+msgid "Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:109 ../raphodo/preferencedialog.py:119
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:94
+#: ../raphodo/preferencedialog.py:147
 msgid "Device Scanning"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:96
+#: ../raphodo/preferencedialog.py:148
 msgid "Scan only external devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:98
+#: ../raphodo/preferencedialog.py:150
 msgid ""
 "Scan for photos and videos only on devices that are external to the "
 "computer,\n"
 "including cameras, memory cards, external hard drives, and USB flash drives."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:102
-msgid "Scan non-camera devices lacking a DCIM folder"
+#: ../raphodo/preferencedialog.py:153
+msgid "Scan only specific folders on devices"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:155
+msgid ""
+"Scan for photos and videos only in the folders specified below (except "
+"paths\n"
+"specified in Ignored Paths).\n"
+"\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:161
+msgid "Folders to scan:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:164
+msgid ""
+"Folders at the base level of device file systems that will be scanned\n"
+"for photos and videos."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:167 ../raphodo/preferencedialog.py:219
+msgid "Add..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:104
+#: ../raphodo/preferencedialog.py:169
 msgid ""
-"Scan the entirety of a device for photos and videos, irrespective of whether "
-"it contains a DCIM folder,\n"
-"as opposed to only scanning within a DCIM folder.\n"
+"Add a folder to the list of folders to scan for photos and videos.\n"
 "\n"
-"Changing this setting causes all devices to be scanned again.\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:172 ../raphodo/preferencedialog.py:198
+#: ../raphodo/preferencedialog.py:224 ../raphodo/preferencedialog.py:529
+msgid "Remove"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:174
+msgid ""
+"Remove a folder from the list of folders to scan for photos and videos.\n"
 "\n"
-"Note: With cameras, only the DCIM folder is scanned."
+"Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:116
+#: ../raphodo/preferencedialog.py:191
 msgid "Devices that have been set to automatically ignore or download from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:117
+#: ../raphodo/preferencedialog.py:192
 msgid "Remembered Devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:121
+#: ../raphodo/preferencedialog.py:196
 msgid ""
 "Remove a device from the list of devices to automatically ignore or download "
 "from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:123 ../raphodo/preferencedialog.py:149
-#: ../raphodo/preferencedialog.py:431
-msgid "Remove"
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:127
+#: ../raphodo/preferencedialog.py:202
 msgid ""
 "Clear the list of devices from which to automatically ignore or download "
 "from.\n"
@@ -1816,315 +2266,434 @@ msgid ""
 "Note: Changes take effect when the computer is next scanned for devices."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:140
+#: ../raphodo/preferencedialog.py:215
 msgid "Ignored Paths"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:141
+#: ../raphodo/preferencedialog.py:216
 msgid ""
 "The end part of a path that should never be scanned for photos or videos."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:144
-msgid "Add..."
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:146
+#: ../raphodo/preferencedialog.py:221
 msgid ""
 "Add a path to the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:151
+#: ../raphodo/preferencedialog.py:226
 msgid ""
 "Remove a path from the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:156
+#: ../raphodo/preferencedialog.py:231
 msgid ""
 "Clear the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:164
+#: ../raphodo/preferencedialog.py:239
 msgid ""
 "Use python-style <a href=\"http://damonlynch.net/rapid/documentation/"
 "#regularexpressions\">regular expressions</a>"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:168
+#: ../raphodo/preferencedialog.py:243
 msgid ""
 "Use regular expressions in the list of ignored paths.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:208
+#: ../raphodo/preferencedialog.py:283
 msgid "Program Automation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:209
+#: ../raphodo/preferencedialog.py:284
 msgid "Start downloading at program startup"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:210
+#: ../raphodo/preferencedialog.py:285
 msgid "Start downloading upon device insertion"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:211
+#: ../raphodo/preferencedialog.py:286
 msgid "Unmount (eject) device upon download completion"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:212
+#: ../raphodo/preferencedialog.py:287
 msgid "Exit program when download completes"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:213
+#: ../raphodo/preferencedialog.py:288
 msgid "Exit program even if download had warnings or errors"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:240
+#: ../raphodo/preferencedialog.py:315
 msgid "Thumbnail Generation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:241
+#: ../raphodo/preferencedialog.py:316
 msgid "Generate thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:242
+#: ../raphodo/preferencedialog.py:318
 msgid "Generate thumbnails to show in the main program window"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:244
+#: ../raphodo/preferencedialog.py:320
 msgid "Cache thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:245
+#: ../raphodo/preferencedialog.py:323
 msgid ""
 "Save thumbnails shown in the main program window in a thumbnail cache unique "
 "to Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:247
+#: ../raphodo/preferencedialog.py:327
 msgid "Generate system thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:248
+#: ../raphodo/preferencedialog.py:330
 msgid ""
 "While downloading, save thumbnails that can be used by desktop file managers "
 "and other programs"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:255
+#: ../raphodo/preferencedialog.py:339
 msgid "Number of CPU cores used to generate thumbnails."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:256
+#: ../raphodo/preferencedialog.py:340
 msgid "CPU cores:"
 msgstr ""
 
 #. Translators: the * acts as an asterisk to denote a reference to an annotation
 #. such as '* Takes effect upon program restart'
-#: ../raphodo/preferencedialog.py:271 ../raphodo/preferencedialog.py:317
+#: ../raphodo/preferencedialog.py:355 ../raphodo/preferencedialog.py:401
 msgid "*"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:294
+#: ../raphodo/preferencedialog.py:378
 msgid "Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:296
+#: ../raphodo/preferencedialog.py:380
 msgid "Calculating..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:302
+#: ../raphodo/preferencedialog.py:386
 msgid "days"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:303
+#: ../raphodo/preferencedialog.py:387
 msgid "forever"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:308
+#: ../raphodo/preferencedialog.py:392
 msgid "Cache size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:310
+#: ../raphodo/preferencedialog.py:394
 msgid "Number of thumbnails:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:312
+#: ../raphodo/preferencedialog.py:396
 msgid "Database size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:314
+#: ../raphodo/preferencedialog.py:398
 msgid "Cache unaccessed thumbnails for:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:322
+#: ../raphodo/preferencedialog.py:406
 msgid "Purge Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:323
+#: ../raphodo/preferencedialog.py:408
 msgid "Optimize Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:336
+#: ../raphodo/preferencedialog.py:421
 msgid "* Takes effect upon program restart"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:346
+#: ../raphodo/preferencedialog.py:431
 msgid "Skip download"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:347
+#: ../raphodo/preferencedialog.py:432
 msgid "Don't download the file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:348
+#: ../raphodo/preferencedialog.py:433
 msgid "Add unique identifier"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:349
+#: ../raphodo/preferencedialog.py:436
 msgid ""
 "Add an identifier like _1 or _2 to the end of the filename, immediately "
 "before the file's extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:355
+#: ../raphodo/preferencedialog.py:444
 msgid "Overwrite"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:356
+#: ../raphodo/preferencedialog.py:445
 msgid "Overwrite the previously backed up file"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:357
+#: ../raphodo/preferencedialog.py:446
 msgid "Skip"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:358
+#: ../raphodo/preferencedialog.py:448
 msgid "Don't overwrite the backup file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:364
+#: ../raphodo/preferencedialog.py:455
 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 identifier:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:378
+#: ../raphodo/preferencedialog.py:464
+msgid ""
+"Using sequence numbers to automatically generate unique filenames is "
+"strongly recommended. Configure file renaming in the Rename panel in the "
+"main window."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:473
 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 ""
 
-#: ../raphodo/preferencedialog.py:398
+#: ../raphodo/preferencedialog.py:494
 msgid "Program Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:399
+#: ../raphodo/preferencedialog.py:495
 msgid "Show a warning when:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:402
+#: ../raphodo/preferencedialog.py:498
 msgid "Downloading files currently not displayed"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:403
+#: ../raphodo/preferencedialog.py:499
 msgid ""
 "Warn when about to download files that are not displayed in the main window."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:405
+#: ../raphodo/preferencedialog.py:501
 msgid "Backup destinations are missing"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:406
+#: ../raphodo/preferencedialog.py:502
 msgid "Warn before starting a download if it is not possible to back up files."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:408
+#: ../raphodo/preferencedialog.py:504
 msgid "Program libraries are missing or broken"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:409
+#: ../raphodo/preferencedialog.py:505
 msgid ""
 "Warn if a software library used by Rapid Photo Downloader is missing or not "
 "functioning."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:412
+#: ../raphodo/preferencedialog.py:508
 msgid "Filesystem metadata cannot be set"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:413
+#: ../raphodo/preferencedialog.py:509
 msgid ""
 "Warn if there is an error setting a file's filesystem metadata, such as its "
 "modification time."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:416
+#: ../raphodo/preferencedialog.py:512
 msgid "Encountering unhandled files"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:417
+#: ../raphodo/preferencedialog.py:513
 msgid ""
 "Warn after scanning a device or this computer if there are unrecognized "
 "files that will not be included in the download."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:420
+#: ../raphodo/preferencedialog.py:517
 msgid "Do not warn about unhandled files with extensions:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:424
+#: ../raphodo/preferencedialog.py:522
 msgid ""
 "File extensions are case insensitive and do not need to include the leading "
 "dot."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:427
+#: ../raphodo/preferencedialog.py:525
 msgid "Add"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:428
+#: ../raphodo/preferencedialog.py:526
 msgid ""
 "Add a file extension to the list of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:430
+#: ../raphodo/preferencedialog.py:528
 msgid ""
 "Remove a file extension from the list of unhandled file types to not warn "
 "about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:434
+#: ../raphodo/preferencedialog.py:532
 msgid ""
 "Clear the list of file extensions of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:469
+#: ../raphodo/preferencedialog.py:568
+msgid "Photo and Video Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:571
+msgid "Consolidate files across devices and downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:574
+msgid ""
+"Analyze the results of device scans looking for duplicate files and matching "
+"RAW and JPEG pairs,\n"
+"comparing them across multiple devices and download sessions."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:580
+msgid "Treat matching RAW and JPEG files as:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:581
+msgid "One photo"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:582
+msgid "Two photos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:584
+msgid ""
+"Display matching pairs of RAW and JPEG photos as one photo, and if marked, "
+"download both."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:589
+msgid ""
+"Display matching pairs of RAW and JPEG photos as two different photos. You "
+"can still synchronize their sequence numbers."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:598
+msgid "With matching RAW and JPEG photos:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:600
+msgid "Do not mark JPEG for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:601
+msgid "Do not mark RAW for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:602
+msgid "Mark both for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:609
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"JPEG for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:614
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"RAW for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:619
+msgid ""
+"When matching RAW and JPEG photos are found, automatically mark both for "
+"download."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:625
+msgid ""
+"If you disable file consolidation, choose what to do when a download device "
+"is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:631
+msgid ""
+"When a download device is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:642
+msgid "Clear completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:643
+msgid "Keep displaying completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:644
+msgid "Prompt for what to do"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:649
+msgid ""
+"Automatically clear the display of completed downloads whenever a new "
+"download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:654
+msgid ""
+"Keep displaying completed downloads whenever a new download device is "
+"inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:658
+msgid ""
+"Prompt whether to keep displaying completed downloads or clear them whenever "
+"a new download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:702
 msgid "Version Check"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:470
+#: ../raphodo/preferencedialog.py:703
 msgid "Check for new version at startup"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:471
+#: ../raphodo/preferencedialog.py:705
 msgid "Check for a new version of the program each time the program starts."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:473
+#: ../raphodo/preferencedialog.py:707
 msgid "Include development releases"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:474
+#: ../raphodo/preferencedialog.py:709
 msgid ""
 "Include alpha, beta and other development releases when checking for a new "
 "version of the program.\n"
@@ -2133,11 +2702,11 @@ msgid ""
 "occur."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:489
+#: ../raphodo/preferencedialog.py:725
 msgid "Ignore DNG date/time metadata on MTP devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:490
+#: ../raphodo/preferencedialog.py:727
 msgid ""
 "Ignore date/time metadata in DNG files located on MTP devices, and use the "
 "file's modification time instead.\n"
@@ -2146,70 +2715,87 @@ msgid ""
 "metadata."
 msgstr ""
 
+#: ../raphodo/preferencedialog.py:741
+#, fuzzy
+msgid "Completed Downloads"
+msgstr "Rapid Photo Downloader"
+
 #. Translators: substituted value is a description for the set of preferences
 #. shown in the preference dialog window, e.g. Devices, Automation, etc.
 #. This string is shown in a tooltip for the "Restore Defaults" button
-#: ../raphodo/preferencedialog.py:710
+#: ../raphodo/preferencedialog.py:1067
 #, python-format
 msgid "Restores default %s preference values"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:832
+#: ../raphodo/preferencedialog.py:1208
 msgid ""
 "Do you want to purge the thumbnail cache? The cache will be purged when the "
 "program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:835
+#: ../raphodo/preferencedialog.py:1212
 msgid "Purge Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:847
+#: ../raphodo/preferencedialog.py:1225
 msgid ""
 "Do you want to optimize the thumbnail cache? The cache will be optimized "
 "when the program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:850
+#: ../raphodo/preferencedialog.py:1229
 msgid "Optimize Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1045
+#: ../raphodo/preferencedialog.py:1481
+msgid "Enter a Folder to Scan"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1482
+msgid "Specify a folder that will be scanned for photos and videos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1483
+msgid "Folder:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1497
 msgid "Enter a Path to Ignore"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1046
+#: ../raphodo/preferencedialog.py:1498
 msgid "Specify a path that will never be scanned for photos or videos"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1047
+#: ../raphodo/preferencedialog.py:1499
 msgid "Path:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1061
+#: ../raphodo/preferencedialog.py:1513
 msgid "Enter a File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1062
+#: ../raphodo/preferencedialog.py:1514
 msgid "Specify a file extension (without the leading dot)"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1063 ../raphodo/renamepanel.py:122
+#: ../raphodo/preferencedialog.py:1515 ../raphodo/renamepanel.py:122
 msgid "Extension:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1078
+#: ../raphodo/preferencedialog.py:1530
 msgid "Invalid File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1079
+#: ../raphodo/preferencedialog.py:1531
 #, python-format
 msgid ""
 "The file extension <b>%s</b> is recognized by Rapid Photo Downloader, so it "
 "makes no sense to warn about its presence."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1081
+#: ../raphodo/preferencedialog.py:1533
 #, python-format
 msgid ""
 "Recognized file types:\n"
@@ -2235,104 +2821,103 @@ msgstr ""
 msgid "Birthday"
 msgstr ""
 
-#: ../raphodo/preferences.py:614
+#: ../raphodo/preferences.py:624
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr ""
 
-#: ../raphodo/preferences.py:617
+#: ../raphodo/preferences.py:627
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr ""
 
-#: ../raphodo/preferences.py:622
+#: ../raphodo/preferences.py:632
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
 
-#. self.setFlat(True)
 #: ../raphodo/primarybutton.py:72
 msgid "Download 8 Photos and 10 Videos"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:86 ../raphodo/problemnotification.py:208
+#: ../raphodo/problemnotification.py:87 ../raphodo/problemnotification.py:209
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:89
+#: ../raphodo/problemnotification.py:90
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:116
+#: ../raphodo/problemnotification.py:117
 #, python-format
 msgid "GPhoto2 Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:124
+#: ../raphodo/problemnotification.py:125
 msgid ""
 "Unable to initialize the camera, probably because another program is using "
 "it. No files were copied from it."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:134
+#: ../raphodo/problemnotification.py:135
 #, python-format
 msgid "Unable to read directory %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:140
+#: ../raphodo/problemnotification.py:141
 #, python-format
 msgid "Unable to access modification time or size from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:146
+#: ../raphodo/problemnotification.py:147
 #, python-format
 msgid "Unable to read file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:152
+#: ../raphodo/problemnotification.py:153
 #, python-format
 msgid "Unable to write file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:158
+#: ../raphodo/problemnotification.py:159
 #, python-format
 msgid "Unable to move file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:164
+#: ../raphodo/problemnotification.py:165
 #, python-format
 msgid "Unable to remove file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:170
+#: ../raphodo/problemnotification.py:171
 #, python-format
 msgid "Unable to copy file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:176
+#: ../raphodo/problemnotification.py:177
 #, python-format
 msgid "Zero length file %s will not be downloaded"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:182
+#: ../raphodo/problemnotification.py:183
 #, python-format
 msgid "Could not determine filesystem modification time for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:188
+#: ../raphodo/problemnotification.py:189
 #, python-format
 msgid "Unable to load metadata from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:194
+#: ../raphodo/problemnotification.py:195
 #, python-format
 msgid ""
 "Unable to load metadata from %(name)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:202
+#: ../raphodo/problemnotification.py:203
 #, python-format
 msgid ""
 "An error occurred setting a file's filesystem metadata on the filesystem %s. "
@@ -2340,212 +2925,212 @@ msgid ""
 "again."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:216
+#: ../raphodo/problemnotification.py:217
 #, python-format
 msgid "Encountered unhandled file %s. It will not be downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:223
+#: ../raphodo/problemnotification.py:224
 #, python-format
 msgid "%(filetype)s %(destination)s already exists."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:234 ../raphodo/problemnotification.py:262
+#: ../raphodo/problemnotification.py:235 ../raphodo/problemnotification.py:263
 #, python-format
 msgid ""
 "The existing %(filetype)s %(destination)s was last modified on %(date)s at "
 "%(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:245
+#: ../raphodo/problemnotification.py:246
 #, python-format
 msgid "The %(filetype)s %(source)s was not downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:273
+#: ../raphodo/problemnotification.py:274
 #, python-format
 msgid "The %(filetype)s %(source)s was downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:282
+#: ../raphodo/problemnotification.py:283
 #, python-format
 msgid "The unique identifier '%s' was added to the filename."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:298
+#: ../raphodo/problemnotification.py:299
 #, python-format
 msgid ""
 "The existing backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:309
+#: ../raphodo/problemnotification.py:310
 #, python-format
 msgid "The %(filetype)s %(source)s was not backed up from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:326
+#: ../raphodo/problemnotification.py:327
 #, python-format
 msgid ""
 "The previous backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:337
+#: ../raphodo/problemnotification.py:338
 #, python-format
 msgid ""
 "The %(filetype)s %(source)s from %(device)s was backed up, overwriting the "
 "previous backup %(filetype)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:356
+#: ../raphodo/problemnotification.py:357
 #, python-format
 msgid ""
 "When synchronizing RAW + JPEG sequence values, a duplicate %(filetype)s "
 "%(file)s was encountered, and was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:366
+#: ../raphodo/problemnotification.py:367
 msgid ""
 "When synchronizing RAW + JPEG sequence values, photos were detected with the "
 "same filenames, but taken at different times:"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:373
+#: ../raphodo/problemnotification.py:374
 #, 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 ""
 
-#: ../raphodo/problemnotification.py:389
+#: ../raphodo/problemnotification.py:390
 #, python-format
 msgid "Unable to finalize the filename for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:424
+#: ../raphodo/problemnotification.py:425
 #, python-format
 msgid ""
 "The filename %(destination)s was not fully generated for %(filetype)s "
 "%(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:433
+#: ../raphodo/problemnotification.py:434
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:439
+#: ../raphodo/problemnotification.py:440
 #, python-format
 msgid "The following metadata is missing: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:445
+#: ../raphodo/problemnotification.py:446
 #, python-format
 msgid "Date/time conversion failed: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:451
+#: ../raphodo/problemnotification.py:452
 msgid ""
 "Could not extract valid date/time metadata or determine the file "
 "modification time."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:457
+#: ../raphodo/problemnotification.py:458
 msgid "Filename does not have an extension."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:460
+#: ../raphodo/problemnotification.py:461
 msgid "Filename does not have a number component."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:464
+#: ../raphodo/problemnotification.py:465
 #, python-format
 msgid "Error generating component %(component)s. Error: %(error)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:477
+#: ../raphodo/problemnotification.py:478
 #, python-format
 msgid ""
 "The download subfolders %(folder)s were only partially generated for "
 "%(filetype)s %(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:486
+#: ../raphodo/problemnotification.py:487
 #, python-format
 msgid ""
 "There is no data with which to generate the %(subfolder_file)s for "
 "%(filename)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:499
+#: ../raphodo/problemnotification.py:500
 #, python-format
 msgid ""
 "Unable to create the %(filetype)s %(destination)s in %(folder)s. The "
 "download file was %(source)s in %(device)s. It was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:514
+#: ../raphodo/problemnotification.py:515
 #, python-format
 msgid "Unable to create the download subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:526
+#: ../raphodo/problemnotification.py:527
 #, python-format
 msgid "Unable to create the backup subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:577
+#: ../raphodo/problemnotification.py:578
 #, python-format
 msgid "Problems scanning %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:584
+#: ../raphodo/problemnotification.py:585
 #, python-format
 msgid "Problems copying from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:591
+#: ../raphodo/problemnotification.py:592
 msgid "Problems while finalizing filenames and generating subfolders"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:598
+#: ../raphodo/problemnotification.py:599
 #, python-format
 msgid "Problems backing up to %s"
 msgstr ""
 
-#. Translators: for example Nov 3 or Dec 31
-#. The start and end dates are on a different day
-#. Translators: for example Nov 3 or Dec 31
-#: ../raphodo/proximity.py:105 ../raphodo/proximity.py:221
-#: ../raphodo/proximity.py:224 ../raphodo/proximity.py:828
+#. Translators: for example Nov 3 2015, 11:25 AM
+#. Translators: for example, Nov 3, 12:15 PM
+#: ../raphodo/proximity.py:188 ../raphodo/proximity.py:213
+#: ../raphodo/proximity.py:236 ../raphodo/proximity.py:239
 #, python-format
-msgid "%(month)s %(numeric_day)s"
+msgid "%(date)s, %(time)s"
 msgstr ""
 
-#. Translators: for example Nov 15 2015
-#. Translators: for example Nov 3 2015
-#: ../raphodo/proximity.py:109 ../raphodo/proximity.py:230
-#: ../raphodo/proximity.py:231 ../raphodo/proximity.py:831
+#: ../raphodo/proximity.py:204
 #, python-format
-msgid "%(date)s %(year)s"
+msgid "%(starttime)s - %(endtime)s"
 msgstr ""
 
-#. Translators: for example Nov 3 2015, 11:25 AM
-#. Translators: for example, Nov 3, 12:15 PM
-#: ../raphodo/proximity.py:197 ../raphodo/proximity.py:215
-#: ../raphodo/proximity.py:234 ../raphodo/proximity.py:236
+#. The start and end dates are on a different day
+#. Translators: for example Nov 3 or Dec 31
+#: ../raphodo/proximity.py:221 ../raphodo/proximity.py:225
+#: ../raphodo/proximity.py:980 ../raphodo/timeutils.py:105
 #, python-format
-msgid "%(date)s, %(time)s"
+msgid "%(month)s %(numeric_day)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:209
+#. Translators: for example Nov 3 2015
+#. Translators: for example Nov 2 2015
+#. Translators: for example Nov 15 2015
+#: ../raphodo/proximity.py:232 ../raphodo/proximity.py:233
+#: ../raphodo/proximity.py:985 ../raphodo/timeutils.py:110
 #, python-format
-msgid "%(starttime)s - %(endtime)s"
+msgid "%(date)s %(year)s"
 msgstr ""
 
 #. Translators: for example, Nov 3, 12:15 PM - Nov 4, 1:00 AM
-#: ../raphodo/proximity.py:241
+#: ../raphodo/proximity.py:245
 #, python-format
 msgid "%(earlier_time)s - %(later_time)s"
 msgstr ""
@@ -2554,25 +3139,25 @@ msgstr ""
 #. Nov 3 2012, 12:15 PM -
 #. Nov 4 2012, 1:00 AM
 #. (please keep the line break signified by \n)
-#: ../raphodo/proximity.py:248
+#: ../raphodo/proximity.py:253
 #, python-format
 msgid ""
 "%(earlier_time)s -\n"
 "%(later_time)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:359
+#: ../raphodo/proximity.py:382
 #, python-format
 msgid "%(month)s  %(year)s"
 msgstr ""
 
 #. Translators: for example Nov 2015
-#: ../raphodo/proximity.py:833
+#: ../raphodo/proximity.py:987
 #, python-format
 msgid "%(month)s %(year)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:1344
+#: ../raphodo/proximity.py:1595
 msgid ""
 "The time elapsed between consecutive photos and videos that is used to build "
 "the Timeline"
@@ -2582,47 +3167,47 @@ msgstr ""
 #. Replace the very last character (after the d) with the correct
 #. localized value, keeping everything else. In other words, change
 #. only the m character.
-#: ../raphodo/proximity.py:1406
+#: ../raphodo/proximity.py:1652
 #, python-format
 msgid "%(minutes)dm"
 msgstr ""
 
 #. Translators: i.e. "1.5h", which is short for 1.5 hours.
 #. Replace the entire string with the correct localized value
-#: ../raphodo/proximity.py:1410
+#: ../raphodo/proximity.py:1656
 msgid "1.5h"
 msgstr ""
 
 #. Translators: e.g. "5h", which is short for 5 hours.
 #. Replace the very last character (after the d) with the correct localized value,
 #. keeping everything else. In other words, change only the h character.
-#: ../raphodo/proximity.py:1415
+#: ../raphodo/proximity.py:1661
 #, python-format
 msgid "%(hours)dh"
 msgstr ""
 
-#: ../raphodo/proximity.py:1461
+#: ../raphodo/proximity.py:1710
 msgid ""
 "The Timeline groups photos and videos based on how much time elapsed between "
 "consecutive shots. Use it to identify photos and videos taken at different "
 "periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/proximity.py:1464
+#: ../raphodo/proximity.py:1715
 msgid ""
 "Use the slider (below) to adjust the time elapsed between consecutive shots "
 "that is used to build the Timeline."
 msgstr ""
 
-#: ../raphodo/proximity.py:1466
+#: ../raphodo/proximity.py:1718
 msgid "Timeline build pending..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1467
+#: ../raphodo/proximity.py:1719
 msgid "Timeline is building..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1468
+#: ../raphodo/proximity.py:1721
 msgid ""
 "The Timeline needs to be rebuilt because the file modification time does not "
 "match the time a shot was taken for one or more shots.<br><br>The Timeline "
@@ -2634,62 +3219,62 @@ msgid ""
 "downloading, which is when the metadata is read."
 msgstr ""
 
-#: ../raphodo/rapid.py:485 ../raphodo/rapid.py:2461 ../raphodo/rapid.py:3728
-#: ../raphodo/rapid.py:3846 ../raphodo/rapid.py:3850 ../raphodo/rapid.py:3870
-#: ../raphodo/rapid.py:3874 ../raphodo/rapid.py:3998 ../raphodo/rapid.py:4007
-#: ../raphodo/rapid.py:4495 ../raphodo/rapid.py:4888 ../raphodo/rapid.py:5722
-#: ../raphodo/rememberthisdialog.py:97
+#: ../raphodo/rapid.py:493 ../raphodo/rapid.py:2555 ../raphodo/rapid.py:3934
+#: ../raphodo/rapid.py:4065 ../raphodo/rapid.py:4069 ../raphodo/rapid.py:4092
+#: ../raphodo/rapid.py:4096 ../raphodo/rapid.py:4226 ../raphodo/rapid.py:4237
+#: ../raphodo/rapid.py:4743 ../raphodo/rapid.py:5195 ../raphodo/rapid.py:5997
+#: ../raphodo/rememberthisdialog.py:99
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:3
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: ../raphodo/rapid.py:1100
+#: ../raphodo/rapid.py:1131
 msgid ""
 "<b>ExifTool has a problem</b><br><br> Rapid Photo Downloader uses ExifTool "
 "to get metadata from videos and photos. The program will run without it, but "
 "installing it is <b>highly</b> recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1110 ../raphodo/rapid.py:1130
+#: ../raphodo/rapid.py:1141 ../raphodo/rapid.py:1161
 msgid "Problem with libmediainfo"
 msgstr ""
 
-#: ../raphodo/rapid.py:1119
+#: ../raphodo/rapid.py:1150
 msgid ""
 "<b>The library libmediainfo appears to be missing</b><br><br> Rapid Photo "
 "Downloader uses libmediainfo to get the date and time a video was shot. The "
 "program will run  without it, but installing it is recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1417
+#: ../raphodo/rapid.py:1448
 msgid "Download failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1419
+#: ../raphodo/rapid.py:1450
 msgid ""
 "Sorry, the download of the new version of Rapid Photo Downloader failed."
 msgstr ""
 
-#: ../raphodo/rapid.py:1425
+#: ../raphodo/rapid.py:1457
 msgid ""
 "The new version was successfully downloaded. Do you want to close Rapid "
 "Photo Downloader and install it now?"
 msgstr ""
 
-#: ../raphodo/rapid.py:1428
+#: ../raphodo/rapid.py:1461
 #, fuzzy
 msgid "Update Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: ../raphodo/rapid.py:1432
+#: ../raphodo/rapid.py:1465
 msgid "Install"
 msgstr ""
 
-#: ../raphodo/rapid.py:1450
+#: ../raphodo/rapid.py:1483
 msgid "New version saved"
 msgstr ""
 
-#: ../raphodo/rapid.py:1451
+#: ../raphodo/rapid.py:1485
 #, python-format
 msgid ""
 "The tar file and installer script are saved at:\n"
@@ -2697,165 +3282,165 @@ msgid ""
 " %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:1468
+#: ../raphodo/rapid.py:1502
 msgid "Upgrade failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1469
+#: ../raphodo/rapid.py:1505
 msgid ""
 "Sorry, upgrading Rapid Photo Downloader failed because there was an error "
 "opening the installer."
 msgstr ""
 
-#: ../raphodo/rapid.py:1667 ../raphodo/rapid.py:2331
+#: ../raphodo/rapid.py:1709 ../raphodo/rapid.py:2425
 msgid "Download"
 msgstr ""
 
-#: ../raphodo/rapid.py:1671
+#: ../raphodo/rapid.py:1713
 msgid "&Refresh..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1675
+#: ../raphodo/rapid.py:1717
 msgid "&Preferences"
 msgstr ""
 
-#: ../raphodo/rapid.py:1679
+#: ../raphodo/rapid.py:1721
 msgid "&Quit"
 msgstr ""
 
-#: ../raphodo/rapid.py:1683
+#: ../raphodo/rapid.py:1725
 msgid "Error &Reports"
 msgstr ""
 
-#: ../raphodo/rapid.py:1687
+#: ../raphodo/rapid.py:1729
 msgid "Clear Completed Downloads"
 msgstr ""
 
-#: ../raphodo/rapid.py:1691
+#: ../raphodo/rapid.py:1733
 msgid "Get Help Online..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1695
+#: ../raphodo/rapid.py:1737
 msgid "&Tip of the Day..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1699
+#: ../raphodo/rapid.py:1741
 msgid "Report a Problem..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1703
+#: ../raphodo/rapid.py:1745
 msgid "Make a Donation..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1707
+#: ../raphodo/rapid.py:1749
 msgid "Translate this Application..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1711
+#: ../raphodo/rapid.py:1753
 msgid "&About..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1715
+#: ../raphodo/rapid.py:1757
 msgid "Check for Updates..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1797
+#: ../raphodo/rapid.py:1840
 msgid "Timeline"
 msgstr ""
 
-#: ../raphodo/rapid.py:1807
+#: ../raphodo/rapid.py:1850
 msgid "Destination"
 msgstr ""
 
-#: ../raphodo/rapid.py:1808
+#: ../raphodo/rapid.py:1851
 msgid "Rename"
 msgstr ""
 
-#: ../raphodo/rapid.py:1810
+#: ../raphodo/rapid.py:1853
 msgid "Back Up"
 msgstr ""
 
 #. Devices Header and View
-#: ../raphodo/rapid.py:1926
+#: ../raphodo/rapid.py:1977
 msgid ""
 "Turn on or off the use of devices attached to this computer as download "
 "sources"
 msgstr ""
 
 #. This Computer Header and View
-#: ../raphodo/rapid.py:1940
+#: ../raphodo/rapid.py:1994
 msgid ""
 "Turn on or off the use of a folder on this computer as a download source"
 msgstr ""
 
-#: ../raphodo/rapid.py:1941
+#: ../raphodo/rapid.py:1996
 msgid "This Computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:1952
+#: ../raphodo/rapid.py:2009
 #, fuzzy
 msgid "Select a source folder"
 msgstr "Select an image folder"
 
-#: ../raphodo/rapid.py:1975
+#: ../raphodo/rapid.py:2038
 msgid "Projected Storage Use"
 msgstr ""
 
-#: ../raphodo/rapid.py:1989 ../raphodo/rapid.py:1997
+#: ../raphodo/rapid.py:2056 ../raphodo/rapid.py:2068
 #, fuzzy
 msgid "Select a destination folder"
 msgstr "Select an image folder"
 
-#: ../raphodo/rapid.py:2045
+#: ../raphodo/rapid.py:2117
 msgid "All"
 msgstr ""
 
-#: ../raphodo/rapid.py:2046
+#: ../raphodo/rapid.py:2118
 msgid "New"
 msgstr ""
 
-#: ../raphodo/rapid.py:2048
+#: ../raphodo/rapid.py:2120
 msgid "Show:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2051
+#: ../raphodo/rapid.py:2123
 msgid "Modification Time"
 msgstr ""
 
-#: ../raphodo/rapid.py:2052
+#: ../raphodo/rapid.py:2124
 msgid "Checked State"
 msgstr ""
 
-#: ../raphodo/rapid.py:2055
+#: ../raphodo/rapid.py:2127
 msgid "File Type"
 msgstr ""
 
-#: ../raphodo/rapid.py:2056
+#: ../raphodo/rapid.py:2128
 msgid "Device"
 msgstr ""
 
-#: ../raphodo/rapid.py:2058
+#: ../raphodo/rapid.py:2130
 msgid "Sort:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2069
+#: ../raphodo/rapid.py:2141
 msgid "Select All:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2311
+#: ../raphodo/rapid.py:2405
 #, python-format
 msgid "Download %(files)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2327
+#: ../raphodo/rapid.py:2421
 msgid "Resume Download"
 msgstr ""
 
-#: ../raphodo/rapid.py:2329
+#: ../raphodo/rapid.py:2423
 msgid "Pause"
 msgstr ""
 
-#: ../raphodo/rapid.py:2417
+#: ../raphodo/rapid.py:2511
 #, python-brace-format
 msgid ""
 "Please report the problem at <a href=\"{website}\">{website}</a>.<br><br>\n"
@@ -2864,12 +3449,12 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/rapid.py:2431
+#: ../raphodo/rapid.py:2525
 #, fuzzy
 msgid "Thank you for reporting a problem in Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: ../raphodo/rapid.py:2529
+#: ../raphodo/rapid.py:2624
 #, python-format
 msgid ""
 "<b>Changing This Computer source path</b><br><br>Do you really want to "
@@ -2878,30 +3463,29 @@ msgid ""
 "from This Computer will be cancelled."
 msgstr ""
 
-#: ../raphodo/rapid.py:2595
+#: ../raphodo/rapid.py:2694
 msgid "You cannot change the download destination while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:2604
+#: ../raphodo/rapid.py:2704
 #, python-format
 msgid ""
 "<b>Confirm Download Destination</b><br><br>Are you sure you want to set the "
 "%(file_type)s download destination to %(path)s?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2682
+#: ../raphodo/rapid.py:2785
 msgid ""
+"\n"
 "<b>Downloading all files</b><br><br>\n"
-"                    A download always includes all files that are checked "
-"for download,\n"
-"                    including those that are not currently displayed because "
-"the Timeline\n"
-"                    is being used or because only new files are being shown."
-"<br><br>\n"
-"                    Do you want to proceed with the download?"
+"A download always includes all files that are checked for download,\n"
+"including those that are not currently displayed because the Timeline\n"
+"is being used or because only new files are being shown.<br><br>\n"
+"Do you want to proceed with the download?\n"
+"                        "
 msgstr ""
 
-#: ../raphodo/rapid.py:2820
+#: ../raphodo/rapid.py:2937
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -2909,207 +3493,201 @@ msgid ""
 "%(folder2)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2824
+#: ../raphodo/rapid.py:2940
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
 "%s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2827
+#: ../raphodo/rapid.py:2943
 #, fuzzy
 msgid "Download Failure"
 msgstr "Invalid Downloads Today value.\n"
 
-#: ../raphodo/rapid.py:2828
+#: ../raphodo/rapid.py:2944
 msgid "The download cannot proceed."
 msgstr ""
 
-#: ../raphodo/rapid.py:2842
+#: ../raphodo/rapid.py:2962
 msgid ""
 "Photos and videos will not be backed up because there is nowhere to back "
 "them up. Do you still want to start the download?"
 msgstr ""
 
-#. Translators: filetype will be replaced with 'photos' or 'videos'
-#: ../raphodo/rapid.py:2847 ../raphodo/rapid.py:2854
+#: ../raphodo/rapid.py:2969 ../raphodo/rapid.py:2979
 #, python-format
 msgid ""
 "No backup device exists for backing up %(filetype)s. Do you still want to "
 "start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2848 ../raphodo/rpdfile.py:228
+#: ../raphodo/rapid.py:2971 ../raphodo/rpdfile.py:228
 msgid "photos"
 msgstr ""
 
-#: ../raphodo/rapid.py:2855 ../raphodo/rpdfile.py:223
+#: ../raphodo/rapid.py:2981 ../raphodo/rpdfile.py:223
 msgid "videos"
 msgstr ""
 
-#: ../raphodo/rapid.py:2861
+#: ../raphodo/rapid.py:2989
 msgid ""
 "<b>The photo and video backup destinations do not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2869 ../raphodo/rapid.py:2876
+#: ../raphodo/rapid.py:2999 ../raphodo/rapid.py:3008
 #, python-format
 msgid ""
 "<b>The %(filetype)s backup destination does not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2871 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:818
+#: ../raphodo/rapid.py:3001 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:843
 msgid "photo"
 msgstr ""
 
-#: ../raphodo/rapid.py:2878 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:858
+#: ../raphodo/rapid.py:3010 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:883
 msgid "video"
 msgstr ""
 
-#: ../raphodo/rapid.py:2886
+#: ../raphodo/rapid.py:3018
 msgid "Backup problem"
 msgstr ""
 
-#. Translators - in the middle is a unicode em dash - please retain it
-#. This string is displayed in the status bar when the download is running
-#: ../raphodo/rapid.py:3571
+#: ../raphodo/rapid.py:3756
 #, python-format
 msgid "%(downloading_from)s — %(time_left)s left (%(speed)s)"
 msgstr ""
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3640
+#: ../raphodo/rapid.py:3828
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr ""
 
-#. Translators: e.g. 2 videos failed to download
-#: ../raphodo/rapid.py:3645
+#: ../raphodo/rapid.py:3836
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr ""
 
-#: ../raphodo/rapid.py:3650 ../raphodo/rapid.py:3723
+#: ../raphodo/rapid.py:3842 ../raphodo/rapid.py:3927
 msgid "warnings"
 msgstr ""
 
-#: ../raphodo/rapid.py:3679
+#: ../raphodo/rapid.py:3873
 msgid "All downloads complete"
 msgstr ""
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3686 ../raphodo/rapid.py:3695 ../raphodo/rapid.py:3704
-#: ../raphodo/rapid.py:3713 ../raphodo/rapid.py:3721
+#: ../raphodo/rapid.py:3881 ../raphodo/rapid.py:3892 ../raphodo/rapid.py:3903
+#: ../raphodo/rapid.py:3914 ../raphodo/rapid.py:3924
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3688 ../raphodo/rapid.py:3706
+#: ../raphodo/rapid.py:3884 ../raphodo/rapid.py:3906
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr ""
 
-#: ../raphodo/rapid.py:3697 ../raphodo/rapid.py:3715
+#: ../raphodo/rapid.py:3895 ../raphodo/rapid.py:3917
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr ""
 
-#: ../raphodo/rapid.py:3742
+#: ../raphodo/rapid.py:3950
 msgid "1 failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:3744
+#: ../raphodo/rapid.py:3952
 #, python-format
 msgid "%d failures"
 msgstr ""
 
-#: ../raphodo/rapid.py:3749
+#: ../raphodo/rapid.py:3957
 msgid "1 warning"
 msgstr ""
 
-#: ../raphodo/rapid.py:3751
+#: ../raphodo/rapid.py:3959
 #, python-format
 msgid "%d warnings"
 msgstr ""
 
-#: ../raphodo/rapid.py:3771
+#: ../raphodo/rapid.py:3981
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3774
+#: ../raphodo/rapid.py:3985
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3779
+#: ../raphodo/rapid.py:3989
 #, python-format
 msgid "No files downloaded — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3781
+#: ../raphodo/rapid.py:3991
 msgid "No files downloaded"
 msgstr ""
 
-#: ../raphodo/rapid.py:3805
+#: ../raphodo/rapid.py:4021
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3809
+#: ../raphodo/rapid.py:4026
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3812
+#: ../raphodo/rapid.py:4031
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3820
+#: ../raphodo/rapid.py:4039
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3833
+#: ../raphodo/rapid.py:4052
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3837
+#: ../raphodo/rapid.py:4056
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3841
+#: ../raphodo/rapid.py:4060
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices"
 msgstr ""
 
-#: ../raphodo/rapid.py:3867
+#: ../raphodo/rapid.py:4087
 msgid "The Destination subfolders and Timeline have been rebuilt"
 msgstr ""
 
-#: ../raphodo/rapid.py:3922
+#: ../raphodo/rapid.py:4144
 msgid "Program preferences are invalid"
 msgstr ""
 
-#: ../raphodo/rapid.py:3999
+#: ../raphodo/rapid.py:4228
 #, python-format
 msgid ""
 "<b>All files on the %(camera)s are inaccessible</b>.<br><br>It may be locked "
@@ -3119,7 +3697,7 @@ msgid ""
 "ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4008
+#: ../raphodo/rapid.py:4239
 #, python-format
 msgid ""
 "<b>The %(camera)s appears to be in use by another application.</"
@@ -3129,34 +3707,34 @@ msgid ""
 "device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4019
+#: ../raphodo/rapid.py:4250
 msgid "&Try Again"
 msgstr ""
 
-#: ../raphodo/rapid.py:4020
+#: ../raphodo/rapid.py:4251
 msgid "&Ignore This Device"
 msgstr ""
 
-#: ../raphodo/rapid.py:4086
+#: ../raphodo/rapid.py:4323
 #, python-format
 msgid "Sorry, an unexpected problem occurred while scanning %s."
 msgstr ""
 
-#: ../raphodo/rapid.py:4087
+#: ../raphodo/rapid.py:4324
 msgid "Unfortunately you cannot download from this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4091
+#: ../raphodo/rapid.py:4328
 msgid ""
 "A possible workaround for the problem might be downloading from the camera's "
 "memory card using a card reader."
 msgstr ""
 
-#: ../raphodo/rapid.py:4096
+#: ../raphodo/rapid.py:4333
 msgid "Device scan failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:4472
+#: ../raphodo/rapid.py:4720
 #, python-format
 msgid ""
 "<b>The %(camera)s cannot be scanned because it cannot be unmounted.</"
@@ -3165,7 +3743,7 @@ msgid ""
 "the computer and plug it in again."
 msgstr ""
 
-#: ../raphodo/rapid.py:4496
+#: ../raphodo/rapid.py:4745
 #, python-format
 msgid ""
 "<b>The download cannot start because the %(camera)s cannot be unmounted.</"
@@ -3175,124 +3753,152 @@ msgid ""
 "download from it."
 msgstr ""
 
-#: ../raphodo/rapid.py:4635
+#: ../raphodo/rapid.py:4842
+#, fuzzy
+msgid "Completed Downloads Present"
+msgstr "Invalid Downloads Today value.\n"
+
+#: ../raphodo/rapid.py:4844
+#, python-format
+msgid "%s whose download have completed are displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4846
+msgid "Do you want to clear the completed downloads?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4848
+#, fuzzy
+msgid "Completed Download Present"
+msgstr "Invalid Downloads Today value.\n"
+
+#: ../raphodo/rapid.py:4850
+#, python-format
+msgid "%s whose download has completed is displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4852
+msgid "Do you want to clear the completed download?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4933
 #, python-format
 msgid ""
 "Do you want to download photos and videos from the device <i>%(device)s</i>?"
 msgstr ""
 
-#: ../raphodo/rapid.py:4877
+#: ../raphodo/rapid.py:5183
 #, python-format
 msgid "<b>Do you want to ignore the %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4879
+#: ../raphodo/rapid.py:5186
 msgid ""
 "All cameras, phones and tablets with the same model name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:4883
+#: ../raphodo/rapid.py:5190
 #, python-format
 msgid ""
 "<b>Do you want to ignore the device %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4885
+#: ../raphodo/rapid.py:5192
 msgid "Any device with the same name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:5178
+#: ../raphodo/rapid.py:5492
 #, python-format
 msgid "Downloading from %(location)s on This Computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5180
+#: ../raphodo/rapid.py:5496
 msgid ""
 "Do you really want to download from here?<br><br>On some systems, scanning "
 "this location can take a very long time."
 msgstr ""
 
-#: ../raphodo/rapid.py:5224
+#: ../raphodo/rapid.py:5537
 #, python-format
 msgid "Generating thumbnails for %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5227
+#: ../raphodo/rapid.py:5540
 #, python-format
 msgid "Scanning %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5237
+#: ../raphodo/rapid.py:5551
 #, python-format
 msgid ""
 "%(number)s of %(available files)s checked for download (%(hidden)s hidden)"
 msgstr ""
 
-#: ../raphodo/rapid.py:5243
+#: ../raphodo/rapid.py:5559
 #, python-format
 msgid "%(number)s of %(available files)s checked for download"
 msgstr ""
 
-#: ../raphodo/rapid.py:5494
+#: ../raphodo/rapid.py:5764
 msgid "Display program information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5496
+#: ../raphodo/rapid.py:5766
 msgid "Display debugging information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5499
+#: ../raphodo/rapid.py:5769
 #, fuzzy
 msgid "List photo and video file extensions the program recognizes and exit."
 msgstr "list image file extensions the program recognises and exit"
 
-#: ../raphodo/rapid.py:5502
+#: ../raphodo/rapid.py:5772
 msgid "Turn on or off the the renaming of photos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5504
+#: ../raphodo/rapid.py:5774
 msgid "turn on or off the the renaming of videos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5506
+#: ../raphodo/rapid.py:5776
 msgid ""
 "Turn on or off the automatic detection of devices from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5510
+#: ../raphodo/rapid.py:5780
 msgid "Turn on or off downloading from this computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5512 ../raphodo/rapid.py:5515 ../raphodo/rapid.py:5518
-#: ../raphodo/rapid.py:5539 ../raphodo/rapid.py:5543
+#: ../raphodo/rapid.py:5782 ../raphodo/rapid.py:5785 ../raphodo/rapid.py:5788
+#: ../raphodo/rapid.py:5809 ../raphodo/rapid.py:5813
 msgid "PATH"
 msgstr ""
 
-#: ../raphodo/rapid.py:5513
+#: ../raphodo/rapid.py:5783
 msgid "The PATH on this computer from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5516
+#: ../raphodo/rapid.py:5786
 msgid "The PATH where photos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5519
+#: ../raphodo/rapid.py:5789
 msgid "The PATH where videos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5521
+#: ../raphodo/rapid.py:5791
 msgid "Turn on or off the backing up of photos and videos while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:5525
+#: ../raphodo/rapid.py:5795
 msgid "Turn on or off the automatic detection of backup devices."
 msgstr ""
 
-#: ../raphodo/rapid.py:5527 ../raphodo/rapid.py:5533
+#: ../raphodo/rapid.py:5797 ../raphodo/rapid.py:5803
 msgid "FOLDER"
 msgstr ""
 
-#: ../raphodo/rapid.py:5528
+#: ../raphodo/rapid.py:5798
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected photo "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3300,7 +3906,7 @@ msgid ""
 "photos up to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5534
+#: ../raphodo/rapid.py:5804
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected video "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3308,116 +3914,123 @@ msgid ""
 "up videos to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5540
+#: ../raphodo/rapid.py:5810
 msgid ""
 "The PATH where photos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5544
+#: ../raphodo/rapid.py:5814
 msgid ""
 "The PATH where videos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5547
+#: ../raphodo/rapid.py:5817
 #, python-format
 msgid "Ignore photos with the following extensions: %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5551
+#: ../raphodo/rapid.py:5821
 msgid "Turn on or off starting downloads as soon as the program itself starts."
 msgstr ""
 
-#: ../raphodo/rapid.py:5554
+#: ../raphodo/rapid.py:5824
 msgid "Turn on or off starting downloads as soon as a device is inserted."
 msgstr ""
 
-#: ../raphodo/rapid.py:5557
+#: ../raphodo/rapid.py:5827
 msgid ""
 "Turn on or off use of the Rapid Photo Downloader Thumbnail Cache. Turning it "
 "off does not delete existing cache contents."
 msgstr ""
 
-#: ../raphodo/rapid.py:5561
+#: ../raphodo/rapid.py:5831
 msgid ""
 "Delete all thumbnails in the Rapid Photo Downloader Thumbnail Cache, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5565
+#: ../raphodo/rapid.py:5835
 msgid "Forget which files have been previously downloaded, and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5568
+#: ../raphodo/rapid.py:5838
 msgid ""
 "Import preferences from an old program version and exit. Requires the "
 "command line program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5571
+#: ../raphodo/rapid.py:5841
 msgid ""
 "Reset all program settings to their default values, delete all thumbnails in "
 "the Thumbnail cache, forget which files have been previously downloaded, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5575
+#: ../raphodo/rapid.py:5845
 msgid "Include gphoto2 debugging information in log files."
 msgstr ""
 
-#: ../raphodo/rapid.py:5579
+#: ../raphodo/rapid.py:5849
 msgid "Print information to the terminal about attached cameras and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5640
+#: ../raphodo/rapid.py:5911
 msgid ""
 "To import preferences from the old version of Rapid Photo Downloader, you "
 "must install the program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5649
+#: ../raphodo/rapid.py:5920
 msgid "No prior program preferences detected: exiting"
 msgstr ""
 
-#: ../raphodo/rapid.py:5652
+#: ../raphodo/rapid.py:5923
 #, python-format
 msgid "Importing preferences from Rapid Photo Downloader %(version)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5714
+#: ../raphodo/rapid.py:5989
 #, python-format
 msgid "Do you want to copy the stored sequence number, which has the value %d?"
 msgstr ""
 
-#: ../raphodo/rapid.py:5726
+#: ../raphodo/rapid.py:6000
 msgid "Program aborting."
 msgstr ""
 
-#: ../raphodo/rapid.py:5736
+#: ../raphodo/rapid.py:6010
 msgid "Never run this program as the sudo / root user."
 msgstr ""
 
-#: ../raphodo/rapid.py:5740
+#: ../raphodo/rapid.py:6014
 #, fuzzy
 msgid "You must install ExifTool to run Rapid Photo Downloader."
 msgstr "Rapid Photo Downloader"
 
-#: ../raphodo/rapid.py:5794
+#: ../raphodo/rapid.py:6026
+msgid ""
+"Rapid Photo Downloader is installed in multiple locations.\n"
+"\n"
+"Uninstall all copies except the version you want to run."
+msgstr ""
+
+#: ../raphodo/rapid.py:6083
 msgid ""
 "When specifying a path on the command line, do not also specify an\n"
 "option for device auto detection or a path on \"This Computer\"."
 msgstr ""
 
-#: ../raphodo/rapid.py:5950
+#: ../raphodo/rapid.py:6243
 msgid "All settings and caches have been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5958
+#: ../raphodo/rapid.py:6251
 msgid "Thumbnail Cache has been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5964
+#: ../raphodo/rapid.py:6257
 msgid "Remembered files have been forgotten"
 msgstr ""
 
@@ -3433,15 +4046,15 @@ msgstr ""
 msgid "&Don't warn me again about missing or broken program libraries"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:546
+#: ../raphodo/renameandmovefile.py:554
 msgid "subfolder and filename"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:548
+#: ../raphodo/renameandmovefile.py:556
 msgid "filename"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:550
+#: ../raphodo/renameandmovefile.py:558
 msgid "subfolder"
 msgstr ""
 
@@ -3522,160 +4135,237 @@ msgstr ""
 msgid "photos or videos"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:306
+#: ../raphodo/rpdfile.py:315
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:318
+#. translators: natural language expression signifying a single video
+#: ../raphodo/rpdfile.py:337
+msgid "a video"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:339
 msgid "1 Video"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:323
+#. translators: natural language expression signifying a single photo
+#: ../raphodo/rpdfile.py:346
+msgid "a photo"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:348
 msgid "1 Photo"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:803
+#: ../raphodo/rpdfile.py:828
 #, python-format
 msgid "%(path)s on %(camera)s"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:819
+#: ../raphodo/rpdfile.py:844
 msgid "Photo"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:859
+#: ../raphodo/rpdfile.py:884
 msgid "Video"
 msgstr ""
 
-#: ../raphodo/storage.py:138
+#: ../raphodo/storage.py:141
 msgid "File system root"
 msgstr ""
 
 #. translators: the name of the Pictures folder
-#: ../raphodo/storage.py:433
+#: ../raphodo/storage.py:437
 msgid "Pictures"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:426
+#: ../raphodo/thumbnaildisplay.py:432
 #, python-format
 msgid "Taken on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:431
+#: ../raphodo/thumbnaildisplay.py:439
 #, python-format
 msgid "Modified on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:437 ../raphodo/thumbnaildisplay.py:466
+#: ../raphodo/thumbnaildisplay.py:447 ../raphodo/thumbnaildisplay.py:481
 #, python-format
 msgid "%(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:451
+#: ../raphodo/thumbnaildisplay.py:464
 #, python-format
 msgid "Memory cards: %s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:457
+#: ../raphodo/thumbnaildisplay.py:468
+#, python-format
+msgid "Memory card: %s"
+msgstr ""
+
+#: ../raphodo/thumbnaildisplay.py:473
 msgid "Downloaded as:"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:472
+#: ../raphodo/thumbnaildisplay.py:489
 #, python-format
 msgid "<br><br>Previous download:<br>%(filename)s<br>%(path)s<br>%(date)s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:1603
+#: ../raphodo/thumbnaildisplay.py:1645
 msgid "Copy Path"
 msgstr ""
 
+#. Translators: these values are file size suffixes like B representing bytes, KB representing
+#. kilobytes, etc.
+#: ../raphodo/utilities.py:170
+msgid "B"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "KB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "MB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "GB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "TB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "PB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "EB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "ZB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "YB"
+msgstr ""
+
 #. two things in a list e.g. "device1 and device2"
-#: ../raphodo/utilities.py:391
+#: ../raphodo/utilities.py:394
 #, python-format
 msgid "%(first_item)s and %(last_item)s"
 msgstr ""
 
-#: ../raphodo/utilities.py:464
+#: ../raphodo/utilities.py:468
 msgid "one"
 msgstr ""
 
-#: ../raphodo/utilities.py:465
+#: ../raphodo/utilities.py:469
 msgid "two"
 msgstr ""
 
-#: ../raphodo/utilities.py:466
+#: ../raphodo/utilities.py:470
 msgid "three"
 msgstr ""
 
-#: ../raphodo/utilities.py:467
+#: ../raphodo/utilities.py:471
 msgid "four"
 msgstr ""
 
-#: ../raphodo/utilities.py:468
+#: ../raphodo/utilities.py:472
 msgid "five"
 msgstr ""
 
-#: ../raphodo/utilities.py:469
+#: ../raphodo/utilities.py:473
 msgid "six"
 msgstr ""
 
-#: ../raphodo/utilities.py:470
+#: ../raphodo/utilities.py:474
 msgid "seven"
 msgstr ""
 
-#: ../raphodo/utilities.py:471
+#: ../raphodo/utilities.py:475
 msgid "eight"
 msgstr ""
 
-#: ../raphodo/utilities.py:472
+#: ../raphodo/utilities.py:476
 msgid "nine"
 msgstr ""
 
-#: ../raphodo/utilities.py:473
+#: ../raphodo/utilities.py:477
 msgid "ten"
 msgstr ""
 
-#: ../raphodo/utilities.py:474
+#: ../raphodo/utilities.py:478
 msgid "eleven"
 msgstr ""
 
-#: ../raphodo/utilities.py:475
+#: ../raphodo/utilities.py:479
 msgid "twelve"
 msgstr ""
 
-#: ../raphodo/utilities.py:476
+#: ../raphodo/utilities.py:480
 msgid "thirteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:477
+#: ../raphodo/utilities.py:481
 msgid "fourteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:478
+#: ../raphodo/utilities.py:482
 msgid "fifteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:479
+#: ../raphodo/utilities.py:483
 msgid "sixteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:480
+#: ../raphodo/utilities.py:484
 msgid "seventeen"
 msgstr ""
 
-#: ../raphodo/utilities.py:481
+#: ../raphodo/utilities.py:485
 msgid "eighteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:482
+#: ../raphodo/utilities.py:486
 msgid "ninenteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:483
+#: ../raphodo/utilities.py:487
 msgid "twenty"
 msgstr ""
 
+#: ../raphodo/viewutils.py:240
+msgid "&OK"
+msgstr ""
+
+#: ../raphodo/viewutils.py:243
+msgid "&Save"
+msgstr ""
+
+#: ../raphodo/viewutils.py:244
+msgid "&Help"
+msgstr ""
+
+#: ../raphodo/viewutils.py:245
+msgid "Restore Defaults"
+msgstr ""
+
+#: ../raphodo/viewutils.py:246
+msgid "&Yes"
+msgstr ""
+
+#: ../raphodo/viewutils.py:247
+msgid "&No"
+msgstr ""
+
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:1
 msgid ""
 "Rapid Photo Downloader imports photos and videos from cameras, phones, "
diff --git a/po/es.po b/po/es.po
index 2f83f57..cdcfe6f 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,36 +7,446 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: damonlynch@gmail.com\n"
-"POT-Creation-Date: 2017-07-08 19:16-0500\n"
-"PO-Revision-Date: 2017-07-06 08:32+0000\n"
-"Last-Translator: Jose Luis Tirado <Unknown>\n"
+"POT-Creation-Date: 2017-09-12 17:01-0400\n"
+"PO-Revision-Date: 2017-09-13 18:39+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
-"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-07-06 19:24+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-09-26 22:04+0000\n"
+"X-Generator: Launchpad (build 18463)\n"
+"Language: es\n"
+
+#: ../install.py:65
+msgid "Rapid Photo Downloader installer"
+msgstr "Instalador de Rapid Photo Downloader"
+
+#: ../install.py:66
+msgid "Download and install latest version of Rapid Photo Downloader."
+msgstr "Descargar e instalar la última versión de Rapid Photo Downloader."
+
+#: ../install.py:236 ../install.py:1732
+msgid "Installer not found:"
+msgstr "Instalador no encontrado:"
+
+#. Translators: do not translate the term tar.gz
+#: ../install.py:240 ../install.py:1736
+msgid "Installer not in tar.gz format:"
+msgstr "El instalador no está en formato tar.gz:"
+
+#: ../install.py:465
+msgid ""
+"Incorrect folder ownership detected. Changing ownership of and resetting "
+"permissions for"
+msgstr ""
+"Detectada propiedad de carpeta incorrecta. Cambiando el propietario y "
+"restaurando los permisos de"
+
+#: ../install.py:540
+msgid "The following command will be run:"
+msgstr "Se ejecutará la siguiente orden:"
+
+#: ../install.py:543 ../install.py:1479 ../install.py:1484
+msgid "sudo may prompt you for the sudo password."
+msgstr "Es posible que sudo le solicite su contraseña."
+
+#: ../install.py:547
+msgid "Would you like to run the command now?"
+msgstr "¿Desea ejecutar la orden ahora?"
+
+#: ../install.py:549
+msgid "Answer is not yes, exiting."
+msgstr "Saliendo, porque la respuesta no es sí."
+
+#: ../install.py:559 ../install.py:751 ../install.py:966
+msgid "Command failed"
+msgstr "Falló la orden"
+
+#: ../install.py:561 ../install.py:752 ../install.py:967
+msgid "Exiting"
+msgstr "Saliendo"
+
+#: ../install.py:582
+msgid "The Universe repository must be enabled."
+msgstr "Se debe activar el repositorio Universe"
+
+#: ../install.py:606
+msgid ""
+"Do you want to to uninstall the previous version of Rapid Photo Downloader:"
+msgstr ""
+"¿Desea desinstalar la versiones anteriores de Rapid Photo Downloader?:"
+
+#: ../install.py:715 ../install.py:740
+msgid ""
+"Querying package system to see if an older version of Rapid Photo Downloader "
+"is installed (this may take a while)..."
+msgstr ""
+"Consultando al sistema de paquetes para ver si está instalada una versión "
+"antigua de Rapid Photo Downloader (puede llevar un tiempo)..."
+
+#: ../install.py:726
+msgid ""
+"Unable to query package system. Please check your Internet connection and "
+"try again"
+msgstr ""
+"No se pudo consultar al sistema de paquetes. Compruebe su conexión a "
+"Internet e inténtelo de nuevo."
+
+#: ../install.py:756
+msgid "Checking if previous version installed with pip..."
+msgstr "Comprobando si las versiones anteriores se instalaron con pip..."
+
+#: ../install.py:850
+msgid "The following package is unknown on your system: {}\n"
+msgstr "El siguiente paquete es desconocido en su sistema: {}\n"
+
+#: ../install.py:857 ../install.py:929 ../install.py:974
+msgid ""
+"To continue, some packages required to run the application will be installed."
+msgstr ""
+"Para continuar, se instalarán algunos paquetes necesarios para que la "
+"aplicación se ejecute."
+
+#: ../install.py:886
+msgid "Querying installed and available packages (this may take a while)"
+msgstr ""
+"Consultando los paquetes instalados y disponibles (puede llevar un tiempo)"
+
+#: ../install.py:958
+msgid ""
+"Querying zypper to see if any required packages are already installed (this "
+"may take a while)... "
+msgstr ""
+"Consultando a zypper para ver si alguno de los paquetes necesarios ya está "
+"instalado (puede llevar un tiempo)... "
+
+#: ../install.py:1004
+msgid "Query to confirm action at each step."
+msgstr "Pedir confirmación de las acciones a cada paso."
+
+#: ../install.py:1011
+msgid ""
+"When downloading the latest version, install the development version if it "
+"is newer than the stable version."
+msgstr ""
+"Al descargar la versión más reciente, instalar la versión de desarrollo si "
+"es más moderna que la versión estable."
+
+#: ../install.py:1020
+msgid ""
+"Optional tar.gz Rapid Photo Downloader installer archive. If not specified, "
+"the latest version is downloaded from the Internet."
+msgstr ""
+"Archivo instalador tar.gz de Rapid Photo Downloader opcional. Si no se "
+"indica, se descargará la última versión de Internet."
+
+#: ../install.py:1043
+msgid ""
+"Do not run the installer in the tar.gz Rapid Photo Downloader installer "
+"archive if it is newer than this version ({}). The default is to run "
+"whichever installer is newer."
+msgstr ""
+"No ejecutar el instalador del archivo tar.gz de Rapid Photo Downloader si es "
+"más moderno que esta versión ({}). De forma predeterminada se ejecutará el "
+"instalador que sea más moderno."
+
+#: ../install.py:1050
+msgid ""
+"Uninstall Rapid Photo Downloader that was installed with pip, keeping its "
+"dependencies."
+msgstr ""
+"Desinstalar el Rapid Photo Downloader que se instaló con pip, manteniendo "
+"sus dependencias."
+
+#: ../install.py:1054
+msgid ""
+"Uninstall the dependencies installed by pip during Rapid Photo Downloader's "
+"installation, and Rapid Photo Downloader itself, then exit."
+msgstr ""
+"Desinstalar las dependencias instaladas por pip durante la instalación de "
+"Rapid Photo Downloader y el propio Rapid Photo Downloader y luego salir."
+
+#: ../install.py:1059
+msgid ""
+"Note: this will not uninstall any version of Rapid Photo Downloader "
+"installed by your Linux distribution's package manager."
+msgstr ""
+"Nota: esto no desintalará cualquier versión de Rapid Photo Downloader "
+"instalada por el gestor de paquetes de su distribución de Linux."
+
+#: ../install.py:1066
+msgid ""
+"Dependencies will only be removed if they are not required by other programs."
+msgstr ""
+"Las dependencias solo se eliminarán si no son necesarias para otros "
+"programas."
+
+#: ../install.py:1072
+msgid ""
+"Note: this option will remove the dependencies regardless of whether they "
+"are required by another program pip has installed. Upgrade to pip 9.0 or "
+"above if you want to avoid this behavior. You can do so using the command "
+"'python3 -m pip install pip -U --user'. Also note that any version of Rapid "
+"Photo Downloader installed by your Linux distribution's package manager will "
+"not be uninstalled."
+msgstr ""
+"Nota: esta opción eliminará las dependencias independientemente de si son "
+"necesarias para otros programas instalados por pip. Actualice a pip 9.0 o "
+"superior si quiere evitar este comportamiento. Puede hacerlo usando la orden "
+"«python3 -m pip install pip -U --user». Tenga en cuenta también que no se "
+"desinstalará cualquier versión de Rapid Photo Downloader instalada por el "
+"gestor de paquetes de su distribución de Linux."
+
+#: ../install.py:1122
+msgid "Failed to download versions file"
+msgstr "Falló al descargar el archivo de versiones"
+
+#: ../install.py:1126
+msgid "Got error code {} while accessing versions file"
+msgstr "Se recibió el código de error {} al acceder al archivo de versiones"
+
+#: ../install.py:1234
+msgid ""
+"Sorry, could not locate installer. Please check your Internet connection and "
+"verify if you can reach https://www.damonlynch.net\n"
+"\n"
+"Exiting.\n"
+msgstr ""
+"No se pudo localizar el instalador. Compruebe su conexión a Internet y "
+"asegúrese de que puede llegar a https://www.damonlynch.net\n"
+"\n"
+"Saliendo.\n"
+
+#: ../install.py:1408
+msgid "Installing application requirements..."
+msgstr "Instalando requisitos de la aplicación..."
+
+#: ../install.py:1424
+msgid "Received error code"
+msgstr "Código de error recibido"
+
+#: ../install.py:1425
+msgid "Failed to install application requirements: exiting"
+msgstr "Falló al instalar los requisitos de la aplicación: saliendo"
+
+#: ../install.py:1428
+msgid "Installing application..."
+msgstr "Instalando la aplicación..."
+
+#: ../install.py:1441
+msgid "Failed to install application: exiting..."
+msgstr "Falló al instalar la aplicación: saliendo..."
+
+#: ../install.py:1465
+msgid ""
+"You may have to restart the computer to be able to run the program from the "
+"commmand line or application launcher."
+msgstr ""
+"Es posible que necesite reiniciar el equipo para poder ejecutar el programa "
+"desde la línea de órdenes o el lanzador de aplicaciones."
+
+#: ../install.py:1476
+msgid "Do you want to install the application's man pages?"
+msgstr "¿Desea instalar las páginas man de la aplicación?"
+
+#: ../install.py:1477
+msgid "They will be installed into {}"
+msgstr "Se instalarán en {}"
+
+#: ../install.py:1478 ../install.py:1483
+msgid "If you uninstall the application, remove these manpages yourself."
+msgstr ""
+"Si quiere desinstalar la aplicación, elimine estás manpages por su cuenta."
+
+#: ../install.py:1480
+msgid "Do want to install the man pages?"
+msgstr "¿Desea instalar las páginas de man?"
+
+#: ../install.py:1482
+msgid "Installing man pages into {}"
+msgstr "Instalando las páginas man en {}"
+
+#: ../install.py:1499
+msgid "Failed to create man page directory: exiting"
+msgstr "Falló al crear el directorio de páginas man: saliendo"
+
+#: ../install.py:1511
+msgid "Failed to copy man page."
+msgstr "Falló al copiar página man."
+
+#: ../install.py:1521
+msgid "(If a segmentation fault occurs at exit, you can ignore it...)"
+msgstr ""
+"(si se produce un fallo de segmentación al salir, puede ignorarlo...)"
+
+#: ../install.py:1534
+msgid ""
+"The python3 tool pip is required to uninstall a version of Rapid Photo "
+"Downloader that was installed with pip.\n"
+"Cannot continue. Exiting."
+msgstr ""
+"Se necesita de la herramienta de python3 pip para desinstalar una versión de "
+"Rapid Photo Downloader que fue instalada con pip.\n"
+"No se puede continuar. Saliendo."
+
+#: ../install.py:1575
+msgid ""
+"Do not run this installer script as sudo / root user.\n"
+"Run it using the user who will run the program.\n"
+msgstr ""
+"No ejecute este script de instalación como sudo o usuario root.\n"
+"Ejecútelo empleando el usuario que ejecutará el programa.\n"
+
+#: ../install.py:1585 ../install.py:1599
+msgid "Do not include any other command line arguments when specifying"
+msgstr ""
+"No incluir ningún otro parámetro de la línea de órdenes al especificar"
+
+#: ../install.py:1614
+msgid ""
+"Sorry, this installer does not support a custom python installation.\n"
+"Exiting..."
+msgstr ""
+"El instalador no es compatible con las versiones de python personalizadas.\n"
+"Saliendo..."
+
+#: ../install.py:1620
+msgid "Restarting script using system python..."
+msgstr "Reiniciando el script usando python del sistema..."
+
+#: ../install.py:1651
+msgid "Exiting..."
+msgstr "Saliendo…"
+
+#. Translators: do not translate the term python3-apt
+#: ../install.py:1670
+msgid "To continue, the package python3-apt must be installed."
+msgstr "Para continuar se debe instalar el paquete python3-apt."
+
+#: ../install.py:1689
+msgid ""
+"Install the following packages using your Linux distribution's standard "
+"package manager, and then rerun this installer"
+msgstr ""
+"Instalé los siguientes paquetes usando el gestor de paquetes estándar de su "
+"distribución Linux y luego vuelva a ejecutar este instalador."
+
+#: ../install.py:1698
+msgid ""
+"To run this program, programs to assist Python 3 and its package management "
+"must be installed."
+msgstr ""
+"Para ejecutar este programa, deben instalarse programas de apoyo a Python 3 "
+"y su gestor de paquetes."
+
+#. Translators: do not translate the terms Python 3, pip and setuptools
+#: ../install.py:1713
+msgid "Python 3's pip and setuptools must be upgraded for your user."
+msgstr "Se deben actualizar el pip de Python 3 y setuptools para su usuario."
+
+#. Translators: do not translate the term python or requests
+#: ../install.py:1726
+msgid "Installing python requests"
+msgstr "Instalando python requests"
+
+#: ../upgrade.py:79
+msgid "Upgrade Rapid Photo Downloader"
+msgstr "Actualizar Rapid Photo Downloader"
+
+#: ../upgrade.py:401 ../raphodo/viewutils.py:242
+msgid "&Cancel"
+msgstr "&Cancelar"
+
+#: ../upgrade.py:405
+msgid "&Upgrade"
+msgstr "&Actualizar"
+
+#: ../upgrade.py:410
+#, python-format
+msgid "Click the Upgrade button to upgrade to version %s."
+msgstr "Pulse el botón Actualizar para actualizar a la versión %s."
+
+#: ../upgrade.py:413
+msgid "Click the Upgrade button to start the upgrade."
+msgstr "Pulse el botón Actualizar para comenzar la actualización."
+
+#: ../upgrade.py:416 ../upgrade.py:422 ../raphodo/viewutils.py:241
+msgid "&Close"
+msgstr "&Cerrar"
+
+#: ../upgrade.py:417
+msgid "&Run"
+msgstr "&Ejecutar"
+
+#: ../upgrade.py:447
+msgid "Close Rapid Photo Downloader before running this upgrade"
+msgstr "Cierre Rapid Photo Downloader antes de iniciar la actualización"
+
+#: ../upgrade.py:450
+msgid "Upgrade running..."
+msgstr "Actualización en proceso..."
+
+#: ../upgrade.py:486
+#, python-format
+msgid ""
+"Successfully upgraded to %s. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+"Actualizado correctamente a %s. Pulse Cerrar para salir o Ejecutar para "
+"iniciar el programa."
+
+#: ../upgrade.py:491
+msgid ""
+"Upgrade finished successfully. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+"Actualización completada correctamente. Pulse Cerrar para salir o Ejecutar "
+"para iniciar el programa."
+
+#: ../upgrade.py:495
+msgid "Upgrade failed. Click Close to exit."
+msgstr "Falló la actualización. Pulse Cerrar para salir."
+
+#: ../upgrade.py:6967
+#, python-format
+msgid "Upgrading %s..."
+msgstr "Actualizando %s..."
+
+#: ../upgrade.py:6969
+msgid "Press any key to continue..."
+msgstr "Pulse cualquier tecla para continuar..."
+
+#: ../upgrade.py:6982
+msgid "Rapid Photo Downloader upgrade failed"
+msgstr "Falló la actualización de Rapid Photo Downloader"
 
-#. type: QPushButton
-#: ../raphodo/aboutdialog.py:217
+#: ../upgrade.py:6984
+#, python-format
+msgid ""
+"The python package %s could not be updated. The upgrade cannot continue."
+msgstr ""
+"El paquete de python %s no se ha podido actualizar. La actualización no "
+"puede continuar."
+
+#: ../raphodo/aboutdialog.py:225
 msgid "Credits"
 msgstr "Agradecimientos"
 
-#: ../raphodo/backuppanel.py:239
+#: ../raphodo/backuppanel.py:240
 msgid "Backups are not configured"
 msgstr "Las copias de seguridad no están configuradas"
 
-#: ../raphodo/backuppanel.py:241
+#: ../raphodo/backuppanel.py:242
 msgid "No backup devices detected"
 msgstr "No se detectaron dispositivos de copia de seguridad"
 
-#: ../raphodo/backuppanel.py:243
+#: ../raphodo/backuppanel.py:244
 msgid "Valid backup locations not yet specified"
 msgstr ""
 "No se ha indicado todavía ubicaciones válidas para las copias de seguridad"
 
-#: ../raphodo/backuppanel.py:401
+#: ../raphodo/backuppanel.py:404
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
@@ -44,18 +454,18 @@ msgstr ""
 "Usted puede tener sus copia de seguridad  de fotos y videos en múltiples "
 "lugares, una vez descargados, por ejemplo, discos duros externos."
 
-#: ../raphodo/backuppanel.py:407
+#: ../raphodo/backuppanel.py:412
 msgid "Back up photos and videos when downloading"
 msgstr "Realizar copia de seguridad al descargar fotos y vídeos"
 
-#: ../raphodo/backuppanel.py:413
+#: ../raphodo/backuppanel.py:418
 msgid "Automatically detect backup devices"
 msgstr "Detectar automáticamente dispositivos de copia de seguridad"
 
-#: ../raphodo/backuppanel.py:417
+#: ../raphodo/backuppanel.py:424
 msgid ""
-"Specify the folder in which backups are stored on the device."
-"<br><br><i>Note: the presence of a folder with this name is used to "
+"Specify the folder in which backups are stored on the "
+"device.<br><br><i>Note: the presence of a folder with this name is used to "
 "determine if 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 folder names. By "
 "adding both folders, the same device can be used to back up both photos and "
@@ -68,79 +478,88 @@ msgstr ""
 "ellos una carpeta con uno de estos nombres. Al añadir ambas carpetas, el "
 "mismo dispositivo se puede usr para hacer copias de fotos y vídeos.</i>"
 
-#: ../raphodo/backuppanel.py:428
+#: ../raphodo/backuppanel.py:439
 msgid "Photo folder name:"
 msgstr "Nombre de la carpeta de fotos:"
 
-#: ../raphodo/backuppanel.py:433
+#: ../raphodo/backuppanel.py:444
 msgid "Video folder name:"
 msgstr "Nombre de la carpeta de vídeos:"
 
-#: ../raphodo/backuppanel.py:438 ../raphodo/nameeditor.py:883
+#: ../raphodo/backuppanel.py:449 ../raphodo/nameeditor.py:890
 #: ../raphodo/renamepanel.py:123
 msgid "Example:"
 msgstr "Ejemplo:"
 
-#: ../raphodo/backuppanel.py:448
-msgid "If you disable automatic detection, choose the exact backup locations."
+#: ../raphodo/backuppanel.py:460
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
 "Si se desactiva la detección automática, elegir la ubicación exacta para la "
 "copia de seguridad."
 
-#: ../raphodo/backuppanel.py:452
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:468
 msgid "Photo backup location:"
 msgstr "Ubicación para copia de seguridad de fotografías:"
 
-#: ../raphodo/backuppanel.py:454
+#: ../raphodo/backuppanel.py:474
 msgid "Select Photo Backup Location"
 msgstr "Seleccione la ubicación de la copia de seguridad de las fotos"
 
-#: ../raphodo/backuppanel.py:460
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:485
 msgid "Video backup location:"
 msgstr "Ubicacion de la copia de seguridad de videos:"
 
-#: ../raphodo/backuppanel.py:462
+#: ../raphodo/backuppanel.py:491
 msgid "Select Video Backup Location"
 msgstr "Seleccione la ubicación de la copia de seguridad de los vídeos"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:564
+#: ../raphodo/backuppanel.py:595
 msgid "drive1"
 msgstr "unidad1"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:567
+#: ../raphodo/backuppanel.py:598
 msgid "drive2"
 msgstr "unidad2"
 
-#: ../raphodo/backuppanel.py:628
+#: ../raphodo/backuppanel.py:663
 msgid "Projected Backup Storage Use"
 msgstr "Espacio usado previsto de copia de seguridad"
 
-#: ../raphodo/backuppanel.py:632
+#: ../raphodo/backuppanel.py:669
 msgid "Backup Options"
 msgstr "Opciones de copia de seguridad"
 
 #. translators: refers to the video thumbnail file that some
 #. cameras generate -- it has a .THM file extension
-#: ../raphodo/copyfiles.py:476
+#: ../raphodo/copyfiles.py:491
 msgid "video THM"
 msgstr "vídeo THM"
 
-#: ../raphodo/copyfiles.py:482
+#: ../raphodo/copyfiles.py:497
 msgid "audio"
 msgstr "audio"
 
 #: ../raphodo/destinationdisplay.py:78 ../raphodo/devicedisplay.py:1079
-#: ../raphodo/rpdfile.py:321
+#: ../raphodo/rpdfile.py:342
 #, python-format
 msgid "%(no_photos)s Photos"
 msgstr "%(no_photos)s fotos"
 
 #: ../raphodo/destinationdisplay.py:82 ../raphodo/devicedisplay.py:1081
-#: ../raphodo/rpdfile.py:316
+#: ../raphodo/rpdfile.py:333
 #, python-format
 msgid "%(no_videos)s Videos"
 msgstr "%(no_videos)s vídeos"
@@ -168,15 +587,15 @@ msgid "%(size_free)s free of %(size_total)s"
 msgstr "%(size_free)s libre de %(size_total)s"
 
 #: ../raphodo/destinationdisplay.py:190 ../raphodo/devicedisplay.py:993
-#: ../raphodo/rapid.py:1964 ../raphodo/rapid.py:2079 ../raphodo/rapid.py:5753
-#: ../raphodo/rpdfile.py:905
+#: ../raphodo/rapid.py:2023 ../raphodo/rapid.py:2151 ../raphodo/rapid.py:6043
+#: ../raphodo/rpdfile.py:930
 msgid "Photos"
 msgstr "Fotos"
 
 #. translators: the name of the Videos folder
 #: ../raphodo/destinationdisplay.py:191 ../raphodo/devicedisplay.py:994
-#: ../raphodo/rapid.py:1967 ../raphodo/rapid.py:2080 ../raphodo/rapid.py:5754
-#: ../raphodo/rpdfile.py:933 ../raphodo/storage.py:445
+#: ../raphodo/rapid.py:2028 ../raphodo/rapid.py:2152 ../raphodo/rapid.py:6044
+#: ../raphodo/rpdfile.py:958 ../raphodo/storage.py:449
 msgid "Videos"
 msgstr "Vídeos"
 
@@ -184,7 +603,7 @@ msgstr "Vídeos"
 msgid "Projected storage use after download"
 msgstr "Espacio usado previsto después de la descarga"
 
-#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:516
+#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:521
 msgid "Custom..."
 msgstr "Personalizado..."
 
@@ -222,59 +641,60 @@ msgstr "Reescanear"
 msgid "%s full"
 msgstr "%s lleno"
 
-#: ../raphodo/devices.py:459
+#: ../raphodo/devices.py:463
 msgid "Cameras"
 msgstr "Cámaras"
 
-#: ../raphodo/devices.py:460 ../raphodo/devices.py:920
-#: ../raphodo/preferencedialog.py:85 ../raphodo/rapid.py:1927
+#: ../raphodo/devices.py:464 ../raphodo/devices.py:927
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/rapid.py:1979
 msgid "Devices"
 msgstr "Dispositivos"
 
-#: ../raphodo/devices.py:720
+#: ../raphodo/devices.py:724
 #, python-format
 msgid "Downloading from %(device_names)s"
 msgstr "Descargando de %(device_names)s"
 
 #. Translators: e.g. Three Devices
-#: ../raphodo/devices.py:780
+#: ../raphodo/devices.py:784
 #, python-format
 msgid "%(no_devices)s %(device_type)s"
 msgstr "%(no_devices)s %(device_type)s"
 
-#: ../raphodo/devices.py:905 ../raphodo/rapid.py:1764
+#: ../raphodo/devices.py:912 ../raphodo/rapid.py:1807
 msgid "Select Source"
 msgstr "Seleccionar fuente"
 
-#: ../raphodo/devices.py:936 ../raphodo/devices.py:947
+#: ../raphodo/devices.py:943 ../raphodo/devices.py:954
 #, python-format
 msgid "%(device1)s + %(device2)s"
 msgstr "%(device1)s + %(device2)s"
 
 #. Number of cameras e.g. 3 Cameras
-#: ../raphodo/devices.py:958
+#: ../raphodo/devices.py:965
 #, python-format
 msgid "%(no_cameras)s Cameras"
 msgstr "%(no_cameras)s cámaras"
 
-#: ../raphodo/devices.py:963
+#: ../raphodo/devices.py:970
 #, python-format
 msgid "%(no_devices)s Devices"
 msgstr "%(no_devices)s dispositivos"
 
 #. Translators: two folder names, separated by a plus sign
-#: ../raphodo/devices.py:1258
+#: ../raphodo/devices.py:1265
 #, python-format
 msgid "%s + %s"
 msgstr "%s + %s"
 
-#: ../raphodo/didyouknow.py:44
+#: ../raphodo/didyouknow.py:45
 msgid "Click on a file's checkbox to mark or unmark it for download."
 msgstr ""
 "Haga clic en la casilla de verificación de los archivos para marcarlos o "
 "desmarcarlos para su descarga."
 
-#: ../raphodo/didyouknow.py:50
+#: ../raphodo/didyouknow.py:51
 msgid ""
 "Files that have already been downloaded are remembered. You can still mark "
 "previously downloaded files to download again, but they are unchecked by "
@@ -287,7 +707,7 @@ msgstr ""
 "oscurecidas para que se puedan diferenciar de aquellos archivos que están "
 "pendientes de descargarse."
 
-#: ../raphodo/didyouknow.py:59
+#: ../raphodo/didyouknow.py:60
 msgid ""
 "If more than one file is selected, they'll all take the mark of the file "
 "whose checkbox was clicked, regardless of whether they previously had a "
@@ -297,7 +717,7 @@ msgstr ""
 "del que se ha marcado la casilla de verificación, independientemente de si "
 "anteriormente estaban marcados o no."
 
-#: ../raphodo/didyouknow.py:67
+#: ../raphodo/didyouknow.py:68
 msgid ""
 "Click on a device's checkbox to quickly mark or unmark all its files for "
 "downloading."
@@ -305,7 +725,64 @@ msgstr ""
 "Haga clic en la casilla de verificación para marcar o desmarcar rápidamente "
 "para descargar todos sus archivos."
 
-#: ../raphodo/didyouknow.py:74
+#: ../raphodo/didyouknow.py:75
+msgid ""
+"After a download finishes, an icon replaces the thumbnail's checkbox. The "
+"icon's color indicates whether the download was successful (green), had file "
+"renaming problems (yellow/orange), or failed (red)."
+msgstr ""
+"Después de que una descarga termine un icono reemplazará la casilla de "
+"verificación de la miniatura. El color del icono indica si la descarga tuvo "
+"éxito (verde), si se han producido problemas al renombrar el archivo "
+"(amarillo/naranja) o si falló (rojo)."
+
+#: ../raphodo/didyouknow.py:83
+msgid ""
+"\n"
+"            In case of any problems, a red icon will appear at the bottom of "
+"the window\n"
+"            indicating how many error reports there are. Clicking on it "
+"opens the Error Report \n"
+"            window.\n"
+"            "
+msgstr ""
+"\n"
+"            En caso de problemas aparecerá un icono rojo en la parte "
+"inferior de la ventana\n"
+"            indicando el número de informes de error. Al hacer clic sobre el "
+"mismo se abre la\n"
+"            ventana de Informes de error.\n"
+"            "
+
+#: ../raphodo/didyouknow.py:91
+msgid ""
+"\n"
+"            The Error Report window lists any problems encountered before, "
+"during or after the \n"
+"            download. An orange triangle represents a warning, a red circle "
+"indicates a failure, \n"
+"            and a black circle indicates more serious failures. You can "
+"click on the hyperlinks to \n"
+"            open its file or device in a file manager. You can also search "
+"the reports using the \n"
+"            search box in the lower left of the Error Report window.\n"
+"            "
+msgstr ""
+"\n"
+"            La ventana de Informes de error muestra los errores encontrados "
+"antes, durante o después\n"
+"            de la descarga. Un triángulo naranja representa un aviso; un "
+"círculo rojo, un fallo; y \n"
+"            un círculo negro, fallos más serios. Puede hacer clic en los "
+"enlaces parar abrir\n"
+"            el archivo o dispositivo en el administrador de archivos. "
+"También puede buscar los\n"
+"            informes usando el campo de búsqueda en la parte inferior "
+"izquierda de la ventana\n"
+"            de Informes de error.\n"
+"            "
+
+#: ../raphodo/didyouknow.py:103
 msgid ""
 "You can simultaneously download from multiple cameras, smartphones, memory "
 "cards, and hard drives&mdash;as many devices as your computer can handle at "
@@ -315,7 +792,7 @@ msgstr ""
 "inteligentes, tarjetas de memoria y discos duros; tantos dispositivos como "
 "su equipo sea capaz de gestionar a la vez."
 
-#: ../raphodo/didyouknow.py:81
+#: ../raphodo/didyouknow.py:110
 msgid ""
 "The <b>Timeline</b> groups photos and videos based on how much time elapsed "
 "between consecutive shots. Use it to identify photos and videos taken at "
@@ -326,7 +803,7 @@ msgstr ""
 "vídeos tomados en diferentes periodos en un único día o en varios días "
 "consecutivos."
 
-#: ../raphodo/didyouknow.py:88
+#: ../raphodo/didyouknow.py:117
 msgid ""
 "\n"
 "<p>In the illustration above, the first row of the Timeline is black because "
@@ -346,7 +823,7 @@ msgstr ""
 "lo que se usa para para construir la línea de tiempo:</p>\n"
 "            "
 
-#: ../raphodo/didyouknow.py:99
+#: ../raphodo/didyouknow.py:128
 msgid ""
 "To view photos and videos for a particular time range, use the mouse "
 "(optionally in combination with the <tt>Shift</tt> or <tt>Ctrl</tt> keys) to "
@@ -359,7 +836,7 @@ msgstr ""
 "se resaltará el botón de Línea de tiempo en la parte izquierda de la ventana "
 "principal."
 
-#: ../raphodo/didyouknow.py:106
+#: ../raphodo/didyouknow.py:135
 msgid ""
 "A download always includes all files that are checked for download, "
 "including those that are not currently displayed because the Timeline is "
@@ -369,7 +846,7 @@ msgstr ""
 "descargarse, incluyendo aquellos no se están visibles actualmente debido a "
 "la línea de tiempo en uso."
 
-#: ../raphodo/didyouknow.py:113
+#: ../raphodo/didyouknow.py:142
 msgid ""
 "You can hide or display the download sources by clicking on the name of the "
 "device you're downloading from at the top left of the program window."
@@ -378,7 +855,7 @@ msgstr ""
 "dispositivo del que se está realizando la descarga en la parte superior "
 "izquierda de la ventana del programa."
 
-#: ../raphodo/didyouknow.py:120
+#: ../raphodo/didyouknow.py:149
 msgid ""
 "\n"
 "          Thumbnails can be sorted using a variety of criteria:\n"
@@ -404,10 +881,10 @@ msgstr ""
 "según sus metadatos (cuando estén disponible) o según el sistema de "
 "archivos\n"
 "(como alternativa).</li>\n"
-"<li><b>Estado marcado:</b> si el archivo está marcado para ser descargado.</"
-"li>\n"
-"<li><b>Nombre de archivo:</b> el nombre completo, incluyendo la extensión.</"
-"li>\n"
+"<li><b>Estado marcado:</b> si el archivo está marcado para ser "
+"descargado.</li>\n"
+"<li><b>Nombre de archivo:</b> el nombre completo, incluyendo la "
+"extensión.</li>\n"
 "<li><b>Extensión:</b> la extensión del nombre de archivo. Puede usarla para "
 "agrupar imágenes  jpeg y raw, \n"
 "por ejemplo.</li>\n"
@@ -416,7 +893,7 @@ msgstr ""
 "lasfotos y vídeos.</li>\n"
 "</ol> "
 
-#: ../raphodo/didyouknow.py:137
+#: ../raphodo/didyouknow.py:166
 msgid ""
 "One of Rapid Photo Downloader's most useful features is its ability to "
 "automatically generate download subfolders and rename files as it downloads, "
@@ -426,7 +903,7 @@ msgstr ""
 "capacidad de generar automáticamente subcarpetas de descarga y renombrar los "
 "ficheros según se descargan, usando un esquema de su elección."
 
-#: ../raphodo/didyouknow.py:143
+#: ../raphodo/didyouknow.py:172
 msgid ""
 "To specify where you want your files downloaded and how you want them named, "
 "open the appropriate panel on the right-side of the application window: "
@@ -436,19 +913,19 @@ msgstr ""
 "nombre, abra el panel apropiado en la parte derecha de la ventana de la "
 "aplicación: <b>Destino</b>, <b>Renombrar</b> o <b>Código de trabajo</b>."
 
-#: ../raphodo/didyouknow.py:150
+#: ../raphodo/didyouknow.py:179
 msgid ""
 "\n"
 "When thinking about your download directory structure, keep in mind two "
 "different types\n"
 "of directory:\n"
 "<ol>\n"
-"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, &quot;"
-"Photos&quot;, or\n"
+"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, "
+"&quot;Photos&quot;, or\n"
 "&quot;Videos&quot;. This directory should already exist on your computer. In "
 "the illustration \n"
-"below, the destination folders are &quot;Pictures&quot; and &quot;"
-"Videos&quot;. The\n"
+"below, the destination folders are &quot;Pictures&quot; and "
+"&quot;Videos&quot;. The\n"
 "name of the destination folder is displayed in the grey bar directly above "
 "the folder tree, \n"
 "with a folder icon to its left and a gear icon to its far right.</li>\n"
@@ -465,12 +942,12 @@ msgstr ""
 "dos tipos\n"
 "diferentes de directorios:\n"
 "<ol>\n"
-"<li>La <b>carpeta de destino</b>, por ejeplo &quot;Imágenes&quot;, &quot;"
-"Fotos&quot; o\n"
+"<li>La <b>carpeta de destino</b>, por ejeplo &quot;Imágenes&quot;, "
+"&quot;Fotos&quot; o\n"
 "&quot;Vídeos&quot;. Este directorio debería existir ya en su equipo. En la "
 "imagen\n"
-"inferior, las carpetas de destino son &quot;Imágenes&quot; y &quot;"
-"Vídeos&quot;. El\n"
+"inferior, las carpetas de destino son &quot;Imágenes&quot; y "
+"&quot;Vídeos&quot;. El\n"
 "nombre de la carpeta de destino se muestra en la barra gris directamente "
 "sobre el árbol de \n"
 "carpetas, con un icono de carpeta a su izquierda y un icono de engranaje en "
@@ -483,7 +960,7 @@ msgstr ""
 "</ol>\n"
 "            "
 
-#: ../raphodo/didyouknow.py:167
+#: ../raphodo/didyouknow.py:196
 msgid ""
 "\n"
 "You can download photos and videos to the same destination folder, or "
@@ -505,7 +982,7 @@ msgstr ""
 "cada tipo.            \n"
 "            "
 
-#: ../raphodo/didyouknow.py:177
+#: ../raphodo/didyouknow.py:206
 msgid ""
 "Automatically generated download subfolders can contain further "
 "automatically generated subfolders if need be. A common scheme is to create "
@@ -516,7 +993,7 @@ msgstr ""
 "habitual es crear una subcarpeta de año y una serie de subcarpetas de año-"
 "mes-día dentro de ella."
 
-#: ../raphodo/didyouknow.py:186
+#: ../raphodo/didyouknow.py:215
 msgid ""
 "\n"
 "Whenever possible, the program previews the download subfolders of photos "
@@ -549,7 +1026,7 @@ msgstr ""
 "</ol>\n"
 "            "
 
-#: ../raphodo/didyouknow.py:201
+#: ../raphodo/didyouknow.py:230
 msgid ""
 "\n"
 "Download subfolder names are typically generated using some or all of the "
@@ -584,8 +1061,8 @@ msgstr ""
 "<li>Un <b>código de trabajo</b>, que es un texto libre que se introduce en "
 "el momento de la descarga, tal como\n"
 "el nombre de un evento o ubicación.</li>\n"
-"<li><b>Texto</b> que desea que aparezca cada vez, como un guión o un espacio."
-"</li>\n"
+"<li><b>Texto</b> que desea que aparezca cada vez, como un guión o un "
+"espacio.</li>\n"
 "</ol>\n"
 "Nombrar las subcarpetas con el año, seguido del mes y finalmente el día en "
 "formato numérico hace\n"
@@ -593,7 +1070,7 @@ msgstr ""
 "es la opción predeterminada:\n"
 "            "
 
-#: ../raphodo/didyouknow.py:219
+#: ../raphodo/didyouknow.py:248
 msgid ""
 "\n"
 "To automatically create download subfolders as you download, \n"
@@ -603,15 +1080,15 @@ msgid ""
 "            "
 msgstr ""
 "\n"
-"Para crear automáticamente subcarpetas de descarga según se descargan, "
-"puede \n"
+"Para crear automáticamente subcarpetas de descarga según se descargan, puede "
+"\n"
 "usar una las configuraciones predefinidas en Rapid Photo Downloader o crear "
 "una personalizada.\n"
-"Haga clic el icono del engranaje para abrir el menú "
-"desplegable:            \n"
+"Haga clic el icono del engranaje para abrir el menú desplegable:            "
+"\n"
 "            "
 
-#: ../raphodo/didyouknow.py:227
+#: ../raphodo/didyouknow.py:256
 msgid ""
 "\n"
 "Using the drop-down menu, select a built-in preset or click on <b>Custom</b> "
@@ -628,7 +1105,7 @@ msgstr ""
 "de subcarpetas de fotos o vídeos:             \n"
 "            "
 
-#: ../raphodo/didyouknow.py:237
+#: ../raphodo/didyouknow.py:266
 msgid ""
 "It's easy to download raw images into one folder, and jpeg images into "
 "another. Simply use the <b>Filename Extension</b> as part of your download "
@@ -638,7 +1115,7 @@ msgstr ""
 "en otra. Simplemente use la <b>Extensión de nombre de archivo</b> como parte "
 "del esquema de generación de subcarpetas de su descarga."
 
-#: ../raphodo/didyouknow.py:242
+#: ../raphodo/didyouknow.py:271
 msgid ""
 "This illustration shows a saved custom preset named &quot;My custom "
 "preset&quot;."
@@ -646,7 +1123,7 @@ msgstr ""
 "Esta imagen muestra una configuración personalizada guardada con el nombre "
 "&quot;Mi configuración personalizada&quot;."
 
-#: ../raphodo/didyouknow.py:246
+#: ../raphodo/didyouknow.py:275
 msgid ""
 "\n"
 "You do not have to create nested download subfolders. This illustration "
@@ -664,7 +1141,7 @@ msgstr ""
 "las fotos y un código de trabajo:\n"
 "            "
 
-#: ../raphodo/didyouknow.py:256
+#: ../raphodo/didyouknow.py:285
 msgid ""
 "\n"
 "Although there are many built-in date/time naming options, you may find that "
@@ -688,7 +1165,7 @@ msgstr ""
 "círculo rojo alrededor del guión):\n"
 "            "
 
-#: ../raphodo/didyouknow.py:265
+#: ../raphodo/didyouknow.py:294
 msgid ""
 "\n"
 "Read more about all the ways you can generate download subfolder names and "
@@ -700,11 +1177,12 @@ msgstr ""
 "\n"
 "Lea más sobre todas las maneras en las que puede generar nombres de "
 "subcarpetas de descarga y nombres\n"
-"de archivo en la <a href=\"http://damonlynch.net/rapid/documentation/"
-"#renamedateandtime\">documentación en línea</a>.\n"
+"de archivo en la <a "
+"href=\"http://damonlynch.net/rapid/documentation/#renamedateandtime\">documen"
+"tación en línea</a>.\n"
 "            "
 
-#: ../raphodo/didyouknow.py:273
+#: ../raphodo/didyouknow.py:302
 msgid ""
 "\n"
 "<b>Job Codes</b> let you easily enter text that describes sets of photos and "
@@ -724,7 +1202,7 @@ msgstr ""
 "seleccionados se les va a\n"
 "aplicar el código de trabajo &quot;Bazar verde&quot;: \n"
 
-#: ../raphodo/didyouknow.py:282
+#: ../raphodo/didyouknow.py:311
 msgid ""
 "\n"
 "You can apply new or existing Job Codes before you start a download. If "
@@ -742,13 +1220,13 @@ msgstr ""
 "introduzca un código de trabajo antes de que la descarga comience.\n"
 "            "
 
-#: ../raphodo/didyouknow.py:291
+#: ../raphodo/didyouknow.py:320
 msgid "Look for hints to guide you when working with Job Codes:"
 msgstr ""
 "Buscar sugerencias que le guíen cuando está trabajando con códigos de "
 "trabajo:"
 
-#: ../raphodo/didyouknow.py:295
+#: ../raphodo/didyouknow.py:324
 msgid ""
 "Hints will vary depending on the context, such as when the mouse is hovering "
 "over a button."
@@ -756,33 +1234,32 @@ msgstr ""
 "Las sugerencias variarán dependiendo del contexto, como por ejemplo cuando "
 "el ratón está sobre un botón."
 
-#: ../raphodo/didyouknow.py:301
+#: ../raphodo/didyouknow.py:330
 msgid ""
 "\n"
 "When you give your photos and videos unique filenames, you'll never be "
 "confused as to \n"
 "which file is which. Using <b>sequence numbers</b> to make filenames unique "
 "is highly \n"
-"recommended!.\n"
+"recommended!\n"
 "            "
 msgstr ""
 "\n"
-"Si da nombres únicos a sus fotos y vídeos no tendrá problemas para saber qué "
-"fichero es\n"
-"cada uno. ¡Se recomienda encarecidamente usar <b>secuencias de números</b> "
-"para crear\n"
-"nombres de archivos únicos!\n"
+"Cuando asigna nombres de archivos únicos a sus fotos y vídeos no tendrá "
+"dudas en saber \n"
+"qué archivo es cada uno. ¡Es muy recomendable usar <b>número de "
+"secuencia</b> para crear nombres de archivos únicos!\n"
 "            "
 
-#: ../raphodo/didyouknow.py:309
+#: ../raphodo/didyouknow.py:338
 msgid ""
 "\n"
 "<p>Four types of sequence values are available to help you assign unique "
 "names to your photos and \n"
 "videos:\n"
 "<ol>\n"
-"<li><b>Downloads today</b>: tracks downloads completed during that day.</"
-"li>\n"
+"<li><b>Downloads today</b>: tracks downloads completed during that "
+"day.</li>\n"
 "<li><b>Stored number</b>: similar to Downloads today, but it is remembered "
 "from the last time the  \n"
 "program was run.</li>\n"
@@ -803,18 +1280,18 @@ msgstr ""
 "día.</li>\n"
 "<li><b>Número almacenado</b>: similar al anterior, pero recuerda el valor de "
 "la última ejecución del programa.</li>\n"
-"<li><b>Número de sesión</b>: se reinicia cada vez que el programa se ejecuta."
-"</li>\n"
+"<li><b>Número de sesión</b>: se reinicia cada vez que el programa se "
+"ejecuta.</li>\n"
 "<li><b>Letra de secuencia</b>: es como el número de sesión, pero usando "
 "letras.</li>\n"
 "</ol></p>\n"
 "<p>\n"
 "Lea más sobre números de secuencia en la <a \n"
-"href=\"http://damonlynch.net/rapid/documentation/#sequencenumbers"
-"\">documentación en línea</a>.</p>\n"
+"href=\"http://damonlynch.net/rapid/documentation/#sequencenumbers\">documenta"
+"ción en línea</a>.</p>\n"
 "            "
 
-#: ../raphodo/didyouknow.py:327
+#: ../raphodo/didyouknow.py:356
 msgid ""
 "\n"
 "The <b>Rename</b> panel allows you to configure file renaming. To rename "
@@ -829,7 +1306,7 @@ msgstr ""
 "la suya propia.              \n"
 "            "
 
-#: ../raphodo/didyouknow.py:334
+#: ../raphodo/didyouknow.py:363
 msgid ""
 "\n"
 "<p>The <b>Synchronize RAW + JPEG</b> option is useful if you use the RAW + "
@@ -861,7 +1338,7 @@ msgstr ""
 "línea</a>.</p>\n"
 "            "
 
-#: ../raphodo/didyouknow.py:348
+#: ../raphodo/didyouknow.py:377
 msgid ""
 "\n"
 "You can have your photos and videos backed up to multiple locations as they "
@@ -879,7 +1356,7 @@ msgstr ""
 "automáticamente o indicar ubicaciones de copia especificamente.\n"
 "            "
 
-#: ../raphodo/didyouknow.py:356
+#: ../raphodo/didyouknow.py:385
 msgid ""
 "In this example, the drive <b>photobackup</b> does not contain a folder "
 "named <tt>Videos</tt>, so videos will not be backed up to it."
@@ -887,7 +1364,7 @@ msgstr ""
 "En este ejemplo, la unidad <b>photobackup</b> no contiene una carpeta con el "
 "nombre <tt>Videos</tt>, por lo que no se hará copia de los vídeos."
 
-#: ../raphodo/didyouknow.py:362
+#: ../raphodo/didyouknow.py:391
 msgid ""
 "\n"
 "Several of the program's preferences can be set from the command line, "
@@ -905,7 +1382,13 @@ msgstr ""
 "predeterminado y las cachés y archivos recordados limpiados.            \n"
 "            "
 
-#: ../raphodo/didyouknow.py:372
+#: ../raphodo/didyouknow.py:396
+msgid "You can also import program preferences from the older 0.4 version."
+msgstr ""
+"También puede importar las preferencias del programa de la versión 0.4 "
+"antigua."
+
+#: ../raphodo/didyouknow.py:401
 msgid ""
 "\n"
 "Rapid Photo Downloader deals with three types of cache:\n"
@@ -915,8 +1398,8 @@ msgid ""
 "memory cards, and other devices.</li>\n"
 "<li>A <b>temporary cache</b> of files downloaded from a camera, one for "
 "photos and another for \n"
-"videos. They are located in temporary subfolders in the download destination."
-"</li>\n"
+"videos. They are located in temporary subfolders in the download "
+"destination.</li>\n"
 "<li>The <b>desktop's thumbnail cache</b>, in which Rapid Photo Downloader "
 "stores thumbnails of \n"
 "RAW and TIFF photos once they have been downloaded. File browsers like Gnome "
@@ -948,29 +1431,29 @@ msgstr ""
 "archivos. \n"
 "</li>\n"
 "</ol>\n"
-"Lea más sobre estas cachés y su efecto en al velocidad de descarga en la "
-"<a \n"
+"Lea más sobre estas cachés y su efecto en al velocidad de descarga en la <a "
+"\n"
 "href=\"http://damonlynch.net/rapid/documentation/#caches\">documentación en "
 "línea</a>.\n"
 "            "
 
-#: ../raphodo/didyouknow.py:431
+#: ../raphodo/didyouknow.py:460
 msgid "Tip of the Day"
 msgstr "Sugerencia del día"
 
-#: ../raphodo/didyouknow.py:439
+#: ../raphodo/didyouknow.py:468
 msgid "Did you know...?"
 msgstr "¿Sabía que...?"
 
-#: ../raphodo/didyouknow.py:466
+#: ../raphodo/didyouknow.py:495
 msgid "Show tips on startup"
 msgstr "Mostrar sugerencias al inicio"
 
-#: ../raphodo/didyouknow.py:470
+#: ../raphodo/didyouknow.py:499
 msgid "&Next"
 msgstr "&Siguiente"
 
-#: ../raphodo/didyouknow.py:471
+#: ../raphodo/didyouknow.py:500
 msgid "&Previous"
 msgstr "&Anterior"
 
@@ -1077,68 +1560,68 @@ msgstr "%d días, 1 hora"
 msgid "%(days)d days, %(hours)d hours"
 msgstr "%(days)d días, %(hours)d horas"
 
-#: ../raphodo/errorlog.py:65
+#: ../raphodo/errorlog.py:66
 msgid "Find"
 msgstr "Buscar"
 
-#: ../raphodo/errorlog.py:135
+#: ../raphodo/errorlog.py:136
 msgid "Error Reports - Rapid Photo Downloader"
 msgstr "Informes de errores - Rapid Photo Downloader"
 
-#: ../raphodo/errorlog.py:170
+#: ../raphodo/errorlog.py:171
 msgid "Find in reports"
 msgstr "Buscar en los informes"
 
-#: ../raphodo/errorlog.py:187
+#: ../raphodo/errorlog.py:188
 msgid "Find the previous occurrence of the phrase"
 msgstr "Buscar la ocurrencia anterior de la frase"
 
-#: ../raphodo/errorlog.py:192
+#: ../raphodo/errorlog.py:193
 msgid "Find the next occurrence of the phrase"
 msgstr "Buscar la siguiente ocurrencia de la frase"
 
-#: ../raphodo/errorlog.py:194
+#: ../raphodo/errorlog.py:195
 msgid "&Highlight All"
 msgstr "&Resaltar todo"
 
-#: ../raphodo/errorlog.py:195
+#: ../raphodo/errorlog.py:196
 msgid "Highlight all occurrences of the phrase"
 msgstr "Resaltar todas las ocurrencias de la frase"
 
-#: ../raphodo/errorlog.py:196
+#: ../raphodo/errorlog.py:197
 msgid "&Match Case"
 msgstr "&Coincidier mayúsculas y minúsculas"
 
-#: ../raphodo/errorlog.py:197
+#: ../raphodo/errorlog.py:198
 msgid "Search with case sensitivity"
 msgstr "Búsqueda sensible a mayúsculas"
 
-#: ../raphodo/errorlog.py:198
+#: ../raphodo/errorlog.py:199
 msgid "&Whole Words"
 msgstr "&Palabras completas"
 
-#: ../raphodo/errorlog.py:199
+#: ../raphodo/errorlog.py:200
 msgid "Search whole words only"
 msgstr "Buscar solo palabras completas"
 
-#: ../raphodo/errorlog.py:209 ../raphodo/errorlog.py:341
+#: ../raphodo/errorlog.py:210 ../raphodo/errorlog.py:345
 #, python-format
 msgid "%s of %s matches"
 msgstr "%s de %s coincidencias"
 
-#: ../raphodo/errorlog.py:228
+#: ../raphodo/errorlog.py:232
 msgid "Clear"
 msgstr "Limpiar"
 
-#: ../raphodo/errorlog.py:328
+#: ../raphodo/errorlog.py:332
 msgid "Phrase not found"
 msgstr "Frase no encontrada"
 
-#: ../raphodo/errorlog.py:487
+#: ../raphodo/errorlog.py:491
 msgid "Search pending..."
 msgstr "Buscar pendientes..."
 
-#: ../raphodo/errorlog.py:535
+#: ../raphodo/errorlog.py:539
 msgid ""
 "The number of new entries added to the Error Report since it was last open. "
 "Click to open the Error Report."
@@ -1154,8 +1637,8 @@ msgstr "Problema en Rapid Photo Downloader"
 #, python-brace-format
 msgid ""
 "<b>A problem occurred in Rapid Photo Downloader</b><br><br>\n"
-"    Please report the problem at <a href=\"{website}\">{website}</a>."
-"<br><br>\n"
+"    Please report the problem at <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
 "    Attach the log file <i>{log_file}</i> to your bug report (click\n"
 "    <a href=\"{log_path}\">here</a> to open the log directory).<br><br>If "
 "the same problem occurs\n"
@@ -1163,12 +1646,12 @@ msgid ""
 "    "
 msgstr ""
 "<b>Ha ocurrido un problema en Rapid Photo Downloader</b><br><br>\n"
-"    Por favor, reporte el problema a <a href=\"{website}\">{website}</a>."
-"<br><br>\n"
+"    Por favor, reporte el problema a <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
 "    Adjunte el archivo de trazas <i>{log_file}</i> a su informe de error "
 "(haga clic\n"
-"    <a href=\"{log_path}\">aquí</a> para abrir el directorio de trazas)."
-"<br><br>Si el mismo problema ocurre\n"
+"    <a href=\"{log_path}\">aquí</a> para abrir el directorio de "
+"trazas).<br><br>Si el mismo problema ocurre\n"
 "    de nuevo antes de que el programa termine esta será la única "
 "notificación que reciba.\n"
 "    "
@@ -1191,7 +1674,7 @@ msgstr ""
 "en {log_path}\n"
 "\n"
 
-#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1601
+#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1643
 msgid "Open in File Browser..."
 msgstr "Abrir en el Explorador de archivos..."
 
@@ -1209,531 +1692,531 @@ msgstr "Otros..."
 msgid "%s (location does not exist)"
 msgstr "%s (la ubicación no existe)"
 
-#: ../raphodo/generatenameconfig.py:186
+#: ../raphodo/generatenameconfig.py:190
 msgid "Date time"
 msgstr "Fecha Hora"
 
-#: ../raphodo/generatenameconfig.py:187
+#: ../raphodo/generatenameconfig.py:191
 msgid "Text"
 msgstr "Texto"
 
-#: ../raphodo/generatenameconfig.py:188 ../raphodo/rapid.py:2053
+#: ../raphodo/generatenameconfig.py:192 ../raphodo/rapid.py:2125
 msgid "Filename"
 msgstr "Nombre de archivo"
 
-#: ../raphodo/generatenameconfig.py:189 ../raphodo/preferencedialog.py:488
+#: ../raphodo/generatenameconfig.py:193 ../raphodo/preferencedialog.py:724
 msgid "Metadata"
 msgstr "Metadatos"
 
-#: ../raphodo/generatenameconfig.py:190
+#: ../raphodo/generatenameconfig.py:194
 msgid "Sequences"
 msgstr "Secuencias"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: ../raphodo/generatenameconfig.py:193
+#: ../raphodo/generatenameconfig.py:197
 msgid "Job code"
 msgstr "Código de trabajo"
 
-#: ../raphodo/generatenameconfig.py:194
+#: ../raphodo/generatenameconfig.py:198
 msgid "Image date"
 msgstr "Fecha de la imagen"
 
-#: ../raphodo/generatenameconfig.py:195
+#: ../raphodo/generatenameconfig.py:199
 msgid "Video date"
 msgstr "Fecha del vídeo"
 
-#: ../raphodo/generatenameconfig.py:196
+#: ../raphodo/generatenameconfig.py:200
 msgid "Today"
 msgstr "Hoy"
 
-#: ../raphodo/generatenameconfig.py:197
+#: ../raphodo/generatenameconfig.py:201
 msgid "Yesterday"
 msgstr "Ayer"
 
 #. Translators: Download time is the time and date that the download started (when the
 #. user clicked the Download button)
-#: ../raphodo/generatenameconfig.py:200
+#: ../raphodo/generatenameconfig.py:204
 msgid "Download time"
 msgstr "Hora de la descarga"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:203
+#: ../raphodo/generatenameconfig.py:207
 msgid "Name"
 msgstr "Nombre"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:206 ../raphodo/rapid.py:2054
+#: ../raphodo/generatenameconfig.py:210 ../raphodo/rapid.py:2126
 msgid "Extension"
 msgstr "Extensión"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:209
+#: ../raphodo/generatenameconfig.py:213
 msgid "Image number"
 msgstr "Número de imagen"
 
-#: ../raphodo/generatenameconfig.py:210
+#: ../raphodo/generatenameconfig.py:214
 msgid "Video number"
 msgstr "Número de vídeo"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:213
+#: ../raphodo/generatenameconfig.py:217
 msgid "Aperture"
 msgstr "Apertura"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:216
+#: ../raphodo/generatenameconfig.py:220
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:219
+#: ../raphodo/generatenameconfig.py:223
 msgid "Exposure time"
 msgstr "Tiempo de exposición"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:222
+#: ../raphodo/generatenameconfig.py:226
 msgid "Focal length"
 msgstr "Longitud focal"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:225
+#: ../raphodo/generatenameconfig.py:229
 msgid "Camera make"
 msgstr "Fabricante de la cámara"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:228
+#: ../raphodo/generatenameconfig.py:232
 msgid "Camera model"
 msgstr "Modelo de la cámara"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:231
+#: ../raphodo/generatenameconfig.py:235
 msgid "Short camera model"
 msgstr "Modelo corto de cámara"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:234
+#: ../raphodo/generatenameconfig.py:238
 msgid "Hyphenated short camera model"
 msgstr "Modelo de cámara con guión corto"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:237
+#: ../raphodo/generatenameconfig.py:241
 msgid "Serial number"
 msgstr "Número de serie"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:240
+#: ../raphodo/generatenameconfig.py:244
 msgid "Shutter count"
 msgstr "Contador de disparos"
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: ../raphodo/generatenameconfig.py:242
+#: ../raphodo/generatenameconfig.py:246
 msgid "File number"
 msgstr "Número de archivo"
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:244
+#: ../raphodo/generatenameconfig.py:248
 msgid "Folder only"
 msgstr "Carpeta solamente"
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:246
+#: ../raphodo/generatenameconfig.py:250
 msgid "Folder and file"
 msgstr "Carpeta y archivo"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:249
+#: ../raphodo/generatenameconfig.py:253
 msgid "Owner name"
 msgstr "Nombre del propietario"
 
-#: ../raphodo/generatenameconfig.py:250
+#: ../raphodo/generatenameconfig.py:254
 msgid "Codec"
 msgstr "Códec"
 
-#: ../raphodo/generatenameconfig.py:251
+#: ../raphodo/generatenameconfig.py:255
 msgid "Width"
 msgstr "Ancho"
 
-#: ../raphodo/generatenameconfig.py:252
+#: ../raphodo/generatenameconfig.py:256
 msgid "Height"
 msgstr "Alto"
 
-#: ../raphodo/generatenameconfig.py:253
+#: ../raphodo/generatenameconfig.py:257
 msgid "Length"
 msgstr "Duración"
 
-#: ../raphodo/generatenameconfig.py:254
+#: ../raphodo/generatenameconfig.py:258
 msgid "Frames Per Second"
 msgstr "Fotogramas por segundo"
 
-#: ../raphodo/generatenameconfig.py:255
+#: ../raphodo/generatenameconfig.py:259
 msgid "Artist"
 msgstr "Autor"
 
-#: ../raphodo/generatenameconfig.py:256
+#: ../raphodo/generatenameconfig.py:260
 msgid "Copyright"
 msgstr "Derechos de autor"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:259
+#: ../raphodo/generatenameconfig.py:263
 msgid "Downloads today"
 msgstr "Descargas de hoy"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:262
+#: ../raphodo/generatenameconfig.py:266
 msgid "Session number"
 msgstr "Número de sesión"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:265
+#: ../raphodo/generatenameconfig.py:269
 msgid "Subfolder number"
 msgstr "Número de subcarpeta"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:268
+#: ../raphodo/generatenameconfig.py:272
 msgid "Stored number"
 msgstr "Número almacenado"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: ../raphodo/generatenameconfig.py:271
+#: ../raphodo/generatenameconfig.py:275
 msgid "Sequence letter"
 msgstr "Letra secuencial"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:274
+#: ../raphodo/generatenameconfig.py:278
 msgid "All digits"
 msgstr "Todos los dígitos"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:277
+#: ../raphodo/generatenameconfig.py:281
 msgid "Last digit"
 msgstr "Último dígito"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:280
+#: ../raphodo/generatenameconfig.py:284
 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
-#: ../raphodo/generatenameconfig.py:283
+#: ../raphodo/generatenameconfig.py:287
 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
-#: ../raphodo/generatenameconfig.py:286
+#: ../raphodo/generatenameconfig.py:290
 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
-#: ../raphodo/generatenameconfig.py:289
+#: ../raphodo/generatenameconfig.py:293
 msgid "Original Case"
 msgstr "Formato original"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:292
+#: ../raphodo/generatenameconfig.py:296
 msgid "UPPERCASE"
 msgstr "MAYÚSCULAS"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:295
+#: ../raphodo/generatenameconfig.py:299
 msgid "lowercase"
 msgstr "minúsculas"
 
-#: ../raphodo/generatenameconfig.py:296
+#: ../raphodo/generatenameconfig.py:300
 msgid "One digit"
 msgstr "Un dígito"
 
-#: ../raphodo/generatenameconfig.py:297
+#: ../raphodo/generatenameconfig.py:301
 msgid "Two digits"
 msgstr "Dos dígitos"
 
-#: ../raphodo/generatenameconfig.py:298
+#: ../raphodo/generatenameconfig.py:302
 msgid "Three digits"
 msgstr "Tres dígitos"
 
-#: ../raphodo/generatenameconfig.py:299
+#: ../raphodo/generatenameconfig.py:303
 msgid "Four digits"
 msgstr "Cuatro dígitos"
 
-#: ../raphodo/generatenameconfig.py:300
+#: ../raphodo/generatenameconfig.py:304
 msgid "Five digits"
 msgstr "Cinco dígitos"
 
-#: ../raphodo/generatenameconfig.py:301
+#: ../raphodo/generatenameconfig.py:305
 msgid "Six digits"
 msgstr "Seis dígitos"
 
-#: ../raphodo/generatenameconfig.py:302
+#: ../raphodo/generatenameconfig.py:306
 msgid "Seven digits"
 msgstr "Siete dígitos"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:305
+#: ../raphodo/generatenameconfig.py:309
 msgid "Subseconds"
 msgstr "Décimas de segundo"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:308 ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:312 ../raphodo/generatenameconfig.py:393
 msgid "YYYYMMDD"
 msgstr "AAAMMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:311 ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:315 ../raphodo/generatenameconfig.py:394
 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
-#: ../raphodo/generatenameconfig.py:314 ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:318 ../raphodo/generatenameconfig.py:395
 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
-#: ../raphodo/generatenameconfig.py:317
+#: ../raphodo/generatenameconfig.py:321
 msgid "YYMMDD"
 msgstr "AAMMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:320
+#: ../raphodo/generatenameconfig.py:324
 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
-#: ../raphodo/generatenameconfig.py:323
+#: ../raphodo/generatenameconfig.py:327
 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
-#: ../raphodo/generatenameconfig.py:326
+#: ../raphodo/generatenameconfig.py:330
 msgid "MMDDYYYY"
 msgstr "MMDDAAAA"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:329
+#: ../raphodo/generatenameconfig.py:333
 msgid "MMDDYY"
 msgstr "MMDDAA"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:332
+#: ../raphodo/generatenameconfig.py:336
 msgid "MMDD"
 msgstr "MMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:335
+#: ../raphodo/generatenameconfig.py:339
 msgid "DDMMYYYY"
 msgstr "DDMMAAAA"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:338
+#: ../raphodo/generatenameconfig.py:342
 msgid "DDMMYY"
 msgstr "DDMMAA"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:341 ../raphodo/generatenameconfig.py:389
-#: ../raphodo/generatenameconfig.py:390 ../raphodo/generatenameconfig.py:391
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:345 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:394 ../raphodo/generatenameconfig.py:395
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:397
 msgid "YYYY"
 msgstr "AAAA"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:344
+#: ../raphodo/generatenameconfig.py:348
 msgid "YY"
 msgstr "AA"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:347
+#: ../raphodo/generatenameconfig.py:351
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:350
+#: ../raphodo/generatenameconfig.py:354
 msgid "DD"
 msgstr "DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:353
+#: ../raphodo/generatenameconfig.py:357
 msgid "Month (full)"
 msgstr "Mes (completo)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:356
+#: ../raphodo/generatenameconfig.py:360
 msgid "Month (abbreviated)"
 msgstr "Mes (abreviado)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:359
+#: ../raphodo/generatenameconfig.py:363
 msgid "HHMMSS"
 msgstr "HHMMSS"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:362
+#: ../raphodo/generatenameconfig.py:366
 msgid "HHMM"
 msgstr "HHMM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:365
+#: ../raphodo/generatenameconfig.py:369
 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
-#: ../raphodo/generatenameconfig.py:368
+#: ../raphodo/generatenameconfig.py:372
 msgid "HH-MM"
 msgstr "HH-MM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:371
+#: ../raphodo/generatenameconfig.py:375
 msgid "HH"
 msgstr "HH"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:374
+#: ../raphodo/generatenameconfig.py:378
 msgid "MM (minutes)"
 msgstr "MM (minutos)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:377
+#: ../raphodo/generatenameconfig.py:381
 msgid "SS"
 msgstr "SS"
 
-#: ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:393
 msgid "Date"
 msgstr "Fecha"
 
-#: ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:394
 msgid "Date (hyphens)"
 msgstr "Fecha (guiones)"
 
-#: ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:395
 msgid "Date (underscores)"
 msgstr "Fecha (subrayados)"
 
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:438
-#: ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:442
+#: ../raphodo/generatenameconfig.py:537
 msgid "Date and Job Code"
 msgstr "Fecha y código de trabajo"
 
-#: ../raphodo/generatenameconfig.py:392
+#: ../raphodo/generatenameconfig.py:396
 msgid "YYYYMM_Job Code"
 msgstr "AAAAMM_Código de trabajo"
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "Date and Job Code Subfolder"
 msgstr "Subcarepta Fecha y código de trabajo"
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "YYYYMM"
 msgstr "AAAAMM"
 
-#: ../raphodo/generatenameconfig.py:393 ../raphodo/jobcodepanel.py:198
-#: ../raphodo/nameeditor.py:827 ../raphodo/rapid.py:1809
+#: ../raphodo/generatenameconfig.py:397 ../raphodo/jobcodepanel.py:199
+#: ../raphodo/nameeditor.py:833 ../raphodo/rapid.py:1852
 #: ../raphodo/renamepanel.py:83 ../raphodo/renamepanel.py:241
 msgid "Job Code"
 msgstr "Código de trabajo"
 
-#: ../raphodo/generatenameconfig.py:433 ../raphodo/generatenameconfig.py:512
+#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:532
 msgid "Original Filename"
 msgstr "Nombre de archivo original"
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "Date-Time and Downloads today"
 msgstr "Fecha-hora y descargas hoy"
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "YYYYMMDD-HHMM-1"
 msgstr "AAAAMMDD-HHMM-1"
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "Date and Downloads today"
 msgstr "Fecha y descargas hoy"
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "YYYYMMDD-1"
 msgstr "AAAAMMDD-1"
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "Date-Time and Image number"
 msgstr "Fecha-hora y número de imagen"
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "YYYYMMDD-1234"
 msgstr "AAAAMMDD-1234"
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "Date-Time and Job Code"
 msgstr "Fecha-hora y código de trabajo"
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "YYYYMMDD-HHMM-Job Code-1"
 msgstr "AAAAMMDD-HHMM-Código de trabajo-1"
 
-#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:442 ../raphodo/generatenameconfig.py:537
 msgid "YYYYMMDD-Job Code-1"
 msgstr "AAAAMMDD-Código de trabajo-1"
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "Date-Time and Video number"
 msgstr "Fecha-hora y número de vídeo"
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "YYYYMMDD_1234"
 msgstr "AAAAMMDD_1234"
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "Resolution"
 msgstr "Resolución"
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "YYYYMMDD-HHMM-1-1920x1080"
 msgstr "AAAAMMDD-HHMM-1-1920x1080"
 
@@ -1796,7 +2279,7 @@ msgstr "Código de trabajo"
 msgid "&Remember this choice"
 msgstr "&Recordar esta selección"
 
-#: ../raphodo/jobcodepanel.py:185
+#: ../raphodo/jobcodepanel.py:186
 msgid ""
 "Select photos and videos to be able to apply a new or existing Job Code to "
 "them."
@@ -1804,13 +2287,14 @@ msgstr ""
 "Seleccione las fotos y vídeos para que pueda aplicarles un código de trabajo "
 "nuevo o existente."
 
-#: ../raphodo/jobcodepanel.py:186
-msgid "The new Job Code will be applied to all selected photos and/or videos."
+#: ../raphodo/jobcodepanel.py:187
+msgid ""
+"The new Job Code will be applied to all selected photos and/or videos."
 msgstr ""
 "Se aplicará un nuevo código de trabajo a todas las fotos y vídeos "
 "seleccionadas."
 
-#: ../raphodo/jobcodepanel.py:187
+#: ../raphodo/jobcodepanel.py:188
 msgid ""
 "Click the Apply button to apply the current Job Code to all selected photos "
 "and/or videos. You can also simply double click the Job Code."
@@ -1819,7 +2303,7 @@ msgstr ""
 "fotos y vídeos seleccionados. También puede simplemente hacer doble clic en "
 "el código de trabajo."
 
-#: ../raphodo/jobcodepanel.py:189
+#: ../raphodo/jobcodepanel.py:190
 msgid ""
 "Removing a Job Code removes it only from the list of saved Job Codes, not "
 "from any photos or videos that it may have been applied to."
@@ -1828,7 +2312,7 @@ msgstr ""
 "trabajo guardados, no de las fotos o vídeos a los que se les pueda haber "
 "aplicado."
 
-#: ../raphodo/jobcodepanel.py:191
+#: ../raphodo/jobcodepanel.py:192
 msgid ""
 "If you want to use Job Codes, configure file renaming or destination "
 "subfolder names to use them."
@@ -1836,48 +2320,48 @@ msgstr ""
 "Si quiere usar códigos de trabajo, configure el renombrado de archivos o los "
 "nombres de subcarpetas de destino para usarlos."
 
-#: ../raphodo/jobcodepanel.py:197
+#: ../raphodo/jobcodepanel.py:198
 msgid "Last Used"
 msgstr "Último usado"
 
-#: ../raphodo/jobcodepanel.py:202
+#: ../raphodo/jobcodepanel.py:203
 msgid "Job Code Sort:"
 msgstr "Tipo de código de trabajo:"
 
-#: ../raphodo/jobcodepanel.py:205 ../raphodo/rapid.py:2061
+#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2133
 msgid "Ascending"
 msgstr "Ascendente"
 
-#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2062
+#: ../raphodo/jobcodepanel.py:207 ../raphodo/rapid.py:2134
 msgid "Descending"
 msgstr "Descendente"
 
-#: ../raphodo/jobcodepanel.py:216
+#: ../raphodo/jobcodepanel.py:217
 msgid "&New..."
 msgstr "&Nuevo..."
 
-#: ../raphodo/jobcodepanel.py:220
+#: ../raphodo/jobcodepanel.py:221
 msgid "&Apply"
 msgstr "&Aplicar"
 
-#: ../raphodo/jobcodepanel.py:224
+#: ../raphodo/jobcodepanel.py:225
 msgid "&Remove"
 msgstr "&Eliminar"
 
-#: ../raphodo/jobcodepanel.py:228 ../raphodo/preferencedialog.py:125
-#: ../raphodo/preferencedialog.py:154 ../raphodo/preferencedialog.py:433
+#: ../raphodo/jobcodepanel.py:229 ../raphodo/preferencedialog.py:200
+#: ../raphodo/preferencedialog.py:229 ../raphodo/preferencedialog.py:531
 msgid "Remove All"
 msgstr "&Eliminar todos"
 
-#: ../raphodo/jobcodepanel.py:427
+#: ../raphodo/jobcodepanel.py:428
 msgid "Do you really want to remove all the Job Codes?"
 msgstr "¿Quiere realmente eliminar todos los códigos de trabajo?"
 
-#: ../raphodo/jobcodepanel.py:429
+#: ../raphodo/jobcodepanel.py:430
 msgid "Remove all Job Codes"
 msgstr "Eliminar todos los códigos de trabajo"
 
-#: ../raphodo/jobcodepanel.py:492
+#: ../raphodo/jobcodepanel.py:493
 msgid "Job Codes"
 msgstr "Códigos de trabajo"
 
@@ -1888,42 +2372,58 @@ msgstr "Códigos de trabajo"
 msgid "<i><b>Hint:</b> %(message)s"
 msgstr "<i><b>Consejo:</b> %(message)s"
 
-#: ../raphodo/nameeditor.py:418 ../raphodo/nameeditor.py:432
+#: ../raphodo/nameeditor.py:423 ../raphodo/nameeditor.py:437
 #, python-format
 msgid "%(description)s - %(elements)s"
 msgstr "%(description)s - %(elements)s"
 
-#: ../raphodo/nameeditor.py:512
+#: ../raphodo/nameeditor.py:517
 msgid "Save New Custom Preset..."
 msgstr "Guardar nueva configuración personalizada..."
 
-#: ../raphodo/nameeditor.py:513
+#: ../raphodo/nameeditor.py:518
 msgid "Remove All Custom Presets..."
 msgstr "Eliminar todas las configuraciones personalizadas..."
 
-#: ../raphodo/nameeditor.py:559
+#: ../raphodo/nameeditor.py:564
 msgid "(New Custom Preset)"
 msgstr "(nueva configuración personalizada)"
 
-#: ../raphodo/nameeditor.py:576
+#: ../raphodo/nameeditor.py:581
 #, python-format
 msgid "%s (edited)"
 msgstr "%s (editada)"
 
-#: ../raphodo/nameeditor.py:579 ../raphodo/nameeditor.py:1370
+#: ../raphodo/nameeditor.py:584 ../raphodo/nameeditor.py:1379
 #, python-format
 msgid "Update Custom Preset \"%s\""
 msgstr "Actualizar configuración personalizada «%s»"
 
-#: ../raphodo/nameeditor.py:667
+#: ../raphodo/nameeditor.py:672
 msgid "Save New Custom Preset - Rapid Photo Downloader"
 msgstr "Guarda nueva configuración personalizada - Raphid Photo Downloader"
 
-#: ../raphodo/nameeditor.py:675
+#: ../raphodo/nameeditor.py:680
 msgid "Preset Name:"
 msgstr "Nombre de configuración:"
 
-#: ../raphodo/nameeditor.py:836
+#: ../raphodo/nameeditor.py:799
+msgid "Photo Subfolder Generation Editor"
+msgstr "Editor de generación de subcarpetas de fotos"
+
+#: ../raphodo/nameeditor.py:805
+msgid "Video Subfolder Generation Editor"
+msgstr "Editor de generación de subcarpetas de vídeos"
+
+#: ../raphodo/nameeditor.py:811
+msgid "Photo Renaming Editor"
+msgstr "Editor de renombrado de fotos"
+
+#: ../raphodo/nameeditor.py:817
+msgid "Video Renaming Editor"
+msgstr "Editor de renombrado de vídeos"
+
+#: ../raphodo/nameeditor.py:842
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>There is insufficient data to "
 "fully generate the name. Please use other renaming options.</i>"
@@ -1935,7 +2435,7 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees.
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:846
+#: ../raphodo/nameeditor.py:853
 #, python-format
 msgid "The character</i> %(separator)s <i>creates a new subfolder level."
 msgstr "El carácter<i> %(separator)s </i>crea un nuevo nivel de subcarpetas."
@@ -1943,7 +2443,7 @@ msgstr "El carácter<i> %(separator)s </i>crea un nuevo nivel de subcarpetas."
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:851
+#: ../raphodo/nameeditor.py:858
 #, python-format
 msgid ""
 "There is no need start or end with the folder separator </i> "
@@ -1952,7 +2452,7 @@ msgstr ""
 "No es necesario comenzar o terminar con el separador de carpetas </i> "
 "%(separator)s<i>, porque se añade automáticamente."
 
-#: ../raphodo/nameeditor.py:859
+#: ../raphodo/nameeditor.py:866
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>Unique filenames may not be "
 "generated. Make filenames unique by using Sequence values.</i>"
@@ -1961,80 +2461,80 @@ msgstr ""
 "archivos únicos. Hacer los nombres de archivos únicos mediante valores "
 "secuenciales.</i>"
 
-#: ../raphodo/nameeditor.py:882 ../raphodo/renamepanel.py:121
+#: ../raphodo/nameeditor.py:889 ../raphodo/renamepanel.py:121
 msgid "Preset:"
 msgstr "Configuración:"
 
 #. Translators: appears in a combobox, e.g. Image Date (YYYY)
-#: ../raphodo/nameeditor.py:959 ../raphodo/nameeditor.py:980
+#: ../raphodo/nameeditor.py:966 ../raphodo/nameeditor.py:987
 #, python-brace-format
 msgid "{choice} ({variant})"
 msgstr "{choice} ({variant})"
 
-#: ../raphodo/nameeditor.py:1005 ../raphodo/preferencedialog.py:530
+#: ../raphodo/nameeditor.py:1012 ../raphodo/preferencedialog.py:783
 msgid "Get help online..."
 msgstr "Obtener ayuda en línea..."
 
-#: ../raphodo/nameeditor.py:1025
+#: ../raphodo/nameeditor.py:1034
 msgid "Insert"
 msgstr "Insertar"
 
-#: ../raphodo/nameeditor.py:1351
+#: ../raphodo/nameeditor.py:1360
 msgid "Save Preset - Rapid Photo Downloader"
 msgstr "Guardar configuración - Rapid Photo Downloader"
 
-#: ../raphodo/nameeditor.py:1356
+#: ../raphodo/nameeditor.py:1365
 msgid ""
-"<b>Do you want to save the changes in a new custom preset?</"
-"b><br><br>Creating a custom preset is not required, but can help you keep "
-"organized.<br><br>The changes to the preferences will still be applied "
-"regardless of whether you create a new custom preset or not."
+"<b>Do you want to save the changes in a new custom "
+"preset?</b><br><br>Creating a custom preset is not required, but can help "
+"you keep organized.<br><br>The changes to the preferences will still be "
+"applied regardless of whether you create a new custom preset or not."
 msgstr ""
-"<b>¿Desea guardar los cambios en una nueva configuración personalizada?</"
-"b><br><br>No es obligatorio crear configuraciones personalizadas, pero le "
-"pueden ayudar a mantenerse organizado.<br><br>Los cambios a las preferencias "
-"se aplicarán independientemente de si crea una nueva configuración "
-"personalizada o no."
+"<b>¿Desea guardar los cambios en una nueva configuración "
+"personalizada?</b><br><br>No es obligatorio crear configuraciones "
+"personalizadas, pero le pueden ayudar a mantenerse organizado.<br><br>Los "
+"cambios a las preferencias se aplicarán independientemente de si crea una "
+"nueva configuración personalizada o no."
 
-#: ../raphodo/nameeditor.py:1365
+#: ../raphodo/nameeditor.py:1374
 msgid ""
 "<b>Do you want to save the changes in a custom preset?</b><br><br>If you "
 "like, you can create a new custom preset or update the existing custom "
 "preset.<br><br>The changes to the preferences will still be applied "
 "regardless of whether you save a custom preset or not."
 msgstr ""
-"<b>¿Desea guardar los cambios en una nueva configuración personalizada?</"
-"b><br><br>Si así lo desea, puede crear una nueva configuración personalizada "
-"o actualizar una existente.<br><br>Los cambios a las preferencias se "
-"aplicarán independientemente de si crea una nueva configuración "
-"personalizada o no."
+"<b>¿Desea guardar los cambios en una nueva configuración "
+"personalizada?</b><br><br>Si así lo desea, puede crear una nueva "
+"configuración personalizada o actualizar una existente.<br><br>Los cambios a "
+"las preferencias se aplicarán independientemente de si crea una nueva "
+"configuración personalizada o no."
 
-#: ../raphodo/nameeditor.py:1372
+#: ../raphodo/nameeditor.py:1381
 msgid "Save New Custom Preset"
 msgstr "Guardar nueva configuración personalizada"
 
-#: ../raphodo/newversion.py:306
+#: ../raphodo/newversion.py:312
 msgid "Checking for new version..."
 msgstr "Comprobando nueva versión..."
 
-#: ../raphodo/newversion.py:307
+#: ../raphodo/newversion.py:313
 msgid "You are running the latest version."
 msgstr "Ya está usando la última versión."
 
-#: ../raphodo/newversion.py:308
+#: ../raphodo/newversion.py:314
 msgid "Failed to contact the update server."
 msgstr "No se pudo conectar con el servidor de actualizaciones."
 
-#: ../raphodo/newversion.py:310
+#: ../raphodo/newversion.py:316
 #, python-format
 msgid "A new version of Rapid Photo Downloader (%s) is available."
 msgstr "Está disponible una nueva versión de Rapid Photo Downloader (%s)."
 
-#: ../raphodo/newversion.py:312
+#: ../raphodo/newversion.py:318
 msgid "Do you want to download the new version?"
 msgstr "¿Quiere descargar la nueva versión?"
 
-#: ../raphodo/newversion.py:313
+#: ../raphodo/newversion.py:319
 #, python-format
 msgid "Changes in the new release can be viewed <a href=\"%s\">here</a>."
 msgstr ""
@@ -2042,63 +2542,68 @@ msgstr ""
 
 #. Translators: this text appears in a button - the & sets the s key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:340 ../raphodo/newversion.py:353
+#: ../raphodo/newversion.py:348 ../raphodo/newversion.py:363
 msgid "&Skip this release"
 msgstr "&Omitir esta versión"
 
 #. Translators: this text appears in a button - the & sets the o key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:356
+#: ../raphodo/newversion.py:366
 msgid "&Open Download Page"
 msgstr "&Abrir la página de descargas"
 
-#: ../raphodo/newversion.py:376
+#: ../raphodo/newversion.py:386
 msgid "Rapid Photo Downloader updates"
 msgstr "Rapid Photo Downloader actualizaciones"
 
 #. Translators: shows how much of a file has been downloaded e.g  123 KB of 1.3 MB
-#: ../raphodo/newversion.py:478
+#: ../raphodo/newversion.py:488
 #, python-format
 msgid "%(downloaded)s of %(total)s"
 msgstr "%(downloaded)s de %(total)s"
 
-#: ../raphodo/newversion.py:495
+#: ../raphodo/newversion.py:507
 msgid "Downloading..."
 msgstr "Descargando..."
 
-#: ../raphodo/preferencedialog.py:76
+#: ../raphodo/preferencedialog.py:86
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Automation"
 msgstr "Automatización"
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Thumbnails"
 msgstr "Miniaturas"
 
-#: ../raphodo/preferencedialog.py:85 ../raphodo/preferencedialog.py:343
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/preferencedialog.py:428
 msgid "Error Handling"
 msgstr "Manejo de errores"
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Warnings"
 msgstr "Avisos"
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:109
+msgid "Consolidation"
+msgstr "Consolidación"
+
+#: ../raphodo/preferencedialog.py:109 ../raphodo/preferencedialog.py:119
 msgid "Miscellaneous"
 msgstr "Varios"
 
-#: ../raphodo/preferencedialog.py:94
+#: ../raphodo/preferencedialog.py:147
 msgid "Device Scanning"
 msgstr "Explorando dispositivo"
 
-#: ../raphodo/preferencedialog.py:96
+#: ../raphodo/preferencedialog.py:148
 msgid "Scan only external devices"
 msgstr "Explorar solo dispositivos externos"
 
-#: ../raphodo/preferencedialog.py:98
+#: ../raphodo/preferencedialog.py:150
 msgid ""
 "Scan for photos and videos only on devices that are external to the "
 "computer,\n"
@@ -2107,40 +2612,77 @@ msgstr ""
 "Explorar buscando fotos y vídeos solo en dispositivos externos al equipo,\n"
 "incluyendo cámaras, tarjetas de memoria, discos duros externos y discos USB."
 
-#: ../raphodo/preferencedialog.py:102
-msgid "Scan non-camera devices lacking a DCIM folder"
-msgstr "Explorar dispositivos no-cámaras sin carpeta DCIM"
+#: ../raphodo/preferencedialog.py:153
+msgid "Scan only specific folders on devices"
+msgstr "Explorar solo carpetas específicas en los dispositivos"
 
-#: ../raphodo/preferencedialog.py:104
+#: ../raphodo/preferencedialog.py:155
 msgid ""
-"Scan the entirety of a device for photos and videos, irrespective of whether "
-"it contains a DCIM folder,\n"
-"as opposed to only scanning within a DCIM folder.\n"
+"Scan for photos and videos only in the folders specified below (except "
+"paths\n"
+"specified in Ignored Paths).\n"
+"\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+"Explorar buscando fotos y vídeos en las carpetas especificadas más abajo\n"
+"(excepto rutas incluidas en Rutas ignoradas).\n"
 "\n"
-"Changing this setting causes all devices to be scanned again.\n"
+"Cambiar este parámetro obliga a explorar todos los dispositivos de nuevo."
+
+#: ../raphodo/preferencedialog.py:161
+msgid "Folders to scan:"
+msgstr "Carpetas a explorar:"
+
+#: ../raphodo/preferencedialog.py:164
+msgid ""
+"Folders at the base level of device file systems that will be scanned\n"
+"for photos and videos."
+msgstr ""
+"Carpetas en nivel raíz del sistema de archivos del dispositivo que\n"
+"se explorarán en busca de fotos y vídeos."
+
+#: ../raphodo/preferencedialog.py:167 ../raphodo/preferencedialog.py:219
+msgid "Add..."
+msgstr "Añadir..."
+
+#: ../raphodo/preferencedialog.py:169
+msgid ""
+"Add a folder to the list of folders to scan for photos and videos.\n"
 "\n"
-"Note: With cameras, only the DCIM folder is scanned."
+"Changing this setting causes all devices to be scanned again."
 msgstr ""
-"Explorar un dispositivo completamente buscando fotos y vídeos, "
-"independientemente de si tiene una carpeta\n"
-"DCIM, en contraposición a explorar solamente dentro de las carpetas DCIM.\n"
+"Añadir una carpeta a la lista de carpetas a explorar buscando fotos y "
+"vídeos.\n"
 "\n"
-"Cambiar este parámetro hará que se vuelvan a explorar todos los "
-"dispositivos.\n"
+"Cambiar este parámetro obliga a explorar todos los dispositivos de nuevo."
+
+#: ../raphodo/preferencedialog.py:172 ../raphodo/preferencedialog.py:198
+#: ../raphodo/preferencedialog.py:224 ../raphodo/preferencedialog.py:529
+msgid "Remove"
+msgstr "Eliminar"
+
+#: ../raphodo/preferencedialog.py:174
+msgid ""
+"Remove a folder from the list of folders to scan for photos and videos.\n"
+"\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+"Eliminar una carpeta a la lista de carpetas a explorar buscando fotos y "
+"vídeos.\n"
 "\n"
-"Nota: en las cámaras solo se explora la carpeta DCIM."
+"Cambiar este parámetro obliga a explorar todos los dispositivos de nuevo."
 
-#: ../raphodo/preferencedialog.py:116
+#: ../raphodo/preferencedialog.py:191
 msgid "Devices that have been set to automatically ignore or download from."
 msgstr ""
 "Dispositivos que se han configurado para ser ignorados automáticamente o "
 "descargar desde los mismos."
 
-#: ../raphodo/preferencedialog.py:117
+#: ../raphodo/preferencedialog.py:192
 msgid "Remembered Devices"
 msgstr "Dispositivos recordados."
 
-#: ../raphodo/preferencedialog.py:121
+#: ../raphodo/preferencedialog.py:196
 msgid ""
 "Remove a device from the list of devices to automatically ignore or download "
 "from."
@@ -2148,12 +2690,7 @@ msgstr ""
 "Eliminar un dispositivo de la lista de dispositivos a ser ignorados o de los "
 "que descargar automáticamente."
 
-#: ../raphodo/preferencedialog.py:123 ../raphodo/preferencedialog.py:149
-#: ../raphodo/preferencedialog.py:431
-msgid "Remove"
-msgstr "Eliminar"
-
-#: ../raphodo/preferencedialog.py:127
+#: ../raphodo/preferencedialog.py:202
 msgid ""
 "Clear the list of devices from which to automatically ignore or download "
 "from.\n"
@@ -2166,22 +2703,18 @@ msgstr ""
 "Nota: los cambios se harán efectivos la próxima vez que el equipo explore "
 "buscando dispositivos."
 
-#: ../raphodo/preferencedialog.py:140
+#: ../raphodo/preferencedialog.py:215
 msgid "Ignored Paths"
 msgstr "IRutas ignoradas"
 
-#: ../raphodo/preferencedialog.py:141
+#: ../raphodo/preferencedialog.py:216
 msgid ""
 "The end part of a path that should never be scanned for photos or videos."
 msgstr ""
 "La parte final de una ruta que nunca debe ser explorada buscando fotos o "
 "vídeos."
 
-#: ../raphodo/preferencedialog.py:144
-msgid "Add..."
-msgstr "Añadir..."
-
-#: ../raphodo/preferencedialog.py:146
+#: ../raphodo/preferencedialog.py:221
 msgid ""
 "Add a path to the list of paths to ignore.\n"
 "\n"
@@ -2191,7 +2724,7 @@ msgstr ""
 "\n"
 "Cambiar este parámetro hará que se vuelvan a explorar todos los dispositivos."
 
-#: ../raphodo/preferencedialog.py:151
+#: ../raphodo/preferencedialog.py:226
 msgid ""
 "Remove a path from the list of paths to ignore.\n"
 "\n"
@@ -2201,7 +2734,7 @@ msgstr ""
 "\n"
 "Cambiar este parámetro hará que se vuelvan a explorar todos los dispositivos."
 
-#: ../raphodo/preferencedialog.py:156
+#: ../raphodo/preferencedialog.py:231
 msgid ""
 "Clear the list of paths to ignore.\n"
 "\n"
@@ -2211,15 +2744,17 @@ msgstr ""
 "\n"
 "Cambiar este parámetro hará que se vuelvan a explorar todos los dispositivos."
 
-#: ../raphodo/preferencedialog.py:164
+#: ../raphodo/preferencedialog.py:239
 msgid ""
-"Use python-style <a href=\"http://damonlynch.net/rapid/documentation/"
-"#regularexpressions\">regular expressions</a>"
+"Use python-style <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">regula"
+"r expressions</a>"
 msgstr ""
-"Usar  <a href=\"http://damonlynch.net/rapid/documentation/#regularexpressions"
-"\">expresiones regulares</a> tipo python."
+"Usar  <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">expres"
+"iones regulares</a> tipo python."
 
-#: ../raphodo/preferencedialog.py:168
+#: ../raphodo/preferencedialog.py:243
 msgid ""
 "Use regular expressions in the list of ignored paths.\n"
 "\n"
@@ -2229,48 +2764,48 @@ msgstr ""
 "\n"
 "Cambiar este parámetro hará que se vuelvan a explorar todos los dispositivos."
 
-#: ../raphodo/preferencedialog.py:208
+#: ../raphodo/preferencedialog.py:283
 msgid "Program Automation"
 msgstr "Automatización del programa"
 
-#: ../raphodo/preferencedialog.py:209
+#: ../raphodo/preferencedialog.py:284
 msgid "Start downloading at program startup"
 msgstr "Empezar descargas al iniciar el programa"
 
-#: ../raphodo/preferencedialog.py:210
+#: ../raphodo/preferencedialog.py:285
 msgid "Start downloading upon device insertion"
 msgstr "Comenzar a descargar al conectar un dispositivo"
 
-#: ../raphodo/preferencedialog.py:211
+#: ../raphodo/preferencedialog.py:286
 msgid "Unmount (eject) device upon download completion"
 msgstr "Extraer (expulsar) el dispositivo al concluir la descarga"
 
-#: ../raphodo/preferencedialog.py:212
+#: ../raphodo/preferencedialog.py:287
 msgid "Exit program when download completes"
 msgstr "Salir del programa cuando se completen las descargas"
 
-#: ../raphodo/preferencedialog.py:213
+#: ../raphodo/preferencedialog.py:288
 msgid "Exit program even if download had warnings or errors"
 msgstr ""
 "Salir del programa, incluso si la descarga tiene advertencias o errores"
 
-#: ../raphodo/preferencedialog.py:240
+#: ../raphodo/preferencedialog.py:315
 msgid "Thumbnail Generation"
 msgstr "Generación de miniaturas"
 
-#: ../raphodo/preferencedialog.py:241
+#: ../raphodo/preferencedialog.py:316
 msgid "Generate thumbnails"
 msgstr "Generar miniaturas"
 
-#: ../raphodo/preferencedialog.py:242
+#: ../raphodo/preferencedialog.py:318
 msgid "Generate thumbnails to show in the main program window"
 msgstr "Generar miniaturas para mostrar en la ventana principal del programa"
 
-#: ../raphodo/preferencedialog.py:244
+#: ../raphodo/preferencedialog.py:320
 msgid "Cache thumbnails"
 msgstr "Caché de miniaturas"
 
-#: ../raphodo/preferencedialog.py:245
+#: ../raphodo/preferencedialog.py:323
 msgid ""
 "Save thumbnails shown in the main program window in a thumbnail cache unique "
 "to Rapid Photo Downloader"
@@ -2278,11 +2813,11 @@ msgstr ""
 "Guardar las miniaturas que se muestran en la ventana principal del programa "
 "en una caché de miniaturas exclusiva para Rapid Photo Downloader"
 
-#: ../raphodo/preferencedialog.py:247
+#: ../raphodo/preferencedialog.py:327
 msgid "Generate system thumbnails"
 msgstr "Generar miniaturas de sistema"
 
-#: ../raphodo/preferencedialog.py:248
+#: ../raphodo/preferencedialog.py:330
 msgid ""
 "While downloading, save thumbnails that can be used by desktop file managers "
 "and other programs"
@@ -2290,77 +2825,77 @@ msgstr ""
 "Mientras se descarga, guardar las miniaturas para que se puedan usar por "
 "gestores de archivos de escritorio y otros programas"
 
-#: ../raphodo/preferencedialog.py:255
+#: ../raphodo/preferencedialog.py:339
 msgid "Number of CPU cores used to generate thumbnails."
 msgstr "Número de núcleos de CPU a usar para generar las miniaturas."
 
-#: ../raphodo/preferencedialog.py:256
+#: ../raphodo/preferencedialog.py:340
 msgid "CPU cores:"
 msgstr "Núcleos de CPU:"
 
 #. Translators: the * acts as an asterisk to denote a reference to an annotation
 #. such as '* Takes effect upon program restart'
-#: ../raphodo/preferencedialog.py:271 ../raphodo/preferencedialog.py:317
+#: ../raphodo/preferencedialog.py:355 ../raphodo/preferencedialog.py:401
 msgid "*"
 msgstr "*"
 
-#: ../raphodo/preferencedialog.py:294
+#: ../raphodo/preferencedialog.py:378
 msgid "Thumbnail Cache"
 msgstr "Caché de miniaturas"
 
-#: ../raphodo/preferencedialog.py:296
+#: ../raphodo/preferencedialog.py:380
 msgid "Calculating..."
 msgstr "Calculando..."
 
-#: ../raphodo/preferencedialog.py:302
+#: ../raphodo/preferencedialog.py:386
 msgid "days"
 msgstr "días"
 
-#: ../raphodo/preferencedialog.py:303
+#: ../raphodo/preferencedialog.py:387
 msgid "forever"
 msgstr "para siempre"
 
-#: ../raphodo/preferencedialog.py:308
+#: ../raphodo/preferencedialog.py:392
 msgid "Cache size:"
 msgstr "Tamaño de la caché:"
 
-#: ../raphodo/preferencedialog.py:310
+#: ../raphodo/preferencedialog.py:394
 msgid "Number of thumbnails:"
 msgstr "Número de miniaturas:"
 
-#: ../raphodo/preferencedialog.py:312
+#: ../raphodo/preferencedialog.py:396
 msgid "Database size:"
 msgstr "Tamaño de la base de datos:"
 
-#: ../raphodo/preferencedialog.py:314
+#: ../raphodo/preferencedialog.py:398
 msgid "Cache unaccessed thumbnails for:"
 msgstr "Cachear las miniaturas no accedida durante:"
 
-#: ../raphodo/preferencedialog.py:322
+#: ../raphodo/preferencedialog.py:406
 msgid "Purge Cache..."
 msgstr "Purgar caché..."
 
-#: ../raphodo/preferencedialog.py:323
+#: ../raphodo/preferencedialog.py:408
 msgid "Optimize Cache..."
 msgstr "Optimizar caché..."
 
-#: ../raphodo/preferencedialog.py:336
+#: ../raphodo/preferencedialog.py:421
 msgid "* Takes effect upon program restart"
 msgstr "* Tiene efecto en el siguiente reinicio del programa"
 
-#: ../raphodo/preferencedialog.py:346
+#: ../raphodo/preferencedialog.py:431
 msgid "Skip download"
 msgstr "Saltar descarga"
 
-#: ../raphodo/preferencedialog.py:347
+#: ../raphodo/preferencedialog.py:432
 msgid "Don't download the file, and issue an error message"
 msgstr "No descargar el archivo y emitir un mensaje de error"
 
-#: ../raphodo/preferencedialog.py:348
+#: ../raphodo/preferencedialog.py:433
 msgid "Add unique identifier"
 msgstr "Agregar identificador único"
 
-#: ../raphodo/preferencedialog.py:349
+#: ../raphodo/preferencedialog.py:436
 msgid ""
 "Add an identifier like _1 or _2 to the end of the filename, immediately "
 "before the file's extension"
@@ -2368,25 +2903,25 @@ msgstr ""
 "Añadir un identificador como _1 o _2 al final del nombre de archivo, "
 "inmediatamente antes de la extensión del archivo"
 
-#: ../raphodo/preferencedialog.py:355
+#: ../raphodo/preferencedialog.py:444
 msgid "Overwrite"
 msgstr "Sobreescribir"
 
-#: ../raphodo/preferencedialog.py:356
+#: ../raphodo/preferencedialog.py:445
 msgid "Overwrite the previously backed up file"
 msgstr "Sobre escribir el archivo de copia de seguridad previo"
 
-#: ../raphodo/preferencedialog.py:357
+#: ../raphodo/preferencedialog.py:446
 msgid "Skip"
 msgstr "Saltar"
 
-#: ../raphodo/preferencedialog.py:358
+#: ../raphodo/preferencedialog.py:448
 msgid "Don't overwrite the backup file, and issue an error message"
 msgstr ""
 "No sobreescribir el archivo de copia de seguridad y emitir un mensaje de "
 "error"
 
-#: ../raphodo/preferencedialog.py:364
+#: ../raphodo/preferencedialog.py:455
 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 identifier:"
@@ -2394,7 +2929,17 @@ msgstr ""
 "Cuando una fotografía o video ha sido ya descargada, elegir omitirla "
 "descarga del archivo o añadir un identificador único."
 
-#: ../raphodo/preferencedialog.py:378
+#: ../raphodo/preferencedialog.py:464
+msgid ""
+"Using sequence numbers to automatically generate unique filenames is "
+"strongly recommended. Configure file renaming in the Rename panel in the "
+"main window."
+msgstr ""
+"Es altamente recomendable usar números de secuencia para generar "
+"automáticamente nombres de archivos únicos. Configure el renombrado de "
+"archivos en el panel Renombrado de la ventana principal."
+
+#: ../raphodo/preferencedialog.py:473
 msgid ""
 "When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up:"
@@ -2403,40 +2948,41 @@ msgstr ""
 "dispositivo de copia de seguridad que tenga el mismo nombre u omitir la "
 "copia de seguridad."
 
-#: ../raphodo/preferencedialog.py:398
+#: ../raphodo/preferencedialog.py:494
 msgid "Program Warnings"
 msgstr "Avisos del programa"
 
-#: ../raphodo/preferencedialog.py:399
+#: ../raphodo/preferencedialog.py:495
 msgid "Show a warning when:"
 msgstr "Mostrar un aviso cuando:"
 
-#: ../raphodo/preferencedialog.py:402
+#: ../raphodo/preferencedialog.py:498
 msgid "Downloading files currently not displayed"
 msgstr "Se descarguen archivos que no se estén mostrando actualmente"
 
-#: ../raphodo/preferencedialog.py:403
+#: ../raphodo/preferencedialog.py:499
 msgid ""
 "Warn when about to download files that are not displayed in the main window."
 msgstr ""
 "Avise cuando esté a punto de descargar archivos que no se muestran en la "
 "ventana principal."
 
-#: ../raphodo/preferencedialog.py:405
+#: ../raphodo/preferencedialog.py:501
 msgid "Backup destinations are missing"
 msgstr "Faltan destinos de copias de seguridad"
 
-#: ../raphodo/preferencedialog.py:406
-msgid "Warn before starting a download if it is not possible to back up files."
+#: ../raphodo/preferencedialog.py:502
+msgid ""
+"Warn before starting a download if it is not possible to back up files."
 msgstr ""
 "Avisar antes de comenzar a descargar si no es posible hacer la copia de "
 "seguridad de los archivos."
 
-#: ../raphodo/preferencedialog.py:408
+#: ../raphodo/preferencedialog.py:504
 msgid "Program libraries are missing or broken"
 msgstr "Faltan bibliotecas del programa o están corruptas"
 
-#: ../raphodo/preferencedialog.py:409
+#: ../raphodo/preferencedialog.py:505
 msgid ""
 "Warn if a software library used by Rapid Photo Downloader is missing or not "
 "functioning."
@@ -2444,11 +2990,11 @@ msgstr ""
 "Avisar si una biblioteca software usada por Rapid Photo Downloader falta o "
 "no está funcionando."
 
-#: ../raphodo/preferencedialog.py:412
+#: ../raphodo/preferencedialog.py:508
 msgid "Filesystem metadata cannot be set"
 msgstr "No se pueden establecer metadatos del sistema de archivos"
 
-#: ../raphodo/preferencedialog.py:413
+#: ../raphodo/preferencedialog.py:509
 msgid ""
 "Warn if there is an error setting a file's filesystem metadata, such as its "
 "modification time."
@@ -2456,11 +3002,11 @@ msgstr ""
 "Avisar si hay un error estableciendo los metadatos del sistema de archivos "
 "de un archivo, como la hora de la modificación."
 
-#: ../raphodo/preferencedialog.py:416
+#: ../raphodo/preferencedialog.py:512
 msgid "Encountering unhandled files"
 msgstr "Encuentro de archivos no gestionados"
 
-#: ../raphodo/preferencedialog.py:417
+#: ../raphodo/preferencedialog.py:513
 msgid ""
 "Warn after scanning a device or this computer if there are unrecognized "
 "files that will not be included in the download."
@@ -2468,11 +3014,11 @@ msgstr ""
 "Avisar después de explorar un dispositivo o este equipo si hay archivos no "
 "reconocidos que no se incluirán en la descarga."
 
-#: ../raphodo/preferencedialog.py:420
+#: ../raphodo/preferencedialog.py:517
 msgid "Do not warn about unhandled files with extensions:"
 msgstr "No avisar de archivos no gestionados con extensión:"
 
-#: ../raphodo/preferencedialog.py:424
+#: ../raphodo/preferencedialog.py:522
 msgid ""
 "File extensions are case insensitive and do not need to include the leading "
 "dot."
@@ -2480,18 +3026,18 @@ msgstr ""
 "Las extensiones de archivo no son sensibles a las mayúsculas y no necesitan "
 "incluir el punto inicial."
 
-#: ../raphodo/preferencedialog.py:427
+#: ../raphodo/preferencedialog.py:525
 msgid "Add"
 msgstr "Añadir"
 
-#: ../raphodo/preferencedialog.py:428
+#: ../raphodo/preferencedialog.py:526
 msgid ""
 "Add a file extension to the list of unhandled file types to not warn about."
 msgstr ""
 "Añadir una extesión de archivo a la lista de tipos de archivos no "
 "gestionados sobre los que no avisar."
 
-#: ../raphodo/preferencedialog.py:430
+#: ../raphodo/preferencedialog.py:528
 msgid ""
 "Remove a file extension from the list of unhandled file types to not warn "
 "about."
@@ -2499,32 +3045,174 @@ msgstr ""
 "Eliminar una extesión de archivo a la lista de tipos de archivos no "
 "gestionados sobre los que no avisar."
 
-#: ../raphodo/preferencedialog.py:434
+#: ../raphodo/preferencedialog.py:532
 msgid ""
 "Clear the list of file extensions of unhandled file types to not warn about."
 msgstr ""
 "Borrar la lista de extesiones de archivo de tipos de archivos no gestionados "
 "sobre los que no avisar."
 
-#: ../raphodo/preferencedialog.py:469
+#: ../raphodo/preferencedialog.py:568
+msgid "Photo and Video Consolidation"
+msgstr "Consolidación de fotos y vídeos"
+
+#: ../raphodo/preferencedialog.py:571
+msgid "Consolidate files across devices and downloads"
+msgstr "Consolidar archivos entre dispositivos y descargas"
+
+#: ../raphodo/preferencedialog.py:574
+msgid ""
+"Analyze the results of device scans looking for duplicate files and matching "
+"RAW and JPEG pairs,\n"
+"comparing them across multiple devices and download sessions."
+msgstr ""
+"Analizar los resultados de exploraciones de dispositivos buscando archivos "
+"duplicados y pares coincidentes de RAWs y JPEGs, comparándolos entre varios "
+"dispositivos y sesiones de descarga."
+
+#: ../raphodo/preferencedialog.py:580
+msgid "Treat matching RAW and JPEG files as:"
+msgstr "Tratar los archivos RAW y JPEG como:"
+
+#: ../raphodo/preferencedialog.py:581
+msgid "One photo"
+msgstr "Una foto"
+
+#: ../raphodo/preferencedialog.py:582
+msgid "Two photos"
+msgstr "Dos fotos"
+
+#: ../raphodo/preferencedialog.py:584
+msgid ""
+"Display matching pairs of RAW and JPEG photos as one photo, and if marked, "
+"download both."
+msgstr ""
+"Mostrar los pares de RAWs y JPEGs coincidentes como una foto y, si se "
+"marcan, descargar ambos."
+
+#: ../raphodo/preferencedialog.py:589
+msgid ""
+"Display matching pairs of RAW and JPEG photos as two different photos. You "
+"can still synchronize their sequence numbers."
+msgstr ""
+"Mostrar los pares de RAWs y JPEGs coincidentes como dos fotos "
+"independientes. Aún así todavía puede sincronizar sus números de secuencia."
+
+#: ../raphodo/preferencedialog.py:598
+msgid "With matching RAW and JPEG photos:"
+msgstr "Con fotos coincidentes de RAW y JPEG:"
+
+#: ../raphodo/preferencedialog.py:600
+msgid "Do not mark JPEG for download"
+msgstr "No marcar JPEG para descargar"
+
+#: ../raphodo/preferencedialog.py:601
+msgid "Do not mark RAW for download"
+msgstr "No marcar RAW para descargar"
+
+#: ../raphodo/preferencedialog.py:602
+msgid "Mark both for download"
+msgstr "Marcar ambos para descargar"
+
+#: ../raphodo/preferencedialog.py:609
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"JPEG for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+"Cuando se encuentren fotos RAW y JPEG coincidentes, no marcar "
+"automáticamente el JPEG para descargar. Aún así todavía puede marcarlo para "
+"descargarlo."
+
+#: ../raphodo/preferencedialog.py:614
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"RAW for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+"Cuando se encuentren fotos RAW y JPEG coincidentes, no marcar "
+"automáticamente el RAW para descargar. Aún así todavía puede marcarlo para "
+"descargarlo."
+
+#: ../raphodo/preferencedialog.py:619
+msgid ""
+"When matching RAW and JPEG photos are found, automatically mark both for "
+"download."
+msgstr ""
+"Cuando se encuentre fotos RAW y JPEG coincidentes, marcar ambas para "
+"descargar."
+
+#: ../raphodo/preferencedialog.py:625
+msgid ""
+"If you disable file consolidation, choose what to do when a download device "
+"is inserted while completed downloads are displayed:"
+msgstr ""
+"Si desactiva la consolidación de archivos, elija qué hacer cuando se "
+"introduzca un dispositivo a descargar mientras se muestran las descargas "
+"completadas:"
+
+#: ../raphodo/preferencedialog.py:631
+msgid ""
+"When a download device is inserted while completed downloads are displayed:"
+msgstr ""
+"Cuando se introduzca un dispositivo a descargar mientras se muestran las "
+"descargas completadas:"
+
+#: ../raphodo/preferencedialog.py:642
+msgid "Clear completed downloads"
+msgstr "Limpiar las descargas completadas"
+
+#: ../raphodo/preferencedialog.py:643
+msgid "Keep displaying completed downloads"
+msgstr "Seguir mostrando las descargas completadas"
+
+#: ../raphodo/preferencedialog.py:644
+msgid "Prompt for what to do"
+msgstr "Preguntar qué hacer"
+
+#: ../raphodo/preferencedialog.py:649
+msgid ""
+"Automatically clear the display of completed downloads whenever a new "
+"download device is inserted."
+msgstr ""
+"Limpiar automáticamente las descargas completadas cada vez que se introduzca "
+"un nuevo dispositivo a descargar."
+
+#: ../raphodo/preferencedialog.py:654
+msgid ""
+"Keep displaying completed downloads whenever a new download device is "
+"inserted."
+msgstr ""
+"Seguir mostrando las descargas completadas cuando se introduzca un nuevo "
+"dispositivo a descargar."
+
+#: ../raphodo/preferencedialog.py:658
+msgid ""
+"Prompt whether to keep displaying completed downloads or clear them whenever "
+"a new download device is inserted."
+msgstr ""
+"Preguntar si seguir mostrando las descargas completadas o limpiarlas cuando "
+"se introduzca un nuevo dispositivo a descargar."
+
+#: ../raphodo/preferencedialog.py:702
 msgid "Version Check"
 msgstr "Comprobación de versión"
 
-#: ../raphodo/preferencedialog.py:470
+#: ../raphodo/preferencedialog.py:703
 msgid "Check for new version at startup"
 msgstr "Comprobar nuevas versiones al arrancar"
 
-#: ../raphodo/preferencedialog.py:471
+#: ../raphodo/preferencedialog.py:705
 msgid "Check for a new version of the program each time the program starts."
 msgstr ""
 "Comprobar si existe una nueva versión del programa cada vez que se inicie el "
 "mismo."
 
-#: ../raphodo/preferencedialog.py:473
+#: ../raphodo/preferencedialog.py:707
 msgid "Include development releases"
 msgstr "Incluir emisiones de desarrollo"
 
-#: ../raphodo/preferencedialog.py:474
+#: ../raphodo/preferencedialog.py:709
 msgid ""
 "Include alpha, beta and other development releases when checking for a new "
 "version of the program.\n"
@@ -2538,11 +3226,11 @@ msgstr ""
 "Si está ejecutando una versión de desarrollo, la comprobación se realizará "
 "siempre."
 
-#: ../raphodo/preferencedialog.py:489
+#: ../raphodo/preferencedialog.py:725
 msgid "Ignore DNG date/time metadata on MTP devices"
 msgstr "Ignorar metadatos de fecha/hora DNG en dispositivos MTP"
 
-#: ../raphodo/preferencedialog.py:490
+#: ../raphodo/preferencedialog.py:727
 msgid ""
 "Ignore date/time metadata in DNG files located on MTP devices, and use the "
 "file's modification time instead.\n"
@@ -2556,15 +3244,19 @@ msgstr ""
 "Útil en dispositivos como algunos teléfonos y tabletas que crean metadatos "
 "DNG incorrectos."
 
+#: ../raphodo/preferencedialog.py:741
+msgid "Completed Downloads"
+msgstr "Descargas completadas"
+
 #. Translators: substituted value is a description for the set of preferences
 #. shown in the preference dialog window, e.g. Devices, Automation, etc.
 #. This string is shown in a tooltip for the "Restore Defaults" button
-#: ../raphodo/preferencedialog.py:710
+#: ../raphodo/preferencedialog.py:1067
 #, python-format
 msgid "Restores default %s preference values"
 msgstr "Restaura a los valores de preferencias %s predeterminados."
 
-#: ../raphodo/preferencedialog.py:832
+#: ../raphodo/preferencedialog.py:1208
 msgid ""
 "Do you want to purge the thumbnail cache? The cache will be purged when the "
 "program is next started."
@@ -2572,11 +3264,11 @@ msgstr ""
 "¿Desea purgar la caché de miniaturas? La caché se purgará la próxima vez que "
 "se inicie el programa."
 
-#: ../raphodo/preferencedialog.py:835
+#: ../raphodo/preferencedialog.py:1212
 msgid "Purge Thumbnail Cache"
 msgstr "Purgar la caché de miniaturas"
 
-#: ../raphodo/preferencedialog.py:847
+#: ../raphodo/preferencedialog.py:1225
 msgid ""
 "Do you want to optimize the thumbnail cache? The cache will be optimized "
 "when the program is next started."
@@ -2584,39 +3276,52 @@ msgstr ""
 "¿Desea optimizar la caché de miniaturas? La caché se optimizará la próxima "
 "vez que se inicie el programa."
 
-#: ../raphodo/preferencedialog.py:850
+#: ../raphodo/preferencedialog.py:1229
 msgid "Optimize Thumbnail Cache"
 msgstr "Optimizar la caché de miniaturas"
 
-#: ../raphodo/preferencedialog.py:1045
+#: ../raphodo/preferencedialog.py:1481
+msgid "Enter a Folder to Scan"
+msgstr "Introducir carpeta a explorar"
+
+#: ../raphodo/preferencedialog.py:1482
+msgid "Specify a folder that will be scanned for photos and videos"
+msgstr "Indicar una carpeta que se explorará buscando fotos y vídeos"
+
+#: ../raphodo/preferencedialog.py:1483
+msgid "Folder:"
+msgstr "Carpeta:"
+
+#: ../raphodo/preferencedialog.py:1497
 msgid "Enter a Path to Ignore"
 msgstr "Escriba una ruta para ignorar"
 
-#: ../raphodo/preferencedialog.py:1046
+#: ../raphodo/preferencedialog.py:1498
 msgid "Specify a path that will never be scanned for photos or videos"
-msgstr "Especifique una ruta que nunca se escaneará en busca de fotos o vídeos"
+msgstr ""
+"Especifique una ruta que nunca se escaneará en busca de fotos o vídeos"
 
-#: ../raphodo/preferencedialog.py:1047
+#: ../raphodo/preferencedialog.py:1499
 msgid "Path:"
 msgstr "Ruta:"
 
-#: ../raphodo/preferencedialog.py:1061
+#: ../raphodo/preferencedialog.py:1513
 msgid "Enter a File Extension"
 msgstr "Introduzca una extensión de archivos"
 
-#: ../raphodo/preferencedialog.py:1062
+#: ../raphodo/preferencedialog.py:1514
 msgid "Specify a file extension (without the leading dot)"
 msgstr "Indique una extensión de archivo (sin el punto inicial)"
 
-#: ../raphodo/preferencedialog.py:1063 ../raphodo/renamepanel.py:122
+#: ../raphodo/preferencedialog.py:1515 ../raphodo/renamepanel.py:122
 msgid "Extension:"
 msgstr "Extensión:"
 
-#: ../raphodo/preferencedialog.py:1078
+#: ../raphodo/preferencedialog.py:1530
 msgid "Invalid File Extension"
 msgstr "Extensión de archivo no válida."
 
-#: ../raphodo/preferencedialog.py:1079
+#: ../raphodo/preferencedialog.py:1531
 #, python-format
 msgid ""
 "The file extension <b>%s</b> is recognized by Rapid Photo Downloader, so it "
@@ -2625,7 +3330,7 @@ msgstr ""
 "La extensión de archivo <b>%s</b> es reconocoida por Rapid Photo Downloader, "
 "por lo que no tiene sentido aletar de su presencia."
 
-#: ../raphodo/preferencedialog.py:1081
+#: ../raphodo/preferencedialog.py:1533
 #, python-format
 msgid ""
 "Recognized file types:\n"
@@ -2664,43 +3369,42 @@ msgstr "Boda"
 msgid "Birthday"
 msgstr "Cumpleaños"
 
-#: ../raphodo/preferences.py:614
+#: ../raphodo/preferences.py:624
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Preferencias de subcarpeta no debe empezar con una %s"
 
-#: ../raphodo/preferences.py:617
+#: ../raphodo/preferences.py:627
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Preferencias de subcarpeta no debe terminar con una %s"
 
-#: ../raphodo/preferences.py:622
+#: ../raphodo/preferences.py:632
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
 "Preferencias de subcarpeta no debe contener dos %s una después de la otra"
 
-#. self.setFlat(True)
 #: ../raphodo/primarybutton.py:72
 msgid "Download 8 Photos and 10 Videos"
 msgstr "Descargar 8 fotos y 10 vídeos"
 
-#: ../raphodo/problemnotification.py:86 ../raphodo/problemnotification.py:208
+#: ../raphodo/problemnotification.py:87 ../raphodo/problemnotification.py:209
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr "Error: %(errno)s %(strerror)s"
 
-#: ../raphodo/problemnotification.py:89
+#: ../raphodo/problemnotification.py:90
 #, python-format
 msgid "Error: %s"
 msgstr "Error: %s"
 
-#: ../raphodo/problemnotification.py:116
+#: ../raphodo/problemnotification.py:117
 #, python-format
 msgid "GPhoto2 Error: %s"
 msgstr "GPhoto2 Error: %s"
 
-#: ../raphodo/problemnotification.py:124
+#: ../raphodo/problemnotification.py:125
 msgid ""
 "Unable to initialize the camera, probably because another program is using "
 "it. No files were copied from it."
@@ -2708,66 +3412,66 @@ msgstr ""
 "No se puedo inicializar la cámara, probablemente porque otro programa la "
 "está usando. No se copió ningún archivo de ella."
 
-#: ../raphodo/problemnotification.py:134
+#: ../raphodo/problemnotification.py:135
 #, python-format
 msgid "Unable to read directory %s"
 msgstr "No se puede leer el directorio %s"
 
-#: ../raphodo/problemnotification.py:140
+#: ../raphodo/problemnotification.py:141
 #, python-format
 msgid "Unable to access modification time or size from %s"
 msgstr "No se puede acceder a la hora de modificación o tamaño de %s"
 
-#: ../raphodo/problemnotification.py:146
+#: ../raphodo/problemnotification.py:147
 #, python-format
 msgid "Unable to read file %s"
 msgstr "No se puede leer el archivo %s"
 
-#: ../raphodo/problemnotification.py:152
+#: ../raphodo/problemnotification.py:153
 #, python-format
 msgid "Unable to write file %s"
 msgstr "No se puede escribir el archivo %s"
 
-#: ../raphodo/problemnotification.py:158
+#: ../raphodo/problemnotification.py:159
 #, python-format
 msgid "Unable to move file %s"
 msgstr "No se puede mover el archivo %s"
 
-#: ../raphodo/problemnotification.py:164
+#: ../raphodo/problemnotification.py:165
 #, python-format
 msgid "Unable to remove file %s"
 msgstr "No se puede eliminar el archivo %s"
 
-#: ../raphodo/problemnotification.py:170
+#: ../raphodo/problemnotification.py:171
 #, python-format
 msgid "Unable to copy file %s"
 msgstr "No se puede copiar el archivo %s"
 
-#: ../raphodo/problemnotification.py:176
+#: ../raphodo/problemnotification.py:177
 #, python-format
 msgid "Zero length file %s will not be downloaded"
 msgstr "El archivo %s con longitud cero no se descargará"
 
-#: ../raphodo/problemnotification.py:182
+#: ../raphodo/problemnotification.py:183
 #, python-format
 msgid "Could not determine filesystem modification time for %s"
 msgstr ""
 "No se puede determinar la hora de modificación del sistema de archivos para "
 "%s"
 
-#: ../raphodo/problemnotification.py:188
+#: ../raphodo/problemnotification.py:189
 #, python-format
 msgid "Unable to load metadata from %s"
 msgstr "No se puede cargar los metadatos de %s."
 
-#: ../raphodo/problemnotification.py:194
+#: ../raphodo/problemnotification.py:195
 #, python-format
 msgid ""
 "Unable to load metadata from %(name)s. The %(filetype)s was not downloaded."
 msgstr ""
 "No se puede cargar los metadatos de %(name)s. El %(filetype)s no se descargó."
 
-#: ../raphodo/problemnotification.py:202
+#: ../raphodo/problemnotification.py:203
 #, python-format
 msgid ""
 "An error occurred setting a file's filesystem metadata on the filesystem %s. "
@@ -2778,17 +3482,17 @@ msgstr ""
 "sistema de archivos %s. Si este error ocurre de nuevo en el mismo sistema de "
 "archivos, no se volverá a reportar."
 
-#: ../raphodo/problemnotification.py:216
+#: ../raphodo/problemnotification.py:217
 #, python-format
 msgid "Encountered unhandled file %s. It will not be downloaded."
 msgstr "Se ha encontrado el archivo no gestionado %s No se descargará."
 
-#: ../raphodo/problemnotification.py:223
+#: ../raphodo/problemnotification.py:224
 #, python-format
 msgid "%(filetype)s %(destination)s already exists."
 msgstr "%(filetype)s %(destination)s ya existe."
 
-#: ../raphodo/problemnotification.py:234 ../raphodo/problemnotification.py:262
+#: ../raphodo/problemnotification.py:235 ../raphodo/problemnotification.py:263
 #, python-format
 msgid ""
 "The existing %(filetype)s %(destination)s was last modified on %(date)s at "
@@ -2797,22 +3501,22 @@ msgstr ""
 "El %(filetype)s %(destination)s existente fue modificado por ultima vez el "
 "%(date)s a las %(time)s."
 
-#: ../raphodo/problemnotification.py:245
+#: ../raphodo/problemnotification.py:246
 #, python-format
 msgid "The %(filetype)s %(source)s was not downloaded from %(device)s."
 msgstr "El %(filetype)s %(source)s no se descargó de %(device)s."
 
-#: ../raphodo/problemnotification.py:273
+#: ../raphodo/problemnotification.py:274
 #, python-format
 msgid "The %(filetype)s %(source)s was downloaded from %(device)s."
 msgstr "El %(filetype)s %(source)s se descargó de %(device)s."
 
-#: ../raphodo/problemnotification.py:282
+#: ../raphodo/problemnotification.py:283
 #, python-format
 msgid "The unique identifier '%s' was added to the filename."
 msgstr "El identificador único «%s» se añadió al nombre de archivo."
 
-#: ../raphodo/problemnotification.py:298
+#: ../raphodo/problemnotification.py:299
 #, python-format
 msgid ""
 "The existing backup %(filetype)s %(destination)s was last modified on "
@@ -2821,13 +3525,13 @@ msgstr ""
 "La copia de seguridad %(filetype)s %(destination)s existente fue modificada "
 "por ultima vez el %(date)s a las %(time)s."
 
-#: ../raphodo/problemnotification.py:309
+#: ../raphodo/problemnotification.py:310
 #, python-format
 msgid "The %(filetype)s %(source)s was not backed up from %(device)s."
 msgstr ""
 "No se hizo copia de seguridad de %(filetype)s %(source)s de %(device)s."
 
-#: ../raphodo/problemnotification.py:326
+#: ../raphodo/problemnotification.py:327
 #, python-format
 msgid ""
 "The previous backup %(filetype)s %(destination)s was last modified on "
@@ -2836,7 +3540,7 @@ msgstr ""
 "La copia de seguridad %(filetype)s %(destination)s existente fue modificada "
 "por ultima vez el %(date)s a las %(time)s."
 
-#: ../raphodo/problemnotification.py:337
+#: ../raphodo/problemnotification.py:338
 #, python-format
 msgid ""
 "The %(filetype)s %(source)s from %(device)s was backed up, overwriting the "
@@ -2845,7 +3549,7 @@ msgstr ""
 "Realizó la copia de seguridad %(filetype)s %(source)s de %(device)s, "
 "sobreescribiendo la copia %(filetype)s previa."
 
-#: ../raphodo/problemnotification.py:356
+#: ../raphodo/problemnotification.py:357
 #, python-format
 msgid ""
 "When synchronizing RAW + JPEG sequence values, a duplicate %(filetype)s "
@@ -2854,7 +3558,7 @@ msgstr ""
 "Al sincronizar valores de secuencia RAW + JPEG, se encontró un %(filetype)s "
 "%(file)s duplicado y no se descargó."
 
-#: ../raphodo/problemnotification.py:366
+#: ../raphodo/problemnotification.py:367
 msgid ""
 "When synchronizing RAW + JPEG sequence values, photos were detected with the "
 "same filenames, but taken at different times:"
@@ -2862,7 +3566,7 @@ msgstr ""
 "Al sincronizar valores de secuencia RAW + JPEG se detectaron fotos con el "
 "mismo nombre de archivo, pero tomadas en diferentes momentos:"
 
-#: ../raphodo/problemnotification.py:373
+#: ../raphodo/problemnotification.py:374
 #, python-format
 msgid ""
 "%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
@@ -2871,12 +3575,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."
 
-#: ../raphodo/problemnotification.py:389
+#: ../raphodo/problemnotification.py:390
 #, python-format
 msgid "Unable to finalize the filename for %s"
 msgstr "No se puede finalizar el nombre de archivo para %s."
 
-#: ../raphodo/problemnotification.py:424
+#: ../raphodo/problemnotification.py:425
 #, python-format
 msgid ""
 "The filename %(destination)s was not fully generated for %(filetype)s "
@@ -2885,22 +3589,22 @@ msgstr ""
 "El nombre de archivo %(destination)s no se generó completamente para "
 "%(filetype)s %(source)s."
 
-#: ../raphodo/problemnotification.py:433
+#: ../raphodo/problemnotification.py:434
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr "Faltan los metadatos de %(type)s."
 
-#: ../raphodo/problemnotification.py:439
+#: ../raphodo/problemnotification.py:440
 #, python-format
 msgid "The following metadata is missing: %s."
 msgstr "Faltan los siguientes metadatos: %s."
 
-#: ../raphodo/problemnotification.py:445
+#: ../raphodo/problemnotification.py:446
 #, python-format
 msgid "Date/time conversion failed: %s."
 msgstr "Falló la conversión de fecha/hora: %s."
 
-#: ../raphodo/problemnotification.py:451
+#: ../raphodo/problemnotification.py:452
 msgid ""
 "Could not extract valid date/time metadata or determine the file "
 "modification time."
@@ -2908,20 +3612,20 @@ msgstr ""
 "No se pudo extraer metadatos de fecha/hora válidos o determinar la hora de "
 "modificación del archivo."
 
-#: ../raphodo/problemnotification.py:457
+#: ../raphodo/problemnotification.py:458
 msgid "Filename does not have an extension."
 msgstr "El nombre del archivo no tiene extension."
 
-#: ../raphodo/problemnotification.py:460
+#: ../raphodo/problemnotification.py:461
 msgid "Filename does not have a number component."
 msgstr "El nombre del archivo no tiene componentes numéricos."
 
-#: ../raphodo/problemnotification.py:464
+#: ../raphodo/problemnotification.py:465
 #, python-format
 msgid "Error generating component %(component)s. Error: %(error)s"
 msgstr "Error generando componente %(component)s. Error: %(error)s"
 
-#: ../raphodo/problemnotification.py:477
+#: ../raphodo/problemnotification.py:478
 #, python-format
 msgid ""
 "The download subfolders %(folder)s were only partially generated for "
@@ -2930,7 +3634,7 @@ msgstr ""
 "Las carpetas de descarga %(folder)s solo se generaron parcialmente para "
 "%(filetype)s %(source)s."
 
-#: ../raphodo/problemnotification.py:486
+#: ../raphodo/problemnotification.py:487
 #, python-format
 msgid ""
 "There is no data with which to generate the %(subfolder_file)s for "
@@ -2939,7 +3643,7 @@ msgstr ""
 "No hay datos con los que generar el %(subfolder_file)s para %(filename)s. El "
 "%(filetype)s no se descargó."
 
-#: ../raphodo/problemnotification.py:499
+#: ../raphodo/problemnotification.py:500
 #, python-format
 msgid ""
 "Unable to create the %(filetype)s %(destination)s in %(folder)s. The "
@@ -2948,67 +3652,67 @@ msgstr ""
 "No se puede crear el %(filetype)s %(destination)s en %(folder)s. El archivo "
 "a descargar era %(source)s in %(device)s. No se ha descargado."
 
-#: ../raphodo/problemnotification.py:514
+#: ../raphodo/problemnotification.py:515
 #, python-format
 msgid "Unable to create the download subfolder %s."
 msgstr "No se puede crear la subcarpeta de descargas %s."
 
-#: ../raphodo/problemnotification.py:526
+#: ../raphodo/problemnotification.py:527
 #, python-format
 msgid "Unable to create the backup subfolder %s."
 msgstr "No se puede crear la subcarpeta de copias de seguridad %s."
 
-#: ../raphodo/problemnotification.py:577
+#: ../raphodo/problemnotification.py:578
 #, python-format
 msgid "Problems scanning %s"
 msgstr "Problemas explorando %s"
 
-#: ../raphodo/problemnotification.py:584
+#: ../raphodo/problemnotification.py:585
 #, python-format
 msgid "Problems copying from %s"
 msgstr "Problemas copiando desde %s"
 
-#: ../raphodo/problemnotification.py:591
+#: ../raphodo/problemnotification.py:592
 msgid "Problems while finalizing filenames and generating subfolders"
 msgstr "Problemas al finalizar los nombres de archivo y generar subcarpetas"
 
-#: ../raphodo/problemnotification.py:598
+#: ../raphodo/problemnotification.py:599
 #, python-format
 msgid "Problems backing up to %s"
 msgstr "Problemas haciendo copias de seguridad a %s"
 
-#. Translators: for example Nov 3 or Dec 31
+#. Translators: for example Nov 3 2015, 11:25 AM
+#. Translators: for example, Nov 3, 12:15 PM
+#: ../raphodo/proximity.py:188 ../raphodo/proximity.py:213
+#: ../raphodo/proximity.py:236 ../raphodo/proximity.py:239
+#, python-format
+msgid "%(date)s, %(time)s"
+msgstr "%(date)s, %(time)s"
+
+#: ../raphodo/proximity.py:204
+#, python-format
+msgid "%(starttime)s - %(endtime)s"
+msgstr "%(starttime)s - %(endtime)s"
+
 #. The start and end dates are on a different day
 #. Translators: for example Nov 3 or Dec 31
-#: ../raphodo/proximity.py:105 ../raphodo/proximity.py:221
-#: ../raphodo/proximity.py:224 ../raphodo/proximity.py:828
+#: ../raphodo/proximity.py:221 ../raphodo/proximity.py:225
+#: ../raphodo/proximity.py:980 ../raphodo/timeutils.py:105
 #, python-format
 msgid "%(month)s %(numeric_day)s"
 msgstr "%(month)s %(numeric_day)s"
 
-#. Translators: for example Nov 15 2015
 #. Translators: for example Nov 3 2015
-#: ../raphodo/proximity.py:109 ../raphodo/proximity.py:230
-#: ../raphodo/proximity.py:231 ../raphodo/proximity.py:831
+#. Translators: for example Nov 2 2015
+#. Translators: for example Nov 15 2015
+#: ../raphodo/proximity.py:232 ../raphodo/proximity.py:233
+#: ../raphodo/proximity.py:985 ../raphodo/timeutils.py:110
 #, python-format
 msgid "%(date)s %(year)s"
 msgstr "%(date)s %(year)s"
 
-#. Translators: for example Nov 3 2015, 11:25 AM
-#. Translators: for example, Nov 3, 12:15 PM
-#: ../raphodo/proximity.py:197 ../raphodo/proximity.py:215
-#: ../raphodo/proximity.py:234 ../raphodo/proximity.py:236
-#, python-format
-msgid "%(date)s, %(time)s"
-msgstr "%(date)s, %(time)s"
-
-#: ../raphodo/proximity.py:209
-#, python-format
-msgid "%(starttime)s - %(endtime)s"
-msgstr "%(starttime)s - %(endtime)s"
-
 #. Translators: for example, Nov 3, 12:15 PM - Nov 4, 1:00 AM
-#: ../raphodo/proximity.py:241
+#: ../raphodo/proximity.py:245
 #, python-format
 msgid "%(earlier_time)s - %(later_time)s"
 msgstr "%(earlier_time)s - %(later_time)s"
@@ -3017,7 +3721,7 @@ msgstr "%(earlier_time)s - %(later_time)s"
 #. Nov 3 2012, 12:15 PM -
 #. Nov 4 2012, 1:00 AM
 #. (please keep the line break signified by \n)
-#: ../raphodo/proximity.py:248
+#: ../raphodo/proximity.py:253
 #, python-format
 msgid ""
 "%(earlier_time)s -\n"
@@ -3026,18 +3730,18 @@ msgstr ""
 "%(earlier_time)s -\n"
 "%(later_time)s"
 
-#: ../raphodo/proximity.py:359
+#: ../raphodo/proximity.py:382
 #, python-format
 msgid "%(month)s  %(year)s"
 msgstr "%(month)s  %(year)s"
 
 #. Translators: for example Nov 2015
-#: ../raphodo/proximity.py:833
+#: ../raphodo/proximity.py:987
 #, python-format
 msgid "%(month)s %(year)s"
 msgstr "%(month)s %(year)s"
 
-#: ../raphodo/proximity.py:1344
+#: ../raphodo/proximity.py:1595
 msgid ""
 "The time elapsed between consecutive photos and videos that is used to build "
 "the Timeline"
@@ -3049,26 +3753,26 @@ msgstr ""
 #. Replace the very last character (after the d) with the correct
 #. localized value, keeping everything else. In other words, change
 #. only the m character.
-#: ../raphodo/proximity.py:1406
+#: ../raphodo/proximity.py:1652
 #, python-format
 msgid "%(minutes)dm"
 msgstr "%(minutes)dm"
 
 #. Translators: i.e. "1.5h", which is short for 1.5 hours.
 #. Replace the entire string with the correct localized value
-#: ../raphodo/proximity.py:1410
+#: ../raphodo/proximity.py:1656
 msgid "1.5h"
 msgstr "1.5h"
 
 #. Translators: e.g. "5h", which is short for 5 hours.
 #. Replace the very last character (after the d) with the correct localized value,
 #. keeping everything else. In other words, change only the h character.
-#: ../raphodo/proximity.py:1415
+#: ../raphodo/proximity.py:1661
 #, python-format
 msgid "%(hours)dh"
 msgstr "%(hours)dh"
 
-#: ../raphodo/proximity.py:1461
+#: ../raphodo/proximity.py:1710
 msgid ""
 "The Timeline groups photos and videos based on how much time elapsed between "
 "consecutive shots. Use it to identify photos and videos taken at different "
@@ -3078,7 +3782,7 @@ msgstr ""
 "entre disparos consecutivos. Úselo para identificar fotos y vídeos tomados "
 "en diferentes períodos en un solo día o en varios días consecutivos."
 
-#: ../raphodo/proximity.py:1464
+#: ../raphodo/proximity.py:1715
 msgid ""
 "Use the slider (below) to adjust the time elapsed between consecutive shots "
 "that is used to build the Timeline."
@@ -3086,15 +3790,15 @@ msgstr ""
 "Use el deslizador (abajo) para ajustar el tiempo transcurrido entre disparos "
 "consecutivos que se usa para construir la línea de tiempo."
 
-#: ../raphodo/proximity.py:1466
+#: ../raphodo/proximity.py:1718
 msgid "Timeline build pending..."
 msgstr "Construcción de línea de tiempo pendiente..."
 
-#: ../raphodo/proximity.py:1467
+#: ../raphodo/proximity.py:1719
 msgid "Timeline is building..."
 msgstr "La línea de tiempo se está construyendo..."
 
-#: ../raphodo/proximity.py:1468
+#: ../raphodo/proximity.py:1721
 msgid ""
 "The Timeline needs to be rebuilt because the file modification time does not "
 "match the time a shot was taken for one or more shots.<br><br>The Timeline "
@@ -3109,22 +3813,22 @@ msgstr ""
 "modificación del archivo no coincide con la hora del disparo, para una o más "
 "fotos.<br><br>La línea de tiempo muestra cuando se realizó el disparo. La "
 "hora en que se realizó el disparo se encuentra en los metadatos de la foto o "
-"vídeo. La lectura de los metadatos llea tiempo, asi que Rapid Photo "
+"vídeo. La lectura de los metadatos lleva tiempo, así que Rapid Photo "
 "Downloader evita hacerlo mientras se escanean los archivos. En su lugar usa "
 "la hora de última modificación del archivo como sustituto para la hora en "
 "que se realizó el disparo. La hora de disparo se confirma cuando se generan "
 "las miniaturas o se realiza la descarga, que es cuando se leen los metadatos."
 
-#: ../raphodo/rapid.py:485 ../raphodo/rapid.py:2461 ../raphodo/rapid.py:3728
-#: ../raphodo/rapid.py:3846 ../raphodo/rapid.py:3850 ../raphodo/rapid.py:3870
-#: ../raphodo/rapid.py:3874 ../raphodo/rapid.py:3998 ../raphodo/rapid.py:4007
-#: ../raphodo/rapid.py:4495 ../raphodo/rapid.py:4888 ../raphodo/rapid.py:5722
-#: ../raphodo/rememberthisdialog.py:97
+#: ../raphodo/rapid.py:493 ../raphodo/rapid.py:2555 ../raphodo/rapid.py:3934
+#: ../raphodo/rapid.py:4065 ../raphodo/rapid.py:4069 ../raphodo/rapid.py:4092
+#: ../raphodo/rapid.py:4096 ../raphodo/rapid.py:4226 ../raphodo/rapid.py:4237
+#: ../raphodo/rapid.py:4743 ../raphodo/rapid.py:5195 ../raphodo/rapid.py:5997
+#: ../raphodo/rememberthisdialog.py:99
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:3
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: ../raphodo/rapid.py:1100
+#: ../raphodo/rapid.py:1131
 msgid ""
 "<b>ExifTool has a problem</b><br><br> Rapid Photo Downloader uses ExifTool "
 "to get metadata from videos and photos. The program will run without it, but "
@@ -3134,11 +3838,11 @@ msgstr ""
 "ExifTool para obtener los metadatos de vídeos y fotos. El programa "
 "funcionará sin él, pero es <b>altamente</b> recomendable instalarlo."
 
-#: ../raphodo/rapid.py:1110 ../raphodo/rapid.py:1130
+#: ../raphodo/rapid.py:1141 ../raphodo/rapid.py:1161
 msgid "Problem with libmediainfo"
 msgstr "Problema con libmediainfo"
 
-#: ../raphodo/rapid.py:1119
+#: ../raphodo/rapid.py:1150
 msgid ""
 "<b>The library libmediainfo appears to be missing</b><br><br> Rapid Photo "
 "Downloader uses libmediainfo to get the date and time a video was shot. The "
@@ -3149,18 +3853,18 @@ msgstr ""
 "un vídeo. El programa se ejecutará sin ella, pero se recomienda su "
 "instalación."
 
-#: ../raphodo/rapid.py:1417
+#: ../raphodo/rapid.py:1448
 msgid "Download failed"
 msgstr "Falló la descarga"
 
-#: ../raphodo/rapid.py:1419
+#: ../raphodo/rapid.py:1450
 msgid ""
 "Sorry, the download of the new version of Rapid Photo Downloader failed."
 msgstr ""
 "No se pudo completar la descarga de la versión nueva de Rapid Photo "
 "Downloader."
 
-#: ../raphodo/rapid.py:1425
+#: ../raphodo/rapid.py:1457
 msgid ""
 "The new version was successfully downloaded. Do you want to close Rapid "
 "Photo Downloader and install it now?"
@@ -3168,19 +3872,19 @@ msgstr ""
 "Se ha descargado con éxito la nueva versión. ¿Desea cerrar Rapid Photo "
 "Downloader e instalarla ahora?"
 
-#: ../raphodo/rapid.py:1428
+#: ../raphodo/rapid.py:1461
 msgid "Update Rapid Photo Downloader"
 msgstr "Actualizar Rapid Photo Downloader"
 
-#: ../raphodo/rapid.py:1432
+#: ../raphodo/rapid.py:1465
 msgid "Install"
 msgstr "Instalar"
 
-#: ../raphodo/rapid.py:1450
+#: ../raphodo/rapid.py:1483
 msgid "New version saved"
 msgstr "Versión nueva guardada"
 
-#: ../raphodo/rapid.py:1451
+#: ../raphodo/rapid.py:1485
 #, python-format
 msgid ""
 "The tar file and installer script are saved at:\n"
@@ -3191,11 +3895,11 @@ msgstr ""
 "\n"
 " %s"
 
-#: ../raphodo/rapid.py:1468
+#: ../raphodo/rapid.py:1502
 msgid "Upgrade failed"
 msgstr "Falló la actualización"
 
-#: ../raphodo/rapid.py:1469
+#: ../raphodo/rapid.py:1505
 msgid ""
 "Sorry, upgrading Rapid Photo Downloader failed because there was an error "
 "opening the installer."
@@ -3203,76 +3907,76 @@ msgstr ""
 "Falló la actualización de Rapid Photo Downloader porque se produjo un error "
 "al abrir el instalador."
 
-#: ../raphodo/rapid.py:1667 ../raphodo/rapid.py:2331
+#: ../raphodo/rapid.py:1709 ../raphodo/rapid.py:2425
 msgid "Download"
 msgstr "Descargar"
 
-#: ../raphodo/rapid.py:1671
+#: ../raphodo/rapid.py:1713
 msgid "&Refresh..."
 msgstr "&Refrescar..."
 
-#: ../raphodo/rapid.py:1675
+#: ../raphodo/rapid.py:1717
 msgid "&Preferences"
 msgstr "&Preferencias"
 
-#: ../raphodo/rapid.py:1679
+#: ../raphodo/rapid.py:1721
 msgid "&Quit"
 msgstr "&Salir"
 
-#: ../raphodo/rapid.py:1683
+#: ../raphodo/rapid.py:1725
 msgid "Error &Reports"
 msgstr "&Informes de errores"
 
-#: ../raphodo/rapid.py:1687
+#: ../raphodo/rapid.py:1729
 msgid "Clear Completed Downloads"
 msgstr "Limpiar descargas completadas"
 
-#: ../raphodo/rapid.py:1691
+#: ../raphodo/rapid.py:1733
 msgid "Get Help Online..."
 msgstr "Obtener ayuda en línea..."
 
-#: ../raphodo/rapid.py:1695
+#: ../raphodo/rapid.py:1737
 msgid "&Tip of the Day..."
 msgstr "&Sugerencia del día..."
 
-#: ../raphodo/rapid.py:1699
+#: ../raphodo/rapid.py:1741
 msgid "Report a Problem..."
 msgstr "Reportar un problema..."
 
-#: ../raphodo/rapid.py:1703
+#: ../raphodo/rapid.py:1745
 msgid "Make a Donation..."
 msgstr "Hacer una donación..."
 
-#: ../raphodo/rapid.py:1707
+#: ../raphodo/rapid.py:1749
 msgid "Translate this Application..."
 msgstr "Traducir esta aplicación..."
 
-#: ../raphodo/rapid.py:1711
+#: ../raphodo/rapid.py:1753
 msgid "&About..."
 msgstr "&Acerca de..."
 
-#: ../raphodo/rapid.py:1715
+#: ../raphodo/rapid.py:1757
 msgid "Check for Updates..."
 msgstr "Buscar actualizaciones…"
 
-#: ../raphodo/rapid.py:1797
+#: ../raphodo/rapid.py:1840
 msgid "Timeline"
 msgstr "Línea de tiempo"
 
-#: ../raphodo/rapid.py:1807
+#: ../raphodo/rapid.py:1850
 msgid "Destination"
 msgstr "Destino"
 
-#: ../raphodo/rapid.py:1808
+#: ../raphodo/rapid.py:1851
 msgid "Rename"
 msgstr "Renombrar"
 
-#: ../raphodo/rapid.py:1810
+#: ../raphodo/rapid.py:1853
 msgid "Back Up"
 msgstr "Copia de seguridad."
 
 #. Devices Header and View
-#: ../raphodo/rapid.py:1926
+#: ../raphodo/rapid.py:1977
 msgid ""
 "Turn on or off the use of devices attached to this computer as download "
 "sources"
@@ -3281,79 +3985,79 @@ msgstr ""
 "fuentes de descargas"
 
 #. This Computer Header and View
-#: ../raphodo/rapid.py:1940
+#: ../raphodo/rapid.py:1994
 msgid ""
 "Turn on or off the use of a folder on this computer as a download source"
 msgstr ""
 "Activar o desactivar el uso de una carpeta de este equipo como fuente de "
 "descargas"
 
-#: ../raphodo/rapid.py:1941
+#: ../raphodo/rapid.py:1996
 msgid "This Computer"
 msgstr "Este equipo"
 
-#: ../raphodo/rapid.py:1952
+#: ../raphodo/rapid.py:2009
 msgid "Select a source folder"
 msgstr "Seleccionar una carpeta origen"
 
-#: ../raphodo/rapid.py:1975
+#: ../raphodo/rapid.py:2038
 msgid "Projected Storage Use"
 msgstr "Uso de almacenamiento previsto"
 
-#: ../raphodo/rapid.py:1989 ../raphodo/rapid.py:1997
+#: ../raphodo/rapid.py:2056 ../raphodo/rapid.py:2068
 msgid "Select a destination folder"
 msgstr "Seleccionar una carpeta destino"
 
-#: ../raphodo/rapid.py:2045
+#: ../raphodo/rapid.py:2117
 msgid "All"
 msgstr "Todos"
 
-#: ../raphodo/rapid.py:2046
+#: ../raphodo/rapid.py:2118
 msgid "New"
 msgstr "Nuevos"
 
-#: ../raphodo/rapid.py:2048
+#: ../raphodo/rapid.py:2120
 msgid "Show:"
 msgstr "Mostrar"
 
-#: ../raphodo/rapid.py:2051
+#: ../raphodo/rapid.py:2123
 msgid "Modification Time"
 msgstr "Hora de modificación"
 
-#: ../raphodo/rapid.py:2052
+#: ../raphodo/rapid.py:2124
 msgid "Checked State"
 msgstr "Estado comprobado"
 
-#: ../raphodo/rapid.py:2055
+#: ../raphodo/rapid.py:2127
 msgid "File Type"
 msgstr "Tipo de archivo"
 
-#: ../raphodo/rapid.py:2056
+#: ../raphodo/rapid.py:2128
 msgid "Device"
 msgstr "Dispositivo"
 
-#: ../raphodo/rapid.py:2058
+#: ../raphodo/rapid.py:2130
 msgid "Sort:"
 msgstr "Ordenación:"
 
-#: ../raphodo/rapid.py:2069
+#: ../raphodo/rapid.py:2141
 msgid "Select All:"
 msgstr "Seleccionar todos"
 
-#: ../raphodo/rapid.py:2311
+#: ../raphodo/rapid.py:2405
 #, python-format
 msgid "Download %(files)s"
 msgstr "Descargar %(files)s"
 
-#: ../raphodo/rapid.py:2327
+#: ../raphodo/rapid.py:2421
 msgid "Resume Download"
 msgstr "Continuar la descarga"
 
-#: ../raphodo/rapid.py:2329
+#: ../raphodo/rapid.py:2423
 msgid "Pause"
 msgstr "Pausar"
 
-#: ../raphodo/rapid.py:2417
+#: ../raphodo/rapid.py:2511
 #, python-brace-format
 msgid ""
 "Please report the problem at <a href=\"{website}\">{website}</a>.<br><br>\n"
@@ -3361,19 +4065,19 @@ msgid ""
 "            <a href=\"{log_path}\">here</a> to open the log directory).\n"
 "            "
 msgstr ""
-"Por favor, informe del problema en <a href=\"{website}\">{website}</a>."
-"<br><br>\n"
+"Por favor, informe del problema en <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
 "            Adjunte el archivo de trazas <i>{log_file}</i> a su informe "
 "(haga clic\n"
 "            <a href=\"{log_path}\">aquí</a> para abrir el directorio de "
 "trazas).\n"
 "            "
 
-#: ../raphodo/rapid.py:2431
+#: ../raphodo/rapid.py:2525
 msgid "Thank you for reporting a problem in Rapid Photo Downloader"
 msgstr "Gracias por informar de un problema en Rapid Photo Downloader"
 
-#: ../raphodo/rapid.py:2529
+#: ../raphodo/rapid.py:2624
 #, python-format
 msgid ""
 "<b>Changing This Computer source path</b><br><br>Do you really want to "
@@ -3386,11 +4090,11 @@ msgstr ""
 "una descarga apdesde %(source_path)s.<br><br>Si cambia la ruta, la descarga "
 "en curso desde Este equipo se cancelará."
 
-#: ../raphodo/rapid.py:2595
+#: ../raphodo/rapid.py:2694
 msgid "You cannot change the download destination while downloading."
 msgstr "No puede cambiar el destino de la descarga mientras está en curso."
 
-#: ../raphodo/rapid.py:2604
+#: ../raphodo/rapid.py:2704
 #, python-format
 msgid ""
 "<b>Confirm Download Destination</b><br><br>Are you sure you want to set the "
@@ -3399,27 +4103,26 @@ msgstr ""
 "<b>Confirme el destino de la descarga</b><br><br>¿Está seguro de que quiere "
 "establecer el destino de descarga %(file_type)s a %(path)s?"
 
-#: ../raphodo/rapid.py:2682
+#: ../raphodo/rapid.py:2785
 msgid ""
+"\n"
 "<b>Downloading all files</b><br><br>\n"
-"                    A download always includes all files that are checked "
-"for download,\n"
-"                    including those that are not currently displayed because "
-"the Timeline\n"
-"                    is being used or because only new files are being shown."
-"<br><br>\n"
-"                    Do you want to proceed with the download?"
+"A download always includes all files that are checked for download,\n"
+"including those that are not currently displayed because the Timeline\n"
+"is being used or because only new files are being shown.<br><br>\n"
+"Do you want to proceed with the download?\n"
+"                        "
 msgstr ""
+"\n"
 "<b>Descargando todos los archivos</b><br><br>\n"
-"                    Una descarga siempre incluye todos los archivos que "
-"están marcados para descargar,\n"
-"                    incluyendo lo que no se están mostrando actualmente "
-"debido a la línea de tiempo\n"
-"                    en uso o porque solo se estén mostrando los archivos "
-"nuevos.<br><br>\n"
-"                    ¿Quiere proceder con la descarga?"
+"Una descarga siempre incluye todos los archivos marcados para descargar,\n"
+"incluyendo aquellos que no están visibles actualmente porque la Línea de "
+"Tiempo\n"
+"en uso o porque solo se están mostrando los archivos nuevos.<br><br>\n"
+"¿Desea proceder con la descarga?\n"
+"                        "
 
-#: ../raphodo/rapid.py:2820
+#: ../raphodo/rapid.py:2937
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -3430,7 +4133,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: ../raphodo/rapid.py:2824
+#: ../raphodo/rapid.py:2940
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -3439,15 +4142,15 @@ msgstr ""
 "Esta carpeta de descarga no es válida:\n"
 "%s"
 
-#: ../raphodo/rapid.py:2827
+#: ../raphodo/rapid.py:2943
 msgid "Download Failure"
 msgstr "Fallo de descarga"
 
-#: ../raphodo/rapid.py:2828
+#: ../raphodo/rapid.py:2944
 msgid "The download cannot proceed."
 msgstr "No se puede iniciar la descarga"
 
-#: ../raphodo/rapid.py:2842
+#: ../raphodo/rapid.py:2962
 msgid ""
 "Photos and videos will not be backed up because there is nowhere to back "
 "them up. Do you still want to start the download?"
@@ -3455,8 +4158,7 @@ msgstr ""
 "No se harán copias de seguridad de las fotos y los vídeos porque no hay "
 "dónde hacerlo. ¿Desea todavía comenzar la descarga?"
 
-#. Translators: filetype will be replaced with 'photos' or 'videos'
-#: ../raphodo/rapid.py:2847 ../raphodo/rapid.py:2854
+#: ../raphodo/rapid.py:2969 ../raphodo/rapid.py:2979
 #, python-format
 msgid ""
 "No backup device exists for backing up %(filetype)s. Do you still want to "
@@ -3465,15 +4167,15 @@ msgstr ""
 "No existe dispositivo de resplado para hacer la copia de seguridad de "
 "%(filetype)s. ¿Desea todavía comenzar la descarga?"
 
-#: ../raphodo/rapid.py:2848 ../raphodo/rpdfile.py:228
+#: ../raphodo/rapid.py:2971 ../raphodo/rpdfile.py:228
 msgid "photos"
 msgstr "fotos"
 
-#: ../raphodo/rapid.py:2855 ../raphodo/rpdfile.py:223
+#: ../raphodo/rapid.py:2981 ../raphodo/rpdfile.py:223
 msgid "videos"
 msgstr "vídeos"
 
-#: ../raphodo/rapid.py:2861
+#: ../raphodo/rapid.py:2989
 msgid ""
 "<b>The photo and video backup destinations do not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
@@ -3481,7 +4183,7 @@ msgstr ""
 "<b>Los destinos de las copias de seguridad de fotos y vídeos no existen o no "
 "son escribibles.</b><br><br>¿Todavía desea comenzar la descarga?"
 
-#: ../raphodo/rapid.py:2869 ../raphodo/rapid.py:2876
+#: ../raphodo/rapid.py:2999 ../raphodo/rapid.py:3008
 #, python-format
 msgid ""
 "<b>The %(filetype)s backup destination does not exist or cannot be written "
@@ -3490,100 +4192,95 @@ msgstr ""
 "<b>El destino de copia de seguridad %(filetype)s no existe o no es "
 "escribible.</b><br><br>¿Todavía desea comenzar la descarga?"
 
-#: ../raphodo/rapid.py:2871 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:818
+#: ../raphodo/rapid.py:3001 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:843
 msgid "photo"
 msgstr "foto"
 
-#: ../raphodo/rapid.py:2878 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:858
+#: ../raphodo/rapid.py:3010 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:883
 msgid "video"
 msgstr "vídeo"
 
-#: ../raphodo/rapid.py:2886
+#: ../raphodo/rapid.py:3018
 msgid "Backup problem"
 msgstr "Problema de copia de seguridad"
 
-#. Translators - in the middle is a unicode em dash - please retain it
-#. This string is displayed in the status bar when the download is running
-#: ../raphodo/rapid.py:3571
+#: ../raphodo/rapid.py:3756
 #, python-format
 msgid "%(downloading_from)s — %(time_left)s left (%(speed)s)"
 msgstr "%(downloading_from)s — queda %(time_left)s (%(speed)s)"
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3640
+#: ../raphodo/rapid.py:3828
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s descargados"
 
-#. Translators: e.g. 2 videos failed to download
-#: ../raphodo/rapid.py:3645
+#: ../raphodo/rapid.py:3836
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "No se pudieron descargar %(noFiles)s %(filetypes)s"
 
-#: ../raphodo/rapid.py:3650 ../raphodo/rapid.py:3723
+#: ../raphodo/rapid.py:3842 ../raphodo/rapid.py:3927
 msgid "warnings"
 msgstr "avisos"
 
-#: ../raphodo/rapid.py:3679
+#: ../raphodo/rapid.py:3873
 msgid "All downloads complete"
 msgstr "Completadas todas las descargas"
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3686 ../raphodo/rapid.py:3695 ../raphodo/rapid.py:3704
-#: ../raphodo/rapid.py:3713 ../raphodo/rapid.py:3721
+#: ../raphodo/rapid.py:3881 ../raphodo/rapid.py:3892 ../raphodo/rapid.py:3903
+#: ../raphodo/rapid.py:3914 ../raphodo/rapid.py:3924
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: ../raphodo/rapid.py:3688 ../raphodo/rapid.py:3706
+#: ../raphodo/rapid.py:3884 ../raphodo/rapid.py:3906
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s descargados"
 
-#: ../raphodo/rapid.py:3697 ../raphodo/rapid.py:3715
+#: ../raphodo/rapid.py:3895 ../raphodo/rapid.py:3917
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "No se pudieron descargar %(filetype)s"
 
-#: ../raphodo/rapid.py:3742
+#: ../raphodo/rapid.py:3950
 msgid "1 failure"
 msgstr "1 fallo"
 
-#: ../raphodo/rapid.py:3744
+#: ../raphodo/rapid.py:3952
 #, python-format
 msgid "%d failures"
 msgstr "%d fallos"
 
-#: ../raphodo/rapid.py:3749
+#: ../raphodo/rapid.py:3957
 msgid "1 warning"
 msgstr "1 aviso"
 
-#: ../raphodo/rapid.py:3751
+#: ../raphodo/rapid.py:3959
 #, python-format
 msgid "%d warnings"
 msgstr "%d avisos"
 
-#: ../raphodo/rapid.py:3771
+#: ../raphodo/rapid.py:3981
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s"
 msgstr "Descargados %(no_files_and_types)s de %(devices)s"
 
-#: ../raphodo/rapid.py:3774
+#: ../raphodo/rapid.py:3985
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s — %(failures)s"
 msgstr "Descargados  %(no_files_and_types)s de %(devices)s — %(failures)s"
 
-#: ../raphodo/rapid.py:3779
+#: ../raphodo/rapid.py:3989
 #, python-format
 msgid "No files downloaded — %(failures)s"
 msgstr "Ningún archivo descargado — %(failures)s"
 
-#: ../raphodo/rapid.py:3781
+#: ../raphodo/rapid.py:3991
 msgid "No files downloaded"
 msgstr "Ningún archivo descargado"
 
-#: ../raphodo/rapid.py:3805
+#: ../raphodo/rapid.py:4021
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
@@ -3592,7 +4289,7 @@ msgstr ""
 "Las subcarpetas de destino y la línea de tiempo se reconstruirán después de "
 "que se hayan generado todas las miniaturas para la %(camera)s"
 
-#: ../raphodo/rapid.py:3809
+#: ../raphodo/rapid.py:4026
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for this computer"
@@ -3600,7 +4297,7 @@ msgstr ""
 "Las subcarpetas de destino y la línea de tiempo se reconstruirán después de "
 "que se hayan generado todas las miniaturas para este equipo."
 
-#: ../raphodo/rapid.py:3812
+#: ../raphodo/rapid.py:4031
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
@@ -3609,7 +4306,7 @@ msgstr ""
 "Las subcarpetas de destino y la línea de tiempo se reconstruirán después de "
 "que se hayan generado todas las miniaturas para %(device)s"
 
-#: ../raphodo/rapid.py:3820
+#: ../raphodo/rapid.py:4039
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
@@ -3619,7 +4316,7 @@ msgstr ""
 "que se hayan generado todas las miniaturas para %(number_devices)s "
 "dispositivos y este equipo."
 
-#: ../raphodo/rapid.py:3833
+#: ../raphodo/rapid.py:4052
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
@@ -3628,7 +4325,7 @@ msgstr ""
 "Las subcarpetas de destino y la línea de tiempo se reconstruirán después de "
 "que se hayan generado todas las miniaturas para la %(camera)s y este equipo."
 
-#: ../raphodo/rapid.py:3837
+#: ../raphodo/rapid.py:4056
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
@@ -3637,7 +4334,7 @@ msgstr ""
 "Las subcarpetas de destino y la línea de tiempo se reconstruirán después de "
 "que se hayan generado todas las miniaturas para %(device)s y este equipo."
 
-#: ../raphodo/rapid.py:3841
+#: ../raphodo/rapid.py:4060
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
@@ -3647,15 +4344,15 @@ msgstr ""
 "que se hayan generado todas las miniaturas para %(number_devices)s "
 "dispositivos."
 
-#: ../raphodo/rapid.py:3867
+#: ../raphodo/rapid.py:4087
 msgid "The Destination subfolders and Timeline have been rebuilt"
 msgstr "Las subcarpetas de destino y la línea de tiempo se han reconstruido."
 
-#: ../raphodo/rapid.py:3922
+#: ../raphodo/rapid.py:4144
 msgid "Program preferences are invalid"
 msgstr "Las preferencias del programa no son válidas"
 
-#: ../raphodo/rapid.py:3999
+#: ../raphodo/rapid.py:4228
 #, python-format
 msgid ""
 "<b>All files on the %(camera)s are inaccessible</b>.<br><br>It may be locked "
@@ -3664,48 +4361,47 @@ msgid ""
 "charging</i> to <i>USB for file transfers</i>.<br><br>Alternatively, you can "
 "ignore this device."
 msgstr ""
-"<b>Todos los archivos en la %(camera)s son inaccesibles</b>.<br><br>Puede "
-"estar bloqueada o no estar configurada para transmitir archivos usando MTP. "
-"Puede desbloquearla e intentarlo de nuevo.<br><br>En algunos modelos también "
-"es necesario cambiar el parámetro <i>USB para carga</i> a <i>USB para "
-"transferencia de archivos</i>.<br><br>Alternativamente, puede ignorar este "
-"dispositivo."
+"<b>All files on the cámara %(camera)s are inaccessible</b>.<br><br>It may be "
+"locked or not configured for file transfers using MTP. You can unlock it and "
+"try again.<br><br>On some models you also need to change the setting <i>USB "
+"for charging</i> to <i>USB for file transfers</i>.<br><br>Alternatively, you "
+"can ignore this device."
 
-#: ../raphodo/rapid.py:4008
+#: ../raphodo/rapid.py:4239
 #, python-format
 msgid ""
-"<b>The %(camera)s appears to be in use by another application.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again.<br><br>Alternatively, you can ignore this "
-"device."
+"<b>The %(camera)s appears to be in use by another "
+"application.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again.<br><br>Alternatively, you "
+"can ignore this device."
 msgstr ""
 "<b>La %(camera)s parece estar en uso por otra aplicación.</b><br><br>Puede "
 "cerrar cualquier otra aplicación (tal como un explorador de archivos) que "
 "esté usando e intentarlo de nuevo. Si eso no funciona, desconecte la "
-"%(camera)s del equipo y vuelva a enchufarla de nuevo."
-"<br><br>Alternativamente, puede ignorar este dispositivo."
+"%(camera)s del equipo y vuelva a enchufarla de "
+"nuevo.<br><br>Alternativamente, puede ignorar este dispositivo."
 
-#: ../raphodo/rapid.py:4019
+#: ../raphodo/rapid.py:4250
 msgid "&Try Again"
 msgstr "In&tentar de nuevo"
 
-#: ../raphodo/rapid.py:4020
+#: ../raphodo/rapid.py:4251
 msgid "&Ignore This Device"
 msgstr "&Ignorar este dispositivo"
 
-#: ../raphodo/rapid.py:4086
+#: ../raphodo/rapid.py:4323
 #, python-format
 msgid "Sorry, an unexpected problem occurred while scanning %s."
 msgstr ""
 "Lo siento, se ha producido un problema inesperado durante la exploración de "
 "%s."
 
-#: ../raphodo/rapid.py:4087
+#: ../raphodo/rapid.py:4324
 msgid "Unfortunately you cannot download from this device."
 msgstr "Lamentablemente no se puede descargar de este dispositivo."
 
-#: ../raphodo/rapid.py:4091
+#: ../raphodo/rapid.py:4328
 msgid ""
 "A possible workaround for the problem might be downloading from the camera's "
 "memory card using a card reader."
@@ -3713,31 +4409,31 @@ msgstr ""
 "Una posible solución al problema podría ser descargar desde la tarjeta de "
 "memoria de la cámara usando un lector de tarjetas."
 
-#: ../raphodo/rapid.py:4096
+#: ../raphodo/rapid.py:4333
 msgid "Device scan failed"
 msgstr "La exploración del dispositivo ha fallado."
 
-#: ../raphodo/rapid.py:4472
+#: ../raphodo/rapid.py:4720
 #, python-format
 msgid ""
-"<b>The %(camera)s cannot be scanned because it cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again."
+"<b>The %(camera)s cannot be scanned because it cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again."
 msgstr ""
-"<b>La %(camera)s no se puede escanear porque no es posible desmontar</"
-"b><br><br>Puede cerrar cualquier otra aplicación (tal como un explorador de "
-"archivos) que esté usando e intentarlo de nuevo. Si eso no funciona, "
-"desconecte la %(camera)s del equipo y vuelva a enchufarla de nuevo."
+"<b>La %(camera)s no se puede escanear porque no es posible "
+"desmontar</b><br><br>Puede cerrar cualquier otra aplicación (tal como un "
+"explorador de archivos) que esté usando e intentarlo de nuevo. Si eso no "
+"funciona, desconecte la %(camera)s del equipo y vuelva a enchufarla de nuevo."
 
-#: ../raphodo/rapid.py:4496
+#: ../raphodo/rapid.py:4745
 #, python-format
 msgid ""
-"<b>The download cannot start because the %(camera)s cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again, and choose which files you want to "
-"download from it."
+"<b>The download cannot start because the %(camera)s cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again, and choose which files "
+"you want to download from it."
 msgstr ""
 "<b>La descarga no puede comenzar porque no es posible desmontar la "
 "%(camera)s.</b><br><br>Puede cerrar cualquier otra aplicación (tal como un "
@@ -3745,41 +4441,67 @@ msgstr ""
 "funciona, desconecte la %(camera)s del equipo y vuelva a enchufarla de nuevo "
 "y elija qué archivos quiere descargar de ella."
 
-#: ../raphodo/rapid.py:4635
+#: ../raphodo/rapid.py:4842
+msgid "Completed Downloads Present"
+msgstr "Descargas completadas presentes"
+
+#: ../raphodo/rapid.py:4844
+#, python-format
+msgid "%s whose download have completed are displayed."
+msgstr "Se muestran %s cuyas descargas se han completado."
+
+#: ../raphodo/rapid.py:4846
+msgid "Do you want to clear the completed downloads?"
+msgstr "¿Desea limpiar las descargas completadas?"
+
+#: ../raphodo/rapid.py:4848
+msgid "Completed Download Present"
+msgstr "Descarga completada presente"
+
+#: ../raphodo/rapid.py:4850
+#, python-format
+msgid "%s whose download has completed is displayed."
+msgstr "Se muestra %s cuya descarga se ha completado."
+
+#: ../raphodo/rapid.py:4852
+msgid "Do you want to clear the completed download?"
+msgstr "¿Desea limpiar la descarga completada?"
+
+#: ../raphodo/rapid.py:4933
 #, python-format
 msgid ""
 "Do you want to download photos and videos from the device <i>%(device)s</i>?"
 msgstr "¿Desea descargar fotos y vídeos del dispositivo <i>%(device)s</i>?"
 
-#: ../raphodo/rapid.py:4877
+#: ../raphodo/rapid.py:5183
 #, python-format
 msgid "<b>Do you want to ignore the %s whenever this program is run?</b>"
 msgstr "<b>¿Quiere ignorar %s cada vez que se ejecute este programa?</b>"
 
-#: ../raphodo/rapid.py:4879
+#: ../raphodo/rapid.py:5186
 msgid ""
 "All cameras, phones and tablets with the same model name will be ignored."
 msgstr ""
 "Todas las cámaras, teléfonos y tabletas con el mismo nombre serán ignorados."
 
-#: ../raphodo/rapid.py:4883
+#: ../raphodo/rapid.py:5190
 #, python-format
 msgid ""
 "<b>Do you want to ignore the device %s whenever this program is run?</b>"
 msgstr ""
-"<b>¿Quiere ignorar el dispositivo %s cada vez que se ejecute este programa?</"
-"b>"
+"<b>¿Quiere ignorar el dispositivo %s cada vez que se ejecute este "
+"programa?</b>"
 
-#: ../raphodo/rapid.py:4885
+#: ../raphodo/rapid.py:5192
 msgid "Any device with the same name will be ignored."
 msgstr "Cualquier dispositivo con el mismo nombre será ignorado."
 
-#: ../raphodo/rapid.py:5178
+#: ../raphodo/rapid.py:5492
 #, python-format
 msgid "Downloading from %(location)s on This Computer."
 msgstr "Descargando de %(location)s a Este equipo."
 
-#: ../raphodo/rapid.py:5180
+#: ../raphodo/rapid.py:5496
 msgid ""
 "Do you really want to download from here?<br><br>On some systems, scanning "
 "this location can take a very long time."
@@ -3787,17 +4509,17 @@ msgstr ""
 "¿Quiere realmente descargar de aquí?<br><br>En algunos sistemas, escanear "
 "esta ubicación puede llevar mucho tiempo."
 
-#: ../raphodo/rapid.py:5224
+#: ../raphodo/rapid.py:5537
 #, python-format
 msgid "Generating thumbnails for %s"
 msgstr "Generando miniaturas para %s"
 
-#: ../raphodo/rapid.py:5227
+#: ../raphodo/rapid.py:5540
 #, python-format
 msgid "Scanning %s"
 msgstr "Escaneando %s"
 
-#: ../raphodo/rapid.py:5237
+#: ../raphodo/rapid.py:5551
 #, python-format
 msgid ""
 "%(number)s of %(available files)s checked for download (%(hidden)s hidden)"
@@ -3805,80 +4527,80 @@ msgstr ""
 "%(number)s de %(available files)s comprobados para descarga (%(hidden)s "
 "hidden)"
 
-#: ../raphodo/rapid.py:5243
+#: ../raphodo/rapid.py:5559
 #, python-format
 msgid "%(number)s of %(available files)s checked for download"
 msgstr "%(number)s de %(available files)s seleccionados/as para su descarga"
 
-#: ../raphodo/rapid.py:5494
+#: ../raphodo/rapid.py:5764
 msgid "Display program information when run from the command line."
 msgstr ""
 "Mostrar información del programa cuando se ejecute desde la línea de órdenes."
 
-#: ../raphodo/rapid.py:5496
+#: ../raphodo/rapid.py:5766
 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."
 
-#: ../raphodo/rapid.py:5499
+#: ../raphodo/rapid.py:5769
 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."
 
-#: ../raphodo/rapid.py:5502
+#: ../raphodo/rapid.py:5772
 msgid "Turn on or off the the renaming of photos."
 msgstr "Activar o desactivar el renombrado de fotos."
 
-#: ../raphodo/rapid.py:5504
+#: ../raphodo/rapid.py:5774
 msgid "turn on or off the the renaming of videos."
 msgstr "Activar o desactivar el renombrado de vídeos."
 
-#: ../raphodo/rapid.py:5506
+#: ../raphodo/rapid.py:5776
 msgid ""
 "Turn on or off the automatic detection of devices from which to download."
 msgstr ""
 "Activar o desactivar la detección automática de dispositivos de los que "
 "descargar."
 
-#: ../raphodo/rapid.py:5510
+#: ../raphodo/rapid.py:5780
 msgid "Turn on or off downloading from this computer."
 msgstr "Activar o desactivar la descarga desde este equipo."
 
-#: ../raphodo/rapid.py:5512 ../raphodo/rapid.py:5515 ../raphodo/rapid.py:5518
-#: ../raphodo/rapid.py:5539 ../raphodo/rapid.py:5543
+#: ../raphodo/rapid.py:5782 ../raphodo/rapid.py:5785 ../raphodo/rapid.py:5788
+#: ../raphodo/rapid.py:5809 ../raphodo/rapid.py:5813
 msgid "PATH"
 msgstr "RUTA"
 
-#: ../raphodo/rapid.py:5513
+#: ../raphodo/rapid.py:5783
 msgid "The PATH on this computer from which to download."
 msgstr "La RUTA en este equipo desde la que descargar."
 
-#: ../raphodo/rapid.py:5516
+#: ../raphodo/rapid.py:5786
 msgid "The PATH where photos will be downloaded to."
 msgstr "La RUTA donde se descargarán las fotos."
 
-#: ../raphodo/rapid.py:5519
+#: ../raphodo/rapid.py:5789
 msgid "The PATH where videos will be downloaded to."
 msgstr "La RUTA en la que se descargarán los vídeos."
 
-#: ../raphodo/rapid.py:5521
+#: ../raphodo/rapid.py:5791
 msgid "Turn on or off the backing up of photos and videos while downloading."
 msgstr ""
 "Activar o desactivar la copia de seguridad de fotos y vídeos mientras se "
 "descargan."
 
-#: ../raphodo/rapid.py:5525
+#: ../raphodo/rapid.py:5795
 msgid "Turn on or off the automatic detection of backup devices."
 msgstr ""
 "Activar o desactivar la detección automática de dispositivos de respaldo."
 
-#: ../raphodo/rapid.py:5527 ../raphodo/rapid.py:5533
+#: ../raphodo/rapid.py:5797 ../raphodo/rapid.py:5803
 msgid "FOLDER"
 msgstr "CARPETA"
 
-#: ../raphodo/rapid.py:5528
+#: ../raphodo/rapid.py:5798
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected photo "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3891,7 +4613,7 @@ msgstr ""
 "seguridad. Para cada dispositivo que desee usar para hacer copias de "
 "seguridad de fotos, cree una carpeta en el mismo con este nombre."
 
-#: ../raphodo/rapid.py:5534
+#: ../raphodo/rapid.py:5804
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected video "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3904,7 +4626,7 @@ msgstr ""
 "seguridad. Para cada dispositivo que desee usar para hacer copias de "
 "seguridad de vídeos, cree una carpeta en el mismo con este nombre."
 
-#: ../raphodo/rapid.py:5540
+#: ../raphodo/rapid.py:5810
 msgid ""
 "The PATH where photos will be backed up when automatic detection of backup "
 "devices is turned off."
@@ -3912,7 +4634,7 @@ msgstr ""
 "La RUTA en la que se copiará las fotos cuando la detección automática de "
 "dispositivos de respaldo está desactivada."
 
-#: ../raphodo/rapid.py:5544
+#: ../raphodo/rapid.py:5814
 msgid ""
 "The PATH where videos will be backed up when automatic detection of backup "
 "devices is turned off."
@@ -3920,24 +4642,25 @@ msgstr ""
 "La RUTA en la que se copiará los vídeos cuando la detección automática de "
 "dispositivos de respaldo está desactivada."
 
-#: ../raphodo/rapid.py:5547
+#: ../raphodo/rapid.py:5817
 #, python-format
 msgid "Ignore photos with the following extensions: %s"
 msgstr "Ignorar fotos con las siguientes extensiones: %s"
 
-#: ../raphodo/rapid.py:5551
-msgid "Turn on or off starting downloads as soon as the program itself starts."
+#: ../raphodo/rapid.py:5821
+msgid ""
+"Turn on or off starting downloads as soon as the program itself starts."
 msgstr ""
 "Activar o desactivar el inicio de las descargas tan pronto como el propio "
 "programa se inicie."
 
-#: ../raphodo/rapid.py:5554
+#: ../raphodo/rapid.py:5824
 msgid "Turn on or off starting downloads as soon as a device is inserted."
 msgstr ""
 "Activar o desactivar el inicio de las descargas tan pronto como un "
 "dispositio se inserte."
 
-#: ../raphodo/rapid.py:5557
+#: ../raphodo/rapid.py:5827
 msgid ""
 "Turn on or off use of the Rapid Photo Downloader Thumbnail Cache. Turning it "
 "off does not delete existing cache contents."
@@ -3945,18 +4668,18 @@ msgstr ""
 "Activar o desactivar el uso de la caché de miniaturas de Rapid Photo "
 "Downloader. Al desactivarlo no se borra el contenido de la caché existente."
 
-#: ../raphodo/rapid.py:5561
+#: ../raphodo/rapid.py:5831
 msgid ""
 "Delete all thumbnails in the Rapid Photo Downloader Thumbnail Cache, and "
 "exit."
 msgstr ""
 "Borrar todas las miniaturas de la caché de Rapid Photo Downloader y salir"
 
-#: ../raphodo/rapid.py:5565
+#: ../raphodo/rapid.py:5835
 msgid "Forget which files have been previously downloaded, and exit."
 msgstr "Olvidar los archivos que se han descargado previamente y salir."
 
-#: ../raphodo/rapid.py:5568
+#: ../raphodo/rapid.py:5838
 msgid ""
 "Import preferences from an old program version and exit. Requires the "
 "command line program gconftool-2."
@@ -3964,7 +4687,7 @@ msgstr ""
 "Importar preferencias de una versión antigua del programa y salir. Requiere "
 "del programa en línea de órdenes gconftool-2."
 
-#: ../raphodo/rapid.py:5571
+#: ../raphodo/rapid.py:5841
 msgid ""
 "Reset all program settings to their default values, delete all thumbnails in "
 "the Thumbnail cache, forget which files have been previously downloaded, and "
@@ -3974,17 +4697,17 @@ msgstr ""
 "borrar todas las miniaturas de la caché de miniaturas, olvidar qué archivos "
 "se han descargados previamente y salir."
 
-#: ../raphodo/rapid.py:5575
+#: ../raphodo/rapid.py:5845
 msgid "Include gphoto2 debugging information in log files."
 msgstr ""
 "Incluir información de depuración de gphoto2 en los archivos de registro."
 
-#: ../raphodo/rapid.py:5579
+#: ../raphodo/rapid.py:5849
 msgid "Print information to the terminal about attached cameras and exit."
 msgstr ""
 "Mostrar información en el terminal sobre las cámaras conectadas y salir."
 
-#: ../raphodo/rapid.py:5640
+#: ../raphodo/rapid.py:5911
 msgid ""
 "To import preferences from the old version of Rapid Photo Downloader, you "
 "must install the program gconftool-2."
@@ -3992,34 +4715,45 @@ msgstr ""
 "Para importar preferencias de una versión antigua de Rapid Photo Downloader, "
 "debe instalar el programa gconftool-2."
 
-#: ../raphodo/rapid.py:5649
+#: ../raphodo/rapid.py:5920
 msgid "No prior program preferences detected: exiting"
 msgstr "No se ha encontrado preferecias de programas anteriores: saliendo"
 
-#: ../raphodo/rapid.py:5652
+#: ../raphodo/rapid.py:5923
 #, python-format
 msgid "Importing preferences from Rapid Photo Downloader %(version)s"
 msgstr "Importando preferencia de Rapid Photo Downloader %(version)s"
 
-#: ../raphodo/rapid.py:5714
+#: ../raphodo/rapid.py:5989
 #, python-format
-msgid "Do you want to copy the stored sequence number, which has the value %d?"
+msgid ""
+"Do you want to copy the stored sequence number, which has the value %d?"
 msgstr ""
 "¿Quiere copiar los números de secuencia almacenados, que tienen el valor %d?"
 
-#: ../raphodo/rapid.py:5726
+#: ../raphodo/rapid.py:6000
 msgid "Program aborting."
 msgstr "Abortando el programa."
 
-#: ../raphodo/rapid.py:5736
+#: ../raphodo/rapid.py:6010
 msgid "Never run this program as the sudo / root user."
 msgstr "Nunca ejecute este programa como el usuario sudo / root."
 
-#: ../raphodo/rapid.py:5740
+#: ../raphodo/rapid.py:6014
 msgid "You must install ExifTool to run Rapid Photo Downloader."
 msgstr "Debe instalar ExifTool para ejecuar Rapid Photo Downloader."
 
-#: ../raphodo/rapid.py:5794
+#: ../raphodo/rapid.py:6026
+msgid ""
+"Rapid Photo Downloader is installed in multiple locations.\n"
+"\n"
+"Uninstall all copies except the version you want to run."
+msgstr ""
+"Rapid Photo Downloader está instalado en varias ubicaciones.\n"
+"\n"
+"Desinstale todas las copias excepto la versión que desee usar."
+
+#: ../raphodo/rapid.py:6083
 msgid ""
 "When specifying a path on the command line, do not also specify an\n"
 "option for device auto detection or a path on \"This Computer\"."
@@ -4027,15 +4761,15 @@ msgstr ""
 "Al indicar una ruta en la línea de órdenes, no indicar también una opción "
 "para la autodetección del dispositivo o una ruta en «Este equipo»."
 
-#: ../raphodo/rapid.py:5950
+#: ../raphodo/rapid.py:6243
 msgid "All settings and caches have been reset"
 msgstr "Todos los ajustes y cachés se han reiniciado"
 
-#: ../raphodo/rapid.py:5958
+#: ../raphodo/rapid.py:6251
 msgid "Thumbnail Cache has been reset"
 msgstr "La caché de miniaturas ha sido reiniciada"
 
-#: ../raphodo/rapid.py:5964
+#: ../raphodo/rapid.py:6257
 msgid "Remembered files have been forgotten"
 msgstr "Los archivos recordados se han olvidado"
 
@@ -4051,15 +4785,15 @@ msgstr "No me avise sobre esto de nuevo"
 msgid "&Don't warn me again about missing or broken program libraries"
 msgstr "&No avisarme de nuevo sobre bibliotecas que faltan o están rotas"
 
-#: ../raphodo/renameandmovefile.py:546
+#: ../raphodo/renameandmovefile.py:554
 msgid "subfolder and filename"
 msgstr "Subdirectorio y nombre de archivo"
 
-#: ../raphodo/renameandmovefile.py:548
+#: ../raphodo/renameandmovefile.py:556
 msgid "filename"
 msgstr "nombre de archivo"
 
-#: ../raphodo/renameandmovefile.py:550
+#: ../raphodo/renameandmovefile.py:558
 msgid "subfolder"
 msgstr "subdirectorio"
 
@@ -4145,160 +4879,237 @@ msgstr "fotos y vídeos"
 msgid "photos or videos"
 msgstr "fotos o vídeos"
 
-#: ../raphodo/rpdfile.py:306
+#: ../raphodo/rpdfile.py:315
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: ../raphodo/rpdfile.py:318
+#. translators: natural language expression signifying a single video
+#: ../raphodo/rpdfile.py:337
+msgid "a video"
+msgstr "un vídeo"
+
+#: ../raphodo/rpdfile.py:339
 msgid "1 Video"
 msgstr "1 vídeo"
 
-#: ../raphodo/rpdfile.py:323
+#. translators: natural language expression signifying a single photo
+#: ../raphodo/rpdfile.py:346
+msgid "a photo"
+msgstr "una foto"
+
+#: ../raphodo/rpdfile.py:348
 msgid "1 Photo"
 msgstr "1 foto"
 
-#: ../raphodo/rpdfile.py:803
+#: ../raphodo/rpdfile.py:828
 #, python-format
 msgid "%(path)s on %(camera)s"
 msgstr "%(path)s en %(camera)s"
 
-#: ../raphodo/rpdfile.py:819
+#: ../raphodo/rpdfile.py:844
 msgid "Photo"
 msgstr "Foto"
 
-#: ../raphodo/rpdfile.py:859
+#: ../raphodo/rpdfile.py:884
 msgid "Video"
 msgstr "Vídeo"
 
-#: ../raphodo/storage.py:138
+#: ../raphodo/storage.py:141
 msgid "File system root"
 msgstr "Raíz del sistema de archivos"
 
 #. translators: the name of the Pictures folder
-#: ../raphodo/storage.py:433
+#: ../raphodo/storage.py:437
 msgid "Pictures"
 msgstr "Imágenes"
 
-#: ../raphodo/thumbnaildisplay.py:426
+#: ../raphodo/thumbnaildisplay.py:432
 #, python-format
 msgid "Taken on %(date_time)s (%(human_readable)s)"
 msgstr "Tomadas a las %(date_time)s (%(human_readable)s)"
 
-#: ../raphodo/thumbnaildisplay.py:431
+#: ../raphodo/thumbnaildisplay.py:439
 #, python-format
 msgid "Modified on %(date_time)s (%(human_readable)s)"
 msgstr "Modificada a las %(date_time)s (%(human_readable)s)"
 
-#: ../raphodo/thumbnaildisplay.py:437 ../raphodo/thumbnaildisplay.py:466
+#: ../raphodo/thumbnaildisplay.py:447 ../raphodo/thumbnaildisplay.py:481
 #, python-format
 msgid "%(date_time)s (%(human_readable)s)"
 msgstr "%(date_time)s (%(human_readable)s)"
 
-#: ../raphodo/thumbnaildisplay.py:451
+#: ../raphodo/thumbnaildisplay.py:464
 #, python-format
 msgid "Memory cards: %s"
 msgstr "Tarjetas de memoria: %s"
 
-#: ../raphodo/thumbnaildisplay.py:457
+#: ../raphodo/thumbnaildisplay.py:468
+#, python-format
+msgid "Memory card: %s"
+msgstr "Tarjeta de memoria: %s"
+
+#: ../raphodo/thumbnaildisplay.py:473
 msgid "Downloaded as:"
 msgstr "Descargada como:"
 
-#: ../raphodo/thumbnaildisplay.py:472
+#: ../raphodo/thumbnaildisplay.py:489
 #, python-format
 msgid "<br><br>Previous download:<br>%(filename)s<br>%(path)s<br>%(date)s"
 msgstr "<br><br>Descarga previas:<br>%(filename)s<br>%(path)s<br>%(date)s"
 
-#: ../raphodo/thumbnaildisplay.py:1603
+#: ../raphodo/thumbnaildisplay.py:1645
 msgid "Copy Path"
 msgstr "Copiar ruta"
 
+#. Translators: these values are file size suffixes like B representing bytes, KB representing
+#. kilobytes, etc.
+#: ../raphodo/utilities.py:170
+msgid "B"
+msgstr "B"
+
+#: ../raphodo/utilities.py:170
+msgid "KB"
+msgstr "KB"
+
+#: ../raphodo/utilities.py:170
+msgid "MB"
+msgstr "MB"
+
+#: ../raphodo/utilities.py:170
+msgid "GB"
+msgstr "GB"
+
+#: ../raphodo/utilities.py:170
+msgid "TB"
+msgstr "TB"
+
+#: ../raphodo/utilities.py:170
+msgid "PB"
+msgstr "PB"
+
+#: ../raphodo/utilities.py:170
+msgid "EB"
+msgstr "EB"
+
+#: ../raphodo/utilities.py:170
+msgid "ZB"
+msgstr "ZB"
+
+#: ../raphodo/utilities.py:170
+msgid "YB"
+msgstr "YB"
+
 #. two things in a list e.g. "device1 and device2"
-#: ../raphodo/utilities.py:391
+#: ../raphodo/utilities.py:394
 #, python-format
 msgid "%(first_item)s and %(last_item)s"
 msgstr "%(first_item)s y %(last_item)s"
 
-#: ../raphodo/utilities.py:464
+#: ../raphodo/utilities.py:468
 msgid "one"
 msgstr "uno"
 
-#: ../raphodo/utilities.py:465
+#: ../raphodo/utilities.py:469
 msgid "two"
 msgstr "dos"
 
-#: ../raphodo/utilities.py:466
+#: ../raphodo/utilities.py:470
 msgid "three"
 msgstr "tres"
 
-#: ../raphodo/utilities.py:467
+#: ../raphodo/utilities.py:471
 msgid "four"
 msgstr "cuatro"
 
-#: ../raphodo/utilities.py:468
+#: ../raphodo/utilities.py:472
 msgid "five"
 msgstr "cinco"
 
-#: ../raphodo/utilities.py:469
+#: ../raphodo/utilities.py:473
 msgid "six"
 msgstr "seis"
 
-#: ../raphodo/utilities.py:470
+#: ../raphodo/utilities.py:474
 msgid "seven"
 msgstr "siete"
 
-#: ../raphodo/utilities.py:471
+#: ../raphodo/utilities.py:475
 msgid "eight"
 msgstr "ocho"
 
-#: ../raphodo/utilities.py:472
+#: ../raphodo/utilities.py:476
 msgid "nine"
 msgstr "nueve"
 
-#: ../raphodo/utilities.py:473
+#: ../raphodo/utilities.py:477
 msgid "ten"
 msgstr "diez"
 
-#: ../raphodo/utilities.py:474
+#: ../raphodo/utilities.py:478
 msgid "eleven"
 msgstr "once"
 
-#: ../raphodo/utilities.py:475
+#: ../raphodo/utilities.py:479
 msgid "twelve"
 msgstr "doce"
 
-#: ../raphodo/utilities.py:476
+#: ../raphodo/utilities.py:480
 msgid "thirteen"
 msgstr "trece"
 
-#: ../raphodo/utilities.py:477
+#: ../raphodo/utilities.py:481
 msgid "fourteen"
 msgstr "catorce"
 
-#: ../raphodo/utilities.py:478
+#: ../raphodo/utilities.py:482
 msgid "fifteen"
 msgstr "quince"
 
-#: ../raphodo/utilities.py:479
+#: ../raphodo/utilities.py:483
 msgid "sixteen"
 msgstr "dieciseis"
 
-#: ../raphodo/utilities.py:480
+#: ../raphodo/utilities.py:484
 msgid "seventeen"
 msgstr "diecisiete"
 
-#: ../raphodo/utilities.py:481
+#: ../raphodo/utilities.py:485
 msgid "eighteen"
 msgstr "dieciocho"
 
-#: ../raphodo/utilities.py:482
+#: ../raphodo/utilities.py:486
 msgid "ninenteen"
 msgstr "diecinueve"
 
-#: ../raphodo/utilities.py:483
+#: ../raphodo/utilities.py:487
 msgid "twenty"
 msgstr "veinte"
 
+#: ../raphodo/viewutils.py:240
+msgid "&OK"
+msgstr "&Aceptar"
+
+#: ../raphodo/viewutils.py:243
+msgid "&Save"
+msgstr "&Guardar"
+
+#: ../raphodo/viewutils.py:244
+msgid "&Help"
+msgstr "&Ayuda"
+
+#: ../raphodo/viewutils.py:245
+msgid "Restore Defaults"
+msgstr "Restaurar los valores predeterminados"
+
+#: ../raphodo/viewutils.py:246
+msgid "&Yes"
+msgstr "&Sí"
+
+#: ../raphodo/viewutils.py:247
+msgid "&No"
+msgstr "&No"
+
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:1
 msgid ""
 "Rapid Photo Downloader imports photos and videos from cameras, phones, "
@@ -4369,8 +5180,8 @@ msgstr "Descargador de fotos"
 #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:5
 msgid ""
-"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;"
-"memory;card;"
+"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;memory"
+";card;"
 msgstr ""
 "foto;descarga;fotografía;importar;vídeo;RAW;cámara;teléfono;ingesta;copia de "
 "seguridad;memoria;tarjeta;"
@@ -4379,6 +5190,7 @@ msgstr ""
 msgid "Download Photos and Videos with Rapid Photo Downloader"
 msgstr "Descargue fotos y vídeos con Rapid Photo Downloader"
 
+#, python-format
 #~ msgid "<i>Example: %s</i>"
 #~ msgstr "<i>Ejemplo: %s</i>"
 
@@ -4388,6 +5200,7 @@ msgstr "Descargue fotos y vídeos con Rapid Photo Downloader"
 #~ msgid "and"
 #~ msgstr "y"
 
+#, python-format
 #~ msgid "and %s"
 #~ msgstr "y %s"
 
@@ -4439,6 +5252,7 @@ msgstr "Descargue fotos y vídeos con Rapid Photo Downloader"
 #~ msgid "Name + extension"
 #~ msgstr "Nombre + extensión"
 
+#, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
 #~ "Destination: %(destination)s"
@@ -4557,6 +5371,7 @@ msgstr "Descargue fotos y vídeos con Rapid Photo Downloader"
 #~ msgid "_Add..."
 #~ msgstr "_Añadir…"
 
+#, python-format
 #~ msgid "Source: %(source)s"
 #~ msgstr "Origen: %(source)s"
 
@@ -4566,6 +5381,7 @@ msgstr "Descargue fotos y vídeos con Rapid Photo Downloader"
 #~ msgid "Remove all Job Codes?"
 #~ msgstr "¿Borrar todos los Códigos de Trabajo?"
 
+#, python-format
 #~ msgid "Destination directory could not be created: %(directory)s\n"
 #~ msgstr "El directorio de destino no puede ser creado: %(directory)s\n"
 
@@ -4581,6 +5397,7 @@ msgstr "Descargue fotos y vídeos con Rapid Photo Downloader"
 #~ msgid "Sydney"
 #~ msgstr "Sídney"
 
+#, python-format
 #~ msgid ""
 #~ "%(date)s\n"
 #~ "%(time)s"
@@ -4588,21 +5405,27 @@ msgstr "Descargue fotos y vídeos con Rapid Photo Downloader"
 #~ "%(date)s\n"
 #~ "%(time)s"
 
+#, python-format
 #~ msgid "%(date)s %(time)s"
 #~ msgstr "%(date)s %(time)s"
 
+#, python-format
 #~ msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
+#, python-format
 #~ msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 #~ msgstr "%(number)s de %(total)s %(filetypes)s (%(remaining)s restantes)"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s"
 #~ msgstr "%(number)s de %(total)s %(filetypes)s"
 
+#, python-format
 #~ msgid "Error: %(inst)s"
 #~ msgstr "Error: %(inst)s"
 
@@ -4628,8 +5451,8 @@ msgstr "Descargue fotos y vídeos con Rapid Photo Downloader"
 #~ "Specify whether photo, video and folder names should have any characters "
 #~ "removed that are not allowed by other operating systems."
 #~ msgstr ""
-#~ "Especifique si se debería de retirar algún caracter no permitido por "
-#~ "otros sistemas operativos de los nombres de las fotos, vídeos y carpetas."
+#~ "Especifique si se debería de retirar algún caracter no permitido por otros "
+#~ "sistemas operativos de los nombres de las fotos, vídeos y carpetas."
 
 #~ msgid "Video Rename"
 #~ msgstr "Renombrar vídeo"
@@ -4660,12 +5483,15 @@ msgstr "Descargue fotos y vídeos con Rapid Photo Downloader"
 #~ msgid "."
 #~ msgstr "."
 
+#, python-format
 #~ msgid "(%(file_type)s)"
 #~ msgstr "(%(file_type)s)"
 
+#, python-format
 #~ msgid "%(free)s %(file_type)s"
 #~ msgstr "%(free)s %(file_type)s"
 
+#, python-format
 #~ msgid "%(freespace)s. %(backuppaths)s."
 #~ msgstr "%(freespace)s. %(backuppaths)s."
 
@@ -4678,6 +5504,7 @@ msgstr "Descargue fotos y vídeos con Rapid Photo Downloader"
 #~ msgid "All settings and preferences have been reset"
 #~ msgstr "Todas las opciones y preferencias se han reestablecido"
 
+#, python-format
 #~ msgid ""
 #~ "%(problem)s\n"
 #~ "File: %(file)s"
@@ -4685,21 +5512,27 @@ msgstr "Descargue fotos y vídeos con Rapid Photo Downloader"
 #~ "%(problem)s\n"
 #~ "Archivo: %(file)s"
 
+#, python-format
 #~ msgid "An error occurred when copying the %(filetype)s"
 #~ msgstr "Ocurrió un error al copiar el/los %(filetype)s"
 
+#, python-format
 #~ msgid "%(filetype)s already exists"
 #~ msgstr "%(filetype)s ya existe"
 
+#, python-format
 #~ msgid "Error: %(errorno)s %(strerror)s"
 #~ msgstr "Error: %(errorno)s %(strerror)s"
 
+#, python-format
 #~ msgid "%s, "
 #~ msgstr "%s, "
 
+#, python-format
 #~ msgid "Folder: %s"
 #~ msgstr "Carpeta: %s"
 
+#, python-format
 #~ msgid "Path: %s"
 #~ msgstr "Ruta: %s"
 
@@ -4723,103 +5556,123 @@ msgstr "Descargue fotos y vídeos con Rapid Photo Downloader"
 #~ msgid "Download cannot proceed"
 #~ msgstr "No se puede iniciar la descarga"
 
+#, python-format
 #~ msgid "%(file_type)s download folder does not exist"
 #~ msgstr "%(file_type)s directorio de descarga no existe"
 
+#, python-format
 #~ msgid "%(file_type)s download folder is not writable"
 #~ msgstr "%(file_type)s imposible escribir en directorio de descarga"
 
+#, python-format
 #~ msgid "%(file_type)s download folder is invalid"
 #~ msgstr "%(file_type)s directorio de descarga es incorrecto"
 
 #~ msgid "Should all Job Codes be removed?"
 #~ msgstr "¿Quitar todos los Codigos de Trabajo?"
 
+#, 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 ""
-#~ "El %(filetype)s las preferencias para el subdirectorio son incorrectas y "
-#~ "no pueden ser utilizadas.\n"
+#~ "El %(filetype)s las preferencias para el subdirectorio son incorrectas y no "
+#~ "pueden ser utilizadas.\n"
 #~ "Se ajustaran a los valores por defecto"
 
 #~ msgid ""
 #~ "<i><b>Warning:</b> There is insufficient metadata to fully generate "
 #~ "subfolders. Please use other subfolder naming options.</i>"
 #~ msgstr ""
-#~ "<i><b>Atencion:</b> No hay suficientes metadatos para crear "
-#~ "subdirectorios. Por favor utilice otro nombre para el subdirectorio.</i>"
+#~ "<i><b>Atencion:</b> No hay suficientes metadatos para crear subdirectorios. "
+#~ "Por favor utilice otro nombre para el subdirectorio.</i>"
 
+#, python-format
 #~ msgid "%(filetype)s metadata cannot be read"
 #~ msgstr "%(filetype)s no se pueden leer los metadatos"
 
+#, python-format
 #~ msgid "Date time value %s appears invalid."
 #~ msgstr "Fecha y hora %s parecen incorrectos."
 
+#, python-format
 #~ msgid "Error generating component %s."
 #~ msgstr "Error generando componente %s."
 
+#, 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."
 
 #~ msgid "The metadata might be corrupt."
 #~ msgstr "Los metadatos parecen corruptos."
 
+#, python-format
 #~ msgid "%(volume)s, "
 #~ msgstr "%(volume)s, "
 
+#, python-format
 #~ msgid "%(volume)s (%(inst)s), "
 #~ msgstr "%(volume)s (%(inst)s), "
 
+#, 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."
 
+#, python-format
 #~ msgid "%(volumes)s and %(volume)s (%(inst)s)."
 #~ msgstr "%(volumes)s y %(volume)s (%(inst)s)."
 
+#, python-format
 #~ msgid "%(volumes)s and %(final_volume)s."
 #~ msgstr "%(volumes)s y %(final_volume)s."
 
+#, python-format
 #~ msgid "%(volumes)s and %(volume)s."
 #~ msgstr "%(volumes)s y %(volume)s."
 
 #~ msgid "Backups overwritten on these devices: "
 #~ msgstr "Sobreescritas copias de seguridad en estos dispositivos: "
 
+#, python-format
 #~ msgid "Backup overwritten on %(volume)s."
 #~ msgstr "Sobreescrita copia de seguridad en %(volume)s."
 
+#, python-format
 #~ msgid "%(previousproblem)s Additionally, %(newproblem)s"
 #~ msgstr "%(previousproblem)s Adicionalmente, %(newproblem)s"
 
+#, python-format
 #~ msgid "Backup already exists on %(volume)s."
 #~ msgstr "La copia de seguridad ya existe en %(volume)s."
 
 #~ msgid ""
-#~ "Errors occurred when creating directories on the following backup "
-#~ "devices: "
+#~ "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: "
 
+#, 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."
 
+#, python-format
 #~ msgid "Problem in %s generation"
 #~ msgstr "Problema al %s crear"
 
+#, python-format
 #~ msgid "Problems in %s generation"
 #~ msgstr "Problemas al %s crear"
 
+#, python-format
 #~ msgid "%(filetype)s already exists, but it was backed up"
 #~ msgstr "%(filetype)s ya existen, pero fue realizada copia de seguridad"
 
-#~ msgid ""
-#~ "An error occurred when copying the %(filetype)s, but it was backed up"
+#, 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"
+#~ "Un error ocurrió al copiar los %(filetype)s, pero fue realizada una copia de "
+#~ "seguridad"
 
 #~ msgid "Problems in subfolder and filename generation"
 #~ msgstr "Problemas al crear subdirectorio y nombre de archivo"
@@ -4827,19 +5680,18 @@ msgstr "Descargue fotos y vídeos con Rapid Photo Downloader"
 #~ msgid "Problem in subfolder and filename generation"
 #~ msgstr "Problema al crear subdirectorio y nombre de archivo"
 
-#~ msgid ""
-#~ "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
+#, python-format
+#~ msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
 #~ msgstr "%(missing_metadata_elements)s y %(final_missing_metadata_element)s."
 
-#~ msgid ""
-#~ "Photos detected with the same filenames, but taken at different times"
+#~ 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"
+#~ "Fotos detectadas con el mismo nombre de archivo, pero tomadas a distinta hora"
 
 #~ msgid "Photo has already been downloaded"
 #~ msgstr "La fotografia ya ha sido descargada"
 
+#, python-format
 #~ msgid "%(previousproblem)s, and %(backinguperror)s"
 #~ msgstr "%(previousproblem)s, y %(backinguperror)s"
 
@@ -4884,8 +5736,8 @@ msgstr "Descargue fotos y vídeos con Rapid Photo Downloader"
 #~ "automatically created in this folder using the structure specified below."
 #~ msgstr ""
 #~ "Seleccione una carpeta para descargas. Las subcarpetas para descargar "
-#~ "fotografías serán creadas automáticamente en la carpeta usando la "
-#~ "estructura especificada abajo."
+#~ "fotografías serán creadas automáticamente en la carpeta usando la estructura "
+#~ "especificada abajo."
 
 #~ msgid "Backup"
 #~ msgstr "Copia de seguridad"
@@ -4894,8 +5746,8 @@ msgstr "Descargue fotos y vídeos con Rapid Photo Downloader"
 #~ "Choose the download folder. Subfolders for the downloaded videos will be "
 #~ "automatically created in this folder using the structure specified below."
 #~ msgstr ""
-#~ "Seleccione una carpeta para descargas. Las subcarpetas para descargar "
-#~ "videos serán creadas automáticamente en la carpeta usando la estructura "
+#~ "Seleccione una carpeta para descargas. Las subcarpetas para descargar videos "
+#~ "serán creadas automáticamente en la carpeta usando la estructura "
 #~ "especificada abajo."
 
 #~ msgid "Generate thumbnails (slower)"
@@ -4908,11 +5760,11 @@ msgstr "Descargue fotos y vídeos con Rapid Photo Downloader"
 #~ msgstr "Directorio de descarga"
 
 #~ msgid ""
-#~ "If you disable automatic detection, choose the exact location of the "
-#~ "photos and videos."
+#~ "If you disable automatic detection, choose the exact location of the photos "
+#~ "and videos."
 #~ msgstr ""
-#~ "Si se desactiva la detección automática, elegir la ubicación exacta para "
-#~ "las fotografías y videos."
+#~ "Si se desactiva la detección automática, elegir la ubicación exacta para las "
+#~ "fotografías y videos."
 
 #~ msgid "Performance"
 #~ msgstr "Prestaciones"
@@ -4942,13 +5794,13 @@ msgstr "Descargue fotos y vídeos con Rapid Photo Downloader"
 #~ msgstr "Extraer (\"eject\") el dispositivo al concluir la descarga"
 
 #~ 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."
+#~ "When a photo or video of the same name has already been downloaded, choose "
+#~ "whether to skip downloading the file, or to add a unique indentifier."
 #~ msgstr ""
 #~ "Cuando una fotografía o video ha sido ya descargada, elegir omitirla "
 #~ "descarga del archivo o añadir un identificador único."
 
+#, python-format
 #~ msgid "%(free)s free"
 #~ msgstr "%(free)s disponible"
 
@@ -4972,8 +5824,7 @@ msgstr "Descargue fotos y vídeos con Rapid Photo Downloader"
 
 #~ 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"
+#~ "Seleccione una carpeta en la que se hará una copia de seguridad de las fotos"
 
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Device Options</span>"
 #~ msgstr ""
@@ -4981,8 +5832,7 @@ msgstr "Descargue fotos y vídeos con Rapid Photo Downloader"
 
 #~ 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"
+#~ "Seleccione una carpeta en la que se hará una copia de seguridad de los vídeos"
 
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
 #~ msgstr "<span weight=\"bold\" size=\"x-large\">Renombrar Foto</span>\t"
@@ -4996,15 +5846,15 @@ msgstr "Descargue fotos y vídeos con Rapid Photo Downloader"
 
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
 #~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Carpetas de Descargas de Vídeos</"
-#~ "span>"
+#~ "<span weight=\"bold\" size=\"x-large\">Carpetas de Descargas de Vídeos</span>"
 
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
 #~ msgstr "<span weight=\"bold\" size=\"x-large\">Renombrar Vídeo</span>\t"
 
+#, python-format
 #~ msgid ""
-#~ "This regular expression is invalid, and will be removed unless you "
-#~ "correct it:\n"
+#~ "This regular expression is invalid, and will be removed unless you correct "
+#~ "it:\n"
 #~ " %s"
 #~ msgstr ""
 #~ "Esta expresión regular no es válida, y se eliminará a menos que use una "
@@ -5015,13 +5865,14 @@ msgstr "Descargue fotos y vídeos con Rapid Photo Downloader"
 #~ "When backing up, choose whether to overwrite a file on the backup device "
 #~ "that has the same name, or skip backing it up."
 #~ msgstr ""
-#~ "Cuando haga copia de seguridad, elija si desea sobrescribir un archivo en "
-#~ "el dispositivo de copia de seguridad que tenga el mismo nombre, o salte "
-#~ "hacer respaldo."
+#~ "Cuando haga copia de seguridad, elija si desea sobrescribir un archivo en el "
+#~ "dispositivo de copia de seguridad que tenga el mismo nombre, o salte hacer "
+#~ "respaldo."
 
 #~ msgid "_Translate this Application..."
 #~ msgstr "_Traducir esta aplicación…"
 
+#, python-format
 #~ msgid "%(device)s did not unmount"
 #~ msgstr "%(device)s no se desmontó"
 
@@ -5031,6 +5882,7 @@ msgstr "Descargue fotos y vídeos con Rapid Photo Downloader"
 #~ msgid "Import your photos and videos efficiently and reliably"
 #~ msgstr "Descargue sus fotografías y vídeos de forma eficaz y segura"
 
+#, python-format
 #~ msgid ""
 #~ "The following regular expressions are invalid, and will be removed unless "
 #~ "you correct them:\n"
@@ -5044,19 +5896,20 @@ msgstr "Descargue fotos y vídeos con Rapid Photo Downloader"
 #~ "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."
+#~ "When this option is enabled, and a potential device is detected, you will be "
+#~ "prompted to determine if it should be scanned or not."
 #~ msgstr ""
 #~ "Si activa la detección automática de dispositivos de almacenamiento "
 #~ "externos, se analizara el dispositivo completo. En dispositivos de gran "
 #~ "capacidad, esto puede llevar algún tiempo.\n"
 #~ "\n"
-#~ "Cuando está opción esté habilitada y se detecte un dispositivo potencial, "
-#~ "se preguntara si desea analizarlo o no."
+#~ "Cuando está opción esté habilitada y se detecte un dispositivo potencial, se "
+#~ "preguntara si desea analizarlo o no."
 
 #~ msgid "Automatically rotate JPEG images"
 #~ msgstr "Rotar automáticamente las imágenes JPEG"
 
+#, python-format
 #~ msgid "Downloading from %(location)s."
 #~ msgstr "Descargando desde %(location)s."
 
@@ -5064,20 +5917,20 @@ msgstr "Descargue fotos y vídeos con Rapid Photo Downloader"
 #~ "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"
+#~ "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>"
+#~ "<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 ""
 #~ "Los dispositivos son de donde se puede descargar las fotos y los vídeos, "
 #~ "como cámaras, tarjetas de memorias o Dispositivos de Almacenamiento "
 #~ "Portables.\n"
 #~ "\n"
-#~ "Puede descargar desde múltiples dispositivos a la vez, o puede "
-#~ "especificar una localización en su disco duro.\n"
+#~ "Puede descargar desde múltiples dispositivos a la vez, o puede especificar "
+#~ "una localización en su disco duro.\n"
 #~ "\n"
 #~ "<i>Descargar directamente desde cámara es actualmente una característica "
 #~ "experimental. Si la descarga desde su cámara funciona mal o no funciona, "
@@ -5085,13 +5938,13 @@ msgstr "Descargue fotos y vídeos con Rapid Photo Downloader"
 #~ "lector de tarjetas.</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>."
+#~ "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 ""
-#~ "Lo sentimos, la funcionalidad de descarga de vídeos está desactivada. "
-#~ "Para descargar los vídeos, por favor instale <i>hachoir metadata</i> y "
-#~ "<i>kaa metadata</i> paquetes de python, o <i>exiftool</i>."
+#~ "Lo sentimos, la funcionalidad de descarga de vídeos está desactivada. Para "
+#~ "descargar los vídeos, por favor instale <i>hachoir metadata</i> y <i>kaa "
+#~ "metadata</i> paquetes de python, o <i>exiftool</i>."
 
 #~ msgid "the root of the file system"
 #~ msgstr "la raíz del sistema de archivos"
@@ -5099,6 +5952,7 @@ msgstr "Descargue fotos y vídeos con Rapid Photo Downloader"
 #~ msgid "scanning..."
 #~ msgstr "analizando…"
 
+#, python-format
 #~ msgid "About %i seconds remaining"
 #~ msgstr "Quedan aproximadamente %i segundos"
 
@@ -5112,9 +5966,10 @@ msgstr "Descargue fotos y vídeos con Rapid Photo Downloader"
 #~ "Do you really want to download from here? On some systems, scanning this "
 #~ "location can take a very long time."
 #~ msgstr ""
-#~ "¿Quiere realmente descargar desde aquí? En algunos sistemas, analizar "
-#~ "esta ubicación puede tardar mucho tiempo."
+#~ "¿Quiere realmente descargar desde aquí? En algunos sistemas, analizar esta "
+#~ "ubicación puede tardar mucho tiempo."
 
+#, python-format
 #~ msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 #~ msgstr "Quedan aproximadamente %(minutes)i:%(seconds)02i minutos"
 
@@ -5127,6 +5982,7 @@ msgstr "Descargue fotos y vídeos con Rapid Photo Downloader"
 #~ msgid "Auto Detect"
 #~ msgstr "Detectar automáticamente"
 
+#, python-format
 #~ msgid "Select a folder containing %(file_types)s"
 #~ msgstr "Elija un directorio que contenga %(file_types)s"
 
@@ -5148,31 +6004,34 @@ msgstr "Descargue fotos y vídeos con Rapid Photo Downloader"
 #~ msgid "Using backup devices"
 #~ msgstr "Usando dispositivos de copia de seguridad"
 
+#, python-format
 #~ msgid "Backing up photos and videos to %(path)s"
 #~ msgstr "Respaldando fotos y vídeos en %(path)s"
 
+#, python-format
 #~ msgid "Backing up to %(path)s"
 #~ msgstr "Respaldando en %(path)s"
 
+#, 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"
 
+#, python-format
 #~ msgid ""
 #~ "display program information on the command line as the program runs "
 #~ "(default: %default)"
 #~ msgstr ""
-#~ "mostrar información del programa en la línea de órdenes mientras se "
-#~ "ejecuta el programa (predet.: %default)"
+#~ "mostrar información del programa en la línea de órdenes mientras se ejecuta "
+#~ "el programa (predet.: %default)"
 
 #~ 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"
+#~ "mostrar información de depuración cuando se ejecute desde la línea de órdenes"
 
 #~ 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."
+#~ "Remembered paths are those associated with devices that you have chosen to "
+#~ "always scan or ignore when automatic detection of Portable Storage Devices "
+#~ "is enabled."
 #~ msgstr ""
 #~ "Recordar las rutas asociadas con los dispositivos elegidos para escanear "
 #~ "siempre o ignorar cuando automáticamente es detectado un dispositivo de "
@@ -5180,8 +6039,8 @@ msgstr "Descargue fotos y vídeos con Rapid Photo Downloader"
 
 #~ 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."
+#~ "devices for photos or videos. Any path ending with the values below will not "
+#~ "be scanned."
 #~ msgstr ""
 #~ "Especificar las carpetas o dispositivos a ignorar al escanear en busca de "
 #~ "fotos o videos. Las que estén marcadas no serán exploradas."
@@ -5193,26 +6052,27 @@ msgstr "Descargue fotos y vídeos con Rapid Photo Downloader"
 #~ "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>"
+#~ "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 ""
 #~ "Especificar la carpeta en la cual se realiza la copia de seguridad en el "
 #~ "dispositivo.  \n"
 #~ " \n"
 #~ "<i>Nota: esto también será utilizado para determinar si el dispositivo se "
 #~ "está utilizado para la copia de seguridad o no. Para cada dispositivo que "
-#~ "desee utilizar para realizar la copia seguridad, cree una carpeta con uno "
-#~ "de estos nombres.</i>"
+#~ "desee utilizar para realizar la copia seguridad, cree una carpeta con uno de "
+#~ "estos nombres.</i>"
 
+#, python-format
 #~ msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
 #~ msgstr "analizando (se encontraron %(photos)s fotos y %(videos)s vídeos)…"
 
 #~ msgid ""
-#~ "manually specify the PATH of the device from which to download, "
-#~ "overwriting existing program preferences"
+#~ "manually specify the PATH of the device from which to download, overwriting "
+#~ "existing program preferences"
 #~ msgstr ""
-#~ "especificar manualmente de que dispositivos descargar, sobreescribiendo "
-#~ "las preferencias existentes del programa"
+#~ "especificar manualmente de que dispositivos descargar, sobreescribiendo las "
+#~ "preferencias existentes del programa"
 
 #~ msgid ""
 #~ "automatically detect devices from which to download, overwriting existing "
@@ -5249,14 +6109,17 @@ msgstr "Descargue fotos y vídeos con Rapid Photo Downloader"
 #~ msgid "An unknown error occurred"
 #~ msgstr "Ocurrió un error desconocido"
 
+#, 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"
 
+#, python-format
 #~ msgid "%(file_type)s not backed up"
 #~ msgstr "%(file_type)s sin respaldar"
 
+#, python-format
 #~ msgid "Backup of %(file_type)s already exists"
 #~ msgstr "Ya existe un respaldo de %(file_type)s"
 
@@ -5272,15 +6135,19 @@ msgstr "Descargue fotos y vídeos con Rapid Photo Downloader"
 #~ msgid "Jakarta"
 #~ msgstr "Yakarta"
 
+#, python-format
 #~ msgid "Backup %(file_type)s overwritten"
 #~ msgstr "Copia de seguridad %(file_type)s sobreescrita"
 
+#, python-format
 #~ msgid "The %(filetype)s did not download correctly"
 #~ msgstr "El %(filetype)s no se descargó correctamente"
 
+#, python-format
 #~ msgid "%(filetype)s %(area)s could not be generated"
 #~ msgstr "%(filetype)s %(area)s no se pudieron generar"
 
+#, python-format
 #~ msgid ""
 #~ "%(filetype)s could not be backed up because no suitable backup locations "
 #~ "were found."
@@ -5288,16 +6155,19 @@ msgstr "Descargue fotos y vídeos con Rapid Photo Downloader"
 #~ "%(filetype)s no se hizo copia de seguridad porque no se encontró una "
 #~ "ubicación donde realizarla."
 
+#, python-format
 #~ msgid "%(filetype)s was already downloaded"
 #~ msgstr "%(filetype)s ya están descargadas"
 
+#, python-format
 #~ msgid ""
-#~ "The existing %(filetype)s was last modified on %(date)s at %(time)s. "
-#~ "Unique identifier '%(identifier)s' added."
+#~ "The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
+#~ "identifier '%(identifier)s' added."
 #~ msgstr ""
 #~ "El existente %(filetype)s fue modificado por última vez el %(date)s a las "
 #~ "%(time)s. Identificador único '%(identifier)s' añadido."
 
+#, python-format
 #~ msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
 #~ msgstr ""
 #~ "El existente %(filetype)s fue modificado por última vez el %(date)s a las "
@@ -5314,16 +6184,17 @@ msgstr "Descargue fotos y vídeos con Rapid Photo Downloader"
 #~ "The filename, extension and Exif information indicate it has already been "
 #~ "downloaded."
 #~ msgstr ""
-#~ "El nombre de archivo, extensión y la información Exif indican que ya ha "
-#~ "sido descargado."
+#~ "El nombre de archivo, extensión y la información Exif indican que ya ha sido "
+#~ "descargado."
 
+#, python-format
 #~ msgid " It was backed up to %(volume)s"
 #~ msgstr " Se realizó una copia de seguridad de los datos en %(volume)s"
 
 #~ msgid " It was backed up to these devices: "
-#~ msgstr ""
-#~ " Se realizó una copia de seguridad de los datos en este dispositivo "
+#~ msgstr " Se realizó una copia de seguridad de los datos en este dispositivo "
 
+#, python-format
 #~ msgid ""
 #~ "Photos detected with the same filenames, but taken at different times: "
 #~ "%(details)s"
@@ -5331,10 +6202,11 @@ msgstr "Descargue fotos y vídeos con Rapid Photo Downloader"
 #~ "Detectadas fotos con el mismo nombre, pero distinta fecha de realización: "
 #~ "%(details)s"
 
+#, python-format
 #~ msgid "An error occurred when backing up on %(volume)s: %(inst)s."
 #~ msgstr ""
-#~ "Ocurrió un error durante la creación de la copia de seguridad en "
-#~ "%(volume)s: %(inst)s."
+#~ "Ocurrió un error durante la creación de la copia de seguridad en %(volume)s: "
+#~ "%(inst)s."
 
 #~ msgid "Errors occurred when backing up on the following backup devices: "
 #~ msgstr ""
@@ -5344,16 +6216,19 @@ msgstr "Descargue fotos y vídeos con Rapid Photo Downloader"
 #~ msgid "Backups already exist in these locations: "
 #~ msgstr "Las copias de seguridad están en este directorio: "
 
+#, python-format
 #~ msgid ""
-#~ "File verification failed on %(volume)s. The backed up version is "
-#~ "different from the downloaded version."
+#~ "File verification failed on %(volume)s. The backed up version is different "
+#~ "from the downloaded version."
 #~ msgstr ""
-#~ "La comprobación del archivo falló en %(volume)s. La versión de la copia "
-#~ "de seguridad es diferente de la versión descargada."
+#~ "La comprobación del archivo falló en %(volume)s. La versión de la copia de "
+#~ "seguridad es diferente de la versión descargada."
 
+#, python-format
 #~ msgid " Furthermore, there were %(problems)s."
 #~ msgstr " Además, se encontrarón %(problems)s."
 
+#, python-format
 #~ msgid " Furthermore, there was a %(problem)s."
 #~ msgstr " Además, se encontró %(problem)s."
 
@@ -5379,5 +6254,5 @@ msgstr "Descargue fotos y vídeos con Rapid Photo Downloader"
 #~ "Specify the time in 24 hour format at which the <i>Downloads today</i> "
 #~ "sequence number should be reset."
 #~ msgstr ""
-#~ "Especifique la hora en formato de 24 horas en la que el número de "
-#~ "secuencia de las <i> Descargas de hoy </i>, debe ser restablecido."
+#~ "Especifique la hora en formato de 24 horas en la que el número de secuencia "
+#~ "de las <i> Descargas de hoy </i>, debe ser restablecido."
diff --git a/po/et.po b/po/et.po
index 0723bc4..ff71d07 100644
--- a/po/et.po
+++ b/po/et.po
@@ -7,129 +7,489 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: damonlynch@gmail.com\n"
-"POT-Creation-Date: 2017-07-08 19:16-0500\n"
-"PO-Revision-Date: 2017-07-04 11:06+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2017-09-12 17:01-0400\n"
+"PO-Revision-Date: 2017-09-13 18:35+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: Estonian <et@li.org>\n"
-"Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-07-05 23:04+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-09-26 22:04+0000\n"
+"X-Generator: Launchpad (build 18463)\n"
+"Language: et\n"
+
+#: ../install.py:65
+msgid "Rapid Photo Downloader installer"
+msgstr ""
+
+#: ../install.py:66
+msgid "Download and install latest version of Rapid Photo Downloader."
+msgstr ""
+
+#: ../install.py:236 ../install.py:1732
+msgid "Installer not found:"
+msgstr ""
+
+#. Translators: do not translate the term tar.gz
+#: ../install.py:240 ../install.py:1736
+msgid "Installer not in tar.gz format:"
+msgstr ""
+
+#: ../install.py:465
+msgid ""
+"Incorrect folder ownership detected. Changing ownership of and resetting "
+"permissions for"
+msgstr ""
+
+#: ../install.py:540
+msgid "The following command will be run:"
+msgstr ""
+
+#: ../install.py:543 ../install.py:1479 ../install.py:1484
+msgid "sudo may prompt you for the sudo password."
+msgstr ""
+
+#: ../install.py:547
+msgid "Would you like to run the command now?"
+msgstr ""
+
+#: ../install.py:549
+msgid "Answer is not yes, exiting."
+msgstr ""
+
+#: ../install.py:559 ../install.py:751 ../install.py:966
+msgid "Command failed"
+msgstr ""
+
+#: ../install.py:561 ../install.py:752 ../install.py:967
+msgid "Exiting"
+msgstr ""
+
+#: ../install.py:582
+msgid "The Universe repository must be enabled."
+msgstr ""
+
+#: ../install.py:606
+msgid ""
+"Do you want to to uninstall the previous version of Rapid Photo Downloader:"
+msgstr ""
+
+#: ../install.py:715 ../install.py:740
+msgid ""
+"Querying package system to see if an older version of Rapid Photo Downloader "
+"is installed (this may take a while)..."
+msgstr ""
+
+#: ../install.py:726
+msgid ""
+"Unable to query package system. Please check your Internet connection and "
+"try again"
+msgstr ""
+
+#: ../install.py:756
+msgid "Checking if previous version installed with pip..."
+msgstr ""
+
+#: ../install.py:850
+msgid "The following package is unknown on your system: {}\n"
+msgstr ""
+
+#: ../install.py:857 ../install.py:929 ../install.py:974
+msgid ""
+"To continue, some packages required to run the application will be installed."
+msgstr ""
+
+#: ../install.py:886
+msgid "Querying installed and available packages (this may take a while)"
+msgstr ""
+
+#: ../install.py:958
+msgid ""
+"Querying zypper to see if any required packages are already installed (this "
+"may take a while)... "
+msgstr ""
+
+#: ../install.py:1004
+msgid "Query to confirm action at each step."
+msgstr ""
+
+#: ../install.py:1011
+msgid ""
+"When downloading the latest version, install the development version if it "
+"is newer than the stable version."
+msgstr ""
+
+#: ../install.py:1020
+msgid ""
+"Optional tar.gz Rapid Photo Downloader installer archive. If not specified, "
+"the latest version is downloaded from the Internet."
+msgstr ""
+
+#: ../install.py:1043
+msgid ""
+"Do not run the installer in the tar.gz Rapid Photo Downloader installer "
+"archive if it is newer than this version ({}). The default is to run "
+"whichever installer is newer."
+msgstr ""
+
+#: ../install.py:1050
+msgid ""
+"Uninstall Rapid Photo Downloader that was installed with pip, keeping its "
+"dependencies."
+msgstr ""
+
+#: ../install.py:1054
+msgid ""
+"Uninstall the dependencies installed by pip during Rapid Photo Downloader's "
+"installation, and Rapid Photo Downloader itself, then exit."
+msgstr ""
+
+#: ../install.py:1059
+msgid ""
+"Note: this will not uninstall any version of Rapid Photo Downloader "
+"installed by your Linux distribution's package manager."
+msgstr ""
+
+#: ../install.py:1066
+msgid ""
+"Dependencies will only be removed if they are not required by other programs."
+msgstr ""
+
+#: ../install.py:1072
+msgid ""
+"Note: this option will remove the dependencies regardless of whether they "
+"are required by another program pip has installed. Upgrade to pip 9.0 or "
+"above if you want to avoid this behavior. You can do so using the command "
+"'python3 -m pip install pip -U --user'. Also note that any version of Rapid "
+"Photo Downloader installed by your Linux distribution's package manager will "
+"not be uninstalled."
+msgstr ""
+
+#: ../install.py:1122
+msgid "Failed to download versions file"
+msgstr ""
+
+#: ../install.py:1126
+msgid "Got error code {} while accessing versions file"
+msgstr ""
+
+#: ../install.py:1234
+msgid ""
+"Sorry, could not locate installer. Please check your Internet connection and "
+"verify if you can reach https://www.damonlynch.net\n"
+"\n"
+"Exiting.\n"
+msgstr ""
+
+#: ../install.py:1408
+msgid "Installing application requirements..."
+msgstr ""
+
+#: ../install.py:1424
+msgid "Received error code"
+msgstr ""
+
+#: ../install.py:1425
+msgid "Failed to install application requirements: exiting"
+msgstr ""
+
+#: ../install.py:1428
+msgid "Installing application..."
+msgstr ""
+
+#: ../install.py:1441
+msgid "Failed to install application: exiting..."
+msgstr ""
+
+#: ../install.py:1465
+msgid ""
+"You may have to restart the computer to be able to run the program from the "
+"commmand line or application launcher."
+msgstr ""
+
+#: ../install.py:1476
+msgid "Do you want to install the application's man pages?"
+msgstr ""
+
+#: ../install.py:1477
+msgid "They will be installed into {}"
+msgstr ""
+
+#: ../install.py:1478 ../install.py:1483
+msgid "If you uninstall the application, remove these manpages yourself."
+msgstr ""
+
+#: ../install.py:1480
+msgid "Do want to install the man pages?"
+msgstr ""
+
+#: ../install.py:1482
+msgid "Installing man pages into {}"
+msgstr ""
+
+#: ../install.py:1499
+msgid "Failed to create man page directory: exiting"
+msgstr ""
+
+#: ../install.py:1511
+msgid "Failed to copy man page."
+msgstr ""
+
+#: ../install.py:1521
+msgid "(If a segmentation fault occurs at exit, you can ignore it...)"
+msgstr ""
+
+#: ../install.py:1534
+msgid ""
+"The python3 tool pip is required to uninstall a version of Rapid Photo "
+"Downloader that was installed with pip.\n"
+"Cannot continue. Exiting."
+msgstr ""
+
+#: ../install.py:1575
+msgid ""
+"Do not run this installer script as sudo / root user.\n"
+"Run it using the user who will run the program.\n"
+msgstr ""
+
+#: ../install.py:1585 ../install.py:1599
+msgid "Do not include any other command line arguments when specifying"
+msgstr ""
+
+#: ../install.py:1614
+msgid ""
+"Sorry, this installer does not support a custom python installation.\n"
+"Exiting..."
+msgstr ""
+
+#: ../install.py:1620
+msgid "Restarting script using system python..."
+msgstr ""
+
+#: ../install.py:1651
+msgid "Exiting..."
+msgstr ""
+
+#. Translators: do not translate the term python3-apt
+#: ../install.py:1670
+msgid "To continue, the package python3-apt must be installed."
+msgstr ""
 
-#. type: QPushButton
-#: ../raphodo/aboutdialog.py:217
+#: ../install.py:1689
+msgid ""
+"Install the following packages using your Linux distribution's standard "
+"package manager, and then rerun this installer"
+msgstr ""
+
+#: ../install.py:1698
+msgid ""
+"To run this program, programs to assist Python 3 and its package management "
+"must be installed."
+msgstr ""
+
+#. Translators: do not translate the terms Python 3, pip and setuptools
+#: ../install.py:1713
+msgid "Python 3's pip and setuptools must be upgraded for your user."
+msgstr ""
+
+#. Translators: do not translate the term python or requests
+#: ../install.py:1726
+msgid "Installing python requests"
+msgstr ""
+
+#: ../upgrade.py:79
+msgid "Upgrade Rapid Photo Downloader"
+msgstr ""
+
+#: ../upgrade.py:401 ../raphodo/viewutils.py:242
+msgid "&Cancel"
+msgstr ""
+
+#: ../upgrade.py:405
+msgid "&Upgrade"
+msgstr ""
+
+#: ../upgrade.py:410
+#, python-format
+msgid "Click the Upgrade button to upgrade to version %s."
+msgstr ""
+
+#: ../upgrade.py:413
+msgid "Click the Upgrade button to start the upgrade."
+msgstr ""
+
+#: ../upgrade.py:416 ../upgrade.py:422 ../raphodo/viewutils.py:241
+msgid "&Close"
+msgstr ""
+
+#: ../upgrade.py:417
+msgid "&Run"
+msgstr ""
+
+#: ../upgrade.py:447
+msgid "Close Rapid Photo Downloader before running this upgrade"
+msgstr ""
+
+#: ../upgrade.py:450
+msgid "Upgrade running..."
+msgstr ""
+
+#: ../upgrade.py:486
+#, python-format
+msgid ""
+"Successfully upgraded to %s. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:491
+msgid ""
+"Upgrade finished successfully. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:495
+msgid "Upgrade failed. Click Close to exit."
+msgstr ""
+
+#: ../upgrade.py:6967
+#, python-format
+msgid "Upgrading %s..."
+msgstr ""
+
+#: ../upgrade.py:6969
+msgid "Press any key to continue..."
+msgstr ""
+
+#: ../upgrade.py:6982
+msgid "Rapid Photo Downloader upgrade failed"
+msgstr ""
+
+#: ../upgrade.py:6984
+#, python-format
+msgid ""
+"The python package %s could not be updated. The upgrade cannot continue."
+msgstr ""
+
+#: ../raphodo/aboutdialog.py:225
 msgid "Credits"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:239
+#: ../raphodo/backuppanel.py:240
 msgid "Backups are not configured"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:241
+#: ../raphodo/backuppanel.py:242
 msgid "No backup devices detected"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:243
+#: ../raphodo/backuppanel.py:244
 msgid "Valid backup locations not yet specified"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:401
+#: ../raphodo/backuppanel.py:404
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
 msgstr ""
 
-#: ../raphodo/backuppanel.py:407
+#: ../raphodo/backuppanel.py:412
 msgid "Back up photos and videos when downloading"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:413
+#: ../raphodo/backuppanel.py:418
 msgid "Automatically detect backup devices"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:417
+#: ../raphodo/backuppanel.py:424
 msgid ""
-"Specify the folder in which backups are stored on the device."
-"<br><br><i>Note: the presence of a folder with this name is used to "
+"Specify the folder in which backups are stored on the "
+"device.<br><br><i>Note: the presence of a folder with this name is used to "
 "determine if 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 folder names. By "
 "adding both folders, the same device can be used to back up both photos and "
 "videos.</i>"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:428
+#: ../raphodo/backuppanel.py:439
 msgid "Photo folder name:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:433
+#: ../raphodo/backuppanel.py:444
 msgid "Video folder name:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:438 ../raphodo/nameeditor.py:883
+#: ../raphodo/backuppanel.py:449 ../raphodo/nameeditor.py:890
 #: ../raphodo/renamepanel.py:123
 msgid "Example:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:448
-msgid "If you disable automatic detection, choose the exact backup locations."
+#: ../raphodo/backuppanel.py:460
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
 
-#: ../raphodo/backuppanel.py:452
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:468
 msgid "Photo backup location:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:454
+#: ../raphodo/backuppanel.py:474
 msgid "Select Photo Backup Location"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:460
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:485
 msgid "Video backup location:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:462
+#: ../raphodo/backuppanel.py:491
 msgid "Select Video Backup Location"
 msgstr ""
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:564
+#: ../raphodo/backuppanel.py:595
 msgid "drive1"
 msgstr ""
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:567
+#: ../raphodo/backuppanel.py:598
 msgid "drive2"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:628
+#: ../raphodo/backuppanel.py:663
 msgid "Projected Backup Storage Use"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:632
+#: ../raphodo/backuppanel.py:669
 msgid "Backup Options"
 msgstr ""
 
 #. translators: refers to the video thumbnail file that some
 #. cameras generate -- it has a .THM file extension
-#: ../raphodo/copyfiles.py:476
+#: ../raphodo/copyfiles.py:491
 msgid "video THM"
 msgstr ""
 
-#: ../raphodo/copyfiles.py:482
+#: ../raphodo/copyfiles.py:497
 msgid "audio"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:78 ../raphodo/devicedisplay.py:1079
-#: ../raphodo/rpdfile.py:321
+#: ../raphodo/rpdfile.py:342
 #, python-format
 msgid "%(no_photos)s Photos"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:82 ../raphodo/devicedisplay.py:1081
-#: ../raphodo/rpdfile.py:316
+#: ../raphodo/rpdfile.py:333
 #, python-format
 msgid "%(no_videos)s Videos"
 msgstr ""
@@ -157,15 +517,15 @@ msgid "%(size_free)s free of %(size_total)s"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:190 ../raphodo/devicedisplay.py:993
-#: ../raphodo/rapid.py:1964 ../raphodo/rapid.py:2079 ../raphodo/rapid.py:5753
-#: ../raphodo/rpdfile.py:905
+#: ../raphodo/rapid.py:2023 ../raphodo/rapid.py:2151 ../raphodo/rapid.py:6043
+#: ../raphodo/rpdfile.py:930
 msgid "Photos"
 msgstr ""
 
 #. translators: the name of the Videos folder
 #: ../raphodo/destinationdisplay.py:191 ../raphodo/devicedisplay.py:994
-#: ../raphodo/rapid.py:1967 ../raphodo/rapid.py:2080 ../raphodo/rapid.py:5754
-#: ../raphodo/rpdfile.py:933 ../raphodo/storage.py:445
+#: ../raphodo/rapid.py:2028 ../raphodo/rapid.py:2152 ../raphodo/rapid.py:6044
+#: ../raphodo/rpdfile.py:958 ../raphodo/storage.py:449
 msgid "Videos"
 msgstr ""
 
@@ -173,7 +533,7 @@ msgstr ""
 msgid "Projected storage use after download"
 msgstr ""
 
-#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:516
+#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:521
 msgid "Custom..."
 msgstr ""
 
@@ -211,57 +571,58 @@ msgstr ""
 msgid "%s full"
 msgstr ""
 
-#: ../raphodo/devices.py:459
+#: ../raphodo/devices.py:463
 msgid "Cameras"
 msgstr ""
 
-#: ../raphodo/devices.py:460 ../raphodo/devices.py:920
-#: ../raphodo/preferencedialog.py:85 ../raphodo/rapid.py:1927
+#: ../raphodo/devices.py:464 ../raphodo/devices.py:927
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/rapid.py:1979
 msgid "Devices"
 msgstr ""
 
-#: ../raphodo/devices.py:720
+#: ../raphodo/devices.py:724
 #, python-format
 msgid "Downloading from %(device_names)s"
 msgstr ""
 
 #. Translators: e.g. Three Devices
-#: ../raphodo/devices.py:780
+#: ../raphodo/devices.py:784
 #, python-format
 msgid "%(no_devices)s %(device_type)s"
 msgstr ""
 
-#: ../raphodo/devices.py:905 ../raphodo/rapid.py:1764
+#: ../raphodo/devices.py:912 ../raphodo/rapid.py:1807
 msgid "Select Source"
 msgstr ""
 
-#: ../raphodo/devices.py:936 ../raphodo/devices.py:947
+#: ../raphodo/devices.py:943 ../raphodo/devices.py:954
 #, python-format
 msgid "%(device1)s + %(device2)s"
 msgstr ""
 
 #. Number of cameras e.g. 3 Cameras
-#: ../raphodo/devices.py:958
+#: ../raphodo/devices.py:965
 #, python-format
 msgid "%(no_cameras)s Cameras"
 msgstr ""
 
-#: ../raphodo/devices.py:963
+#: ../raphodo/devices.py:970
 #, python-format
 msgid "%(no_devices)s Devices"
 msgstr ""
 
 #. Translators: two folder names, separated by a plus sign
-#: ../raphodo/devices.py:1258
+#: ../raphodo/devices.py:1265
 #, python-format
 msgid "%s + %s"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:44
+#: ../raphodo/didyouknow.py:45
 msgid "Click on a file's checkbox to mark or unmark it for download."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:50
+#: ../raphodo/didyouknow.py:51
 msgid ""
 "Files that have already been downloaded are remembered. You can still mark "
 "previously downloaded files to download again, but they are unchecked by "
@@ -269,34 +630,67 @@ msgid ""
 "files that are yet to be downloaded."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:59
+#: ../raphodo/didyouknow.py:60
 msgid ""
 "If more than one file is selected, they'll all take the mark of the file "
 "whose checkbox was clicked, regardless of whether they previously had a "
 "checkmark or not."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:67
+#: ../raphodo/didyouknow.py:68
 msgid ""
 "Click on a device's checkbox to quickly mark or unmark all its files for "
 "downloading."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:74
+#: ../raphodo/didyouknow.py:75
+msgid ""
+"After a download finishes, an icon replaces the thumbnail's checkbox. The "
+"icon's color indicates whether the download was successful (green), had file "
+"renaming problems (yellow/orange), or failed (red)."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:83
+msgid ""
+"\n"
+"            In case of any problems, a red icon will appear at the bottom of "
+"the window\n"
+"            indicating how many error reports there are. Clicking on it "
+"opens the Error Report \n"
+"            window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:91
+msgid ""
+"\n"
+"            The Error Report window lists any problems encountered before, "
+"during or after the \n"
+"            download. An orange triangle represents a warning, a red circle "
+"indicates a failure, \n"
+"            and a black circle indicates more serious failures. You can "
+"click on the hyperlinks to \n"
+"            open its file or device in a file manager. You can also search "
+"the reports using the \n"
+"            search box in the lower left of the Error Report window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:103
 msgid ""
 "You can simultaneously download from multiple cameras, smartphones, memory "
 "cards, and hard drives&mdash;as many devices as your computer can handle at "
 "one time."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:81
+#: ../raphodo/didyouknow.py:110
 msgid ""
 "The <b>Timeline</b> groups photos and videos based on how much time elapsed "
 "between consecutive shots. Use it to identify photos and videos taken at "
 "different periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:88
+#: ../raphodo/didyouknow.py:117
 msgid ""
 "\n"
 "<p>In the illustration above, the first row of the Timeline is black because "
@@ -308,7 +702,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:99
+#: ../raphodo/didyouknow.py:128
 msgid ""
 "To view photos and videos for a particular time range, use the mouse "
 "(optionally in combination with the <tt>Shift</tt> or <tt>Ctrl</tt> keys) to "
@@ -316,20 +710,20 @@ msgid ""
 "the left side of the main window will be highlighted."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:106
+#: ../raphodo/didyouknow.py:135
 msgid ""
 "A download always includes all files that are checked for download, "
 "including those that are not currently displayed because the Timeline is "
 "being used."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:113
+#: ../raphodo/didyouknow.py:142
 msgid ""
 "You can hide or display the download sources by clicking on the name of the "
 "device you're downloading from at the top left of the program window."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:120
+#: ../raphodo/didyouknow.py:149
 msgid ""
 "\n"
 "          Thumbnails can be sorted using a variety of criteria:\n"
@@ -348,33 +742,33 @@ msgid ""
 "</ol> "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:137
+#: ../raphodo/didyouknow.py:166
 msgid ""
 "One of Rapid Photo Downloader's most useful features is its ability to "
 "automatically generate download subfolders and rename files as it downloads, "
 "using a scheme of your choosing."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:143
+#: ../raphodo/didyouknow.py:172
 msgid ""
 "To specify where you want your files downloaded and how you want them named, "
 "open the appropriate panel on the right-side of the application window: "
 "<b>Destination</b>, <b>Rename</b>, or <b>Job Code</b>."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:150
+#: ../raphodo/didyouknow.py:179
 msgid ""
 "\n"
 "When thinking about your download directory structure, keep in mind two "
 "different types\n"
 "of directory:\n"
 "<ol>\n"
-"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, &quot;"
-"Photos&quot;, or\n"
+"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, "
+"&quot;Photos&quot;, or\n"
 "&quot;Videos&quot;. This directory should already exist on your computer. In "
 "the illustration \n"
-"below, the destination folders are &quot;Pictures&quot; and &quot;"
-"Videos&quot;. The\n"
+"below, the destination folders are &quot;Pictures&quot; and "
+"&quot;Videos&quot;. The\n"
 "name of the destination folder is displayed in the grey bar directly above "
 "the folder tree, \n"
 "with a folder icon to its left and a gear icon to its far right.</li>\n"
@@ -387,7 +781,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:167
+#: ../raphodo/didyouknow.py:196
 msgid ""
 "\n"
 "You can download photos and videos to the same destination folder, or "
@@ -400,14 +794,14 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:177
+#: ../raphodo/didyouknow.py:206
 msgid ""
 "Automatically generated download subfolders can contain further "
 "automatically generated subfolders if need be. A common scheme is to create "
 "a year subfolder and then a series of year-month-day subfolders within it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:186
+#: ../raphodo/didyouknow.py:215
 msgid ""
 "\n"
 "Whenever possible, the program previews the download subfolders of photos "
@@ -425,7 +819,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:201
+#: ../raphodo/didyouknow.py:230
 msgid ""
 "\n"
 "Download subfolder names are typically generated using some or all of the "
@@ -449,7 +843,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:219
+#: ../raphodo/didyouknow.py:248
 msgid ""
 "\n"
 "To automatically create download subfolders as you download, \n"
@@ -459,7 +853,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:227
+#: ../raphodo/didyouknow.py:256
 msgid ""
 "\n"
 "Using the drop-down menu, select a built-in preset or click on <b>Custom</b> "
@@ -469,20 +863,20 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:237
+#: ../raphodo/didyouknow.py:266
 msgid ""
 "It's easy to download raw images into one folder, and jpeg images into "
 "another. Simply use the <b>Filename Extension</b> as part of your download "
 "subfolder generation scheme:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:242
+#: ../raphodo/didyouknow.py:271
 msgid ""
 "This illustration shows a saved custom preset named &quot;My custom "
 "preset&quot;."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:246
+#: ../raphodo/didyouknow.py:275
 msgid ""
 "\n"
 "You do not have to create nested download subfolders. This illustration "
@@ -493,7 +887,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:256
+#: ../raphodo/didyouknow.py:285
 msgid ""
 "\n"
 "Although there are many built-in date/time naming options, you may find that "
@@ -507,7 +901,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:265
+#: ../raphodo/didyouknow.py:294
 msgid ""
 "\n"
 "Read more about all the ways you can generate download subfolder names and "
@@ -517,7 +911,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:273
+#: ../raphodo/didyouknow.py:302
 msgid ""
 "\n"
 "<b>Job Codes</b> let you easily enter text that describes sets of photos and "
@@ -529,7 +923,7 @@ msgid ""
 "&quot;Green Bazaar&quot;: \n"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:282
+#: ../raphodo/didyouknow.py:311
 msgid ""
 "\n"
 "You can apply new or existing Job Codes before you start a download. If "
@@ -540,36 +934,36 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:291
+#: ../raphodo/didyouknow.py:320
 msgid "Look for hints to guide you when working with Job Codes:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:295
+#: ../raphodo/didyouknow.py:324
 msgid ""
 "Hints will vary depending on the context, such as when the mouse is hovering "
 "over a button."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:301
+#: ../raphodo/didyouknow.py:330
 msgid ""
 "\n"
 "When you give your photos and videos unique filenames, you'll never be "
 "confused as to \n"
 "which file is which. Using <b>sequence numbers</b> to make filenames unique "
 "is highly \n"
-"recommended!.\n"
+"recommended!\n"
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:309
+#: ../raphodo/didyouknow.py:338
 msgid ""
 "\n"
 "<p>Four types of sequence values are available to help you assign unique "
 "names to your photos and \n"
 "videos:\n"
 "<ol>\n"
-"<li><b>Downloads today</b>: tracks downloads completed during that day.</"
-"li>\n"
+"<li><b>Downloads today</b>: tracks downloads completed during that "
+"day.</li>\n"
 "<li><b>Stored number</b>: similar to Downloads today, but it is remembered "
 "from the last time the  \n"
 "program was run.</li>\n"
@@ -583,7 +977,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:327
+#: ../raphodo/didyouknow.py:356
 msgid ""
 "\n"
 "The <b>Rename</b> panel allows you to configure file renaming. To rename "
@@ -592,7 +986,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:334
+#: ../raphodo/didyouknow.py:363
 msgid ""
 "\n"
 "<p>The <b>Synchronize RAW + JPEG</b> option is useful if you use the RAW + "
@@ -611,7 +1005,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:348
+#: ../raphodo/didyouknow.py:377
 msgid ""
 "\n"
 "You can have your photos and videos backed up to multiple locations as they "
@@ -622,13 +1016,13 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:356
+#: ../raphodo/didyouknow.py:385
 msgid ""
 "In this example, the drive <b>photobackup</b> does not contain a folder "
 "named <tt>Videos</tt>, so videos will not be backed up to it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:362
+#: ../raphodo/didyouknow.py:391
 msgid ""
 "\n"
 "Several of the program's preferences can be set from the command line, "
@@ -639,7 +1033,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:372
+#: ../raphodo/didyouknow.py:396
+msgid "You can also import program preferences from the older 0.4 version."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:401
 msgid ""
 "\n"
 "Rapid Photo Downloader deals with three types of cache:\n"
@@ -649,8 +1047,8 @@ msgid ""
 "memory cards, and other devices.</li>\n"
 "<li>A <b>temporary cache</b> of files downloaded from a camera, one for "
 "photos and another for \n"
-"videos. They are located in temporary subfolders in the download destination."
-"</li>\n"
+"videos. They are located in temporary subfolders in the download "
+"destination.</li>\n"
 "<li>The <b>desktop's thumbnail cache</b>, in which Rapid Photo Downloader "
 "stores thumbnails of \n"
 "RAW and TIFF photos once they have been downloaded. File browsers like Gnome "
@@ -665,23 +1063,23 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:431
+#: ../raphodo/didyouknow.py:460
 msgid "Tip of the Day"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:439
+#: ../raphodo/didyouknow.py:468
 msgid "Did you know...?"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:466
+#: ../raphodo/didyouknow.py:495
 msgid "Show tips on startup"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:470
+#: ../raphodo/didyouknow.py:499
 msgid "&Next"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:471
+#: ../raphodo/didyouknow.py:500
 msgid "&Previous"
 msgstr ""
 
@@ -788,68 +1186,68 @@ msgstr ""
 msgid "%(days)d days, %(hours)d hours"
 msgstr ""
 
-#: ../raphodo/errorlog.py:65
+#: ../raphodo/errorlog.py:66
 msgid "Find"
 msgstr ""
 
-#: ../raphodo/errorlog.py:135
+#: ../raphodo/errorlog.py:136
 msgid "Error Reports - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/errorlog.py:170
+#: ../raphodo/errorlog.py:171
 msgid "Find in reports"
 msgstr ""
 
-#: ../raphodo/errorlog.py:187
+#: ../raphodo/errorlog.py:188
 msgid "Find the previous occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:192
+#: ../raphodo/errorlog.py:193
 msgid "Find the next occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:194
+#: ../raphodo/errorlog.py:195
 msgid "&Highlight All"
 msgstr ""
 
-#: ../raphodo/errorlog.py:195
+#: ../raphodo/errorlog.py:196
 msgid "Highlight all occurrences of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:196
+#: ../raphodo/errorlog.py:197
 msgid "&Match Case"
 msgstr ""
 
-#: ../raphodo/errorlog.py:197
+#: ../raphodo/errorlog.py:198
 msgid "Search with case sensitivity"
 msgstr ""
 
-#: ../raphodo/errorlog.py:198
+#: ../raphodo/errorlog.py:199
 msgid "&Whole Words"
 msgstr ""
 
-#: ../raphodo/errorlog.py:199
+#: ../raphodo/errorlog.py:200
 msgid "Search whole words only"
 msgstr ""
 
-#: ../raphodo/errorlog.py:209 ../raphodo/errorlog.py:341
+#: ../raphodo/errorlog.py:210 ../raphodo/errorlog.py:345
 #, python-format
 msgid "%s of %s matches"
 msgstr ""
 
-#: ../raphodo/errorlog.py:228
+#: ../raphodo/errorlog.py:232
 msgid "Clear"
 msgstr ""
 
-#: ../raphodo/errorlog.py:328
+#: ../raphodo/errorlog.py:332
 msgid "Phrase not found"
 msgstr ""
 
-#: ../raphodo/errorlog.py:487
+#: ../raphodo/errorlog.py:491
 msgid "Search pending..."
 msgstr ""
 
-#: ../raphodo/errorlog.py:535
+#: ../raphodo/errorlog.py:539
 msgid ""
 "The number of new entries added to the Error Report since it was last open. "
 "Click to open the Error Report."
@@ -863,8 +1261,8 @@ msgstr ""
 #, python-brace-format
 msgid ""
 "<b>A problem occurred in Rapid Photo Downloader</b><br><br>\n"
-"    Please report the problem at <a href=\"{website}\">{website}</a>."
-"<br><br>\n"
+"    Please report the problem at <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
 "    Attach the log file <i>{log_file}</i> to your bug report (click\n"
 "    <a href=\"{log_path}\">here</a> to open the log directory).<br><br>If "
 "the same problem occurs\n"
@@ -885,7 +1283,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1601
+#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1643
 msgid "Open in File Browser..."
 msgstr ""
 
@@ -903,531 +1301,531 @@ msgstr ""
 msgid "%s (location does not exist)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:186
+#: ../raphodo/generatenameconfig.py:190
 msgid "Date time"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:187
+#: ../raphodo/generatenameconfig.py:191
 msgid "Text"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:188 ../raphodo/rapid.py:2053
+#: ../raphodo/generatenameconfig.py:192 ../raphodo/rapid.py:2125
 msgid "Filename"
 msgstr "Faili nimi"
 
-#: ../raphodo/generatenameconfig.py:189 ../raphodo/preferencedialog.py:488
+#: ../raphodo/generatenameconfig.py:193 ../raphodo/preferencedialog.py:724
 msgid "Metadata"
 msgstr "Metaandmed"
 
-#: ../raphodo/generatenameconfig.py:190
+#: ../raphodo/generatenameconfig.py:194
 msgid "Sequences"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: ../raphodo/generatenameconfig.py:193
+#: ../raphodo/generatenameconfig.py:197
 msgid "Job code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:194
+#: ../raphodo/generatenameconfig.py:198
 msgid "Image date"
 msgstr "Pildi kuupäev"
 
-#: ../raphodo/generatenameconfig.py:195
+#: ../raphodo/generatenameconfig.py:199
 msgid "Video date"
 msgstr "Video kuupäev"
 
-#: ../raphodo/generatenameconfig.py:196
+#: ../raphodo/generatenameconfig.py:200
 msgid "Today"
 msgstr "Täna"
 
-#: ../raphodo/generatenameconfig.py:197
+#: ../raphodo/generatenameconfig.py:201
 msgid "Yesterday"
 msgstr "Eile"
 
 #. Translators: Download time is the time and date that the download started (when the
 #. user clicked the Download button)
-#: ../raphodo/generatenameconfig.py:200
+#: ../raphodo/generatenameconfig.py:204
 msgid "Download time"
 msgstr "Allalaadimise aeg"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:203
+#: ../raphodo/generatenameconfig.py:207
 msgid "Name"
 msgstr "Nimi"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:206 ../raphodo/rapid.py:2054
+#: ../raphodo/generatenameconfig.py:210 ../raphodo/rapid.py:2126
 msgid "Extension"
 msgstr "Laiend"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:209
+#: ../raphodo/generatenameconfig.py:213
 msgid "Image number"
 msgstr "Pildi number"
 
-#: ../raphodo/generatenameconfig.py:210
+#: ../raphodo/generatenameconfig.py:214
 msgid "Video number"
 msgstr "Video number"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:213
+#: ../raphodo/generatenameconfig.py:217
 msgid "Aperture"
 msgstr "Ava"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:216
+#: ../raphodo/generatenameconfig.py:220
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:219
+#: ../raphodo/generatenameconfig.py:223
 msgid "Exposure time"
 msgstr "Säritusaeg"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:222
+#: ../raphodo/generatenameconfig.py:226
 msgid "Focal length"
 msgstr "Fookuskaugus"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:225
+#: ../raphodo/generatenameconfig.py:229
 msgid "Camera make"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:228
+#: ../raphodo/generatenameconfig.py:232
 msgid "Camera model"
 msgstr "Kaamera mudel"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:231
+#: ../raphodo/generatenameconfig.py:235
 msgid "Short camera model"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:234
+#: ../raphodo/generatenameconfig.py:238
 msgid "Hyphenated short camera model"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:237
+#: ../raphodo/generatenameconfig.py:241
 msgid "Serial number"
 msgstr "Seerianumber"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:240
+#: ../raphodo/generatenameconfig.py:244
 msgid "Shutter count"
 msgstr ""
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: ../raphodo/generatenameconfig.py:242
+#: ../raphodo/generatenameconfig.py:246
 msgid "File number"
 msgstr "Faili number"
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:244
+#: ../raphodo/generatenameconfig.py:248
 msgid "Folder only"
 msgstr "Ainult kataloog"
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:246
+#: ../raphodo/generatenameconfig.py:250
 msgid "Folder and file"
 msgstr "Kataloog ja fail"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:249
+#: ../raphodo/generatenameconfig.py:253
 msgid "Owner name"
 msgstr "Omaniku nimi"
 
-#: ../raphodo/generatenameconfig.py:250
+#: ../raphodo/generatenameconfig.py:254
 msgid "Codec"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:251
+#: ../raphodo/generatenameconfig.py:255
 msgid "Width"
 msgstr "Laius"
 
-#: ../raphodo/generatenameconfig.py:252
+#: ../raphodo/generatenameconfig.py:256
 msgid "Height"
 msgstr "Kõrgus"
 
-#: ../raphodo/generatenameconfig.py:253
+#: ../raphodo/generatenameconfig.py:257
 msgid "Length"
 msgstr "Kestvus"
 
-#: ../raphodo/generatenameconfig.py:254
+#: ../raphodo/generatenameconfig.py:258
 msgid "Frames Per Second"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:255
+#: ../raphodo/generatenameconfig.py:259
 msgid "Artist"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:256
+#: ../raphodo/generatenameconfig.py:260
 msgid "Copyright"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:259
+#: ../raphodo/generatenameconfig.py:263
 msgid "Downloads today"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:262
+#: ../raphodo/generatenameconfig.py:266
 msgid "Session number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:265
+#: ../raphodo/generatenameconfig.py:269
 msgid "Subfolder number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:268
+#: ../raphodo/generatenameconfig.py:272
 msgid "Stored number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: ../raphodo/generatenameconfig.py:271
+#: ../raphodo/generatenameconfig.py:275
 msgid "Sequence letter"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:274
+#: ../raphodo/generatenameconfig.py:278
 msgid "All digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:277
+#: ../raphodo/generatenameconfig.py:281
 msgid "Last digit"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:280
+#: ../raphodo/generatenameconfig.py:284
 msgid "Last 2 digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:283
+#: ../raphodo/generatenameconfig.py:287
 msgid "Last 3 digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:286
+#: ../raphodo/generatenameconfig.py:290
 msgid "Last 4 digits"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:289
+#: ../raphodo/generatenameconfig.py:293
 msgid "Original Case"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:292
+#: ../raphodo/generatenameconfig.py:296
 msgid "UPPERCASE"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:295
+#: ../raphodo/generatenameconfig.py:299
 msgid "lowercase"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:296
+#: ../raphodo/generatenameconfig.py:300
 msgid "One digit"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:297
+#: ../raphodo/generatenameconfig.py:301
 msgid "Two digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:298
+#: ../raphodo/generatenameconfig.py:302
 msgid "Three digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:299
+#: ../raphodo/generatenameconfig.py:303
 msgid "Four digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:300
+#: ../raphodo/generatenameconfig.py:304
 msgid "Five digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:301
+#: ../raphodo/generatenameconfig.py:305
 msgid "Six digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:302
+#: ../raphodo/generatenameconfig.py:306
 msgid "Seven digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:305
+#: ../raphodo/generatenameconfig.py:309
 msgid "Subseconds"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:308 ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:312 ../raphodo/generatenameconfig.py:393
 msgid "YYYYMMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:311 ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:315 ../raphodo/generatenameconfig.py:394
 msgid "YYYY-MM-DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:314 ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:318 ../raphodo/generatenameconfig.py:395
 msgid "YYYY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:317
+#: ../raphodo/generatenameconfig.py:321
 msgid "YYMMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:320
+#: ../raphodo/generatenameconfig.py:324
 msgid "YY-MM-DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:323
+#: ../raphodo/generatenameconfig.py:327
 msgid "YY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:326
+#: ../raphodo/generatenameconfig.py:330
 msgid "MMDDYYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:329
+#: ../raphodo/generatenameconfig.py:333
 msgid "MMDDYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:332
+#: ../raphodo/generatenameconfig.py:336
 msgid "MMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:335
+#: ../raphodo/generatenameconfig.py:339
 msgid "DDMMYYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:338
+#: ../raphodo/generatenameconfig.py:342
 msgid "DDMMYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:341 ../raphodo/generatenameconfig.py:389
-#: ../raphodo/generatenameconfig.py:390 ../raphodo/generatenameconfig.py:391
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:345 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:394 ../raphodo/generatenameconfig.py:395
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:397
 msgid "YYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:344
+#: ../raphodo/generatenameconfig.py:348
 msgid "YY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:347
+#: ../raphodo/generatenameconfig.py:351
 msgid "MM"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:350
+#: ../raphodo/generatenameconfig.py:354
 msgid "DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:353
+#: ../raphodo/generatenameconfig.py:357
 msgid "Month (full)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:356
+#: ../raphodo/generatenameconfig.py:360
 msgid "Month (abbreviated)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:359
+#: ../raphodo/generatenameconfig.py:363
 msgid "HHMMSS"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:362
+#: ../raphodo/generatenameconfig.py:366
 msgid "HHMM"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:365
+#: ../raphodo/generatenameconfig.py:369
 msgid "HH-MM-SS"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:368
+#: ../raphodo/generatenameconfig.py:372
 msgid "HH-MM"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:371
+#: ../raphodo/generatenameconfig.py:375
 msgid "HH"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:374
+#: ../raphodo/generatenameconfig.py:378
 msgid "MM (minutes)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:377
+#: ../raphodo/generatenameconfig.py:381
 msgid "SS"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:393
 msgid "Date"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:394
 msgid "Date (hyphens)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:395
 msgid "Date (underscores)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:438
-#: ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:442
+#: ../raphodo/generatenameconfig.py:537
 msgid "Date and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392
+#: ../raphodo/generatenameconfig.py:396
 msgid "YYYYMM_Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "Date and Job Code Subfolder"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "YYYYMM"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393 ../raphodo/jobcodepanel.py:198
-#: ../raphodo/nameeditor.py:827 ../raphodo/rapid.py:1809
+#: ../raphodo/generatenameconfig.py:397 ../raphodo/jobcodepanel.py:199
+#: ../raphodo/nameeditor.py:833 ../raphodo/rapid.py:1852
 #: ../raphodo/renamepanel.py:83 ../raphodo/renamepanel.py:241
 msgid "Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:433 ../raphodo/generatenameconfig.py:512
+#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:532
 msgid "Original Filename"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "Date-Time and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "YYYYMMDD-HHMM-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "Date and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "YYYYMMDD-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "Date-Time and Image number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "YYYYMMDD-1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "Date-Time and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "YYYYMMDD-HHMM-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:442 ../raphodo/generatenameconfig.py:537
 msgid "YYYYMMDD-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "Date-Time and Video number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "YYYYMMDD_1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "Resolution"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "YYYYMMDD-HHMM-1-1920x1080"
 msgstr ""
 
@@ -1486,76 +1884,77 @@ msgstr ""
 msgid "&Remember this choice"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:185
+#: ../raphodo/jobcodepanel.py:186
 msgid ""
 "Select photos and videos to be able to apply a new or existing Job Code to "
 "them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:186
-msgid "The new Job Code will be applied to all selected photos and/or videos."
+#: ../raphodo/jobcodepanel.py:187
+msgid ""
+"The new Job Code will be applied to all selected photos and/or videos."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:187
+#: ../raphodo/jobcodepanel.py:188
 msgid ""
 "Click the Apply button to apply the current Job Code to all selected photos "
 "and/or videos. You can also simply double click the Job Code."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:189
+#: ../raphodo/jobcodepanel.py:190
 msgid ""
 "Removing a Job Code removes it only from the list of saved Job Codes, not "
 "from any photos or videos that it may have been applied to."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:191
+#: ../raphodo/jobcodepanel.py:192
 msgid ""
 "If you want to use Job Codes, configure file renaming or destination "
 "subfolder names to use them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:197
+#: ../raphodo/jobcodepanel.py:198
 msgid "Last Used"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:202
+#: ../raphodo/jobcodepanel.py:203
 msgid "Job Code Sort:"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:205 ../raphodo/rapid.py:2061
+#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2133
 msgid "Ascending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2062
+#: ../raphodo/jobcodepanel.py:207 ../raphodo/rapid.py:2134
 msgid "Descending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:216
+#: ../raphodo/jobcodepanel.py:217
 msgid "&New..."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:220
+#: ../raphodo/jobcodepanel.py:221
 msgid "&Apply"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:224
+#: ../raphodo/jobcodepanel.py:225
 msgid "&Remove"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:228 ../raphodo/preferencedialog.py:125
-#: ../raphodo/preferencedialog.py:154 ../raphodo/preferencedialog.py:433
+#: ../raphodo/jobcodepanel.py:229 ../raphodo/preferencedialog.py:200
+#: ../raphodo/preferencedialog.py:229 ../raphodo/preferencedialog.py:531
 msgid "Remove All"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:427
+#: ../raphodo/jobcodepanel.py:428
 msgid "Do you really want to remove all the Job Codes?"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:429
+#: ../raphodo/jobcodepanel.py:430
 msgid "Remove all Job Codes"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:492
+#: ../raphodo/jobcodepanel.py:493
 msgid "Job Codes"
 msgstr ""
 
@@ -1566,42 +1965,58 @@ msgstr ""
 msgid "<i><b>Hint:</b> %(message)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:418 ../raphodo/nameeditor.py:432
+#: ../raphodo/nameeditor.py:423 ../raphodo/nameeditor.py:437
 #, python-format
 msgid "%(description)s - %(elements)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:512
+#: ../raphodo/nameeditor.py:517
 msgid "Save New Custom Preset..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:513
+#: ../raphodo/nameeditor.py:518
 msgid "Remove All Custom Presets..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:559
+#: ../raphodo/nameeditor.py:564
 msgid "(New Custom Preset)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:576
+#: ../raphodo/nameeditor.py:581
 #, python-format
 msgid "%s (edited)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:579 ../raphodo/nameeditor.py:1370
+#: ../raphodo/nameeditor.py:584 ../raphodo/nameeditor.py:1379
 #, python-format
 msgid "Update Custom Preset \"%s\""
 msgstr ""
 
-#: ../raphodo/nameeditor.py:667
+#: ../raphodo/nameeditor.py:672
 msgid "Save New Custom Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:675
+#: ../raphodo/nameeditor.py:680
 msgid "Preset Name:"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:836
+#: ../raphodo/nameeditor.py:799
+msgid "Photo Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:805
+msgid "Video Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:811
+msgid "Photo Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:817
+msgid "Video Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:842
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>There is insufficient data to "
 "fully generate the name. Please use other renaming options.</i>"
@@ -1610,7 +2025,7 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees.
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:846
+#: ../raphodo/nameeditor.py:853
 #, python-format
 msgid "The character</i> %(separator)s <i>creates a new subfolder level."
 msgstr ""
@@ -1618,50 +2033,50 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:851
+#: ../raphodo/nameeditor.py:858
 #, python-format
 msgid ""
 "There is no need start or end with the folder separator </i> "
 "%(separator)s<i>, because it is added automatically."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:859
+#: ../raphodo/nameeditor.py:866
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>Unique filenames may not be "
 "generated. Make filenames unique by using Sequence values.</i>"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:882 ../raphodo/renamepanel.py:121
+#: ../raphodo/nameeditor.py:889 ../raphodo/renamepanel.py:121
 msgid "Preset:"
 msgstr ""
 
 #. Translators: appears in a combobox, e.g. Image Date (YYYY)
-#: ../raphodo/nameeditor.py:959 ../raphodo/nameeditor.py:980
+#: ../raphodo/nameeditor.py:966 ../raphodo/nameeditor.py:987
 #, python-brace-format
 msgid "{choice} ({variant})"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1005 ../raphodo/preferencedialog.py:530
+#: ../raphodo/nameeditor.py:1012 ../raphodo/preferencedialog.py:783
 msgid "Get help online..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1025
+#: ../raphodo/nameeditor.py:1034
 msgid "Insert"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1351
+#: ../raphodo/nameeditor.py:1360
 msgid "Save Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1356
+#: ../raphodo/nameeditor.py:1365
 msgid ""
-"<b>Do you want to save the changes in a new custom preset?</"
-"b><br><br>Creating a custom preset is not required, but can help you keep "
-"organized.<br><br>The changes to the preferences will still be applied "
-"regardless of whether you create a new custom preset or not."
+"<b>Do you want to save the changes in a new custom "
+"preset?</b><br><br>Creating a custom preset is not required, but can help "
+"you keep organized.<br><br>The changes to the preferences will still be "
+"applied regardless of whether you create a new custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1365
+#: ../raphodo/nameeditor.py:1374
 msgid ""
 "<b>Do you want to save the changes in a custom preset?</b><br><br>If you "
 "like, you can create a new custom preset or update the existing custom "
@@ -1669,136 +2084,167 @@ msgid ""
 "regardless of whether you save a custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1372
+#: ../raphodo/nameeditor.py:1381
 msgid "Save New Custom Preset"
 msgstr ""
 
-#: ../raphodo/newversion.py:306
+#: ../raphodo/newversion.py:312
 msgid "Checking for new version..."
 msgstr ""
 
-#: ../raphodo/newversion.py:307
+#: ../raphodo/newversion.py:313
 msgid "You are running the latest version."
 msgstr ""
 
-#: ../raphodo/newversion.py:308
+#: ../raphodo/newversion.py:314
 msgid "Failed to contact the update server."
 msgstr ""
 
-#: ../raphodo/newversion.py:310
+#: ../raphodo/newversion.py:316
 #, python-format
 msgid "A new version of Rapid Photo Downloader (%s) is available."
 msgstr ""
 
-#: ../raphodo/newversion.py:312
+#: ../raphodo/newversion.py:318
 msgid "Do you want to download the new version?"
 msgstr ""
 
-#: ../raphodo/newversion.py:313
+#: ../raphodo/newversion.py:319
 #, python-format
 msgid "Changes in the new release can be viewed <a href=\"%s\">here</a>."
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the s key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:340 ../raphodo/newversion.py:353
+#: ../raphodo/newversion.py:348 ../raphodo/newversion.py:363
 msgid "&Skip this release"
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the o key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:356
+#: ../raphodo/newversion.py:366
 msgid "&Open Download Page"
 msgstr ""
 
-#: ../raphodo/newversion.py:376
+#: ../raphodo/newversion.py:386
 msgid "Rapid Photo Downloader updates"
 msgstr ""
 
 #. Translators: shows how much of a file has been downloaded e.g  123 KB of 1.3 MB
-#: ../raphodo/newversion.py:478
+#: ../raphodo/newversion.py:488
 #, python-format
 msgid "%(downloaded)s of %(total)s"
 msgstr ""
 
-#: ../raphodo/newversion.py:495
+#: ../raphodo/newversion.py:507
 msgid "Downloading..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:76
+#: ../raphodo/preferencedialog.py:86
 msgid "Preferences"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Automation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Thumbnails"
 msgstr "Pisipildid"
 
-#: ../raphodo/preferencedialog.py:85 ../raphodo/preferencedialog.py:343
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/preferencedialog.py:428
 msgid "Error Handling"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:109
+msgid "Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:109 ../raphodo/preferencedialog.py:119
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:94
+#: ../raphodo/preferencedialog.py:147
 msgid "Device Scanning"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:96
+#: ../raphodo/preferencedialog.py:148
 msgid "Scan only external devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:98
+#: ../raphodo/preferencedialog.py:150
 msgid ""
 "Scan for photos and videos only on devices that are external to the "
 "computer,\n"
 "including cameras, memory cards, external hard drives, and USB flash drives."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:102
-msgid "Scan non-camera devices lacking a DCIM folder"
+#: ../raphodo/preferencedialog.py:153
+msgid "Scan only specific folders on devices"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:155
+msgid ""
+"Scan for photos and videos only in the folders specified below (except "
+"paths\n"
+"specified in Ignored Paths).\n"
+"\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:161
+msgid "Folders to scan:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:164
+msgid ""
+"Folders at the base level of device file systems that will be scanned\n"
+"for photos and videos."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:167 ../raphodo/preferencedialog.py:219
+msgid "Add..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:104
+#: ../raphodo/preferencedialog.py:169
 msgid ""
-"Scan the entirety of a device for photos and videos, irrespective of whether "
-"it contains a DCIM folder,\n"
-"as opposed to only scanning within a DCIM folder.\n"
+"Add a folder to the list of folders to scan for photos and videos.\n"
 "\n"
-"Changing this setting causes all devices to be scanned again.\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:172 ../raphodo/preferencedialog.py:198
+#: ../raphodo/preferencedialog.py:224 ../raphodo/preferencedialog.py:529
+msgid "Remove"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:174
+msgid ""
+"Remove a folder from the list of folders to scan for photos and videos.\n"
 "\n"
-"Note: With cameras, only the DCIM folder is scanned."
+"Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:116
+#: ../raphodo/preferencedialog.py:191
 msgid "Devices that have been set to automatically ignore or download from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:117
+#: ../raphodo/preferencedialog.py:192
 msgid "Remembered Devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:121
+#: ../raphodo/preferencedialog.py:196
 msgid ""
 "Remove a device from the list of devices to automatically ignore or download "
 "from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:123 ../raphodo/preferencedialog.py:149
-#: ../raphodo/preferencedialog.py:431
-msgid "Remove"
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:127
+#: ../raphodo/preferencedialog.py:202
 msgid ""
 "Clear the list of devices from which to automatically ignore or download "
 "from.\n"
@@ -1806,315 +2252,436 @@ msgid ""
 "Note: Changes take effect when the computer is next scanned for devices."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:140
+#: ../raphodo/preferencedialog.py:215
 msgid "Ignored Paths"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:141
+#: ../raphodo/preferencedialog.py:216
 msgid ""
 "The end part of a path that should never be scanned for photos or videos."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:144
-msgid "Add..."
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:146
+#: ../raphodo/preferencedialog.py:221
 msgid ""
 "Add a path to the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:151
+#: ../raphodo/preferencedialog.py:226
 msgid ""
 "Remove a path from the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:156
+#: ../raphodo/preferencedialog.py:231
 msgid ""
 "Clear the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:164
+#: ../raphodo/preferencedialog.py:239
 msgid ""
-"Use python-style <a href=\"http://damonlynch.net/rapid/documentation/"
-"#regularexpressions\">regular expressions</a>"
+"Use python-style <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">regula"
+"r expressions</a>"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:168
+#: ../raphodo/preferencedialog.py:243
 msgid ""
 "Use regular expressions in the list of ignored paths.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:208
+#: ../raphodo/preferencedialog.py:283
 msgid "Program Automation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:209
+#: ../raphodo/preferencedialog.py:284
 msgid "Start downloading at program startup"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:210
+#: ../raphodo/preferencedialog.py:285
 msgid "Start downloading upon device insertion"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:211
+#: ../raphodo/preferencedialog.py:286
 msgid "Unmount (eject) device upon download completion"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:212
+#: ../raphodo/preferencedialog.py:287
 msgid "Exit program when download completes"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:213
+#: ../raphodo/preferencedialog.py:288
 msgid "Exit program even if download had warnings or errors"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:240
+#: ../raphodo/preferencedialog.py:315
 msgid "Thumbnail Generation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:241
+#: ../raphodo/preferencedialog.py:316
 msgid "Generate thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:242
+#: ../raphodo/preferencedialog.py:318
 msgid "Generate thumbnails to show in the main program window"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:244
+#: ../raphodo/preferencedialog.py:320
 msgid "Cache thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:245
+#: ../raphodo/preferencedialog.py:323
 msgid ""
 "Save thumbnails shown in the main program window in a thumbnail cache unique "
 "to Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:247
+#: ../raphodo/preferencedialog.py:327
 msgid "Generate system thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:248
+#: ../raphodo/preferencedialog.py:330
 msgid ""
 "While downloading, save thumbnails that can be used by desktop file managers "
 "and other programs"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:255
+#: ../raphodo/preferencedialog.py:339
 msgid "Number of CPU cores used to generate thumbnails."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:256
+#: ../raphodo/preferencedialog.py:340
 msgid "CPU cores:"
 msgstr ""
 
 #. Translators: the * acts as an asterisk to denote a reference to an annotation
 #. such as '* Takes effect upon program restart'
-#: ../raphodo/preferencedialog.py:271 ../raphodo/preferencedialog.py:317
+#: ../raphodo/preferencedialog.py:355 ../raphodo/preferencedialog.py:401
 msgid "*"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:294
+#: ../raphodo/preferencedialog.py:378
 msgid "Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:296
+#: ../raphodo/preferencedialog.py:380
 msgid "Calculating..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:302
+#: ../raphodo/preferencedialog.py:386
 msgid "days"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:303
+#: ../raphodo/preferencedialog.py:387
 msgid "forever"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:308
+#: ../raphodo/preferencedialog.py:392
 msgid "Cache size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:310
+#: ../raphodo/preferencedialog.py:394
 msgid "Number of thumbnails:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:312
+#: ../raphodo/preferencedialog.py:396
 msgid "Database size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:314
+#: ../raphodo/preferencedialog.py:398
 msgid "Cache unaccessed thumbnails for:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:322
+#: ../raphodo/preferencedialog.py:406
 msgid "Purge Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:323
+#: ../raphodo/preferencedialog.py:408
 msgid "Optimize Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:336
+#: ../raphodo/preferencedialog.py:421
 msgid "* Takes effect upon program restart"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:346
+#: ../raphodo/preferencedialog.py:431
 msgid "Skip download"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:347
+#: ../raphodo/preferencedialog.py:432
 msgid "Don't download the file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:348
+#: ../raphodo/preferencedialog.py:433
 msgid "Add unique identifier"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:349
+#: ../raphodo/preferencedialog.py:436
 msgid ""
 "Add an identifier like _1 or _2 to the end of the filename, immediately "
 "before the file's extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:355
+#: ../raphodo/preferencedialog.py:444
 msgid "Overwrite"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:356
+#: ../raphodo/preferencedialog.py:445
 msgid "Overwrite the previously backed up file"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:357
+#: ../raphodo/preferencedialog.py:446
 msgid "Skip"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:358
+#: ../raphodo/preferencedialog.py:448
 msgid "Don't overwrite the backup file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:364
+#: ../raphodo/preferencedialog.py:455
 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 identifier:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:378
+#: ../raphodo/preferencedialog.py:464
+msgid ""
+"Using sequence numbers to automatically generate unique filenames is "
+"strongly recommended. Configure file renaming in the Rename panel in the "
+"main window."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:473
 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 ""
 
-#: ../raphodo/preferencedialog.py:398
+#: ../raphodo/preferencedialog.py:494
 msgid "Program Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:399
+#: ../raphodo/preferencedialog.py:495
 msgid "Show a warning when:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:402
+#: ../raphodo/preferencedialog.py:498
 msgid "Downloading files currently not displayed"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:403
+#: ../raphodo/preferencedialog.py:499
 msgid ""
 "Warn when about to download files that are not displayed in the main window."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:405
+#: ../raphodo/preferencedialog.py:501
 msgid "Backup destinations are missing"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:406
-msgid "Warn before starting a download if it is not possible to back up files."
+#: ../raphodo/preferencedialog.py:502
+msgid ""
+"Warn before starting a download if it is not possible to back up files."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:408
+#: ../raphodo/preferencedialog.py:504
 msgid "Program libraries are missing or broken"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:409
+#: ../raphodo/preferencedialog.py:505
 msgid ""
 "Warn if a software library used by Rapid Photo Downloader is missing or not "
 "functioning."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:412
+#: ../raphodo/preferencedialog.py:508
 msgid "Filesystem metadata cannot be set"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:413
+#: ../raphodo/preferencedialog.py:509
 msgid ""
 "Warn if there is an error setting a file's filesystem metadata, such as its "
 "modification time."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:416
+#: ../raphodo/preferencedialog.py:512
 msgid "Encountering unhandled files"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:417
+#: ../raphodo/preferencedialog.py:513
 msgid ""
 "Warn after scanning a device or this computer if there are unrecognized "
 "files that will not be included in the download."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:420
+#: ../raphodo/preferencedialog.py:517
 msgid "Do not warn about unhandled files with extensions:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:424
+#: ../raphodo/preferencedialog.py:522
 msgid ""
 "File extensions are case insensitive and do not need to include the leading "
 "dot."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:427
+#: ../raphodo/preferencedialog.py:525
 msgid "Add"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:428
+#: ../raphodo/preferencedialog.py:526
 msgid ""
 "Add a file extension to the list of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:430
+#: ../raphodo/preferencedialog.py:528
 msgid ""
 "Remove a file extension from the list of unhandled file types to not warn "
 "about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:434
+#: ../raphodo/preferencedialog.py:532
 msgid ""
 "Clear the list of file extensions of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:469
+#: ../raphodo/preferencedialog.py:568
+msgid "Photo and Video Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:571
+msgid "Consolidate files across devices and downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:574
+msgid ""
+"Analyze the results of device scans looking for duplicate files and matching "
+"RAW and JPEG pairs,\n"
+"comparing them across multiple devices and download sessions."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:580
+msgid "Treat matching RAW and JPEG files as:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:581
+msgid "One photo"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:582
+msgid "Two photos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:584
+msgid ""
+"Display matching pairs of RAW and JPEG photos as one photo, and if marked, "
+"download both."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:589
+msgid ""
+"Display matching pairs of RAW and JPEG photos as two different photos. You "
+"can still synchronize their sequence numbers."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:598
+msgid "With matching RAW and JPEG photos:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:600
+msgid "Do not mark JPEG for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:601
+msgid "Do not mark RAW for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:602
+msgid "Mark both for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:609
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"JPEG for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:614
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"RAW for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:619
+msgid ""
+"When matching RAW and JPEG photos are found, automatically mark both for "
+"download."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:625
+msgid ""
+"If you disable file consolidation, choose what to do when a download device "
+"is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:631
+msgid ""
+"When a download device is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:642
+msgid "Clear completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:643
+msgid "Keep displaying completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:644
+msgid "Prompt for what to do"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:649
+msgid ""
+"Automatically clear the display of completed downloads whenever a new "
+"download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:654
+msgid ""
+"Keep displaying completed downloads whenever a new download device is "
+"inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:658
+msgid ""
+"Prompt whether to keep displaying completed downloads or clear them whenever "
+"a new download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:702
 msgid "Version Check"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:470
+#: ../raphodo/preferencedialog.py:703
 msgid "Check for new version at startup"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:471
+#: ../raphodo/preferencedialog.py:705
 msgid "Check for a new version of the program each time the program starts."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:473
+#: ../raphodo/preferencedialog.py:707
 msgid "Include development releases"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:474
+#: ../raphodo/preferencedialog.py:709
 msgid ""
 "Include alpha, beta and other development releases when checking for a new "
 "version of the program.\n"
@@ -2123,11 +2690,11 @@ msgid ""
 "occur."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:489
+#: ../raphodo/preferencedialog.py:725
 msgid "Ignore DNG date/time metadata on MTP devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:490
+#: ../raphodo/preferencedialog.py:727
 msgid ""
 "Ignore date/time metadata in DNG files located on MTP devices, and use the "
 "file's modification time instead.\n"
@@ -2136,70 +2703,86 @@ msgid ""
 "metadata."
 msgstr ""
 
+#: ../raphodo/preferencedialog.py:741
+msgid "Completed Downloads"
+msgstr ""
+
 #. Translators: substituted value is a description for the set of preferences
 #. shown in the preference dialog window, e.g. Devices, Automation, etc.
 #. This string is shown in a tooltip for the "Restore Defaults" button
-#: ../raphodo/preferencedialog.py:710
+#: ../raphodo/preferencedialog.py:1067
 #, python-format
 msgid "Restores default %s preference values"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:832
+#: ../raphodo/preferencedialog.py:1208
 msgid ""
 "Do you want to purge the thumbnail cache? The cache will be purged when the "
 "program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:835
+#: ../raphodo/preferencedialog.py:1212
 msgid "Purge Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:847
+#: ../raphodo/preferencedialog.py:1225
 msgid ""
 "Do you want to optimize the thumbnail cache? The cache will be optimized "
 "when the program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:850
+#: ../raphodo/preferencedialog.py:1229
 msgid "Optimize Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1045
+#: ../raphodo/preferencedialog.py:1481
+msgid "Enter a Folder to Scan"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1482
+msgid "Specify a folder that will be scanned for photos and videos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1483
+msgid "Folder:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1497
 msgid "Enter a Path to Ignore"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1046
+#: ../raphodo/preferencedialog.py:1498
 msgid "Specify a path that will never be scanned for photos or videos"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1047
+#: ../raphodo/preferencedialog.py:1499
 msgid "Path:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1061
+#: ../raphodo/preferencedialog.py:1513
 msgid "Enter a File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1062
+#: ../raphodo/preferencedialog.py:1514
 msgid "Specify a file extension (without the leading dot)"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1063 ../raphodo/renamepanel.py:122
+#: ../raphodo/preferencedialog.py:1515 ../raphodo/renamepanel.py:122
 msgid "Extension:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1078
+#: ../raphodo/preferencedialog.py:1530
 msgid "Invalid File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1079
+#: ../raphodo/preferencedialog.py:1531
 #, python-format
 msgid ""
 "The file extension <b>%s</b> is recognized by Rapid Photo Downloader, so it "
 "makes no sense to warn about its presence."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1081
+#: ../raphodo/preferencedialog.py:1533
 #, python-format
 msgid ""
 "Recognized file types:\n"
@@ -2225,104 +2808,103 @@ msgstr ""
 msgid "Birthday"
 msgstr ""
 
-#: ../raphodo/preferences.py:614
+#: ../raphodo/preferences.py:624
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr ""
 
-#: ../raphodo/preferences.py:617
+#: ../raphodo/preferences.py:627
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr ""
 
-#: ../raphodo/preferences.py:622
+#: ../raphodo/preferences.py:632
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
 
-#. self.setFlat(True)
 #: ../raphodo/primarybutton.py:72
 msgid "Download 8 Photos and 10 Videos"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:86 ../raphodo/problemnotification.py:208
+#: ../raphodo/problemnotification.py:87 ../raphodo/problemnotification.py:209
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:89
+#: ../raphodo/problemnotification.py:90
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:116
+#: ../raphodo/problemnotification.py:117
 #, python-format
 msgid "GPhoto2 Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:124
+#: ../raphodo/problemnotification.py:125
 msgid ""
 "Unable to initialize the camera, probably because another program is using "
 "it. No files were copied from it."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:134
+#: ../raphodo/problemnotification.py:135
 #, python-format
 msgid "Unable to read directory %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:140
+#: ../raphodo/problemnotification.py:141
 #, python-format
 msgid "Unable to access modification time or size from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:146
+#: ../raphodo/problemnotification.py:147
 #, python-format
 msgid "Unable to read file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:152
+#: ../raphodo/problemnotification.py:153
 #, python-format
 msgid "Unable to write file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:158
+#: ../raphodo/problemnotification.py:159
 #, python-format
 msgid "Unable to move file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:164
+#: ../raphodo/problemnotification.py:165
 #, python-format
 msgid "Unable to remove file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:170
+#: ../raphodo/problemnotification.py:171
 #, python-format
 msgid "Unable to copy file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:176
+#: ../raphodo/problemnotification.py:177
 #, python-format
 msgid "Zero length file %s will not be downloaded"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:182
+#: ../raphodo/problemnotification.py:183
 #, python-format
 msgid "Could not determine filesystem modification time for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:188
+#: ../raphodo/problemnotification.py:189
 #, python-format
 msgid "Unable to load metadata from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:194
+#: ../raphodo/problemnotification.py:195
 #, python-format
 msgid ""
 "Unable to load metadata from %(name)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:202
+#: ../raphodo/problemnotification.py:203
 #, python-format
 msgid ""
 "An error occurred setting a file's filesystem metadata on the filesystem %s. "
@@ -2330,212 +2912,212 @@ msgid ""
 "again."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:216
+#: ../raphodo/problemnotification.py:217
 #, python-format
 msgid "Encountered unhandled file %s. It will not be downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:223
+#: ../raphodo/problemnotification.py:224
 #, python-format
 msgid "%(filetype)s %(destination)s already exists."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:234 ../raphodo/problemnotification.py:262
+#: ../raphodo/problemnotification.py:235 ../raphodo/problemnotification.py:263
 #, python-format
 msgid ""
 "The existing %(filetype)s %(destination)s was last modified on %(date)s at "
 "%(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:245
+#: ../raphodo/problemnotification.py:246
 #, python-format
 msgid "The %(filetype)s %(source)s was not downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:273
+#: ../raphodo/problemnotification.py:274
 #, python-format
 msgid "The %(filetype)s %(source)s was downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:282
+#: ../raphodo/problemnotification.py:283
 #, python-format
 msgid "The unique identifier '%s' was added to the filename."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:298
+#: ../raphodo/problemnotification.py:299
 #, python-format
 msgid ""
 "The existing backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:309
+#: ../raphodo/problemnotification.py:310
 #, python-format
 msgid "The %(filetype)s %(source)s was not backed up from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:326
+#: ../raphodo/problemnotification.py:327
 #, python-format
 msgid ""
 "The previous backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:337
+#: ../raphodo/problemnotification.py:338
 #, python-format
 msgid ""
 "The %(filetype)s %(source)s from %(device)s was backed up, overwriting the "
 "previous backup %(filetype)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:356
+#: ../raphodo/problemnotification.py:357
 #, python-format
 msgid ""
 "When synchronizing RAW + JPEG sequence values, a duplicate %(filetype)s "
 "%(file)s was encountered, and was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:366
+#: ../raphodo/problemnotification.py:367
 msgid ""
 "When synchronizing RAW + JPEG sequence values, photos were detected with the "
 "same filenames, but taken at different times:"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:373
+#: ../raphodo/problemnotification.py:374
 #, 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 ""
 
-#: ../raphodo/problemnotification.py:389
+#: ../raphodo/problemnotification.py:390
 #, python-format
 msgid "Unable to finalize the filename for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:424
+#: ../raphodo/problemnotification.py:425
 #, python-format
 msgid ""
 "The filename %(destination)s was not fully generated for %(filetype)s "
 "%(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:433
+#: ../raphodo/problemnotification.py:434
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:439
+#: ../raphodo/problemnotification.py:440
 #, python-format
 msgid "The following metadata is missing: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:445
+#: ../raphodo/problemnotification.py:446
 #, python-format
 msgid "Date/time conversion failed: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:451
+#: ../raphodo/problemnotification.py:452
 msgid ""
 "Could not extract valid date/time metadata or determine the file "
 "modification time."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:457
+#: ../raphodo/problemnotification.py:458
 msgid "Filename does not have an extension."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:460
+#: ../raphodo/problemnotification.py:461
 msgid "Filename does not have a number component."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:464
+#: ../raphodo/problemnotification.py:465
 #, python-format
 msgid "Error generating component %(component)s. Error: %(error)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:477
+#: ../raphodo/problemnotification.py:478
 #, python-format
 msgid ""
 "The download subfolders %(folder)s were only partially generated for "
 "%(filetype)s %(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:486
+#: ../raphodo/problemnotification.py:487
 #, python-format
 msgid ""
 "There is no data with which to generate the %(subfolder_file)s for "
 "%(filename)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:499
+#: ../raphodo/problemnotification.py:500
 #, python-format
 msgid ""
 "Unable to create the %(filetype)s %(destination)s in %(folder)s. The "
 "download file was %(source)s in %(device)s. It was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:514
+#: ../raphodo/problemnotification.py:515
 #, python-format
 msgid "Unable to create the download subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:526
+#: ../raphodo/problemnotification.py:527
 #, python-format
 msgid "Unable to create the backup subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:577
+#: ../raphodo/problemnotification.py:578
 #, python-format
 msgid "Problems scanning %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:584
+#: ../raphodo/problemnotification.py:585
 #, python-format
 msgid "Problems copying from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:591
+#: ../raphodo/problemnotification.py:592
 msgid "Problems while finalizing filenames and generating subfolders"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:598
+#: ../raphodo/problemnotification.py:599
 #, python-format
 msgid "Problems backing up to %s"
 msgstr ""
 
-#. Translators: for example Nov 3 or Dec 31
-#. The start and end dates are on a different day
-#. Translators: for example Nov 3 or Dec 31
-#: ../raphodo/proximity.py:105 ../raphodo/proximity.py:221
-#: ../raphodo/proximity.py:224 ../raphodo/proximity.py:828
+#. Translators: for example Nov 3 2015, 11:25 AM
+#. Translators: for example, Nov 3, 12:15 PM
+#: ../raphodo/proximity.py:188 ../raphodo/proximity.py:213
+#: ../raphodo/proximity.py:236 ../raphodo/proximity.py:239
 #, python-format
-msgid "%(month)s %(numeric_day)s"
+msgid "%(date)s, %(time)s"
 msgstr ""
 
-#. Translators: for example Nov 15 2015
-#. Translators: for example Nov 3 2015
-#: ../raphodo/proximity.py:109 ../raphodo/proximity.py:230
-#: ../raphodo/proximity.py:231 ../raphodo/proximity.py:831
+#: ../raphodo/proximity.py:204
 #, python-format
-msgid "%(date)s %(year)s"
+msgid "%(starttime)s - %(endtime)s"
 msgstr ""
 
-#. Translators: for example Nov 3 2015, 11:25 AM
-#. Translators: for example, Nov 3, 12:15 PM
-#: ../raphodo/proximity.py:197 ../raphodo/proximity.py:215
-#: ../raphodo/proximity.py:234 ../raphodo/proximity.py:236
+#. The start and end dates are on a different day
+#. Translators: for example Nov 3 or Dec 31
+#: ../raphodo/proximity.py:221 ../raphodo/proximity.py:225
+#: ../raphodo/proximity.py:980 ../raphodo/timeutils.py:105
 #, python-format
-msgid "%(date)s, %(time)s"
+msgid "%(month)s %(numeric_day)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:209
+#. Translators: for example Nov 3 2015
+#. Translators: for example Nov 2 2015
+#. Translators: for example Nov 15 2015
+#: ../raphodo/proximity.py:232 ../raphodo/proximity.py:233
+#: ../raphodo/proximity.py:985 ../raphodo/timeutils.py:110
 #, python-format
-msgid "%(starttime)s - %(endtime)s"
+msgid "%(date)s %(year)s"
 msgstr ""
 
 #. Translators: for example, Nov 3, 12:15 PM - Nov 4, 1:00 AM
-#: ../raphodo/proximity.py:241
+#: ../raphodo/proximity.py:245
 #, python-format
 msgid "%(earlier_time)s - %(later_time)s"
 msgstr ""
@@ -2544,25 +3126,25 @@ msgstr ""
 #. Nov 3 2012, 12:15 PM -
 #. Nov 4 2012, 1:00 AM
 #. (please keep the line break signified by \n)
-#: ../raphodo/proximity.py:248
+#: ../raphodo/proximity.py:253
 #, python-format
 msgid ""
 "%(earlier_time)s -\n"
 "%(later_time)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:359
+#: ../raphodo/proximity.py:382
 #, python-format
 msgid "%(month)s  %(year)s"
 msgstr ""
 
 #. Translators: for example Nov 2015
-#: ../raphodo/proximity.py:833
+#: ../raphodo/proximity.py:987
 #, python-format
 msgid "%(month)s %(year)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:1344
+#: ../raphodo/proximity.py:1595
 msgid ""
 "The time elapsed between consecutive photos and videos that is used to build "
 "the Timeline"
@@ -2572,47 +3154,47 @@ msgstr ""
 #. Replace the very last character (after the d) with the correct
 #. localized value, keeping everything else. In other words, change
 #. only the m character.
-#: ../raphodo/proximity.py:1406
+#: ../raphodo/proximity.py:1652
 #, python-format
 msgid "%(minutes)dm"
 msgstr ""
 
 #. Translators: i.e. "1.5h", which is short for 1.5 hours.
 #. Replace the entire string with the correct localized value
-#: ../raphodo/proximity.py:1410
+#: ../raphodo/proximity.py:1656
 msgid "1.5h"
 msgstr ""
 
 #. Translators: e.g. "5h", which is short for 5 hours.
 #. Replace the very last character (after the d) with the correct localized value,
 #. keeping everything else. In other words, change only the h character.
-#: ../raphodo/proximity.py:1415
+#: ../raphodo/proximity.py:1661
 #, python-format
 msgid "%(hours)dh"
 msgstr ""
 
-#: ../raphodo/proximity.py:1461
+#: ../raphodo/proximity.py:1710
 msgid ""
 "The Timeline groups photos and videos based on how much time elapsed between "
 "consecutive shots. Use it to identify photos and videos taken at different "
 "periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/proximity.py:1464
+#: ../raphodo/proximity.py:1715
 msgid ""
 "Use the slider (below) to adjust the time elapsed between consecutive shots "
 "that is used to build the Timeline."
 msgstr ""
 
-#: ../raphodo/proximity.py:1466
+#: ../raphodo/proximity.py:1718
 msgid "Timeline build pending..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1467
+#: ../raphodo/proximity.py:1719
 msgid "Timeline is building..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1468
+#: ../raphodo/proximity.py:1721
 msgid ""
 "The Timeline needs to be rebuilt because the file modification time does not "
 "match the time a shot was taken for one or more shots.<br><br>The Timeline "
@@ -2624,61 +3206,61 @@ msgid ""
 "downloading, which is when the metadata is read."
 msgstr ""
 
-#: ../raphodo/rapid.py:485 ../raphodo/rapid.py:2461 ../raphodo/rapid.py:3728
-#: ../raphodo/rapid.py:3846 ../raphodo/rapid.py:3850 ../raphodo/rapid.py:3870
-#: ../raphodo/rapid.py:3874 ../raphodo/rapid.py:3998 ../raphodo/rapid.py:4007
-#: ../raphodo/rapid.py:4495 ../raphodo/rapid.py:4888 ../raphodo/rapid.py:5722
-#: ../raphodo/rememberthisdialog.py:97
+#: ../raphodo/rapid.py:493 ../raphodo/rapid.py:2555 ../raphodo/rapid.py:3934
+#: ../raphodo/rapid.py:4065 ../raphodo/rapid.py:4069 ../raphodo/rapid.py:4092
+#: ../raphodo/rapid.py:4096 ../raphodo/rapid.py:4226 ../raphodo/rapid.py:4237
+#: ../raphodo/rapid.py:4743 ../raphodo/rapid.py:5195 ../raphodo/rapid.py:5997
+#: ../raphodo/rememberthisdialog.py:99
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:3
 msgid "Rapid Photo Downloader"
 msgstr "Rapid foto allalaadija"
 
-#: ../raphodo/rapid.py:1100
+#: ../raphodo/rapid.py:1131
 msgid ""
 "<b>ExifTool has a problem</b><br><br> Rapid Photo Downloader uses ExifTool "
 "to get metadata from videos and photos. The program will run without it, but "
 "installing it is <b>highly</b> recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1110 ../raphodo/rapid.py:1130
+#: ../raphodo/rapid.py:1141 ../raphodo/rapid.py:1161
 msgid "Problem with libmediainfo"
 msgstr ""
 
-#: ../raphodo/rapid.py:1119
+#: ../raphodo/rapid.py:1150
 msgid ""
 "<b>The library libmediainfo appears to be missing</b><br><br> Rapid Photo "
 "Downloader uses libmediainfo to get the date and time a video was shot. The "
 "program will run  without it, but installing it is recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1417
+#: ../raphodo/rapid.py:1448
 msgid "Download failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1419
+#: ../raphodo/rapid.py:1450
 msgid ""
 "Sorry, the download of the new version of Rapid Photo Downloader failed."
 msgstr ""
 
-#: ../raphodo/rapid.py:1425
+#: ../raphodo/rapid.py:1457
 msgid ""
 "The new version was successfully downloaded. Do you want to close Rapid "
 "Photo Downloader and install it now?"
 msgstr ""
 
-#: ../raphodo/rapid.py:1428
+#: ../raphodo/rapid.py:1461
 msgid "Update Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:1432
+#: ../raphodo/rapid.py:1465
 msgid "Install"
 msgstr ""
 
-#: ../raphodo/rapid.py:1450
+#: ../raphodo/rapid.py:1483
 msgid "New version saved"
 msgstr ""
 
-#: ../raphodo/rapid.py:1451
+#: ../raphodo/rapid.py:1485
 #, python-format
 msgid ""
 "The tar file and installer script are saved at:\n"
@@ -2686,163 +3268,163 @@ msgid ""
 " %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:1468
+#: ../raphodo/rapid.py:1502
 msgid "Upgrade failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1469
+#: ../raphodo/rapid.py:1505
 msgid ""
 "Sorry, upgrading Rapid Photo Downloader failed because there was an error "
 "opening the installer."
 msgstr ""
 
-#: ../raphodo/rapid.py:1667 ../raphodo/rapid.py:2331
+#: ../raphodo/rapid.py:1709 ../raphodo/rapid.py:2425
 msgid "Download"
 msgstr "Laadi arvutisse"
 
-#: ../raphodo/rapid.py:1671
+#: ../raphodo/rapid.py:1713
 msgid "&Refresh..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1675
+#: ../raphodo/rapid.py:1717
 msgid "&Preferences"
 msgstr ""
 
-#: ../raphodo/rapid.py:1679
+#: ../raphodo/rapid.py:1721
 msgid "&Quit"
 msgstr ""
 
-#: ../raphodo/rapid.py:1683
+#: ../raphodo/rapid.py:1725
 msgid "Error &Reports"
 msgstr ""
 
-#: ../raphodo/rapid.py:1687
+#: ../raphodo/rapid.py:1729
 msgid "Clear Completed Downloads"
 msgstr ""
 
-#: ../raphodo/rapid.py:1691
+#: ../raphodo/rapid.py:1733
 msgid "Get Help Online..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1695
+#: ../raphodo/rapid.py:1737
 msgid "&Tip of the Day..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1699
+#: ../raphodo/rapid.py:1741
 msgid "Report a Problem..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1703
+#: ../raphodo/rapid.py:1745
 msgid "Make a Donation..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1707
+#: ../raphodo/rapid.py:1749
 msgid "Translate this Application..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1711
+#: ../raphodo/rapid.py:1753
 msgid "&About..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1715
+#: ../raphodo/rapid.py:1757
 msgid "Check for Updates..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1797
+#: ../raphodo/rapid.py:1840
 msgid "Timeline"
 msgstr ""
 
-#: ../raphodo/rapid.py:1807
+#: ../raphodo/rapid.py:1850
 msgid "Destination"
 msgstr ""
 
-#: ../raphodo/rapid.py:1808
+#: ../raphodo/rapid.py:1851
 msgid "Rename"
 msgstr ""
 
-#: ../raphodo/rapid.py:1810
+#: ../raphodo/rapid.py:1853
 msgid "Back Up"
 msgstr ""
 
 #. Devices Header and View
-#: ../raphodo/rapid.py:1926
+#: ../raphodo/rapid.py:1977
 msgid ""
 "Turn on or off the use of devices attached to this computer as download "
 "sources"
 msgstr ""
 
 #. This Computer Header and View
-#: ../raphodo/rapid.py:1940
+#: ../raphodo/rapid.py:1994
 msgid ""
 "Turn on or off the use of a folder on this computer as a download source"
 msgstr ""
 
-#: ../raphodo/rapid.py:1941
+#: ../raphodo/rapid.py:1996
 msgid "This Computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:1952
+#: ../raphodo/rapid.py:2009
 msgid "Select a source folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:1975
+#: ../raphodo/rapid.py:2038
 msgid "Projected Storage Use"
 msgstr ""
 
-#: ../raphodo/rapid.py:1989 ../raphodo/rapid.py:1997
+#: ../raphodo/rapid.py:2056 ../raphodo/rapid.py:2068
 msgid "Select a destination folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:2045
+#: ../raphodo/rapid.py:2117
 msgid "All"
 msgstr ""
 
-#: ../raphodo/rapid.py:2046
+#: ../raphodo/rapid.py:2118
 msgid "New"
 msgstr ""
 
-#: ../raphodo/rapid.py:2048
+#: ../raphodo/rapid.py:2120
 msgid "Show:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2051
+#: ../raphodo/rapid.py:2123
 msgid "Modification Time"
 msgstr ""
 
-#: ../raphodo/rapid.py:2052
+#: ../raphodo/rapid.py:2124
 msgid "Checked State"
 msgstr ""
 
-#: ../raphodo/rapid.py:2055
+#: ../raphodo/rapid.py:2127
 msgid "File Type"
 msgstr ""
 
-#: ../raphodo/rapid.py:2056
+#: ../raphodo/rapid.py:2128
 msgid "Device"
 msgstr "Seade"
 
-#: ../raphodo/rapid.py:2058
+#: ../raphodo/rapid.py:2130
 msgid "Sort:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2069
+#: ../raphodo/rapid.py:2141
 msgid "Select All:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2311
+#: ../raphodo/rapid.py:2405
 #, python-format
 msgid "Download %(files)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2327
+#: ../raphodo/rapid.py:2421
 msgid "Resume Download"
 msgstr ""
 
-#: ../raphodo/rapid.py:2329
+#: ../raphodo/rapid.py:2423
 msgid "Pause"
 msgstr "Peata"
 
-#: ../raphodo/rapid.py:2417
+#: ../raphodo/rapid.py:2511
 #, python-brace-format
 msgid ""
 "Please report the problem at <a href=\"{website}\">{website}</a>.<br><br>\n"
@@ -2851,11 +3433,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/rapid.py:2431
+#: ../raphodo/rapid.py:2525
 msgid "Thank you for reporting a problem in Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:2529
+#: ../raphodo/rapid.py:2624
 #, python-format
 msgid ""
 "<b>Changing This Computer source path</b><br><br>Do you really want to "
@@ -2864,30 +3446,29 @@ msgid ""
 "from This Computer will be cancelled."
 msgstr ""
 
-#: ../raphodo/rapid.py:2595
+#: ../raphodo/rapid.py:2694
 msgid "You cannot change the download destination while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:2604
+#: ../raphodo/rapid.py:2704
 #, python-format
 msgid ""
 "<b>Confirm Download Destination</b><br><br>Are you sure you want to set the "
 "%(file_type)s download destination to %(path)s?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2682
+#: ../raphodo/rapid.py:2785
 msgid ""
+"\n"
 "<b>Downloading all files</b><br><br>\n"
-"                    A download always includes all files that are checked "
-"for download,\n"
-"                    including those that are not currently displayed because "
-"the Timeline\n"
-"                    is being used or because only new files are being shown."
-"<br><br>\n"
-"                    Do you want to proceed with the download?"
+"A download always includes all files that are checked for download,\n"
+"including those that are not currently displayed because the Timeline\n"
+"is being used or because only new files are being shown.<br><br>\n"
+"Do you want to proceed with the download?\n"
+"                        "
 msgstr ""
 
-#: ../raphodo/rapid.py:2820
+#: ../raphodo/rapid.py:2937
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -2895,206 +3476,200 @@ msgid ""
 "%(folder2)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2824
+#: ../raphodo/rapid.py:2940
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
 "%s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2827
+#: ../raphodo/rapid.py:2943
 msgid "Download Failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:2828
+#: ../raphodo/rapid.py:2944
 msgid "The download cannot proceed."
 msgstr ""
 
-#: ../raphodo/rapid.py:2842
+#: ../raphodo/rapid.py:2962
 msgid ""
 "Photos and videos will not be backed up because there is nowhere to back "
 "them up. Do you still want to start the download?"
 msgstr ""
 
-#. Translators: filetype will be replaced with 'photos' or 'videos'
-#: ../raphodo/rapid.py:2847 ../raphodo/rapid.py:2854
+#: ../raphodo/rapid.py:2969 ../raphodo/rapid.py:2979
 #, python-format
 msgid ""
 "No backup device exists for backing up %(filetype)s. Do you still want to "
 "start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2848 ../raphodo/rpdfile.py:228
+#: ../raphodo/rapid.py:2971 ../raphodo/rpdfile.py:228
 msgid "photos"
 msgstr "fotod"
 
-#: ../raphodo/rapid.py:2855 ../raphodo/rpdfile.py:223
+#: ../raphodo/rapid.py:2981 ../raphodo/rpdfile.py:223
 msgid "videos"
 msgstr "videod"
 
-#: ../raphodo/rapid.py:2861
+#: ../raphodo/rapid.py:2989
 msgid ""
 "<b>The photo and video backup destinations do not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2869 ../raphodo/rapid.py:2876
+#: ../raphodo/rapid.py:2999 ../raphodo/rapid.py:3008
 #, python-format
 msgid ""
 "<b>The %(filetype)s backup destination does not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2871 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:818
+#: ../raphodo/rapid.py:3001 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:843
 msgid "photo"
 msgstr "foto"
 
-#: ../raphodo/rapid.py:2878 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:858
+#: ../raphodo/rapid.py:3010 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:883
 msgid "video"
 msgstr "video"
 
-#: ../raphodo/rapid.py:2886
+#: ../raphodo/rapid.py:3018
 msgid "Backup problem"
 msgstr ""
 
-#. Translators - in the middle is a unicode em dash - please retain it
-#. This string is displayed in the status bar when the download is running
-#: ../raphodo/rapid.py:3571
+#: ../raphodo/rapid.py:3756
 #, python-format
 msgid "%(downloading_from)s — %(time_left)s left (%(speed)s)"
 msgstr ""
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3640
+#: ../raphodo/rapid.py:3828
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr ""
 
-#. Translators: e.g. 2 videos failed to download
-#: ../raphodo/rapid.py:3645
+#: ../raphodo/rapid.py:3836
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr ""
 
-#: ../raphodo/rapid.py:3650 ../raphodo/rapid.py:3723
+#: ../raphodo/rapid.py:3842 ../raphodo/rapid.py:3927
 msgid "warnings"
 msgstr "hoiatused"
 
-#: ../raphodo/rapid.py:3679
+#: ../raphodo/rapid.py:3873
 msgid "All downloads complete"
 msgstr "Kõik allalaadimised lõpetatud"
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3686 ../raphodo/rapid.py:3695 ../raphodo/rapid.py:3704
-#: ../raphodo/rapid.py:3713 ../raphodo/rapid.py:3721
+#: ../raphodo/rapid.py:3881 ../raphodo/rapid.py:3892 ../raphodo/rapid.py:3903
+#: ../raphodo/rapid.py:3914 ../raphodo/rapid.py:3924
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3688 ../raphodo/rapid.py:3706
+#: ../raphodo/rapid.py:3884 ../raphodo/rapid.py:3906
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr ""
 
-#: ../raphodo/rapid.py:3697 ../raphodo/rapid.py:3715
+#: ../raphodo/rapid.py:3895 ../raphodo/rapid.py:3917
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr ""
 
-#: ../raphodo/rapid.py:3742
+#: ../raphodo/rapid.py:3950
 msgid "1 failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:3744
+#: ../raphodo/rapid.py:3952
 #, python-format
 msgid "%d failures"
 msgstr ""
 
-#: ../raphodo/rapid.py:3749
+#: ../raphodo/rapid.py:3957
 msgid "1 warning"
 msgstr ""
 
-#: ../raphodo/rapid.py:3751
+#: ../raphodo/rapid.py:3959
 #, python-format
 msgid "%d warnings"
 msgstr ""
 
-#: ../raphodo/rapid.py:3771
+#: ../raphodo/rapid.py:3981
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3774
+#: ../raphodo/rapid.py:3985
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3779
+#: ../raphodo/rapid.py:3989
 #, python-format
 msgid "No files downloaded — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3781
+#: ../raphodo/rapid.py:3991
 msgid "No files downloaded"
 msgstr ""
 
-#: ../raphodo/rapid.py:3805
+#: ../raphodo/rapid.py:4021
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3809
+#: ../raphodo/rapid.py:4026
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3812
+#: ../raphodo/rapid.py:4031
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3820
+#: ../raphodo/rapid.py:4039
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3833
+#: ../raphodo/rapid.py:4052
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3837
+#: ../raphodo/rapid.py:4056
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3841
+#: ../raphodo/rapid.py:4060
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices"
 msgstr ""
 
-#: ../raphodo/rapid.py:3867
+#: ../raphodo/rapid.py:4087
 msgid "The Destination subfolders and Timeline have been rebuilt"
 msgstr ""
 
-#: ../raphodo/rapid.py:3922
+#: ../raphodo/rapid.py:4144
 msgid "Program preferences are invalid"
 msgstr ""
 
-#: ../raphodo/rapid.py:3999
+#: ../raphodo/rapid.py:4228
 #, python-format
 msgid ""
 "<b>All files on the %(camera)s are inaccessible</b>.<br><br>It may be locked "
@@ -3104,179 +3679,205 @@ msgid ""
 "ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4008
+#: ../raphodo/rapid.py:4239
 #, python-format
 msgid ""
-"<b>The %(camera)s appears to be in use by another application.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again.<br><br>Alternatively, you can ignore this "
-"device."
+"<b>The %(camera)s appears to be in use by another "
+"application.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again.<br><br>Alternatively, you "
+"can ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4019
+#: ../raphodo/rapid.py:4250
 msgid "&Try Again"
 msgstr ""
 
-#: ../raphodo/rapid.py:4020
+#: ../raphodo/rapid.py:4251
 msgid "&Ignore This Device"
 msgstr ""
 
-#: ../raphodo/rapid.py:4086
+#: ../raphodo/rapid.py:4323
 #, python-format
 msgid "Sorry, an unexpected problem occurred while scanning %s."
 msgstr ""
 
-#: ../raphodo/rapid.py:4087
+#: ../raphodo/rapid.py:4324
 msgid "Unfortunately you cannot download from this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4091
+#: ../raphodo/rapid.py:4328
 msgid ""
 "A possible workaround for the problem might be downloading from the camera's "
 "memory card using a card reader."
 msgstr ""
 
-#: ../raphodo/rapid.py:4096
+#: ../raphodo/rapid.py:4333
 msgid "Device scan failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:4472
+#: ../raphodo/rapid.py:4720
 #, python-format
 msgid ""
-"<b>The %(camera)s cannot be scanned because it cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again."
+"<b>The %(camera)s cannot be scanned because it cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again."
 msgstr ""
 
-#: ../raphodo/rapid.py:4496
+#: ../raphodo/rapid.py:4745
 #, python-format
 msgid ""
-"<b>The download cannot start because the %(camera)s cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again, and choose which files you want to "
-"download from it."
+"<b>The download cannot start because the %(camera)s cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again, and choose which files "
+"you want to download from it."
 msgstr ""
 
-#: ../raphodo/rapid.py:4635
+#: ../raphodo/rapid.py:4842
+msgid "Completed Downloads Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4844
+#, python-format
+msgid "%s whose download have completed are displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4846
+msgid "Do you want to clear the completed downloads?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4848
+msgid "Completed Download Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4850
+#, python-format
+msgid "%s whose download has completed is displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4852
+msgid "Do you want to clear the completed download?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4933
 #, python-format
 msgid ""
 "Do you want to download photos and videos from the device <i>%(device)s</i>?"
 msgstr ""
 
-#: ../raphodo/rapid.py:4877
+#: ../raphodo/rapid.py:5183
 #, python-format
 msgid "<b>Do you want to ignore the %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4879
+#: ../raphodo/rapid.py:5186
 msgid ""
 "All cameras, phones and tablets with the same model name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:4883
+#: ../raphodo/rapid.py:5190
 #, python-format
 msgid ""
 "<b>Do you want to ignore the device %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4885
+#: ../raphodo/rapid.py:5192
 msgid "Any device with the same name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:5178
+#: ../raphodo/rapid.py:5492
 #, python-format
 msgid "Downloading from %(location)s on This Computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5180
+#: ../raphodo/rapid.py:5496
 msgid ""
 "Do you really want to download from here?<br><br>On some systems, scanning "
 "this location can take a very long time."
 msgstr ""
 
-#: ../raphodo/rapid.py:5224
+#: ../raphodo/rapid.py:5537
 #, python-format
 msgid "Generating thumbnails for %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5227
+#: ../raphodo/rapid.py:5540
 #, python-format
 msgid "Scanning %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5237
+#: ../raphodo/rapid.py:5551
 #, python-format
 msgid ""
 "%(number)s of %(available files)s checked for download (%(hidden)s hidden)"
 msgstr ""
 
-#: ../raphodo/rapid.py:5243
+#: ../raphodo/rapid.py:5559
 #, python-format
 msgid "%(number)s of %(available files)s checked for download"
 msgstr ""
 
-#: ../raphodo/rapid.py:5494
+#: ../raphodo/rapid.py:5764
 msgid "Display program information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5496
+#: ../raphodo/rapid.py:5766
 msgid "Display debugging information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5499
+#: ../raphodo/rapid.py:5769
 msgid "List photo and video file extensions the program recognizes and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5502
+#: ../raphodo/rapid.py:5772
 msgid "Turn on or off the the renaming of photos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5504
+#: ../raphodo/rapid.py:5774
 msgid "turn on or off the the renaming of videos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5506
+#: ../raphodo/rapid.py:5776
 msgid ""
 "Turn on or off the automatic detection of devices from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5510
+#: ../raphodo/rapid.py:5780
 msgid "Turn on or off downloading from this computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5512 ../raphodo/rapid.py:5515 ../raphodo/rapid.py:5518
-#: ../raphodo/rapid.py:5539 ../raphodo/rapid.py:5543
+#: ../raphodo/rapid.py:5782 ../raphodo/rapid.py:5785 ../raphodo/rapid.py:5788
+#: ../raphodo/rapid.py:5809 ../raphodo/rapid.py:5813
 msgid "PATH"
 msgstr ""
 
-#: ../raphodo/rapid.py:5513
+#: ../raphodo/rapid.py:5783
 msgid "The PATH on this computer from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5516
+#: ../raphodo/rapid.py:5786
 msgid "The PATH where photos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5519
+#: ../raphodo/rapid.py:5789
 msgid "The PATH where videos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5521
+#: ../raphodo/rapid.py:5791
 msgid "Turn on or off the backing up of photos and videos while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:5525
+#: ../raphodo/rapid.py:5795
 msgid "Turn on or off the automatic detection of backup devices."
 msgstr ""
 
-#: ../raphodo/rapid.py:5527 ../raphodo/rapid.py:5533
+#: ../raphodo/rapid.py:5797 ../raphodo/rapid.py:5803
 msgid "FOLDER"
 msgstr ""
 
-#: ../raphodo/rapid.py:5528
+#: ../raphodo/rapid.py:5798
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected photo "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3284,7 +3885,7 @@ msgid ""
 "photos up to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5534
+#: ../raphodo/rapid.py:5804
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected video "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3292,115 +3893,124 @@ msgid ""
 "up videos to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5540
+#: ../raphodo/rapid.py:5810
 msgid ""
 "The PATH where photos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5544
+#: ../raphodo/rapid.py:5814
 msgid ""
 "The PATH where videos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5547
+#: ../raphodo/rapid.py:5817
 #, python-format
 msgid "Ignore photos with the following extensions: %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5551
-msgid "Turn on or off starting downloads as soon as the program itself starts."
+#: ../raphodo/rapid.py:5821
+msgid ""
+"Turn on or off starting downloads as soon as the program itself starts."
 msgstr ""
 
-#: ../raphodo/rapid.py:5554
+#: ../raphodo/rapid.py:5824
 msgid "Turn on or off starting downloads as soon as a device is inserted."
 msgstr ""
 
-#: ../raphodo/rapid.py:5557
+#: ../raphodo/rapid.py:5827
 msgid ""
 "Turn on or off use of the Rapid Photo Downloader Thumbnail Cache. Turning it "
 "off does not delete existing cache contents."
 msgstr ""
 
-#: ../raphodo/rapid.py:5561
+#: ../raphodo/rapid.py:5831
 msgid ""
 "Delete all thumbnails in the Rapid Photo Downloader Thumbnail Cache, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5565
+#: ../raphodo/rapid.py:5835
 msgid "Forget which files have been previously downloaded, and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5568
+#: ../raphodo/rapid.py:5838
 msgid ""
 "Import preferences from an old program version and exit. Requires the "
 "command line program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5571
+#: ../raphodo/rapid.py:5841
 msgid ""
 "Reset all program settings to their default values, delete all thumbnails in "
 "the Thumbnail cache, forget which files have been previously downloaded, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5575
+#: ../raphodo/rapid.py:5845
 msgid "Include gphoto2 debugging information in log files."
 msgstr ""
 
-#: ../raphodo/rapid.py:5579
+#: ../raphodo/rapid.py:5849
 msgid "Print information to the terminal about attached cameras and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5640
+#: ../raphodo/rapid.py:5911
 msgid ""
 "To import preferences from the old version of Rapid Photo Downloader, you "
 "must install the program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5649
+#: ../raphodo/rapid.py:5920
 msgid "No prior program preferences detected: exiting"
 msgstr ""
 
-#: ../raphodo/rapid.py:5652
+#: ../raphodo/rapid.py:5923
 #, python-format
 msgid "Importing preferences from Rapid Photo Downloader %(version)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5714
+#: ../raphodo/rapid.py:5989
 #, python-format
-msgid "Do you want to copy the stored sequence number, which has the value %d?"
+msgid ""
+"Do you want to copy the stored sequence number, which has the value %d?"
 msgstr ""
 
-#: ../raphodo/rapid.py:5726
+#: ../raphodo/rapid.py:6000
 msgid "Program aborting."
 msgstr ""
 
-#: ../raphodo/rapid.py:5736
+#: ../raphodo/rapid.py:6010
 msgid "Never run this program as the sudo / root user."
 msgstr ""
 
-#: ../raphodo/rapid.py:5740
+#: ../raphodo/rapid.py:6014
 msgid "You must install ExifTool to run Rapid Photo Downloader."
 msgstr ""
 
-#: ../raphodo/rapid.py:5794
+#: ../raphodo/rapid.py:6026
+msgid ""
+"Rapid Photo Downloader is installed in multiple locations.\n"
+"\n"
+"Uninstall all copies except the version you want to run."
+msgstr ""
+
+#: ../raphodo/rapid.py:6083
 msgid ""
 "When specifying a path on the command line, do not also specify an\n"
 "option for device auto detection or a path on \"This Computer\"."
 msgstr ""
 
-#: ../raphodo/rapid.py:5950
+#: ../raphodo/rapid.py:6243
 msgid "All settings and caches have been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5958
+#: ../raphodo/rapid.py:6251
 msgid "Thumbnail Cache has been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5964
+#: ../raphodo/rapid.py:6257
 msgid "Remembered files have been forgotten"
 msgstr ""
 
@@ -3416,15 +4026,15 @@ msgstr ""
 msgid "&Don't warn me again about missing or broken program libraries"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:546
+#: ../raphodo/renameandmovefile.py:554
 msgid "subfolder and filename"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:548
+#: ../raphodo/renameandmovefile.py:556
 msgid "filename"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:550
+#: ../raphodo/renameandmovefile.py:558
 msgid "subfolder"
 msgstr ""
 
@@ -3504,160 +4114,237 @@ msgstr "fotod ja videod"
 msgid "photos or videos"
 msgstr "fotod või videod"
 
-#: ../raphodo/rpdfile.py:306
+#: ../raphodo/rpdfile.py:315
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:318
+#. translators: natural language expression signifying a single video
+#: ../raphodo/rpdfile.py:337
+msgid "a video"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:339
 msgid "1 Video"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:323
+#. translators: natural language expression signifying a single photo
+#: ../raphodo/rpdfile.py:346
+msgid "a photo"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:348
 msgid "1 Photo"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:803
+#: ../raphodo/rpdfile.py:828
 #, python-format
 msgid "%(path)s on %(camera)s"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:819
+#: ../raphodo/rpdfile.py:844
 msgid "Photo"
 msgstr "Foto"
 
-#: ../raphodo/rpdfile.py:859
+#: ../raphodo/rpdfile.py:884
 msgid "Video"
 msgstr "Video"
 
-#: ../raphodo/storage.py:138
+#: ../raphodo/storage.py:141
 msgid "File system root"
 msgstr ""
 
 #. translators: the name of the Pictures folder
-#: ../raphodo/storage.py:433
+#: ../raphodo/storage.py:437
 msgid "Pictures"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:426
+#: ../raphodo/thumbnaildisplay.py:432
 #, python-format
 msgid "Taken on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:431
+#: ../raphodo/thumbnaildisplay.py:439
 #, python-format
 msgid "Modified on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:437 ../raphodo/thumbnaildisplay.py:466
+#: ../raphodo/thumbnaildisplay.py:447 ../raphodo/thumbnaildisplay.py:481
 #, python-format
 msgid "%(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:451
+#: ../raphodo/thumbnaildisplay.py:464
 #, python-format
 msgid "Memory cards: %s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:457
+#: ../raphodo/thumbnaildisplay.py:468
+#, python-format
+msgid "Memory card: %s"
+msgstr ""
+
+#: ../raphodo/thumbnaildisplay.py:473
 msgid "Downloaded as:"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:472
+#: ../raphodo/thumbnaildisplay.py:489
 #, python-format
 msgid "<br><br>Previous download:<br>%(filename)s<br>%(path)s<br>%(date)s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:1603
+#: ../raphodo/thumbnaildisplay.py:1645
 msgid "Copy Path"
 msgstr ""
 
+#. Translators: these values are file size suffixes like B representing bytes, KB representing
+#. kilobytes, etc.
+#: ../raphodo/utilities.py:170
+msgid "B"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "KB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "MB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "GB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "TB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "PB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "EB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "ZB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "YB"
+msgstr ""
+
 #. two things in a list e.g. "device1 and device2"
-#: ../raphodo/utilities.py:391
+#: ../raphodo/utilities.py:394
 #, python-format
 msgid "%(first_item)s and %(last_item)s"
 msgstr ""
 
-#: ../raphodo/utilities.py:464
+#: ../raphodo/utilities.py:468
 msgid "one"
 msgstr ""
 
-#: ../raphodo/utilities.py:465
+#: ../raphodo/utilities.py:469
 msgid "two"
 msgstr ""
 
-#: ../raphodo/utilities.py:466
+#: ../raphodo/utilities.py:470
 msgid "three"
 msgstr ""
 
-#: ../raphodo/utilities.py:467
+#: ../raphodo/utilities.py:471
 msgid "four"
 msgstr ""
 
-#: ../raphodo/utilities.py:468
+#: ../raphodo/utilities.py:472
 msgid "five"
 msgstr ""
 
-#: ../raphodo/utilities.py:469
+#: ../raphodo/utilities.py:473
 msgid "six"
 msgstr ""
 
-#: ../raphodo/utilities.py:470
+#: ../raphodo/utilities.py:474
 msgid "seven"
 msgstr ""
 
-#: ../raphodo/utilities.py:471
+#: ../raphodo/utilities.py:475
 msgid "eight"
 msgstr ""
 
-#: ../raphodo/utilities.py:472
+#: ../raphodo/utilities.py:476
 msgid "nine"
 msgstr ""
 
-#: ../raphodo/utilities.py:473
+#: ../raphodo/utilities.py:477
 msgid "ten"
 msgstr ""
 
-#: ../raphodo/utilities.py:474
+#: ../raphodo/utilities.py:478
 msgid "eleven"
 msgstr ""
 
-#: ../raphodo/utilities.py:475
+#: ../raphodo/utilities.py:479
 msgid "twelve"
 msgstr ""
 
-#: ../raphodo/utilities.py:476
+#: ../raphodo/utilities.py:480
 msgid "thirteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:477
+#: ../raphodo/utilities.py:481
 msgid "fourteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:478
+#: ../raphodo/utilities.py:482
 msgid "fifteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:479
+#: ../raphodo/utilities.py:483
 msgid "sixteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:480
+#: ../raphodo/utilities.py:484
 msgid "seventeen"
 msgstr ""
 
-#: ../raphodo/utilities.py:481
+#: ../raphodo/utilities.py:485
 msgid "eighteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:482
+#: ../raphodo/utilities.py:486
 msgid "ninenteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:483
+#: ../raphodo/utilities.py:487
 msgid "twenty"
 msgstr ""
 
+#: ../raphodo/viewutils.py:240
+msgid "&OK"
+msgstr ""
+
+#: ../raphodo/viewutils.py:243
+msgid "&Save"
+msgstr ""
+
+#: ../raphodo/viewutils.py:244
+msgid "&Help"
+msgstr ""
+
+#: ../raphodo/viewutils.py:245
+msgid "Restore Defaults"
+msgstr ""
+
+#: ../raphodo/viewutils.py:246
+msgid "&Yes"
+msgstr ""
+
+#: ../raphodo/viewutils.py:247
+msgid "&No"
+msgstr ""
+
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:1
 msgid ""
 "Rapid Photo Downloader imports photos and videos from cameras, phones, "
@@ -3711,8 +4398,8 @@ msgstr ""
 #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:5
 msgid ""
-"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;"
-"memory;card;"
+"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;memory"
+";card;"
 msgstr ""
 
 #: ../data/kde/net.damonlynch.rapid-photo-downloader.desktop.in.h:1
diff --git a/po/fa.po b/po/fa.po
index 1455cb6..45a9b73 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -7,129 +7,489 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: damonlynch@gmail.com\n"
-"POT-Creation-Date: 2017-07-08 19:16-0500\n"
-"PO-Revision-Date: 2017-07-04 11:06+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2017-09-12 17:01-0400\n"
+"PO-Revision-Date: 2017-09-13 18:34+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: Persian <fa@li.org>\n"
-"Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-07-05 23:04+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-09-26 22:04+0000\n"
+"X-Generator: Launchpad (build 18463)\n"
+"Language: fa\n"
+
+#: ../install.py:65
+msgid "Rapid Photo Downloader installer"
+msgstr ""
+
+#: ../install.py:66
+msgid "Download and install latest version of Rapid Photo Downloader."
+msgstr ""
+
+#: ../install.py:236 ../install.py:1732
+msgid "Installer not found:"
+msgstr ""
+
+#. Translators: do not translate the term tar.gz
+#: ../install.py:240 ../install.py:1736
+msgid "Installer not in tar.gz format:"
+msgstr ""
+
+#: ../install.py:465
+msgid ""
+"Incorrect folder ownership detected. Changing ownership of and resetting "
+"permissions for"
+msgstr ""
+
+#: ../install.py:540
+msgid "The following command will be run:"
+msgstr ""
+
+#: ../install.py:543 ../install.py:1479 ../install.py:1484
+msgid "sudo may prompt you for the sudo password."
+msgstr ""
+
+#: ../install.py:547
+msgid "Would you like to run the command now?"
+msgstr ""
+
+#: ../install.py:549
+msgid "Answer is not yes, exiting."
+msgstr ""
+
+#: ../install.py:559 ../install.py:751 ../install.py:966
+msgid "Command failed"
+msgstr ""
+
+#: ../install.py:561 ../install.py:752 ../install.py:967
+msgid "Exiting"
+msgstr ""
+
+#: ../install.py:582
+msgid "The Universe repository must be enabled."
+msgstr ""
+
+#: ../install.py:606
+msgid ""
+"Do you want to to uninstall the previous version of Rapid Photo Downloader:"
+msgstr ""
+
+#: ../install.py:715 ../install.py:740
+msgid ""
+"Querying package system to see if an older version of Rapid Photo Downloader "
+"is installed (this may take a while)..."
+msgstr ""
+
+#: ../install.py:726
+msgid ""
+"Unable to query package system. Please check your Internet connection and "
+"try again"
+msgstr ""
+
+#: ../install.py:756
+msgid "Checking if previous version installed with pip..."
+msgstr ""
+
+#: ../install.py:850
+msgid "The following package is unknown on your system: {}\n"
+msgstr ""
+
+#: ../install.py:857 ../install.py:929 ../install.py:974
+msgid ""
+"To continue, some packages required to run the application will be installed."
+msgstr ""
+
+#: ../install.py:886
+msgid "Querying installed and available packages (this may take a while)"
+msgstr ""
+
+#: ../install.py:958
+msgid ""
+"Querying zypper to see if any required packages are already installed (this "
+"may take a while)... "
+msgstr ""
+
+#: ../install.py:1004
+msgid "Query to confirm action at each step."
+msgstr ""
+
+#: ../install.py:1011
+msgid ""
+"When downloading the latest version, install the development version if it "
+"is newer than the stable version."
+msgstr ""
+
+#: ../install.py:1020
+msgid ""
+"Optional tar.gz Rapid Photo Downloader installer archive. If not specified, "
+"the latest version is downloaded from the Internet."
+msgstr ""
+
+#: ../install.py:1043
+msgid ""
+"Do not run the installer in the tar.gz Rapid Photo Downloader installer "
+"archive if it is newer than this version ({}). The default is to run "
+"whichever installer is newer."
+msgstr ""
+
+#: ../install.py:1050
+msgid ""
+"Uninstall Rapid Photo Downloader that was installed with pip, keeping its "
+"dependencies."
+msgstr ""
+
+#: ../install.py:1054
+msgid ""
+"Uninstall the dependencies installed by pip during Rapid Photo Downloader's "
+"installation, and Rapid Photo Downloader itself, then exit."
+msgstr ""
+
+#: ../install.py:1059
+msgid ""
+"Note: this will not uninstall any version of Rapid Photo Downloader "
+"installed by your Linux distribution's package manager."
+msgstr ""
+
+#: ../install.py:1066
+msgid ""
+"Dependencies will only be removed if they are not required by other programs."
+msgstr ""
+
+#: ../install.py:1072
+msgid ""
+"Note: this option will remove the dependencies regardless of whether they "
+"are required by another program pip has installed. Upgrade to pip 9.0 or "
+"above if you want to avoid this behavior. You can do so using the command "
+"'python3 -m pip install pip -U --user'. Also note that any version of Rapid "
+"Photo Downloader installed by your Linux distribution's package manager will "
+"not be uninstalled."
+msgstr ""
+
+#: ../install.py:1122
+msgid "Failed to download versions file"
+msgstr ""
+
+#: ../install.py:1126
+msgid "Got error code {} while accessing versions file"
+msgstr ""
+
+#: ../install.py:1234
+msgid ""
+"Sorry, could not locate installer. Please check your Internet connection and "
+"verify if you can reach https://www.damonlynch.net\n"
+"\n"
+"Exiting.\n"
+msgstr ""
+
+#: ../install.py:1408
+msgid "Installing application requirements..."
+msgstr ""
+
+#: ../install.py:1424
+msgid "Received error code"
+msgstr ""
+
+#: ../install.py:1425
+msgid "Failed to install application requirements: exiting"
+msgstr ""
+
+#: ../install.py:1428
+msgid "Installing application..."
+msgstr ""
+
+#: ../install.py:1441
+msgid "Failed to install application: exiting..."
+msgstr ""
+
+#: ../install.py:1465
+msgid ""
+"You may have to restart the computer to be able to run the program from the "
+"commmand line or application launcher."
+msgstr ""
+
+#: ../install.py:1476
+msgid "Do you want to install the application's man pages?"
+msgstr ""
+
+#: ../install.py:1477
+msgid "They will be installed into {}"
+msgstr ""
+
+#: ../install.py:1478 ../install.py:1483
+msgid "If you uninstall the application, remove these manpages yourself."
+msgstr ""
+
+#: ../install.py:1480
+msgid "Do want to install the man pages?"
+msgstr ""
+
+#: ../install.py:1482
+msgid "Installing man pages into {}"
+msgstr ""
+
+#: ../install.py:1499
+msgid "Failed to create man page directory: exiting"
+msgstr ""
+
+#: ../install.py:1511
+msgid "Failed to copy man page."
+msgstr ""
+
+#: ../install.py:1521
+msgid "(If a segmentation fault occurs at exit, you can ignore it...)"
+msgstr ""
+
+#: ../install.py:1534
+msgid ""
+"The python3 tool pip is required to uninstall a version of Rapid Photo "
+"Downloader that was installed with pip.\n"
+"Cannot continue. Exiting."
+msgstr ""
+
+#: ../install.py:1575
+msgid ""
+"Do not run this installer script as sudo / root user.\n"
+"Run it using the user who will run the program.\n"
+msgstr ""
+
+#: ../install.py:1585 ../install.py:1599
+msgid "Do not include any other command line arguments when specifying"
+msgstr ""
+
+#: ../install.py:1614
+msgid ""
+"Sorry, this installer does not support a custom python installation.\n"
+"Exiting..."
+msgstr ""
+
+#: ../install.py:1620
+msgid "Restarting script using system python..."
+msgstr ""
+
+#: ../install.py:1651
+msgid "Exiting..."
+msgstr ""
+
+#. Translators: do not translate the term python3-apt
+#: ../install.py:1670
+msgid "To continue, the package python3-apt must be installed."
+msgstr ""
 
-#. type: QPushButton
-#: ../raphodo/aboutdialog.py:217
+#: ../install.py:1689
+msgid ""
+"Install the following packages using your Linux distribution's standard "
+"package manager, and then rerun this installer"
+msgstr ""
+
+#: ../install.py:1698
+msgid ""
+"To run this program, programs to assist Python 3 and its package management "
+"must be installed."
+msgstr ""
+
+#. Translators: do not translate the terms Python 3, pip and setuptools
+#: ../install.py:1713
+msgid "Python 3's pip and setuptools must be upgraded for your user."
+msgstr ""
+
+#. Translators: do not translate the term python or requests
+#: ../install.py:1726
+msgid "Installing python requests"
+msgstr ""
+
+#: ../upgrade.py:79
+msgid "Upgrade Rapid Photo Downloader"
+msgstr ""
+
+#: ../upgrade.py:401 ../raphodo/viewutils.py:242
+msgid "&Cancel"
+msgstr ""
+
+#: ../upgrade.py:405
+msgid "&Upgrade"
+msgstr ""
+
+#: ../upgrade.py:410
+#, python-format
+msgid "Click the Upgrade button to upgrade to version %s."
+msgstr ""
+
+#: ../upgrade.py:413
+msgid "Click the Upgrade button to start the upgrade."
+msgstr ""
+
+#: ../upgrade.py:416 ../upgrade.py:422 ../raphodo/viewutils.py:241
+msgid "&Close"
+msgstr ""
+
+#: ../upgrade.py:417
+msgid "&Run"
+msgstr ""
+
+#: ../upgrade.py:447
+msgid "Close Rapid Photo Downloader before running this upgrade"
+msgstr ""
+
+#: ../upgrade.py:450
+msgid "Upgrade running..."
+msgstr ""
+
+#: ../upgrade.py:486
+#, python-format
+msgid ""
+"Successfully upgraded to %s. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:491
+msgid ""
+"Upgrade finished successfully. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:495
+msgid "Upgrade failed. Click Close to exit."
+msgstr ""
+
+#: ../upgrade.py:6967
+#, python-format
+msgid "Upgrading %s..."
+msgstr ""
+
+#: ../upgrade.py:6969
+msgid "Press any key to continue..."
+msgstr ""
+
+#: ../upgrade.py:6982
+msgid "Rapid Photo Downloader upgrade failed"
+msgstr ""
+
+#: ../upgrade.py:6984
+#, python-format
+msgid ""
+"The python package %s could not be updated. The upgrade cannot continue."
+msgstr ""
+
+#: ../raphodo/aboutdialog.py:225
 msgid "Credits"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:239
+#: ../raphodo/backuppanel.py:240
 msgid "Backups are not configured"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:241
+#: ../raphodo/backuppanel.py:242
 msgid "No backup devices detected"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:243
+#: ../raphodo/backuppanel.py:244
 msgid "Valid backup locations not yet specified"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:401
+#: ../raphodo/backuppanel.py:404
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
 msgstr ""
 
-#: ../raphodo/backuppanel.py:407
+#: ../raphodo/backuppanel.py:412
 msgid "Back up photos and videos when downloading"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:413
+#: ../raphodo/backuppanel.py:418
 msgid "Automatically detect backup devices"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:417
+#: ../raphodo/backuppanel.py:424
 msgid ""
-"Specify the folder in which backups are stored on the device."
-"<br><br><i>Note: the presence of a folder with this name is used to "
+"Specify the folder in which backups are stored on the "
+"device.<br><br><i>Note: the presence of a folder with this name is used to "
 "determine if 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 folder names. By "
 "adding both folders, the same device can be used to back up both photos and "
 "videos.</i>"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:428
+#: ../raphodo/backuppanel.py:439
 msgid "Photo folder name:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:433
+#: ../raphodo/backuppanel.py:444
 msgid "Video folder name:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:438 ../raphodo/nameeditor.py:883
+#: ../raphodo/backuppanel.py:449 ../raphodo/nameeditor.py:890
 #: ../raphodo/renamepanel.py:123
 msgid "Example:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:448
-msgid "If you disable automatic detection, choose the exact backup locations."
+#: ../raphodo/backuppanel.py:460
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
 
-#: ../raphodo/backuppanel.py:452
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:468
 msgid "Photo backup location:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:454
+#: ../raphodo/backuppanel.py:474
 msgid "Select Photo Backup Location"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:460
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:485
 msgid "Video backup location:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:462
+#: ../raphodo/backuppanel.py:491
 msgid "Select Video Backup Location"
 msgstr ""
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:564
+#: ../raphodo/backuppanel.py:595
 msgid "drive1"
 msgstr ""
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:567
+#: ../raphodo/backuppanel.py:598
 msgid "drive2"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:628
+#: ../raphodo/backuppanel.py:663
 msgid "Projected Backup Storage Use"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:632
+#: ../raphodo/backuppanel.py:669
 msgid "Backup Options"
 msgstr ""
 
 #. translators: refers to the video thumbnail file that some
 #. cameras generate -- it has a .THM file extension
-#: ../raphodo/copyfiles.py:476
+#: ../raphodo/copyfiles.py:491
 msgid "video THM"
 msgstr ""
 
-#: ../raphodo/copyfiles.py:482
+#: ../raphodo/copyfiles.py:497
 msgid "audio"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:78 ../raphodo/devicedisplay.py:1079
-#: ../raphodo/rpdfile.py:321
+#: ../raphodo/rpdfile.py:342
 #, python-format
 msgid "%(no_photos)s Photos"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:82 ../raphodo/devicedisplay.py:1081
-#: ../raphodo/rpdfile.py:316
+#: ../raphodo/rpdfile.py:333
 #, python-format
 msgid "%(no_videos)s Videos"
 msgstr ""
@@ -157,15 +517,15 @@ msgid "%(size_free)s free of %(size_total)s"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:190 ../raphodo/devicedisplay.py:993
-#: ../raphodo/rapid.py:1964 ../raphodo/rapid.py:2079 ../raphodo/rapid.py:5753
-#: ../raphodo/rpdfile.py:905
+#: ../raphodo/rapid.py:2023 ../raphodo/rapid.py:2151 ../raphodo/rapid.py:6043
+#: ../raphodo/rpdfile.py:930
 msgid "Photos"
 msgstr ""
 
 #. translators: the name of the Videos folder
 #: ../raphodo/destinationdisplay.py:191 ../raphodo/devicedisplay.py:994
-#: ../raphodo/rapid.py:1967 ../raphodo/rapid.py:2080 ../raphodo/rapid.py:5754
-#: ../raphodo/rpdfile.py:933 ../raphodo/storage.py:445
+#: ../raphodo/rapid.py:2028 ../raphodo/rapid.py:2152 ../raphodo/rapid.py:6044
+#: ../raphodo/rpdfile.py:958 ../raphodo/storage.py:449
 msgid "Videos"
 msgstr ""
 
@@ -173,7 +533,7 @@ msgstr ""
 msgid "Projected storage use after download"
 msgstr ""
 
-#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:516
+#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:521
 msgid "Custom..."
 msgstr ""
 
@@ -211,57 +571,58 @@ msgstr ""
 msgid "%s full"
 msgstr ""
 
-#: ../raphodo/devices.py:459
+#: ../raphodo/devices.py:463
 msgid "Cameras"
 msgstr ""
 
-#: ../raphodo/devices.py:460 ../raphodo/devices.py:920
-#: ../raphodo/preferencedialog.py:85 ../raphodo/rapid.py:1927
+#: ../raphodo/devices.py:464 ../raphodo/devices.py:927
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/rapid.py:1979
 msgid "Devices"
 msgstr ""
 
-#: ../raphodo/devices.py:720
+#: ../raphodo/devices.py:724
 #, python-format
 msgid "Downloading from %(device_names)s"
 msgstr ""
 
 #. Translators: e.g. Three Devices
-#: ../raphodo/devices.py:780
+#: ../raphodo/devices.py:784
 #, python-format
 msgid "%(no_devices)s %(device_type)s"
 msgstr ""
 
-#: ../raphodo/devices.py:905 ../raphodo/rapid.py:1764
+#: ../raphodo/devices.py:912 ../raphodo/rapid.py:1807
 msgid "Select Source"
 msgstr ""
 
-#: ../raphodo/devices.py:936 ../raphodo/devices.py:947
+#: ../raphodo/devices.py:943 ../raphodo/devices.py:954
 #, python-format
 msgid "%(device1)s + %(device2)s"
 msgstr ""
 
 #. Number of cameras e.g. 3 Cameras
-#: ../raphodo/devices.py:958
+#: ../raphodo/devices.py:965
 #, python-format
 msgid "%(no_cameras)s Cameras"
 msgstr ""
 
-#: ../raphodo/devices.py:963
+#: ../raphodo/devices.py:970
 #, python-format
 msgid "%(no_devices)s Devices"
 msgstr ""
 
 #. Translators: two folder names, separated by a plus sign
-#: ../raphodo/devices.py:1258
+#: ../raphodo/devices.py:1265
 #, python-format
 msgid "%s + %s"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:44
+#: ../raphodo/didyouknow.py:45
 msgid "Click on a file's checkbox to mark or unmark it for download."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:50
+#: ../raphodo/didyouknow.py:51
 msgid ""
 "Files that have already been downloaded are remembered. You can still mark "
 "previously downloaded files to download again, but they are unchecked by "
@@ -269,34 +630,67 @@ msgid ""
 "files that are yet to be downloaded."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:59
+#: ../raphodo/didyouknow.py:60
 msgid ""
 "If more than one file is selected, they'll all take the mark of the file "
 "whose checkbox was clicked, regardless of whether they previously had a "
 "checkmark or not."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:67
+#: ../raphodo/didyouknow.py:68
 msgid ""
 "Click on a device's checkbox to quickly mark or unmark all its files for "
 "downloading."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:74
+#: ../raphodo/didyouknow.py:75
+msgid ""
+"After a download finishes, an icon replaces the thumbnail's checkbox. The "
+"icon's color indicates whether the download was successful (green), had file "
+"renaming problems (yellow/orange), or failed (red)."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:83
+msgid ""
+"\n"
+"            In case of any problems, a red icon will appear at the bottom of "
+"the window\n"
+"            indicating how many error reports there are. Clicking on it "
+"opens the Error Report \n"
+"            window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:91
+msgid ""
+"\n"
+"            The Error Report window lists any problems encountered before, "
+"during or after the \n"
+"            download. An orange triangle represents a warning, a red circle "
+"indicates a failure, \n"
+"            and a black circle indicates more serious failures. You can "
+"click on the hyperlinks to \n"
+"            open its file or device in a file manager. You can also search "
+"the reports using the \n"
+"            search box in the lower left of the Error Report window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:103
 msgid ""
 "You can simultaneously download from multiple cameras, smartphones, memory "
 "cards, and hard drives&mdash;as many devices as your computer can handle at "
 "one time."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:81
+#: ../raphodo/didyouknow.py:110
 msgid ""
 "The <b>Timeline</b> groups photos and videos based on how much time elapsed "
 "between consecutive shots. Use it to identify photos and videos taken at "
 "different periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:88
+#: ../raphodo/didyouknow.py:117
 msgid ""
 "\n"
 "<p>In the illustration above, the first row of the Timeline is black because "
@@ -308,7 +702,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:99
+#: ../raphodo/didyouknow.py:128
 msgid ""
 "To view photos and videos for a particular time range, use the mouse "
 "(optionally in combination with the <tt>Shift</tt> or <tt>Ctrl</tt> keys) to "
@@ -316,20 +710,20 @@ msgid ""
 "the left side of the main window will be highlighted."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:106
+#: ../raphodo/didyouknow.py:135
 msgid ""
 "A download always includes all files that are checked for download, "
 "including those that are not currently displayed because the Timeline is "
 "being used."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:113
+#: ../raphodo/didyouknow.py:142
 msgid ""
 "You can hide or display the download sources by clicking on the name of the "
 "device you're downloading from at the top left of the program window."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:120
+#: ../raphodo/didyouknow.py:149
 msgid ""
 "\n"
 "          Thumbnails can be sorted using a variety of criteria:\n"
@@ -348,33 +742,33 @@ msgid ""
 "</ol> "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:137
+#: ../raphodo/didyouknow.py:166
 msgid ""
 "One of Rapid Photo Downloader's most useful features is its ability to "
 "automatically generate download subfolders and rename files as it downloads, "
 "using a scheme of your choosing."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:143
+#: ../raphodo/didyouknow.py:172
 msgid ""
 "To specify where you want your files downloaded and how you want them named, "
 "open the appropriate panel on the right-side of the application window: "
 "<b>Destination</b>, <b>Rename</b>, or <b>Job Code</b>."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:150
+#: ../raphodo/didyouknow.py:179
 msgid ""
 "\n"
 "When thinking about your download directory structure, keep in mind two "
 "different types\n"
 "of directory:\n"
 "<ol>\n"
-"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, &quot;"
-"Photos&quot;, or\n"
+"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, "
+"&quot;Photos&quot;, or\n"
 "&quot;Videos&quot;. This directory should already exist on your computer. In "
 "the illustration \n"
-"below, the destination folders are &quot;Pictures&quot; and &quot;"
-"Videos&quot;. The\n"
+"below, the destination folders are &quot;Pictures&quot; and "
+"&quot;Videos&quot;. The\n"
 "name of the destination folder is displayed in the grey bar directly above "
 "the folder tree, \n"
 "with a folder icon to its left and a gear icon to its far right.</li>\n"
@@ -387,7 +781,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:167
+#: ../raphodo/didyouknow.py:196
 msgid ""
 "\n"
 "You can download photos and videos to the same destination folder, or "
@@ -400,14 +794,14 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:177
+#: ../raphodo/didyouknow.py:206
 msgid ""
 "Automatically generated download subfolders can contain further "
 "automatically generated subfolders if need be. A common scheme is to create "
 "a year subfolder and then a series of year-month-day subfolders within it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:186
+#: ../raphodo/didyouknow.py:215
 msgid ""
 "\n"
 "Whenever possible, the program previews the download subfolders of photos "
@@ -425,7 +819,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:201
+#: ../raphodo/didyouknow.py:230
 msgid ""
 "\n"
 "Download subfolder names are typically generated using some or all of the "
@@ -449,7 +843,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:219
+#: ../raphodo/didyouknow.py:248
 msgid ""
 "\n"
 "To automatically create download subfolders as you download, \n"
@@ -459,7 +853,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:227
+#: ../raphodo/didyouknow.py:256
 msgid ""
 "\n"
 "Using the drop-down menu, select a built-in preset or click on <b>Custom</b> "
@@ -469,20 +863,20 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:237
+#: ../raphodo/didyouknow.py:266
 msgid ""
 "It's easy to download raw images into one folder, and jpeg images into "
 "another. Simply use the <b>Filename Extension</b> as part of your download "
 "subfolder generation scheme:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:242
+#: ../raphodo/didyouknow.py:271
 msgid ""
 "This illustration shows a saved custom preset named &quot;My custom "
 "preset&quot;."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:246
+#: ../raphodo/didyouknow.py:275
 msgid ""
 "\n"
 "You do not have to create nested download subfolders. This illustration "
@@ -493,7 +887,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:256
+#: ../raphodo/didyouknow.py:285
 msgid ""
 "\n"
 "Although there are many built-in date/time naming options, you may find that "
@@ -507,7 +901,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:265
+#: ../raphodo/didyouknow.py:294
 msgid ""
 "\n"
 "Read more about all the ways you can generate download subfolder names and "
@@ -517,7 +911,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:273
+#: ../raphodo/didyouknow.py:302
 msgid ""
 "\n"
 "<b>Job Codes</b> let you easily enter text that describes sets of photos and "
@@ -529,7 +923,7 @@ msgid ""
 "&quot;Green Bazaar&quot;: \n"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:282
+#: ../raphodo/didyouknow.py:311
 msgid ""
 "\n"
 "You can apply new or existing Job Codes before you start a download. If "
@@ -540,36 +934,36 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:291
+#: ../raphodo/didyouknow.py:320
 msgid "Look for hints to guide you when working with Job Codes:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:295
+#: ../raphodo/didyouknow.py:324
 msgid ""
 "Hints will vary depending on the context, such as when the mouse is hovering "
 "over a button."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:301
+#: ../raphodo/didyouknow.py:330
 msgid ""
 "\n"
 "When you give your photos and videos unique filenames, you'll never be "
 "confused as to \n"
 "which file is which. Using <b>sequence numbers</b> to make filenames unique "
 "is highly \n"
-"recommended!.\n"
+"recommended!\n"
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:309
+#: ../raphodo/didyouknow.py:338
 msgid ""
 "\n"
 "<p>Four types of sequence values are available to help you assign unique "
 "names to your photos and \n"
 "videos:\n"
 "<ol>\n"
-"<li><b>Downloads today</b>: tracks downloads completed during that day.</"
-"li>\n"
+"<li><b>Downloads today</b>: tracks downloads completed during that "
+"day.</li>\n"
 "<li><b>Stored number</b>: similar to Downloads today, but it is remembered "
 "from the last time the  \n"
 "program was run.</li>\n"
@@ -583,7 +977,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:327
+#: ../raphodo/didyouknow.py:356
 msgid ""
 "\n"
 "The <b>Rename</b> panel allows you to configure file renaming. To rename "
@@ -592,7 +986,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:334
+#: ../raphodo/didyouknow.py:363
 msgid ""
 "\n"
 "<p>The <b>Synchronize RAW + JPEG</b> option is useful if you use the RAW + "
@@ -611,7 +1005,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:348
+#: ../raphodo/didyouknow.py:377
 msgid ""
 "\n"
 "You can have your photos and videos backed up to multiple locations as they "
@@ -622,13 +1016,13 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:356
+#: ../raphodo/didyouknow.py:385
 msgid ""
 "In this example, the drive <b>photobackup</b> does not contain a folder "
 "named <tt>Videos</tt>, so videos will not be backed up to it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:362
+#: ../raphodo/didyouknow.py:391
 msgid ""
 "\n"
 "Several of the program's preferences can be set from the command line, "
@@ -639,7 +1033,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:372
+#: ../raphodo/didyouknow.py:396
+msgid "You can also import program preferences from the older 0.4 version."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:401
 msgid ""
 "\n"
 "Rapid Photo Downloader deals with three types of cache:\n"
@@ -649,8 +1047,8 @@ msgid ""
 "memory cards, and other devices.</li>\n"
 "<li>A <b>temporary cache</b> of files downloaded from a camera, one for "
 "photos and another for \n"
-"videos. They are located in temporary subfolders in the download destination."
-"</li>\n"
+"videos. They are located in temporary subfolders in the download "
+"destination.</li>\n"
 "<li>The <b>desktop's thumbnail cache</b>, in which Rapid Photo Downloader "
 "stores thumbnails of \n"
 "RAW and TIFF photos once they have been downloaded. File browsers like Gnome "
@@ -665,23 +1063,23 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:431
+#: ../raphodo/didyouknow.py:460
 msgid "Tip of the Day"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:439
+#: ../raphodo/didyouknow.py:468
 msgid "Did you know...?"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:466
+#: ../raphodo/didyouknow.py:495
 msgid "Show tips on startup"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:470
+#: ../raphodo/didyouknow.py:499
 msgid "&Next"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:471
+#: ../raphodo/didyouknow.py:500
 msgid "&Previous"
 msgstr ""
 
@@ -788,68 +1186,68 @@ msgstr ""
 msgid "%(days)d days, %(hours)d hours"
 msgstr ""
 
-#: ../raphodo/errorlog.py:65
+#: ../raphodo/errorlog.py:66
 msgid "Find"
 msgstr ""
 
-#: ../raphodo/errorlog.py:135
+#: ../raphodo/errorlog.py:136
 msgid "Error Reports - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/errorlog.py:170
+#: ../raphodo/errorlog.py:171
 msgid "Find in reports"
 msgstr ""
 
-#: ../raphodo/errorlog.py:187
+#: ../raphodo/errorlog.py:188
 msgid "Find the previous occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:192
+#: ../raphodo/errorlog.py:193
 msgid "Find the next occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:194
+#: ../raphodo/errorlog.py:195
 msgid "&Highlight All"
 msgstr ""
 
-#: ../raphodo/errorlog.py:195
+#: ../raphodo/errorlog.py:196
 msgid "Highlight all occurrences of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:196
+#: ../raphodo/errorlog.py:197
 msgid "&Match Case"
 msgstr ""
 
-#: ../raphodo/errorlog.py:197
+#: ../raphodo/errorlog.py:198
 msgid "Search with case sensitivity"
 msgstr ""
 
-#: ../raphodo/errorlog.py:198
+#: ../raphodo/errorlog.py:199
 msgid "&Whole Words"
 msgstr ""
 
-#: ../raphodo/errorlog.py:199
+#: ../raphodo/errorlog.py:200
 msgid "Search whole words only"
 msgstr ""
 
-#: ../raphodo/errorlog.py:209 ../raphodo/errorlog.py:341
+#: ../raphodo/errorlog.py:210 ../raphodo/errorlog.py:345
 #, python-format
 msgid "%s of %s matches"
 msgstr ""
 
-#: ../raphodo/errorlog.py:228
+#: ../raphodo/errorlog.py:232
 msgid "Clear"
 msgstr ""
 
-#: ../raphodo/errorlog.py:328
+#: ../raphodo/errorlog.py:332
 msgid "Phrase not found"
 msgstr ""
 
-#: ../raphodo/errorlog.py:487
+#: ../raphodo/errorlog.py:491
 msgid "Search pending..."
 msgstr ""
 
-#: ../raphodo/errorlog.py:535
+#: ../raphodo/errorlog.py:539
 msgid ""
 "The number of new entries added to the Error Report since it was last open. "
 "Click to open the Error Report."
@@ -863,8 +1261,8 @@ msgstr ""
 #, python-brace-format
 msgid ""
 "<b>A problem occurred in Rapid Photo Downloader</b><br><br>\n"
-"    Please report the problem at <a href=\"{website}\">{website}</a>."
-"<br><br>\n"
+"    Please report the problem at <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
 "    Attach the log file <i>{log_file}</i> to your bug report (click\n"
 "    <a href=\"{log_path}\">here</a> to open the log directory).<br><br>If "
 "the same problem occurs\n"
@@ -885,7 +1283,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1601
+#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1643
 msgid "Open in File Browser..."
 msgstr ""
 
@@ -903,531 +1301,531 @@ msgstr ""
 msgid "%s (location does not exist)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:186
+#: ../raphodo/generatenameconfig.py:190
 msgid "Date time"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:187
+#: ../raphodo/generatenameconfig.py:191
 msgid "Text"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:188 ../raphodo/rapid.py:2053
+#: ../raphodo/generatenameconfig.py:192 ../raphodo/rapid.py:2125
 msgid "Filename"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:189 ../raphodo/preferencedialog.py:488
+#: ../raphodo/generatenameconfig.py:193 ../raphodo/preferencedialog.py:724
 msgid "Metadata"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:190
+#: ../raphodo/generatenameconfig.py:194
 msgid "Sequences"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: ../raphodo/generatenameconfig.py:193
+#: ../raphodo/generatenameconfig.py:197
 msgid "Job code"
 msgstr "کد دستور"
 
-#: ../raphodo/generatenameconfig.py:194
+#: ../raphodo/generatenameconfig.py:198
 msgid "Image date"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:195
+#: ../raphodo/generatenameconfig.py:199
 msgid "Video date"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:196
+#: ../raphodo/generatenameconfig.py:200
 msgid "Today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:197
+#: ../raphodo/generatenameconfig.py:201
 msgid "Yesterday"
 msgstr ""
 
 #. Translators: Download time is the time and date that the download started (when the
 #. user clicked the Download button)
-#: ../raphodo/generatenameconfig.py:200
+#: ../raphodo/generatenameconfig.py:204
 msgid "Download time"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:203
+#: ../raphodo/generatenameconfig.py:207
 msgid "Name"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:206 ../raphodo/rapid.py:2054
+#: ../raphodo/generatenameconfig.py:210 ../raphodo/rapid.py:2126
 msgid "Extension"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:209
+#: ../raphodo/generatenameconfig.py:213
 msgid "Image number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:210
+#: ../raphodo/generatenameconfig.py:214
 msgid "Video number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:213
+#: ../raphodo/generatenameconfig.py:217
 msgid "Aperture"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:216
+#: ../raphodo/generatenameconfig.py:220
 msgid "ISO"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:219
+#: ../raphodo/generatenameconfig.py:223
 msgid "Exposure time"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:222
+#: ../raphodo/generatenameconfig.py:226
 msgid "Focal length"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:225
+#: ../raphodo/generatenameconfig.py:229
 msgid "Camera make"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:228
+#: ../raphodo/generatenameconfig.py:232
 msgid "Camera model"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:231
+#: ../raphodo/generatenameconfig.py:235
 msgid "Short camera model"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:234
+#: ../raphodo/generatenameconfig.py:238
 msgid "Hyphenated short camera model"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:237
+#: ../raphodo/generatenameconfig.py:241
 msgid "Serial number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:240
+#: ../raphodo/generatenameconfig.py:244
 msgid "Shutter count"
 msgstr ""
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: ../raphodo/generatenameconfig.py:242
+#: ../raphodo/generatenameconfig.py:246
 msgid "File number"
 msgstr ""
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:244
+#: ../raphodo/generatenameconfig.py:248
 msgid "Folder only"
 msgstr ""
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:246
+#: ../raphodo/generatenameconfig.py:250
 msgid "Folder and file"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:249
+#: ../raphodo/generatenameconfig.py:253
 msgid "Owner name"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:250
+#: ../raphodo/generatenameconfig.py:254
 msgid "Codec"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:251
+#: ../raphodo/generatenameconfig.py:255
 msgid "Width"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:252
+#: ../raphodo/generatenameconfig.py:256
 msgid "Height"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:253
+#: ../raphodo/generatenameconfig.py:257
 msgid "Length"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:254
+#: ../raphodo/generatenameconfig.py:258
 msgid "Frames Per Second"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:255
+#: ../raphodo/generatenameconfig.py:259
 msgid "Artist"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:256
+#: ../raphodo/generatenameconfig.py:260
 msgid "Copyright"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:259
+#: ../raphodo/generatenameconfig.py:263
 msgid "Downloads today"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:262
+#: ../raphodo/generatenameconfig.py:266
 msgid "Session number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:265
+#: ../raphodo/generatenameconfig.py:269
 msgid "Subfolder number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:268
+#: ../raphodo/generatenameconfig.py:272
 msgid "Stored number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: ../raphodo/generatenameconfig.py:271
+#: ../raphodo/generatenameconfig.py:275
 msgid "Sequence letter"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:274
+#: ../raphodo/generatenameconfig.py:278
 msgid "All digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:277
+#: ../raphodo/generatenameconfig.py:281
 msgid "Last digit"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:280
+#: ../raphodo/generatenameconfig.py:284
 msgid "Last 2 digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:283
+#: ../raphodo/generatenameconfig.py:287
 msgid "Last 3 digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:286
+#: ../raphodo/generatenameconfig.py:290
 msgid "Last 4 digits"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:289
+#: ../raphodo/generatenameconfig.py:293
 msgid "Original Case"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:292
+#: ../raphodo/generatenameconfig.py:296
 msgid "UPPERCASE"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:295
+#: ../raphodo/generatenameconfig.py:299
 msgid "lowercase"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:296
+#: ../raphodo/generatenameconfig.py:300
 msgid "One digit"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:297
+#: ../raphodo/generatenameconfig.py:301
 msgid "Two digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:298
+#: ../raphodo/generatenameconfig.py:302
 msgid "Three digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:299
+#: ../raphodo/generatenameconfig.py:303
 msgid "Four digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:300
+#: ../raphodo/generatenameconfig.py:304
 msgid "Five digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:301
+#: ../raphodo/generatenameconfig.py:305
 msgid "Six digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:302
+#: ../raphodo/generatenameconfig.py:306
 msgid "Seven digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:305
+#: ../raphodo/generatenameconfig.py:309
 msgid "Subseconds"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:308 ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:312 ../raphodo/generatenameconfig.py:393
 msgid "YYYYMMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:311 ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:315 ../raphodo/generatenameconfig.py:394
 msgid "YYYY-MM-DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:314 ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:318 ../raphodo/generatenameconfig.py:395
 msgid "YYYY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:317
+#: ../raphodo/generatenameconfig.py:321
 msgid "YYMMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:320
+#: ../raphodo/generatenameconfig.py:324
 msgid "YY-MM-DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:323
+#: ../raphodo/generatenameconfig.py:327
 msgid "YY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:326
+#: ../raphodo/generatenameconfig.py:330
 msgid "MMDDYYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:329
+#: ../raphodo/generatenameconfig.py:333
 msgid "MMDDYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:332
+#: ../raphodo/generatenameconfig.py:336
 msgid "MMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:335
+#: ../raphodo/generatenameconfig.py:339
 msgid "DDMMYYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:338
+#: ../raphodo/generatenameconfig.py:342
 msgid "DDMMYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:341 ../raphodo/generatenameconfig.py:389
-#: ../raphodo/generatenameconfig.py:390 ../raphodo/generatenameconfig.py:391
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:345 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:394 ../raphodo/generatenameconfig.py:395
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:397
 msgid "YYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:344
+#: ../raphodo/generatenameconfig.py:348
 msgid "YY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:347
+#: ../raphodo/generatenameconfig.py:351
 msgid "MM"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:350
+#: ../raphodo/generatenameconfig.py:354
 msgid "DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:353
+#: ../raphodo/generatenameconfig.py:357
 msgid "Month (full)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:356
+#: ../raphodo/generatenameconfig.py:360
 msgid "Month (abbreviated)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:359
+#: ../raphodo/generatenameconfig.py:363
 msgid "HHMMSS"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:362
+#: ../raphodo/generatenameconfig.py:366
 msgid "HHMM"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:365
+#: ../raphodo/generatenameconfig.py:369
 msgid "HH-MM-SS"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:368
+#: ../raphodo/generatenameconfig.py:372
 msgid "HH-MM"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:371
+#: ../raphodo/generatenameconfig.py:375
 msgid "HH"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:374
+#: ../raphodo/generatenameconfig.py:378
 msgid "MM (minutes)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:377
+#: ../raphodo/generatenameconfig.py:381
 msgid "SS"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:393
 msgid "Date"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:394
 msgid "Date (hyphens)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:395
 msgid "Date (underscores)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:438
-#: ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:442
+#: ../raphodo/generatenameconfig.py:537
 msgid "Date and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392
+#: ../raphodo/generatenameconfig.py:396
 msgid "YYYYMM_Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "Date and Job Code Subfolder"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "YYYYMM"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393 ../raphodo/jobcodepanel.py:198
-#: ../raphodo/nameeditor.py:827 ../raphodo/rapid.py:1809
+#: ../raphodo/generatenameconfig.py:397 ../raphodo/jobcodepanel.py:199
+#: ../raphodo/nameeditor.py:833 ../raphodo/rapid.py:1852
 #: ../raphodo/renamepanel.py:83 ../raphodo/renamepanel.py:241
 msgid "Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:433 ../raphodo/generatenameconfig.py:512
+#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:532
 msgid "Original Filename"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "Date-Time and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "YYYYMMDD-HHMM-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "Date and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "YYYYMMDD-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "Date-Time and Image number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "YYYYMMDD-1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "Date-Time and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "YYYYMMDD-HHMM-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:442 ../raphodo/generatenameconfig.py:537
 msgid "YYYYMMDD-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "Date-Time and Video number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "YYYYMMDD_1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "Resolution"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "YYYYMMDD-HHMM-1-1920x1080"
 msgstr ""
 
@@ -1486,76 +1884,77 @@ msgstr ""
 msgid "&Remember this choice"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:185
+#: ../raphodo/jobcodepanel.py:186
 msgid ""
 "Select photos and videos to be able to apply a new or existing Job Code to "
 "them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:186
-msgid "The new Job Code will be applied to all selected photos and/or videos."
+#: ../raphodo/jobcodepanel.py:187
+msgid ""
+"The new Job Code will be applied to all selected photos and/or videos."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:187
+#: ../raphodo/jobcodepanel.py:188
 msgid ""
 "Click the Apply button to apply the current Job Code to all selected photos "
 "and/or videos. You can also simply double click the Job Code."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:189
+#: ../raphodo/jobcodepanel.py:190
 msgid ""
 "Removing a Job Code removes it only from the list of saved Job Codes, not "
 "from any photos or videos that it may have been applied to."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:191
+#: ../raphodo/jobcodepanel.py:192
 msgid ""
 "If you want to use Job Codes, configure file renaming or destination "
 "subfolder names to use them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:197
+#: ../raphodo/jobcodepanel.py:198
 msgid "Last Used"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:202
+#: ../raphodo/jobcodepanel.py:203
 msgid "Job Code Sort:"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:205 ../raphodo/rapid.py:2061
+#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2133
 msgid "Ascending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2062
+#: ../raphodo/jobcodepanel.py:207 ../raphodo/rapid.py:2134
 msgid "Descending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:216
+#: ../raphodo/jobcodepanel.py:217
 msgid "&New..."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:220
+#: ../raphodo/jobcodepanel.py:221
 msgid "&Apply"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:224
+#: ../raphodo/jobcodepanel.py:225
 msgid "&Remove"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:228 ../raphodo/preferencedialog.py:125
-#: ../raphodo/preferencedialog.py:154 ../raphodo/preferencedialog.py:433
+#: ../raphodo/jobcodepanel.py:229 ../raphodo/preferencedialog.py:200
+#: ../raphodo/preferencedialog.py:229 ../raphodo/preferencedialog.py:531
 msgid "Remove All"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:427
+#: ../raphodo/jobcodepanel.py:428
 msgid "Do you really want to remove all the Job Codes?"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:429
+#: ../raphodo/jobcodepanel.py:430
 msgid "Remove all Job Codes"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:492
+#: ../raphodo/jobcodepanel.py:493
 msgid "Job Codes"
 msgstr ""
 
@@ -1566,42 +1965,58 @@ msgstr ""
 msgid "<i><b>Hint:</b> %(message)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:418 ../raphodo/nameeditor.py:432
+#: ../raphodo/nameeditor.py:423 ../raphodo/nameeditor.py:437
 #, python-format
 msgid "%(description)s - %(elements)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:512
+#: ../raphodo/nameeditor.py:517
 msgid "Save New Custom Preset..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:513
+#: ../raphodo/nameeditor.py:518
 msgid "Remove All Custom Presets..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:559
+#: ../raphodo/nameeditor.py:564
 msgid "(New Custom Preset)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:576
+#: ../raphodo/nameeditor.py:581
 #, python-format
 msgid "%s (edited)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:579 ../raphodo/nameeditor.py:1370
+#: ../raphodo/nameeditor.py:584 ../raphodo/nameeditor.py:1379
 #, python-format
 msgid "Update Custom Preset \"%s\""
 msgstr ""
 
-#: ../raphodo/nameeditor.py:667
+#: ../raphodo/nameeditor.py:672
 msgid "Save New Custom Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:675
+#: ../raphodo/nameeditor.py:680
 msgid "Preset Name:"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:836
+#: ../raphodo/nameeditor.py:799
+msgid "Photo Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:805
+msgid "Video Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:811
+msgid "Photo Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:817
+msgid "Video Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:842
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>There is insufficient data to "
 "fully generate the name. Please use other renaming options.</i>"
@@ -1610,7 +2025,7 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees.
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:846
+#: ../raphodo/nameeditor.py:853
 #, python-format
 msgid "The character</i> %(separator)s <i>creates a new subfolder level."
 msgstr ""
@@ -1618,50 +2033,50 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:851
+#: ../raphodo/nameeditor.py:858
 #, python-format
 msgid ""
 "There is no need start or end with the folder separator </i> "
 "%(separator)s<i>, because it is added automatically."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:859
+#: ../raphodo/nameeditor.py:866
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>Unique filenames may not be "
 "generated. Make filenames unique by using Sequence values.</i>"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:882 ../raphodo/renamepanel.py:121
+#: ../raphodo/nameeditor.py:889 ../raphodo/renamepanel.py:121
 msgid "Preset:"
 msgstr ""
 
 #. Translators: appears in a combobox, e.g. Image Date (YYYY)
-#: ../raphodo/nameeditor.py:959 ../raphodo/nameeditor.py:980
+#: ../raphodo/nameeditor.py:966 ../raphodo/nameeditor.py:987
 #, python-brace-format
 msgid "{choice} ({variant})"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1005 ../raphodo/preferencedialog.py:530
+#: ../raphodo/nameeditor.py:1012 ../raphodo/preferencedialog.py:783
 msgid "Get help online..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1025
+#: ../raphodo/nameeditor.py:1034
 msgid "Insert"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1351
+#: ../raphodo/nameeditor.py:1360
 msgid "Save Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1356
+#: ../raphodo/nameeditor.py:1365
 msgid ""
-"<b>Do you want to save the changes in a new custom preset?</"
-"b><br><br>Creating a custom preset is not required, but can help you keep "
-"organized.<br><br>The changes to the preferences will still be applied "
-"regardless of whether you create a new custom preset or not."
+"<b>Do you want to save the changes in a new custom "
+"preset?</b><br><br>Creating a custom preset is not required, but can help "
+"you keep organized.<br><br>The changes to the preferences will still be "
+"applied regardless of whether you create a new custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1365
+#: ../raphodo/nameeditor.py:1374
 msgid ""
 "<b>Do you want to save the changes in a custom preset?</b><br><br>If you "
 "like, you can create a new custom preset or update the existing custom "
@@ -1669,136 +2084,167 @@ msgid ""
 "regardless of whether you save a custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1372
+#: ../raphodo/nameeditor.py:1381
 msgid "Save New Custom Preset"
 msgstr ""
 
-#: ../raphodo/newversion.py:306
+#: ../raphodo/newversion.py:312
 msgid "Checking for new version..."
 msgstr ""
 
-#: ../raphodo/newversion.py:307
+#: ../raphodo/newversion.py:313
 msgid "You are running the latest version."
 msgstr ""
 
-#: ../raphodo/newversion.py:308
+#: ../raphodo/newversion.py:314
 msgid "Failed to contact the update server."
 msgstr ""
 
-#: ../raphodo/newversion.py:310
+#: ../raphodo/newversion.py:316
 #, python-format
 msgid "A new version of Rapid Photo Downloader (%s) is available."
 msgstr ""
 
-#: ../raphodo/newversion.py:312
+#: ../raphodo/newversion.py:318
 msgid "Do you want to download the new version?"
 msgstr ""
 
-#: ../raphodo/newversion.py:313
+#: ../raphodo/newversion.py:319
 #, python-format
 msgid "Changes in the new release can be viewed <a href=\"%s\">here</a>."
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the s key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:340 ../raphodo/newversion.py:353
+#: ../raphodo/newversion.py:348 ../raphodo/newversion.py:363
 msgid "&Skip this release"
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the o key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:356
+#: ../raphodo/newversion.py:366
 msgid "&Open Download Page"
 msgstr ""
 
-#: ../raphodo/newversion.py:376
+#: ../raphodo/newversion.py:386
 msgid "Rapid Photo Downloader updates"
 msgstr ""
 
 #. Translators: shows how much of a file has been downloaded e.g  123 KB of 1.3 MB
-#: ../raphodo/newversion.py:478
+#: ../raphodo/newversion.py:488
 #, python-format
 msgid "%(downloaded)s of %(total)s"
 msgstr ""
 
-#: ../raphodo/newversion.py:495
+#: ../raphodo/newversion.py:507
 msgid "Downloading..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:76
+#: ../raphodo/preferencedialog.py:86
 msgid "Preferences"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Automation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85 ../raphodo/preferencedialog.py:343
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/preferencedialog.py:428
 msgid "Error Handling"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:109
+msgid "Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:109 ../raphodo/preferencedialog.py:119
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:94
+#: ../raphodo/preferencedialog.py:147
 msgid "Device Scanning"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:96
+#: ../raphodo/preferencedialog.py:148
 msgid "Scan only external devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:98
+#: ../raphodo/preferencedialog.py:150
 msgid ""
 "Scan for photos and videos only on devices that are external to the "
 "computer,\n"
 "including cameras, memory cards, external hard drives, and USB flash drives."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:102
-msgid "Scan non-camera devices lacking a DCIM folder"
+#: ../raphodo/preferencedialog.py:153
+msgid "Scan only specific folders on devices"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:155
+msgid ""
+"Scan for photos and videos only in the folders specified below (except "
+"paths\n"
+"specified in Ignored Paths).\n"
+"\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:161
+msgid "Folders to scan:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:164
+msgid ""
+"Folders at the base level of device file systems that will be scanned\n"
+"for photos and videos."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:167 ../raphodo/preferencedialog.py:219
+msgid "Add..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:104
+#: ../raphodo/preferencedialog.py:169
 msgid ""
-"Scan the entirety of a device for photos and videos, irrespective of whether "
-"it contains a DCIM folder,\n"
-"as opposed to only scanning within a DCIM folder.\n"
+"Add a folder to the list of folders to scan for photos and videos.\n"
 "\n"
-"Changing this setting causes all devices to be scanned again.\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:172 ../raphodo/preferencedialog.py:198
+#: ../raphodo/preferencedialog.py:224 ../raphodo/preferencedialog.py:529
+msgid "Remove"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:174
+msgid ""
+"Remove a folder from the list of folders to scan for photos and videos.\n"
 "\n"
-"Note: With cameras, only the DCIM folder is scanned."
+"Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:116
+#: ../raphodo/preferencedialog.py:191
 msgid "Devices that have been set to automatically ignore or download from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:117
+#: ../raphodo/preferencedialog.py:192
 msgid "Remembered Devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:121
+#: ../raphodo/preferencedialog.py:196
 msgid ""
 "Remove a device from the list of devices to automatically ignore or download "
 "from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:123 ../raphodo/preferencedialog.py:149
-#: ../raphodo/preferencedialog.py:431
-msgid "Remove"
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:127
+#: ../raphodo/preferencedialog.py:202
 msgid ""
 "Clear the list of devices from which to automatically ignore or download "
 "from.\n"
@@ -1806,315 +2252,436 @@ msgid ""
 "Note: Changes take effect when the computer is next scanned for devices."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:140
+#: ../raphodo/preferencedialog.py:215
 msgid "Ignored Paths"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:141
+#: ../raphodo/preferencedialog.py:216
 msgid ""
 "The end part of a path that should never be scanned for photos or videos."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:144
-msgid "Add..."
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:146
+#: ../raphodo/preferencedialog.py:221
 msgid ""
 "Add a path to the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:151
+#: ../raphodo/preferencedialog.py:226
 msgid ""
 "Remove a path from the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:156
+#: ../raphodo/preferencedialog.py:231
 msgid ""
 "Clear the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:164
+#: ../raphodo/preferencedialog.py:239
 msgid ""
-"Use python-style <a href=\"http://damonlynch.net/rapid/documentation/"
-"#regularexpressions\">regular expressions</a>"
+"Use python-style <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">regula"
+"r expressions</a>"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:168
+#: ../raphodo/preferencedialog.py:243
 msgid ""
 "Use regular expressions in the list of ignored paths.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:208
+#: ../raphodo/preferencedialog.py:283
 msgid "Program Automation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:209
+#: ../raphodo/preferencedialog.py:284
 msgid "Start downloading at program startup"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:210
+#: ../raphodo/preferencedialog.py:285
 msgid "Start downloading upon device insertion"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:211
+#: ../raphodo/preferencedialog.py:286
 msgid "Unmount (eject) device upon download completion"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:212
+#: ../raphodo/preferencedialog.py:287
 msgid "Exit program when download completes"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:213
+#: ../raphodo/preferencedialog.py:288
 msgid "Exit program even if download had warnings or errors"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:240
+#: ../raphodo/preferencedialog.py:315
 msgid "Thumbnail Generation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:241
+#: ../raphodo/preferencedialog.py:316
 msgid "Generate thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:242
+#: ../raphodo/preferencedialog.py:318
 msgid "Generate thumbnails to show in the main program window"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:244
+#: ../raphodo/preferencedialog.py:320
 msgid "Cache thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:245
+#: ../raphodo/preferencedialog.py:323
 msgid ""
 "Save thumbnails shown in the main program window in a thumbnail cache unique "
 "to Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:247
+#: ../raphodo/preferencedialog.py:327
 msgid "Generate system thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:248
+#: ../raphodo/preferencedialog.py:330
 msgid ""
 "While downloading, save thumbnails that can be used by desktop file managers "
 "and other programs"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:255
+#: ../raphodo/preferencedialog.py:339
 msgid "Number of CPU cores used to generate thumbnails."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:256
+#: ../raphodo/preferencedialog.py:340
 msgid "CPU cores:"
 msgstr ""
 
 #. Translators: the * acts as an asterisk to denote a reference to an annotation
 #. such as '* Takes effect upon program restart'
-#: ../raphodo/preferencedialog.py:271 ../raphodo/preferencedialog.py:317
+#: ../raphodo/preferencedialog.py:355 ../raphodo/preferencedialog.py:401
 msgid "*"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:294
+#: ../raphodo/preferencedialog.py:378
 msgid "Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:296
+#: ../raphodo/preferencedialog.py:380
 msgid "Calculating..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:302
+#: ../raphodo/preferencedialog.py:386
 msgid "days"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:303
+#: ../raphodo/preferencedialog.py:387
 msgid "forever"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:308
+#: ../raphodo/preferencedialog.py:392
 msgid "Cache size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:310
+#: ../raphodo/preferencedialog.py:394
 msgid "Number of thumbnails:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:312
+#: ../raphodo/preferencedialog.py:396
 msgid "Database size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:314
+#: ../raphodo/preferencedialog.py:398
 msgid "Cache unaccessed thumbnails for:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:322
+#: ../raphodo/preferencedialog.py:406
 msgid "Purge Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:323
+#: ../raphodo/preferencedialog.py:408
 msgid "Optimize Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:336
+#: ../raphodo/preferencedialog.py:421
 msgid "* Takes effect upon program restart"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:346
+#: ../raphodo/preferencedialog.py:431
 msgid "Skip download"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:347
+#: ../raphodo/preferencedialog.py:432
 msgid "Don't download the file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:348
+#: ../raphodo/preferencedialog.py:433
 msgid "Add unique identifier"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:349
+#: ../raphodo/preferencedialog.py:436
 msgid ""
 "Add an identifier like _1 or _2 to the end of the filename, immediately "
 "before the file's extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:355
+#: ../raphodo/preferencedialog.py:444
 msgid "Overwrite"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:356
+#: ../raphodo/preferencedialog.py:445
 msgid "Overwrite the previously backed up file"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:357
+#: ../raphodo/preferencedialog.py:446
 msgid "Skip"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:358
+#: ../raphodo/preferencedialog.py:448
 msgid "Don't overwrite the backup file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:364
+#: ../raphodo/preferencedialog.py:455
 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 identifier:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:378
+#: ../raphodo/preferencedialog.py:464
+msgid ""
+"Using sequence numbers to automatically generate unique filenames is "
+"strongly recommended. Configure file renaming in the Rename panel in the "
+"main window."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:473
 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 ""
 
-#: ../raphodo/preferencedialog.py:398
+#: ../raphodo/preferencedialog.py:494
 msgid "Program Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:399
+#: ../raphodo/preferencedialog.py:495
 msgid "Show a warning when:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:402
+#: ../raphodo/preferencedialog.py:498
 msgid "Downloading files currently not displayed"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:403
+#: ../raphodo/preferencedialog.py:499
 msgid ""
 "Warn when about to download files that are not displayed in the main window."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:405
+#: ../raphodo/preferencedialog.py:501
 msgid "Backup destinations are missing"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:406
-msgid "Warn before starting a download if it is not possible to back up files."
+#: ../raphodo/preferencedialog.py:502
+msgid ""
+"Warn before starting a download if it is not possible to back up files."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:408
+#: ../raphodo/preferencedialog.py:504
 msgid "Program libraries are missing or broken"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:409
+#: ../raphodo/preferencedialog.py:505
 msgid ""
 "Warn if a software library used by Rapid Photo Downloader is missing or not "
 "functioning."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:412
+#: ../raphodo/preferencedialog.py:508
 msgid "Filesystem metadata cannot be set"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:413
+#: ../raphodo/preferencedialog.py:509
 msgid ""
 "Warn if there is an error setting a file's filesystem metadata, such as its "
 "modification time."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:416
+#: ../raphodo/preferencedialog.py:512
 msgid "Encountering unhandled files"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:417
+#: ../raphodo/preferencedialog.py:513
 msgid ""
 "Warn after scanning a device or this computer if there are unrecognized "
 "files that will not be included in the download."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:420
+#: ../raphodo/preferencedialog.py:517
 msgid "Do not warn about unhandled files with extensions:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:424
+#: ../raphodo/preferencedialog.py:522
 msgid ""
 "File extensions are case insensitive and do not need to include the leading "
 "dot."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:427
+#: ../raphodo/preferencedialog.py:525
 msgid "Add"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:428
+#: ../raphodo/preferencedialog.py:526
 msgid ""
 "Add a file extension to the list of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:430
+#: ../raphodo/preferencedialog.py:528
 msgid ""
 "Remove a file extension from the list of unhandled file types to not warn "
 "about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:434
+#: ../raphodo/preferencedialog.py:532
 msgid ""
 "Clear the list of file extensions of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:469
+#: ../raphodo/preferencedialog.py:568
+msgid "Photo and Video Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:571
+msgid "Consolidate files across devices and downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:574
+msgid ""
+"Analyze the results of device scans looking for duplicate files and matching "
+"RAW and JPEG pairs,\n"
+"comparing them across multiple devices and download sessions."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:580
+msgid "Treat matching RAW and JPEG files as:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:581
+msgid "One photo"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:582
+msgid "Two photos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:584
+msgid ""
+"Display matching pairs of RAW and JPEG photos as one photo, and if marked, "
+"download both."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:589
+msgid ""
+"Display matching pairs of RAW and JPEG photos as two different photos. You "
+"can still synchronize their sequence numbers."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:598
+msgid "With matching RAW and JPEG photos:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:600
+msgid "Do not mark JPEG for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:601
+msgid "Do not mark RAW for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:602
+msgid "Mark both for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:609
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"JPEG for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:614
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"RAW for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:619
+msgid ""
+"When matching RAW and JPEG photos are found, automatically mark both for "
+"download."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:625
+msgid ""
+"If you disable file consolidation, choose what to do when a download device "
+"is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:631
+msgid ""
+"When a download device is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:642
+msgid "Clear completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:643
+msgid "Keep displaying completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:644
+msgid "Prompt for what to do"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:649
+msgid ""
+"Automatically clear the display of completed downloads whenever a new "
+"download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:654
+msgid ""
+"Keep displaying completed downloads whenever a new download device is "
+"inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:658
+msgid ""
+"Prompt whether to keep displaying completed downloads or clear them whenever "
+"a new download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:702
 msgid "Version Check"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:470
+#: ../raphodo/preferencedialog.py:703
 msgid "Check for new version at startup"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:471
+#: ../raphodo/preferencedialog.py:705
 msgid "Check for a new version of the program each time the program starts."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:473
+#: ../raphodo/preferencedialog.py:707
 msgid "Include development releases"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:474
+#: ../raphodo/preferencedialog.py:709
 msgid ""
 "Include alpha, beta and other development releases when checking for a new "
 "version of the program.\n"
@@ -2123,11 +2690,11 @@ msgid ""
 "occur."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:489
+#: ../raphodo/preferencedialog.py:725
 msgid "Ignore DNG date/time metadata on MTP devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:490
+#: ../raphodo/preferencedialog.py:727
 msgid ""
 "Ignore date/time metadata in DNG files located on MTP devices, and use the "
 "file's modification time instead.\n"
@@ -2136,70 +2703,86 @@ msgid ""
 "metadata."
 msgstr ""
 
+#: ../raphodo/preferencedialog.py:741
+msgid "Completed Downloads"
+msgstr ""
+
 #. Translators: substituted value is a description for the set of preferences
 #. shown in the preference dialog window, e.g. Devices, Automation, etc.
 #. This string is shown in a tooltip for the "Restore Defaults" button
-#: ../raphodo/preferencedialog.py:710
+#: ../raphodo/preferencedialog.py:1067
 #, python-format
 msgid "Restores default %s preference values"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:832
+#: ../raphodo/preferencedialog.py:1208
 msgid ""
 "Do you want to purge the thumbnail cache? The cache will be purged when the "
 "program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:835
+#: ../raphodo/preferencedialog.py:1212
 msgid "Purge Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:847
+#: ../raphodo/preferencedialog.py:1225
 msgid ""
 "Do you want to optimize the thumbnail cache? The cache will be optimized "
 "when the program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:850
+#: ../raphodo/preferencedialog.py:1229
 msgid "Optimize Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1045
+#: ../raphodo/preferencedialog.py:1481
+msgid "Enter a Folder to Scan"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1482
+msgid "Specify a folder that will be scanned for photos and videos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1483
+msgid "Folder:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1497
 msgid "Enter a Path to Ignore"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1046
+#: ../raphodo/preferencedialog.py:1498
 msgid "Specify a path that will never be scanned for photos or videos"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1047
+#: ../raphodo/preferencedialog.py:1499
 msgid "Path:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1061
+#: ../raphodo/preferencedialog.py:1513
 msgid "Enter a File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1062
+#: ../raphodo/preferencedialog.py:1514
 msgid "Specify a file extension (without the leading dot)"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1063 ../raphodo/renamepanel.py:122
+#: ../raphodo/preferencedialog.py:1515 ../raphodo/renamepanel.py:122
 msgid "Extension:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1078
+#: ../raphodo/preferencedialog.py:1530
 msgid "Invalid File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1079
+#: ../raphodo/preferencedialog.py:1531
 #, python-format
 msgid ""
 "The file extension <b>%s</b> is recognized by Rapid Photo Downloader, so it "
 "makes no sense to warn about its presence."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1081
+#: ../raphodo/preferencedialog.py:1533
 #, python-format
 msgid ""
 "Recognized file types:\n"
@@ -2225,104 +2808,103 @@ msgstr ""
 msgid "Birthday"
 msgstr ""
 
-#: ../raphodo/preferences.py:614
+#: ../raphodo/preferences.py:624
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr ""
 
-#: ../raphodo/preferences.py:617
+#: ../raphodo/preferences.py:627
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr ""
 
-#: ../raphodo/preferences.py:622
+#: ../raphodo/preferences.py:632
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
 
-#. self.setFlat(True)
 #: ../raphodo/primarybutton.py:72
 msgid "Download 8 Photos and 10 Videos"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:86 ../raphodo/problemnotification.py:208
+#: ../raphodo/problemnotification.py:87 ../raphodo/problemnotification.py:209
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:89
+#: ../raphodo/problemnotification.py:90
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:116
+#: ../raphodo/problemnotification.py:117
 #, python-format
 msgid "GPhoto2 Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:124
+#: ../raphodo/problemnotification.py:125
 msgid ""
 "Unable to initialize the camera, probably because another program is using "
 "it. No files were copied from it."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:134
+#: ../raphodo/problemnotification.py:135
 #, python-format
 msgid "Unable to read directory %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:140
+#: ../raphodo/problemnotification.py:141
 #, python-format
 msgid "Unable to access modification time or size from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:146
+#: ../raphodo/problemnotification.py:147
 #, python-format
 msgid "Unable to read file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:152
+#: ../raphodo/problemnotification.py:153
 #, python-format
 msgid "Unable to write file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:158
+#: ../raphodo/problemnotification.py:159
 #, python-format
 msgid "Unable to move file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:164
+#: ../raphodo/problemnotification.py:165
 #, python-format
 msgid "Unable to remove file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:170
+#: ../raphodo/problemnotification.py:171
 #, python-format
 msgid "Unable to copy file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:176
+#: ../raphodo/problemnotification.py:177
 #, python-format
 msgid "Zero length file %s will not be downloaded"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:182
+#: ../raphodo/problemnotification.py:183
 #, python-format
 msgid "Could not determine filesystem modification time for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:188
+#: ../raphodo/problemnotification.py:189
 #, python-format
 msgid "Unable to load metadata from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:194
+#: ../raphodo/problemnotification.py:195
 #, python-format
 msgid ""
 "Unable to load metadata from %(name)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:202
+#: ../raphodo/problemnotification.py:203
 #, python-format
 msgid ""
 "An error occurred setting a file's filesystem metadata on the filesystem %s. "
@@ -2330,212 +2912,212 @@ msgid ""
 "again."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:216
+#: ../raphodo/problemnotification.py:217
 #, python-format
 msgid "Encountered unhandled file %s. It will not be downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:223
+#: ../raphodo/problemnotification.py:224
 #, python-format
 msgid "%(filetype)s %(destination)s already exists."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:234 ../raphodo/problemnotification.py:262
+#: ../raphodo/problemnotification.py:235 ../raphodo/problemnotification.py:263
 #, python-format
 msgid ""
 "The existing %(filetype)s %(destination)s was last modified on %(date)s at "
 "%(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:245
+#: ../raphodo/problemnotification.py:246
 #, python-format
 msgid "The %(filetype)s %(source)s was not downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:273
+#: ../raphodo/problemnotification.py:274
 #, python-format
 msgid "The %(filetype)s %(source)s was downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:282
+#: ../raphodo/problemnotification.py:283
 #, python-format
 msgid "The unique identifier '%s' was added to the filename."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:298
+#: ../raphodo/problemnotification.py:299
 #, python-format
 msgid ""
 "The existing backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:309
+#: ../raphodo/problemnotification.py:310
 #, python-format
 msgid "The %(filetype)s %(source)s was not backed up from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:326
+#: ../raphodo/problemnotification.py:327
 #, python-format
 msgid ""
 "The previous backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:337
+#: ../raphodo/problemnotification.py:338
 #, python-format
 msgid ""
 "The %(filetype)s %(source)s from %(device)s was backed up, overwriting the "
 "previous backup %(filetype)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:356
+#: ../raphodo/problemnotification.py:357
 #, python-format
 msgid ""
 "When synchronizing RAW + JPEG sequence values, a duplicate %(filetype)s "
 "%(file)s was encountered, and was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:366
+#: ../raphodo/problemnotification.py:367
 msgid ""
 "When synchronizing RAW + JPEG sequence values, photos were detected with the "
 "same filenames, but taken at different times:"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:373
+#: ../raphodo/problemnotification.py:374
 #, 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 ""
 
-#: ../raphodo/problemnotification.py:389
+#: ../raphodo/problemnotification.py:390
 #, python-format
 msgid "Unable to finalize the filename for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:424
+#: ../raphodo/problemnotification.py:425
 #, python-format
 msgid ""
 "The filename %(destination)s was not fully generated for %(filetype)s "
 "%(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:433
+#: ../raphodo/problemnotification.py:434
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:439
+#: ../raphodo/problemnotification.py:440
 #, python-format
 msgid "The following metadata is missing: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:445
+#: ../raphodo/problemnotification.py:446
 #, python-format
 msgid "Date/time conversion failed: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:451
+#: ../raphodo/problemnotification.py:452
 msgid ""
 "Could not extract valid date/time metadata or determine the file "
 "modification time."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:457
+#: ../raphodo/problemnotification.py:458
 msgid "Filename does not have an extension."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:460
+#: ../raphodo/problemnotification.py:461
 msgid "Filename does not have a number component."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:464
+#: ../raphodo/problemnotification.py:465
 #, python-format
 msgid "Error generating component %(component)s. Error: %(error)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:477
+#: ../raphodo/problemnotification.py:478
 #, python-format
 msgid ""
 "The download subfolders %(folder)s were only partially generated for "
 "%(filetype)s %(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:486
+#: ../raphodo/problemnotification.py:487
 #, python-format
 msgid ""
 "There is no data with which to generate the %(subfolder_file)s for "
 "%(filename)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:499
+#: ../raphodo/problemnotification.py:500
 #, python-format
 msgid ""
 "Unable to create the %(filetype)s %(destination)s in %(folder)s. The "
 "download file was %(source)s in %(device)s. It was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:514
+#: ../raphodo/problemnotification.py:515
 #, python-format
 msgid "Unable to create the download subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:526
+#: ../raphodo/problemnotification.py:527
 #, python-format
 msgid "Unable to create the backup subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:577
+#: ../raphodo/problemnotification.py:578
 #, python-format
 msgid "Problems scanning %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:584
+#: ../raphodo/problemnotification.py:585
 #, python-format
 msgid "Problems copying from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:591
+#: ../raphodo/problemnotification.py:592
 msgid "Problems while finalizing filenames and generating subfolders"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:598
+#: ../raphodo/problemnotification.py:599
 #, python-format
 msgid "Problems backing up to %s"
 msgstr ""
 
-#. Translators: for example Nov 3 or Dec 31
-#. The start and end dates are on a different day
-#. Translators: for example Nov 3 or Dec 31
-#: ../raphodo/proximity.py:105 ../raphodo/proximity.py:221
-#: ../raphodo/proximity.py:224 ../raphodo/proximity.py:828
+#. Translators: for example Nov 3 2015, 11:25 AM
+#. Translators: for example, Nov 3, 12:15 PM
+#: ../raphodo/proximity.py:188 ../raphodo/proximity.py:213
+#: ../raphodo/proximity.py:236 ../raphodo/proximity.py:239
 #, python-format
-msgid "%(month)s %(numeric_day)s"
+msgid "%(date)s, %(time)s"
 msgstr ""
 
-#. Translators: for example Nov 15 2015
-#. Translators: for example Nov 3 2015
-#: ../raphodo/proximity.py:109 ../raphodo/proximity.py:230
-#: ../raphodo/proximity.py:231 ../raphodo/proximity.py:831
+#: ../raphodo/proximity.py:204
 #, python-format
-msgid "%(date)s %(year)s"
+msgid "%(starttime)s - %(endtime)s"
 msgstr ""
 
-#. Translators: for example Nov 3 2015, 11:25 AM
-#. Translators: for example, Nov 3, 12:15 PM
-#: ../raphodo/proximity.py:197 ../raphodo/proximity.py:215
-#: ../raphodo/proximity.py:234 ../raphodo/proximity.py:236
+#. The start and end dates are on a different day
+#. Translators: for example Nov 3 or Dec 31
+#: ../raphodo/proximity.py:221 ../raphodo/proximity.py:225
+#: ../raphodo/proximity.py:980 ../raphodo/timeutils.py:105
 #, python-format
-msgid "%(date)s, %(time)s"
+msgid "%(month)s %(numeric_day)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:209
+#. Translators: for example Nov 3 2015
+#. Translators: for example Nov 2 2015
+#. Translators: for example Nov 15 2015
+#: ../raphodo/proximity.py:232 ../raphodo/proximity.py:233
+#: ../raphodo/proximity.py:985 ../raphodo/timeutils.py:110
 #, python-format
-msgid "%(starttime)s - %(endtime)s"
+msgid "%(date)s %(year)s"
 msgstr ""
 
 #. Translators: for example, Nov 3, 12:15 PM - Nov 4, 1:00 AM
-#: ../raphodo/proximity.py:241
+#: ../raphodo/proximity.py:245
 #, python-format
 msgid "%(earlier_time)s - %(later_time)s"
 msgstr ""
@@ -2544,25 +3126,25 @@ msgstr ""
 #. Nov 3 2012, 12:15 PM -
 #. Nov 4 2012, 1:00 AM
 #. (please keep the line break signified by \n)
-#: ../raphodo/proximity.py:248
+#: ../raphodo/proximity.py:253
 #, python-format
 msgid ""
 "%(earlier_time)s -\n"
 "%(later_time)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:359
+#: ../raphodo/proximity.py:382
 #, python-format
 msgid "%(month)s  %(year)s"
 msgstr ""
 
 #. Translators: for example Nov 2015
-#: ../raphodo/proximity.py:833
+#: ../raphodo/proximity.py:987
 #, python-format
 msgid "%(month)s %(year)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:1344
+#: ../raphodo/proximity.py:1595
 msgid ""
 "The time elapsed between consecutive photos and videos that is used to build "
 "the Timeline"
@@ -2572,47 +3154,47 @@ msgstr ""
 #. Replace the very last character (after the d) with the correct
 #. localized value, keeping everything else. In other words, change
 #. only the m character.
-#: ../raphodo/proximity.py:1406
+#: ../raphodo/proximity.py:1652
 #, python-format
 msgid "%(minutes)dm"
 msgstr ""
 
 #. Translators: i.e. "1.5h", which is short for 1.5 hours.
 #. Replace the entire string with the correct localized value
-#: ../raphodo/proximity.py:1410
+#: ../raphodo/proximity.py:1656
 msgid "1.5h"
 msgstr ""
 
 #. Translators: e.g. "5h", which is short for 5 hours.
 #. Replace the very last character (after the d) with the correct localized value,
 #. keeping everything else. In other words, change only the h character.
-#: ../raphodo/proximity.py:1415
+#: ../raphodo/proximity.py:1661
 #, python-format
 msgid "%(hours)dh"
 msgstr ""
 
-#: ../raphodo/proximity.py:1461
+#: ../raphodo/proximity.py:1710
 msgid ""
 "The Timeline groups photos and videos based on how much time elapsed between "
 "consecutive shots. Use it to identify photos and videos taken at different "
 "periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/proximity.py:1464
+#: ../raphodo/proximity.py:1715
 msgid ""
 "Use the slider (below) to adjust the time elapsed between consecutive shots "
 "that is used to build the Timeline."
 msgstr ""
 
-#: ../raphodo/proximity.py:1466
+#: ../raphodo/proximity.py:1718
 msgid "Timeline build pending..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1467
+#: ../raphodo/proximity.py:1719
 msgid "Timeline is building..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1468
+#: ../raphodo/proximity.py:1721
 msgid ""
 "The Timeline needs to be rebuilt because the file modification time does not "
 "match the time a shot was taken for one or more shots.<br><br>The Timeline "
@@ -2624,61 +3206,61 @@ msgid ""
 "downloading, which is when the metadata is read."
 msgstr ""
 
-#: ../raphodo/rapid.py:485 ../raphodo/rapid.py:2461 ../raphodo/rapid.py:3728
-#: ../raphodo/rapid.py:3846 ../raphodo/rapid.py:3850 ../raphodo/rapid.py:3870
-#: ../raphodo/rapid.py:3874 ../raphodo/rapid.py:3998 ../raphodo/rapid.py:4007
-#: ../raphodo/rapid.py:4495 ../raphodo/rapid.py:4888 ../raphodo/rapid.py:5722
-#: ../raphodo/rememberthisdialog.py:97
+#: ../raphodo/rapid.py:493 ../raphodo/rapid.py:2555 ../raphodo/rapid.py:3934
+#: ../raphodo/rapid.py:4065 ../raphodo/rapid.py:4069 ../raphodo/rapid.py:4092
+#: ../raphodo/rapid.py:4096 ../raphodo/rapid.py:4226 ../raphodo/rapid.py:4237
+#: ../raphodo/rapid.py:4743 ../raphodo/rapid.py:5195 ../raphodo/rapid.py:5997
+#: ../raphodo/rememberthisdialog.py:99
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:3
 msgid "Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:1100
+#: ../raphodo/rapid.py:1131
 msgid ""
 "<b>ExifTool has a problem</b><br><br> Rapid Photo Downloader uses ExifTool "
 "to get metadata from videos and photos. The program will run without it, but "
 "installing it is <b>highly</b> recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1110 ../raphodo/rapid.py:1130
+#: ../raphodo/rapid.py:1141 ../raphodo/rapid.py:1161
 msgid "Problem with libmediainfo"
 msgstr ""
 
-#: ../raphodo/rapid.py:1119
+#: ../raphodo/rapid.py:1150
 msgid ""
 "<b>The library libmediainfo appears to be missing</b><br><br> Rapid Photo "
 "Downloader uses libmediainfo to get the date and time a video was shot. The "
 "program will run  without it, but installing it is recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1417
+#: ../raphodo/rapid.py:1448
 msgid "Download failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1419
+#: ../raphodo/rapid.py:1450
 msgid ""
 "Sorry, the download of the new version of Rapid Photo Downloader failed."
 msgstr ""
 
-#: ../raphodo/rapid.py:1425
+#: ../raphodo/rapid.py:1457
 msgid ""
 "The new version was successfully downloaded. Do you want to close Rapid "
 "Photo Downloader and install it now?"
 msgstr ""
 
-#: ../raphodo/rapid.py:1428
+#: ../raphodo/rapid.py:1461
 msgid "Update Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:1432
+#: ../raphodo/rapid.py:1465
 msgid "Install"
 msgstr ""
 
-#: ../raphodo/rapid.py:1450
+#: ../raphodo/rapid.py:1483
 msgid "New version saved"
 msgstr ""
 
-#: ../raphodo/rapid.py:1451
+#: ../raphodo/rapid.py:1485
 #, python-format
 msgid ""
 "The tar file and installer script are saved at:\n"
@@ -2686,163 +3268,163 @@ msgid ""
 " %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:1468
+#: ../raphodo/rapid.py:1502
 msgid "Upgrade failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1469
+#: ../raphodo/rapid.py:1505
 msgid ""
 "Sorry, upgrading Rapid Photo Downloader failed because there was an error "
 "opening the installer."
 msgstr ""
 
-#: ../raphodo/rapid.py:1667 ../raphodo/rapid.py:2331
+#: ../raphodo/rapid.py:1709 ../raphodo/rapid.py:2425
 msgid "Download"
 msgstr ""
 
-#: ../raphodo/rapid.py:1671
+#: ../raphodo/rapid.py:1713
 msgid "&Refresh..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1675
+#: ../raphodo/rapid.py:1717
 msgid "&Preferences"
 msgstr ""
 
-#: ../raphodo/rapid.py:1679
+#: ../raphodo/rapid.py:1721
 msgid "&Quit"
 msgstr ""
 
-#: ../raphodo/rapid.py:1683
+#: ../raphodo/rapid.py:1725
 msgid "Error &Reports"
 msgstr ""
 
-#: ../raphodo/rapid.py:1687
+#: ../raphodo/rapid.py:1729
 msgid "Clear Completed Downloads"
 msgstr ""
 
-#: ../raphodo/rapid.py:1691
+#: ../raphodo/rapid.py:1733
 msgid "Get Help Online..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1695
+#: ../raphodo/rapid.py:1737
 msgid "&Tip of the Day..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1699
+#: ../raphodo/rapid.py:1741
 msgid "Report a Problem..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1703
+#: ../raphodo/rapid.py:1745
 msgid "Make a Donation..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1707
+#: ../raphodo/rapid.py:1749
 msgid "Translate this Application..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1711
+#: ../raphodo/rapid.py:1753
 msgid "&About..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1715
+#: ../raphodo/rapid.py:1757
 msgid "Check for Updates..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1797
+#: ../raphodo/rapid.py:1840
 msgid "Timeline"
 msgstr ""
 
-#: ../raphodo/rapid.py:1807
+#: ../raphodo/rapid.py:1850
 msgid "Destination"
 msgstr ""
 
-#: ../raphodo/rapid.py:1808
+#: ../raphodo/rapid.py:1851
 msgid "Rename"
 msgstr ""
 
-#: ../raphodo/rapid.py:1810
+#: ../raphodo/rapid.py:1853
 msgid "Back Up"
 msgstr ""
 
 #. Devices Header and View
-#: ../raphodo/rapid.py:1926
+#: ../raphodo/rapid.py:1977
 msgid ""
 "Turn on or off the use of devices attached to this computer as download "
 "sources"
 msgstr ""
 
 #. This Computer Header and View
-#: ../raphodo/rapid.py:1940
+#: ../raphodo/rapid.py:1994
 msgid ""
 "Turn on or off the use of a folder on this computer as a download source"
 msgstr ""
 
-#: ../raphodo/rapid.py:1941
+#: ../raphodo/rapid.py:1996
 msgid "This Computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:1952
+#: ../raphodo/rapid.py:2009
 msgid "Select a source folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:1975
+#: ../raphodo/rapid.py:2038
 msgid "Projected Storage Use"
 msgstr ""
 
-#: ../raphodo/rapid.py:1989 ../raphodo/rapid.py:1997
+#: ../raphodo/rapid.py:2056 ../raphodo/rapid.py:2068
 msgid "Select a destination folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:2045
+#: ../raphodo/rapid.py:2117
 msgid "All"
 msgstr ""
 
-#: ../raphodo/rapid.py:2046
+#: ../raphodo/rapid.py:2118
 msgid "New"
 msgstr ""
 
-#: ../raphodo/rapid.py:2048
+#: ../raphodo/rapid.py:2120
 msgid "Show:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2051
+#: ../raphodo/rapid.py:2123
 msgid "Modification Time"
 msgstr ""
 
-#: ../raphodo/rapid.py:2052
+#: ../raphodo/rapid.py:2124
 msgid "Checked State"
 msgstr ""
 
-#: ../raphodo/rapid.py:2055
+#: ../raphodo/rapid.py:2127
 msgid "File Type"
 msgstr ""
 
-#: ../raphodo/rapid.py:2056
+#: ../raphodo/rapid.py:2128
 msgid "Device"
 msgstr ""
 
-#: ../raphodo/rapid.py:2058
+#: ../raphodo/rapid.py:2130
 msgid "Sort:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2069
+#: ../raphodo/rapid.py:2141
 msgid "Select All:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2311
+#: ../raphodo/rapid.py:2405
 #, python-format
 msgid "Download %(files)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2327
+#: ../raphodo/rapid.py:2421
 msgid "Resume Download"
 msgstr ""
 
-#: ../raphodo/rapid.py:2329
+#: ../raphodo/rapid.py:2423
 msgid "Pause"
 msgstr ""
 
-#: ../raphodo/rapid.py:2417
+#: ../raphodo/rapid.py:2511
 #, python-brace-format
 msgid ""
 "Please report the problem at <a href=\"{website}\">{website}</a>.<br><br>\n"
@@ -2851,11 +3433,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/rapid.py:2431
+#: ../raphodo/rapid.py:2525
 msgid "Thank you for reporting a problem in Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:2529
+#: ../raphodo/rapid.py:2624
 #, python-format
 msgid ""
 "<b>Changing This Computer source path</b><br><br>Do you really want to "
@@ -2864,30 +3446,29 @@ msgid ""
 "from This Computer will be cancelled."
 msgstr ""
 
-#: ../raphodo/rapid.py:2595
+#: ../raphodo/rapid.py:2694
 msgid "You cannot change the download destination while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:2604
+#: ../raphodo/rapid.py:2704
 #, python-format
 msgid ""
 "<b>Confirm Download Destination</b><br><br>Are you sure you want to set the "
 "%(file_type)s download destination to %(path)s?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2682
+#: ../raphodo/rapid.py:2785
 msgid ""
+"\n"
 "<b>Downloading all files</b><br><br>\n"
-"                    A download always includes all files that are checked "
-"for download,\n"
-"                    including those that are not currently displayed because "
-"the Timeline\n"
-"                    is being used or because only new files are being shown."
-"<br><br>\n"
-"                    Do you want to proceed with the download?"
+"A download always includes all files that are checked for download,\n"
+"including those that are not currently displayed because the Timeline\n"
+"is being used or because only new files are being shown.<br><br>\n"
+"Do you want to proceed with the download?\n"
+"                        "
 msgstr ""
 
-#: ../raphodo/rapid.py:2820
+#: ../raphodo/rapid.py:2937
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -2895,206 +3476,200 @@ msgid ""
 "%(folder2)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2824
+#: ../raphodo/rapid.py:2940
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
 "%s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2827
+#: ../raphodo/rapid.py:2943
 msgid "Download Failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:2828
+#: ../raphodo/rapid.py:2944
 msgid "The download cannot proceed."
 msgstr ""
 
-#: ../raphodo/rapid.py:2842
+#: ../raphodo/rapid.py:2962
 msgid ""
 "Photos and videos will not be backed up because there is nowhere to back "
 "them up. Do you still want to start the download?"
 msgstr ""
 
-#. Translators: filetype will be replaced with 'photos' or 'videos'
-#: ../raphodo/rapid.py:2847 ../raphodo/rapid.py:2854
+#: ../raphodo/rapid.py:2969 ../raphodo/rapid.py:2979
 #, python-format
 msgid ""
 "No backup device exists for backing up %(filetype)s. Do you still want to "
 "start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2848 ../raphodo/rpdfile.py:228
+#: ../raphodo/rapid.py:2971 ../raphodo/rpdfile.py:228
 msgid "photos"
 msgstr ""
 
-#: ../raphodo/rapid.py:2855 ../raphodo/rpdfile.py:223
+#: ../raphodo/rapid.py:2981 ../raphodo/rpdfile.py:223
 msgid "videos"
 msgstr ""
 
-#: ../raphodo/rapid.py:2861
+#: ../raphodo/rapid.py:2989
 msgid ""
 "<b>The photo and video backup destinations do not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2869 ../raphodo/rapid.py:2876
+#: ../raphodo/rapid.py:2999 ../raphodo/rapid.py:3008
 #, python-format
 msgid ""
 "<b>The %(filetype)s backup destination does not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2871 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:818
+#: ../raphodo/rapid.py:3001 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:843
 msgid "photo"
 msgstr ""
 
-#: ../raphodo/rapid.py:2878 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:858
+#: ../raphodo/rapid.py:3010 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:883
 msgid "video"
 msgstr ""
 
-#: ../raphodo/rapid.py:2886
+#: ../raphodo/rapid.py:3018
 msgid "Backup problem"
 msgstr ""
 
-#. Translators - in the middle is a unicode em dash - please retain it
-#. This string is displayed in the status bar when the download is running
-#: ../raphodo/rapid.py:3571
+#: ../raphodo/rapid.py:3756
 #, python-format
 msgid "%(downloading_from)s — %(time_left)s left (%(speed)s)"
 msgstr ""
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3640
+#: ../raphodo/rapid.py:3828
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr ""
 
-#. Translators: e.g. 2 videos failed to download
-#: ../raphodo/rapid.py:3645
+#: ../raphodo/rapid.py:3836
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr ""
 
-#: ../raphodo/rapid.py:3650 ../raphodo/rapid.py:3723
+#: ../raphodo/rapid.py:3842 ../raphodo/rapid.py:3927
 msgid "warnings"
 msgstr ""
 
-#: ../raphodo/rapid.py:3679
+#: ../raphodo/rapid.py:3873
 msgid "All downloads complete"
 msgstr ""
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3686 ../raphodo/rapid.py:3695 ../raphodo/rapid.py:3704
-#: ../raphodo/rapid.py:3713 ../raphodo/rapid.py:3721
+#: ../raphodo/rapid.py:3881 ../raphodo/rapid.py:3892 ../raphodo/rapid.py:3903
+#: ../raphodo/rapid.py:3914 ../raphodo/rapid.py:3924
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3688 ../raphodo/rapid.py:3706
+#: ../raphodo/rapid.py:3884 ../raphodo/rapid.py:3906
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr ""
 
-#: ../raphodo/rapid.py:3697 ../raphodo/rapid.py:3715
+#: ../raphodo/rapid.py:3895 ../raphodo/rapid.py:3917
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr ""
 
-#: ../raphodo/rapid.py:3742
+#: ../raphodo/rapid.py:3950
 msgid "1 failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:3744
+#: ../raphodo/rapid.py:3952
 #, python-format
 msgid "%d failures"
 msgstr ""
 
-#: ../raphodo/rapid.py:3749
+#: ../raphodo/rapid.py:3957
 msgid "1 warning"
 msgstr ""
 
-#: ../raphodo/rapid.py:3751
+#: ../raphodo/rapid.py:3959
 #, python-format
 msgid "%d warnings"
 msgstr ""
 
-#: ../raphodo/rapid.py:3771
+#: ../raphodo/rapid.py:3981
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3774
+#: ../raphodo/rapid.py:3985
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3779
+#: ../raphodo/rapid.py:3989
 #, python-format
 msgid "No files downloaded — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3781
+#: ../raphodo/rapid.py:3991
 msgid "No files downloaded"
 msgstr ""
 
-#: ../raphodo/rapid.py:3805
+#: ../raphodo/rapid.py:4021
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3809
+#: ../raphodo/rapid.py:4026
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3812
+#: ../raphodo/rapid.py:4031
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3820
+#: ../raphodo/rapid.py:4039
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3833
+#: ../raphodo/rapid.py:4052
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3837
+#: ../raphodo/rapid.py:4056
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3841
+#: ../raphodo/rapid.py:4060
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices"
 msgstr ""
 
-#: ../raphodo/rapid.py:3867
+#: ../raphodo/rapid.py:4087
 msgid "The Destination subfolders and Timeline have been rebuilt"
 msgstr ""
 
-#: ../raphodo/rapid.py:3922
+#: ../raphodo/rapid.py:4144
 msgid "Program preferences are invalid"
 msgstr ""
 
-#: ../raphodo/rapid.py:3999
+#: ../raphodo/rapid.py:4228
 #, python-format
 msgid ""
 "<b>All files on the %(camera)s are inaccessible</b>.<br><br>It may be locked "
@@ -3104,179 +3679,205 @@ msgid ""
 "ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4008
+#: ../raphodo/rapid.py:4239
 #, python-format
 msgid ""
-"<b>The %(camera)s appears to be in use by another application.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again.<br><br>Alternatively, you can ignore this "
-"device."
+"<b>The %(camera)s appears to be in use by another "
+"application.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again.<br><br>Alternatively, you "
+"can ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4019
+#: ../raphodo/rapid.py:4250
 msgid "&Try Again"
 msgstr ""
 
-#: ../raphodo/rapid.py:4020
+#: ../raphodo/rapid.py:4251
 msgid "&Ignore This Device"
 msgstr ""
 
-#: ../raphodo/rapid.py:4086
+#: ../raphodo/rapid.py:4323
 #, python-format
 msgid "Sorry, an unexpected problem occurred while scanning %s."
 msgstr ""
 
-#: ../raphodo/rapid.py:4087
+#: ../raphodo/rapid.py:4324
 msgid "Unfortunately you cannot download from this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4091
+#: ../raphodo/rapid.py:4328
 msgid ""
 "A possible workaround for the problem might be downloading from the camera's "
 "memory card using a card reader."
 msgstr ""
 
-#: ../raphodo/rapid.py:4096
+#: ../raphodo/rapid.py:4333
 msgid "Device scan failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:4472
+#: ../raphodo/rapid.py:4720
 #, python-format
 msgid ""
-"<b>The %(camera)s cannot be scanned because it cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again."
+"<b>The %(camera)s cannot be scanned because it cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again."
 msgstr ""
 
-#: ../raphodo/rapid.py:4496
+#: ../raphodo/rapid.py:4745
 #, python-format
 msgid ""
-"<b>The download cannot start because the %(camera)s cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again, and choose which files you want to "
-"download from it."
+"<b>The download cannot start because the %(camera)s cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again, and choose which files "
+"you want to download from it."
+msgstr ""
+
+#: ../raphodo/rapid.py:4842
+msgid "Completed Downloads Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4844
+#, python-format
+msgid "%s whose download have completed are displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4846
+msgid "Do you want to clear the completed downloads?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4848
+msgid "Completed Download Present"
 msgstr ""
 
-#: ../raphodo/rapid.py:4635
+#: ../raphodo/rapid.py:4850
+#, python-format
+msgid "%s whose download has completed is displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4852
+msgid "Do you want to clear the completed download?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4933
 #, python-format
 msgid ""
 "Do you want to download photos and videos from the device <i>%(device)s</i>?"
 msgstr ""
 
-#: ../raphodo/rapid.py:4877
+#: ../raphodo/rapid.py:5183
 #, python-format
 msgid "<b>Do you want to ignore the %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4879
+#: ../raphodo/rapid.py:5186
 msgid ""
 "All cameras, phones and tablets with the same model name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:4883
+#: ../raphodo/rapid.py:5190
 #, python-format
 msgid ""
 "<b>Do you want to ignore the device %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4885
+#: ../raphodo/rapid.py:5192
 msgid "Any device with the same name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:5178
+#: ../raphodo/rapid.py:5492
 #, python-format
 msgid "Downloading from %(location)s on This Computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5180
+#: ../raphodo/rapid.py:5496
 msgid ""
 "Do you really want to download from here?<br><br>On some systems, scanning "
 "this location can take a very long time."
 msgstr ""
 
-#: ../raphodo/rapid.py:5224
+#: ../raphodo/rapid.py:5537
 #, python-format
 msgid "Generating thumbnails for %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5227
+#: ../raphodo/rapid.py:5540
 #, python-format
 msgid "Scanning %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5237
+#: ../raphodo/rapid.py:5551
 #, python-format
 msgid ""
 "%(number)s of %(available files)s checked for download (%(hidden)s hidden)"
 msgstr ""
 
-#: ../raphodo/rapid.py:5243
+#: ../raphodo/rapid.py:5559
 #, python-format
 msgid "%(number)s of %(available files)s checked for download"
 msgstr ""
 
-#: ../raphodo/rapid.py:5494
+#: ../raphodo/rapid.py:5764
 msgid "Display program information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5496
+#: ../raphodo/rapid.py:5766
 msgid "Display debugging information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5499
+#: ../raphodo/rapid.py:5769
 msgid "List photo and video file extensions the program recognizes and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5502
+#: ../raphodo/rapid.py:5772
 msgid "Turn on or off the the renaming of photos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5504
+#: ../raphodo/rapid.py:5774
 msgid "turn on or off the the renaming of videos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5506
+#: ../raphodo/rapid.py:5776
 msgid ""
 "Turn on or off the automatic detection of devices from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5510
+#: ../raphodo/rapid.py:5780
 msgid "Turn on or off downloading from this computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5512 ../raphodo/rapid.py:5515 ../raphodo/rapid.py:5518
-#: ../raphodo/rapid.py:5539 ../raphodo/rapid.py:5543
+#: ../raphodo/rapid.py:5782 ../raphodo/rapid.py:5785 ../raphodo/rapid.py:5788
+#: ../raphodo/rapid.py:5809 ../raphodo/rapid.py:5813
 msgid "PATH"
 msgstr ""
 
-#: ../raphodo/rapid.py:5513
+#: ../raphodo/rapid.py:5783
 msgid "The PATH on this computer from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5516
+#: ../raphodo/rapid.py:5786
 msgid "The PATH where photos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5519
+#: ../raphodo/rapid.py:5789
 msgid "The PATH where videos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5521
+#: ../raphodo/rapid.py:5791
 msgid "Turn on or off the backing up of photos and videos while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:5525
+#: ../raphodo/rapid.py:5795
 msgid "Turn on or off the automatic detection of backup devices."
 msgstr ""
 
-#: ../raphodo/rapid.py:5527 ../raphodo/rapid.py:5533
+#: ../raphodo/rapid.py:5797 ../raphodo/rapid.py:5803
 msgid "FOLDER"
 msgstr ""
 
-#: ../raphodo/rapid.py:5528
+#: ../raphodo/rapid.py:5798
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected photo "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3284,7 +3885,7 @@ msgid ""
 "photos up to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5534
+#: ../raphodo/rapid.py:5804
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected video "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3292,115 +3893,124 @@ msgid ""
 "up videos to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5540
+#: ../raphodo/rapid.py:5810
 msgid ""
 "The PATH where photos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5544
+#: ../raphodo/rapid.py:5814
 msgid ""
 "The PATH where videos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5547
+#: ../raphodo/rapid.py:5817
 #, python-format
 msgid "Ignore photos with the following extensions: %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5551
-msgid "Turn on or off starting downloads as soon as the program itself starts."
+#: ../raphodo/rapid.py:5821
+msgid ""
+"Turn on or off starting downloads as soon as the program itself starts."
 msgstr ""
 
-#: ../raphodo/rapid.py:5554
+#: ../raphodo/rapid.py:5824
 msgid "Turn on or off starting downloads as soon as a device is inserted."
 msgstr ""
 
-#: ../raphodo/rapid.py:5557
+#: ../raphodo/rapid.py:5827
 msgid ""
 "Turn on or off use of the Rapid Photo Downloader Thumbnail Cache. Turning it "
 "off does not delete existing cache contents."
 msgstr ""
 
-#: ../raphodo/rapid.py:5561
+#: ../raphodo/rapid.py:5831
 msgid ""
 "Delete all thumbnails in the Rapid Photo Downloader Thumbnail Cache, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5565
+#: ../raphodo/rapid.py:5835
 msgid "Forget which files have been previously downloaded, and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5568
+#: ../raphodo/rapid.py:5838
 msgid ""
 "Import preferences from an old program version and exit. Requires the "
 "command line program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5571
+#: ../raphodo/rapid.py:5841
 msgid ""
 "Reset all program settings to their default values, delete all thumbnails in "
 "the Thumbnail cache, forget which files have been previously downloaded, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5575
+#: ../raphodo/rapid.py:5845
 msgid "Include gphoto2 debugging information in log files."
 msgstr ""
 
-#: ../raphodo/rapid.py:5579
+#: ../raphodo/rapid.py:5849
 msgid "Print information to the terminal about attached cameras and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5640
+#: ../raphodo/rapid.py:5911
 msgid ""
 "To import preferences from the old version of Rapid Photo Downloader, you "
 "must install the program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5649
+#: ../raphodo/rapid.py:5920
 msgid "No prior program preferences detected: exiting"
 msgstr ""
 
-#: ../raphodo/rapid.py:5652
+#: ../raphodo/rapid.py:5923
 #, python-format
 msgid "Importing preferences from Rapid Photo Downloader %(version)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5714
+#: ../raphodo/rapid.py:5989
 #, python-format
-msgid "Do you want to copy the stored sequence number, which has the value %d?"
+msgid ""
+"Do you want to copy the stored sequence number, which has the value %d?"
 msgstr ""
 
-#: ../raphodo/rapid.py:5726
+#: ../raphodo/rapid.py:6000
 msgid "Program aborting."
 msgstr ""
 
-#: ../raphodo/rapid.py:5736
+#: ../raphodo/rapid.py:6010
 msgid "Never run this program as the sudo / root user."
 msgstr ""
 
-#: ../raphodo/rapid.py:5740
+#: ../raphodo/rapid.py:6014
 msgid "You must install ExifTool to run Rapid Photo Downloader."
 msgstr ""
 
-#: ../raphodo/rapid.py:5794
+#: ../raphodo/rapid.py:6026
+msgid ""
+"Rapid Photo Downloader is installed in multiple locations.\n"
+"\n"
+"Uninstall all copies except the version you want to run."
+msgstr ""
+
+#: ../raphodo/rapid.py:6083
 msgid ""
 "When specifying a path on the command line, do not also specify an\n"
 "option for device auto detection or a path on \"This Computer\"."
 msgstr ""
 
-#: ../raphodo/rapid.py:5950
+#: ../raphodo/rapid.py:6243
 msgid "All settings and caches have been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5958
+#: ../raphodo/rapid.py:6251
 msgid "Thumbnail Cache has been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5964
+#: ../raphodo/rapid.py:6257
 msgid "Remembered files have been forgotten"
 msgstr ""
 
@@ -3416,15 +4026,15 @@ msgstr ""
 msgid "&Don't warn me again about missing or broken program libraries"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:546
+#: ../raphodo/renameandmovefile.py:554
 msgid "subfolder and filename"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:548
+#: ../raphodo/renameandmovefile.py:556
 msgid "filename"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:550
+#: ../raphodo/renameandmovefile.py:558
 msgid "subfolder"
 msgstr ""
 
@@ -3504,160 +4114,237 @@ msgstr ""
 msgid "photos or videos"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:306
+#: ../raphodo/rpdfile.py:315
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:318
+#. translators: natural language expression signifying a single video
+#: ../raphodo/rpdfile.py:337
+msgid "a video"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:339
 msgid "1 Video"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:323
+#. translators: natural language expression signifying a single photo
+#: ../raphodo/rpdfile.py:346
+msgid "a photo"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:348
 msgid "1 Photo"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:803
+#: ../raphodo/rpdfile.py:828
 #, python-format
 msgid "%(path)s on %(camera)s"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:819
+#: ../raphodo/rpdfile.py:844
 msgid "Photo"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:859
+#: ../raphodo/rpdfile.py:884
 msgid "Video"
 msgstr ""
 
-#: ../raphodo/storage.py:138
+#: ../raphodo/storage.py:141
 msgid "File system root"
 msgstr ""
 
 #. translators: the name of the Pictures folder
-#: ../raphodo/storage.py:433
+#: ../raphodo/storage.py:437
 msgid "Pictures"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:426
+#: ../raphodo/thumbnaildisplay.py:432
 #, python-format
 msgid "Taken on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:431
+#: ../raphodo/thumbnaildisplay.py:439
 #, python-format
 msgid "Modified on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:437 ../raphodo/thumbnaildisplay.py:466
+#: ../raphodo/thumbnaildisplay.py:447 ../raphodo/thumbnaildisplay.py:481
 #, python-format
 msgid "%(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:451
+#: ../raphodo/thumbnaildisplay.py:464
 #, python-format
 msgid "Memory cards: %s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:457
+#: ../raphodo/thumbnaildisplay.py:468
+#, python-format
+msgid "Memory card: %s"
+msgstr ""
+
+#: ../raphodo/thumbnaildisplay.py:473
 msgid "Downloaded as:"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:472
+#: ../raphodo/thumbnaildisplay.py:489
 #, python-format
 msgid "<br><br>Previous download:<br>%(filename)s<br>%(path)s<br>%(date)s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:1603
+#: ../raphodo/thumbnaildisplay.py:1645
 msgid "Copy Path"
 msgstr ""
 
+#. Translators: these values are file size suffixes like B representing bytes, KB representing
+#. kilobytes, etc.
+#: ../raphodo/utilities.py:170
+msgid "B"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "KB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "MB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "GB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "TB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "PB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "EB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "ZB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "YB"
+msgstr ""
+
 #. two things in a list e.g. "device1 and device2"
-#: ../raphodo/utilities.py:391
+#: ../raphodo/utilities.py:394
 #, python-format
 msgid "%(first_item)s and %(last_item)s"
 msgstr ""
 
-#: ../raphodo/utilities.py:464
+#: ../raphodo/utilities.py:468
 msgid "one"
 msgstr ""
 
-#: ../raphodo/utilities.py:465
+#: ../raphodo/utilities.py:469
 msgid "two"
 msgstr ""
 
-#: ../raphodo/utilities.py:466
+#: ../raphodo/utilities.py:470
 msgid "three"
 msgstr ""
 
-#: ../raphodo/utilities.py:467
+#: ../raphodo/utilities.py:471
 msgid "four"
 msgstr ""
 
-#: ../raphodo/utilities.py:468
+#: ../raphodo/utilities.py:472
 msgid "five"
 msgstr ""
 
-#: ../raphodo/utilities.py:469
+#: ../raphodo/utilities.py:473
 msgid "six"
 msgstr ""
 
-#: ../raphodo/utilities.py:470
+#: ../raphodo/utilities.py:474
 msgid "seven"
 msgstr ""
 
-#: ../raphodo/utilities.py:471
+#: ../raphodo/utilities.py:475
 msgid "eight"
 msgstr ""
 
-#: ../raphodo/utilities.py:472
+#: ../raphodo/utilities.py:476
 msgid "nine"
 msgstr ""
 
-#: ../raphodo/utilities.py:473
+#: ../raphodo/utilities.py:477
 msgid "ten"
 msgstr ""
 
-#: ../raphodo/utilities.py:474
+#: ../raphodo/utilities.py:478
 msgid "eleven"
 msgstr ""
 
-#: ../raphodo/utilities.py:475
+#: ../raphodo/utilities.py:479
 msgid "twelve"
 msgstr ""
 
-#: ../raphodo/utilities.py:476
+#: ../raphodo/utilities.py:480
 msgid "thirteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:477
+#: ../raphodo/utilities.py:481
 msgid "fourteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:478
+#: ../raphodo/utilities.py:482
 msgid "fifteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:479
+#: ../raphodo/utilities.py:483
 msgid "sixteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:480
+#: ../raphodo/utilities.py:484
 msgid "seventeen"
 msgstr ""
 
-#: ../raphodo/utilities.py:481
+#: ../raphodo/utilities.py:485
 msgid "eighteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:482
+#: ../raphodo/utilities.py:486
 msgid "ninenteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:483
+#: ../raphodo/utilities.py:487
 msgid "twenty"
 msgstr ""
 
+#: ../raphodo/viewutils.py:240
+msgid "&OK"
+msgstr ""
+
+#: ../raphodo/viewutils.py:243
+msgid "&Save"
+msgstr ""
+
+#: ../raphodo/viewutils.py:244
+msgid "&Help"
+msgstr ""
+
+#: ../raphodo/viewutils.py:245
+msgid "Restore Defaults"
+msgstr ""
+
+#: ../raphodo/viewutils.py:246
+msgid "&Yes"
+msgstr ""
+
+#: ../raphodo/viewutils.py:247
+msgid "&No"
+msgstr ""
+
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:1
 msgid ""
 "Rapid Photo Downloader imports photos and videos from cameras, phones, "
@@ -3711,8 +4398,8 @@ msgstr ""
 #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:5
 msgid ""
-"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;"
-"memory;card;"
+"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;memory"
+";card;"
 msgstr ""
 
 #: ../data/kde/net.damonlynch.rapid-photo-downloader.desktop.in.h:1
@@ -3776,6 +4463,7 @@ msgstr ""
 #~ msgid "Select a folder to download photos to"
 #~ msgstr "یک پوشه را برای دانلود عکس انتخاب نمایید"
 
+#, python-format
 #~ msgid "<i>Example: %s</i>"
 #~ msgstr "<i>مثال : %s</i>"
 
diff --git a/po/fi.po b/po/fi.po
index 24dee19..a1ee34a 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,35 +7,386 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: damonlynch@gmail.com\n"
-"POT-Creation-Date: 2017-07-08 19:16-0500\n"
-"PO-Revision-Date: 2017-07-04 11:06+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2017-09-12 17:01-0400\n"
+"PO-Revision-Date: 2017-09-13 18:43+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: Finnish <fi@li.org>\n"
-"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-07-05 23:04+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-09-26 22:04+0000\n"
+"X-Generator: Launchpad (build 18463)\n"
+"Language: fi\n"
+
+#: ../install.py:65
+msgid "Rapid Photo Downloader installer"
+msgstr ""
+
+#: ../install.py:66
+msgid "Download and install latest version of Rapid Photo Downloader."
+msgstr ""
+
+#: ../install.py:236 ../install.py:1732
+msgid "Installer not found:"
+msgstr ""
+
+#. Translators: do not translate the term tar.gz
+#: ../install.py:240 ../install.py:1736
+msgid "Installer not in tar.gz format:"
+msgstr ""
+
+#: ../install.py:465
+msgid ""
+"Incorrect folder ownership detected. Changing ownership of and resetting "
+"permissions for"
+msgstr ""
+
+#: ../install.py:540
+msgid "The following command will be run:"
+msgstr ""
+
+#: ../install.py:543 ../install.py:1479 ../install.py:1484
+msgid "sudo may prompt you for the sudo password."
+msgstr ""
+
+#: ../install.py:547
+msgid "Would you like to run the command now?"
+msgstr ""
+
+#: ../install.py:549
+msgid "Answer is not yes, exiting."
+msgstr ""
+
+#: ../install.py:559 ../install.py:751 ../install.py:966
+msgid "Command failed"
+msgstr ""
+
+#: ../install.py:561 ../install.py:752 ../install.py:967
+msgid "Exiting"
+msgstr ""
+
+#: ../install.py:582
+msgid "The Universe repository must be enabled."
+msgstr ""
+
+#: ../install.py:606
+msgid ""
+"Do you want to to uninstall the previous version of Rapid Photo Downloader:"
+msgstr ""
+
+#: ../install.py:715 ../install.py:740
+msgid ""
+"Querying package system to see if an older version of Rapid Photo Downloader "
+"is installed (this may take a while)..."
+msgstr ""
+
+#: ../install.py:726
+msgid ""
+"Unable to query package system. Please check your Internet connection and "
+"try again"
+msgstr ""
+
+#: ../install.py:756
+msgid "Checking if previous version installed with pip..."
+msgstr ""
+
+#: ../install.py:850
+msgid "The following package is unknown on your system: {}\n"
+msgstr ""
+
+#: ../install.py:857 ../install.py:929 ../install.py:974
+msgid ""
+"To continue, some packages required to run the application will be installed."
+msgstr ""
+
+#: ../install.py:886
+msgid "Querying installed and available packages (this may take a while)"
+msgstr ""
+
+#: ../install.py:958
+msgid ""
+"Querying zypper to see if any required packages are already installed (this "
+"may take a while)... "
+msgstr ""
+
+#: ../install.py:1004
+msgid "Query to confirm action at each step."
+msgstr ""
+
+#: ../install.py:1011
+msgid ""
+"When downloading the latest version, install the development version if it "
+"is newer than the stable version."
+msgstr ""
+
+#: ../install.py:1020
+msgid ""
+"Optional tar.gz Rapid Photo Downloader installer archive. If not specified, "
+"the latest version is downloaded from the Internet."
+msgstr ""
+
+#: ../install.py:1043
+msgid ""
+"Do not run the installer in the tar.gz Rapid Photo Downloader installer "
+"archive if it is newer than this version ({}). The default is to run "
+"whichever installer is newer."
+msgstr ""
+
+#: ../install.py:1050
+msgid ""
+"Uninstall Rapid Photo Downloader that was installed with pip, keeping its "
+"dependencies."
+msgstr ""
+
+#: ../install.py:1054
+msgid ""
+"Uninstall the dependencies installed by pip during Rapid Photo Downloader's "
+"installation, and Rapid Photo Downloader itself, then exit."
+msgstr ""
+
+#: ../install.py:1059
+msgid ""
+"Note: this will not uninstall any version of Rapid Photo Downloader "
+"installed by your Linux distribution's package manager."
+msgstr ""
+
+#: ../install.py:1066
+msgid ""
+"Dependencies will only be removed if they are not required by other programs."
+msgstr ""
+
+#: ../install.py:1072
+msgid ""
+"Note: this option will remove the dependencies regardless of whether they "
+"are required by another program pip has installed. Upgrade to pip 9.0 or "
+"above if you want to avoid this behavior. You can do so using the command "
+"'python3 -m pip install pip -U --user'. Also note that any version of Rapid "
+"Photo Downloader installed by your Linux distribution's package manager will "
+"not be uninstalled."
+msgstr ""
+
+#: ../install.py:1122
+msgid "Failed to download versions file"
+msgstr ""
+
+#: ../install.py:1126
+msgid "Got error code {} while accessing versions file"
+msgstr ""
+
+#: ../install.py:1234
+msgid ""
+"Sorry, could not locate installer. Please check your Internet connection and "
+"verify if you can reach https://www.damonlynch.net\n"
+"\n"
+"Exiting.\n"
+msgstr ""
+
+#: ../install.py:1408
+msgid "Installing application requirements..."
+msgstr ""
+
+#: ../install.py:1424
+msgid "Received error code"
+msgstr ""
+
+#: ../install.py:1425
+msgid "Failed to install application requirements: exiting"
+msgstr ""
+
+#: ../install.py:1428
+msgid "Installing application..."
+msgstr ""
+
+#: ../install.py:1441
+msgid "Failed to install application: exiting..."
+msgstr ""
+
+#: ../install.py:1465
+msgid ""
+"You may have to restart the computer to be able to run the program from the "
+"commmand line or application launcher."
+msgstr ""
+
+#: ../install.py:1476
+msgid "Do you want to install the application's man pages?"
+msgstr ""
+
+#: ../install.py:1477
+msgid "They will be installed into {}"
+msgstr ""
+
+#: ../install.py:1478 ../install.py:1483
+msgid "If you uninstall the application, remove these manpages yourself."
+msgstr ""
+
+#: ../install.py:1480
+msgid "Do want to install the man pages?"
+msgstr ""
+
+#: ../install.py:1482
+msgid "Installing man pages into {}"
+msgstr ""
+
+#: ../install.py:1499
+msgid "Failed to create man page directory: exiting"
+msgstr ""
+
+#: ../install.py:1511
+msgid "Failed to copy man page."
+msgstr ""
+
+#: ../install.py:1521
+msgid "(If a segmentation fault occurs at exit, you can ignore it...)"
+msgstr ""
+
+#: ../install.py:1534
+msgid ""
+"The python3 tool pip is required to uninstall a version of Rapid Photo "
+"Downloader that was installed with pip.\n"
+"Cannot continue. Exiting."
+msgstr ""
+
+#: ../install.py:1575
+msgid ""
+"Do not run this installer script as sudo / root user.\n"
+"Run it using the user who will run the program.\n"
+msgstr ""
+
+#: ../install.py:1585 ../install.py:1599
+msgid "Do not include any other command line arguments when specifying"
+msgstr ""
+
+#: ../install.py:1614
+msgid ""
+"Sorry, this installer does not support a custom python installation.\n"
+"Exiting..."
+msgstr ""
+
+#: ../install.py:1620
+msgid "Restarting script using system python..."
+msgstr ""
+
+#: ../install.py:1651
+msgid "Exiting..."
+msgstr ""
+
+#. Translators: do not translate the term python3-apt
+#: ../install.py:1670
+msgid "To continue, the package python3-apt must be installed."
+msgstr ""
+
+#: ../install.py:1689
+msgid ""
+"Install the following packages using your Linux distribution's standard "
+"package manager, and then rerun this installer"
+msgstr ""
+
+#: ../install.py:1698
+msgid ""
+"To run this program, programs to assist Python 3 and its package management "
+"must be installed."
+msgstr ""
+
+#. Translators: do not translate the terms Python 3, pip and setuptools
+#: ../install.py:1713
+msgid "Python 3's pip and setuptools must be upgraded for your user."
+msgstr ""
+
+#. Translators: do not translate the term python or requests
+#: ../install.py:1726
+msgid "Installing python requests"
+msgstr ""
+
+#: ../upgrade.py:79
+msgid "Upgrade Rapid Photo Downloader"
+msgstr ""
+
+#: ../upgrade.py:401 ../raphodo/viewutils.py:242
+msgid "&Cancel"
+msgstr ""
+
+#: ../upgrade.py:405
+msgid "&Upgrade"
+msgstr ""
+
+#: ../upgrade.py:410
+#, python-format
+msgid "Click the Upgrade button to upgrade to version %s."
+msgstr ""
+
+#: ../upgrade.py:413
+msgid "Click the Upgrade button to start the upgrade."
+msgstr ""
+
+#: ../upgrade.py:416 ../upgrade.py:422 ../raphodo/viewutils.py:241
+msgid "&Close"
+msgstr ""
+
+#: ../upgrade.py:417
+msgid "&Run"
+msgstr ""
+
+#: ../upgrade.py:447
+msgid "Close Rapid Photo Downloader before running this upgrade"
+msgstr ""
 
-#. type: QPushButton
-#: ../raphodo/aboutdialog.py:217
+#: ../upgrade.py:450
+msgid "Upgrade running..."
+msgstr ""
+
+#: ../upgrade.py:486
+#, python-format
+msgid ""
+"Successfully upgraded to %s. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:491
+msgid ""
+"Upgrade finished successfully. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:495
+msgid "Upgrade failed. Click Close to exit."
+msgstr ""
+
+#: ../upgrade.py:6967
+#, python-format
+msgid "Upgrading %s..."
+msgstr ""
+
+#: ../upgrade.py:6969
+msgid "Press any key to continue..."
+msgstr ""
+
+#: ../upgrade.py:6982
+msgid "Rapid Photo Downloader upgrade failed"
+msgstr ""
+
+#: ../upgrade.py:6984
+#, python-format
+msgid ""
+"The python package %s could not be updated. The upgrade cannot continue."
+msgstr ""
+
+#: ../raphodo/aboutdialog.py:225
 msgid "Credits"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:239
+#: ../raphodo/backuppanel.py:240
 msgid "Backups are not configured"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:241
+#: ../raphodo/backuppanel.py:242
 msgid "No backup devices detected"
 msgstr "Varmuuskopiolaitetta ei löytynyt"
 
-#: ../raphodo/backuppanel.py:243
+#: ../raphodo/backuppanel.py:244
 msgid "Valid backup locations not yet specified"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:401
+#: ../raphodo/backuppanel.py:404
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
@@ -43,95 +394,104 @@ msgstr ""
 "Voit varmuuskopioida kuvat ja videot useaan sijaintiin ladattaessa, "
 "esimerkiksi ulkoisiin kiintolevyihin."
 
-#: ../raphodo/backuppanel.py:407
+#: ../raphodo/backuppanel.py:412
 msgid "Back up photos and videos when downloading"
 msgstr "Varmuuskopioi kuvat ja videot ladattaessa"
 
-#: ../raphodo/backuppanel.py:413
+#: ../raphodo/backuppanel.py:418
 msgid "Automatically detect backup devices"
 msgstr "Tunnista automaattisesti varmuuskopiolaitteet"
 
-#: ../raphodo/backuppanel.py:417
+#: ../raphodo/backuppanel.py:424
 msgid ""
-"Specify the folder in which backups are stored on the device."
-"<br><br><i>Note: the presence of a folder with this name is used to "
+"Specify the folder in which backups are stored on the "
+"device.<br><br><i>Note: the presence of a folder with this name is used to "
 "determine if 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 folder names. By "
 "adding both folders, the same device can be used to back up both photos and "
 "videos.</i>"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:428
+#: ../raphodo/backuppanel.py:439
 msgid "Photo folder name:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:433
+#: ../raphodo/backuppanel.py:444
 msgid "Video folder name:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:438 ../raphodo/nameeditor.py:883
+#: ../raphodo/backuppanel.py:449 ../raphodo/nameeditor.py:890
 #: ../raphodo/renamepanel.py:123
 msgid "Example:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:448
-msgid "If you disable automatic detection, choose the exact backup locations."
+#: ../raphodo/backuppanel.py:460
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
 
-#: ../raphodo/backuppanel.py:452
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:468
 msgid "Photo backup location:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:454
+#: ../raphodo/backuppanel.py:474
 msgid "Select Photo Backup Location"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:460
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:485
 msgid "Video backup location:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:462
+#: ../raphodo/backuppanel.py:491
 msgid "Select Video Backup Location"
 msgstr ""
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:564
+#: ../raphodo/backuppanel.py:595
 msgid "drive1"
 msgstr ""
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:567
+#: ../raphodo/backuppanel.py:598
 msgid "drive2"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:628
+#: ../raphodo/backuppanel.py:663
 msgid "Projected Backup Storage Use"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:632
+#: ../raphodo/backuppanel.py:669
 msgid "Backup Options"
 msgstr ""
 
 #. translators: refers to the video thumbnail file that some
 #. cameras generate -- it has a .THM file extension
-#: ../raphodo/copyfiles.py:476
+#: ../raphodo/copyfiles.py:491
 msgid "video THM"
 msgstr ""
 
-#: ../raphodo/copyfiles.py:482
+#: ../raphodo/copyfiles.py:497
 msgid "audio"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:78 ../raphodo/devicedisplay.py:1079
-#: ../raphodo/rpdfile.py:321
+#: ../raphodo/rpdfile.py:342
 #, python-format
 msgid "%(no_photos)s Photos"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:82 ../raphodo/devicedisplay.py:1081
-#: ../raphodo/rpdfile.py:316
+#: ../raphodo/rpdfile.py:333
 #, python-format
 msgid "%(no_videos)s Videos"
 msgstr ""
@@ -159,15 +519,15 @@ msgid "%(size_free)s free of %(size_total)s"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:190 ../raphodo/devicedisplay.py:993
-#: ../raphodo/rapid.py:1964 ../raphodo/rapid.py:2079 ../raphodo/rapid.py:5753
-#: ../raphodo/rpdfile.py:905
+#: ../raphodo/rapid.py:2023 ../raphodo/rapid.py:2151 ../raphodo/rapid.py:6043
+#: ../raphodo/rpdfile.py:930
 msgid "Photos"
 msgstr ""
 
 #. translators: the name of the Videos folder
 #: ../raphodo/destinationdisplay.py:191 ../raphodo/devicedisplay.py:994
-#: ../raphodo/rapid.py:1967 ../raphodo/rapid.py:2080 ../raphodo/rapid.py:5754
-#: ../raphodo/rpdfile.py:933 ../raphodo/storage.py:445
+#: ../raphodo/rapid.py:2028 ../raphodo/rapid.py:2152 ../raphodo/rapid.py:6044
+#: ../raphodo/rpdfile.py:958 ../raphodo/storage.py:449
 msgid "Videos"
 msgstr ""
 
@@ -175,7 +535,7 @@ msgstr ""
 msgid "Projected storage use after download"
 msgstr ""
 
-#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:516
+#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:521
 msgid "Custom..."
 msgstr ""
 
@@ -213,57 +573,58 @@ msgstr ""
 msgid "%s full"
 msgstr ""
 
-#: ../raphodo/devices.py:459
+#: ../raphodo/devices.py:463
 msgid "Cameras"
 msgstr ""
 
-#: ../raphodo/devices.py:460 ../raphodo/devices.py:920
-#: ../raphodo/preferencedialog.py:85 ../raphodo/rapid.py:1927
+#: ../raphodo/devices.py:464 ../raphodo/devices.py:927
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/rapid.py:1979
 msgid "Devices"
 msgstr "Laitteet"
 
-#: ../raphodo/devices.py:720
+#: ../raphodo/devices.py:724
 #, python-format
 msgid "Downloading from %(device_names)s"
 msgstr ""
 
 #. Translators: e.g. Three Devices
-#: ../raphodo/devices.py:780
+#: ../raphodo/devices.py:784
 #, python-format
 msgid "%(no_devices)s %(device_type)s"
 msgstr ""
 
-#: ../raphodo/devices.py:905 ../raphodo/rapid.py:1764
+#: ../raphodo/devices.py:912 ../raphodo/rapid.py:1807
 msgid "Select Source"
 msgstr ""
 
-#: ../raphodo/devices.py:936 ../raphodo/devices.py:947
+#: ../raphodo/devices.py:943 ../raphodo/devices.py:954
 #, python-format
 msgid "%(device1)s + %(device2)s"
 msgstr ""
 
 #. Number of cameras e.g. 3 Cameras
-#: ../raphodo/devices.py:958
+#: ../raphodo/devices.py:965
 #, python-format
 msgid "%(no_cameras)s Cameras"
 msgstr ""
 
-#: ../raphodo/devices.py:963
+#: ../raphodo/devices.py:970
 #, python-format
 msgid "%(no_devices)s Devices"
 msgstr ""
 
 #. Translators: two folder names, separated by a plus sign
-#: ../raphodo/devices.py:1258
+#: ../raphodo/devices.py:1265
 #, python-format
 msgid "%s + %s"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:44
+#: ../raphodo/didyouknow.py:45
 msgid "Click on a file's checkbox to mark or unmark it for download."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:50
+#: ../raphodo/didyouknow.py:51
 msgid ""
 "Files that have already been downloaded are remembered. You can still mark "
 "previously downloaded files to download again, but they are unchecked by "
@@ -271,34 +632,67 @@ msgid ""
 "files that are yet to be downloaded."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:59
+#: ../raphodo/didyouknow.py:60
 msgid ""
 "If more than one file is selected, they'll all take the mark of the file "
 "whose checkbox was clicked, regardless of whether they previously had a "
 "checkmark or not."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:67
+#: ../raphodo/didyouknow.py:68
 msgid ""
 "Click on a device's checkbox to quickly mark or unmark all its files for "
 "downloading."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:74
+#: ../raphodo/didyouknow.py:75
+msgid ""
+"After a download finishes, an icon replaces the thumbnail's checkbox. The "
+"icon's color indicates whether the download was successful (green), had file "
+"renaming problems (yellow/orange), or failed (red)."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:83
+msgid ""
+"\n"
+"            In case of any problems, a red icon will appear at the bottom of "
+"the window\n"
+"            indicating how many error reports there are. Clicking on it "
+"opens the Error Report \n"
+"            window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:91
+msgid ""
+"\n"
+"            The Error Report window lists any problems encountered before, "
+"during or after the \n"
+"            download. An orange triangle represents a warning, a red circle "
+"indicates a failure, \n"
+"            and a black circle indicates more serious failures. You can "
+"click on the hyperlinks to \n"
+"            open its file or device in a file manager. You can also search "
+"the reports using the \n"
+"            search box in the lower left of the Error Report window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:103
 msgid ""
 "You can simultaneously download from multiple cameras, smartphones, memory "
 "cards, and hard drives&mdash;as many devices as your computer can handle at "
 "one time."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:81
+#: ../raphodo/didyouknow.py:110
 msgid ""
 "The <b>Timeline</b> groups photos and videos based on how much time elapsed "
 "between consecutive shots. Use it to identify photos and videos taken at "
 "different periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:88
+#: ../raphodo/didyouknow.py:117
 msgid ""
 "\n"
 "<p>In the illustration above, the first row of the Timeline is black because "
@@ -310,7 +704,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:99
+#: ../raphodo/didyouknow.py:128
 msgid ""
 "To view photos and videos for a particular time range, use the mouse "
 "(optionally in combination with the <tt>Shift</tt> or <tt>Ctrl</tt> keys) to "
@@ -318,20 +712,20 @@ msgid ""
 "the left side of the main window will be highlighted."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:106
+#: ../raphodo/didyouknow.py:135
 msgid ""
 "A download always includes all files that are checked for download, "
 "including those that are not currently displayed because the Timeline is "
 "being used."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:113
+#: ../raphodo/didyouknow.py:142
 msgid ""
 "You can hide or display the download sources by clicking on the name of the "
 "device you're downloading from at the top left of the program window."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:120
+#: ../raphodo/didyouknow.py:149
 msgid ""
 "\n"
 "          Thumbnails can be sorted using a variety of criteria:\n"
@@ -350,33 +744,33 @@ msgid ""
 "</ol> "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:137
+#: ../raphodo/didyouknow.py:166
 msgid ""
 "One of Rapid Photo Downloader's most useful features is its ability to "
 "automatically generate download subfolders and rename files as it downloads, "
 "using a scheme of your choosing."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:143
+#: ../raphodo/didyouknow.py:172
 msgid ""
 "To specify where you want your files downloaded and how you want them named, "
 "open the appropriate panel on the right-side of the application window: "
 "<b>Destination</b>, <b>Rename</b>, or <b>Job Code</b>."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:150
+#: ../raphodo/didyouknow.py:179
 msgid ""
 "\n"
 "When thinking about your download directory structure, keep in mind two "
 "different types\n"
 "of directory:\n"
 "<ol>\n"
-"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, &quot;"
-"Photos&quot;, or\n"
+"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, "
+"&quot;Photos&quot;, or\n"
 "&quot;Videos&quot;. This directory should already exist on your computer. In "
 "the illustration \n"
-"below, the destination folders are &quot;Pictures&quot; and &quot;"
-"Videos&quot;. The\n"
+"below, the destination folders are &quot;Pictures&quot; and "
+"&quot;Videos&quot;. The\n"
 "name of the destination folder is displayed in the grey bar directly above "
 "the folder tree, \n"
 "with a folder icon to its left and a gear icon to its far right.</li>\n"
@@ -389,7 +783,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:167
+#: ../raphodo/didyouknow.py:196
 msgid ""
 "\n"
 "You can download photos and videos to the same destination folder, or "
@@ -402,14 +796,14 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:177
+#: ../raphodo/didyouknow.py:206
 msgid ""
 "Automatically generated download subfolders can contain further "
 "automatically generated subfolders if need be. A common scheme is to create "
 "a year subfolder and then a series of year-month-day subfolders within it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:186
+#: ../raphodo/didyouknow.py:215
 msgid ""
 "\n"
 "Whenever possible, the program previews the download subfolders of photos "
@@ -427,7 +821,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:201
+#: ../raphodo/didyouknow.py:230
 msgid ""
 "\n"
 "Download subfolder names are typically generated using some or all of the "
@@ -451,7 +845,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:219
+#: ../raphodo/didyouknow.py:248
 msgid ""
 "\n"
 "To automatically create download subfolders as you download, \n"
@@ -461,7 +855,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:227
+#: ../raphodo/didyouknow.py:256
 msgid ""
 "\n"
 "Using the drop-down menu, select a built-in preset or click on <b>Custom</b> "
@@ -471,20 +865,20 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:237
+#: ../raphodo/didyouknow.py:266
 msgid ""
 "It's easy to download raw images into one folder, and jpeg images into "
 "another. Simply use the <b>Filename Extension</b> as part of your download "
 "subfolder generation scheme:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:242
+#: ../raphodo/didyouknow.py:271
 msgid ""
 "This illustration shows a saved custom preset named &quot;My custom "
 "preset&quot;."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:246
+#: ../raphodo/didyouknow.py:275
 msgid ""
 "\n"
 "You do not have to create nested download subfolders. This illustration "
@@ -495,7 +889,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:256
+#: ../raphodo/didyouknow.py:285
 msgid ""
 "\n"
 "Although there are many built-in date/time naming options, you may find that "
@@ -509,7 +903,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:265
+#: ../raphodo/didyouknow.py:294
 msgid ""
 "\n"
 "Read more about all the ways you can generate download subfolder names and "
@@ -519,7 +913,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:273
+#: ../raphodo/didyouknow.py:302
 msgid ""
 "\n"
 "<b>Job Codes</b> let you easily enter text that describes sets of photos and "
@@ -531,7 +925,7 @@ msgid ""
 "&quot;Green Bazaar&quot;: \n"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:282
+#: ../raphodo/didyouknow.py:311
 msgid ""
 "\n"
 "You can apply new or existing Job Codes before you start a download. If "
@@ -542,36 +936,36 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:291
+#: ../raphodo/didyouknow.py:320
 msgid "Look for hints to guide you when working with Job Codes:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:295
+#: ../raphodo/didyouknow.py:324
 msgid ""
 "Hints will vary depending on the context, such as when the mouse is hovering "
 "over a button."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:301
+#: ../raphodo/didyouknow.py:330
 msgid ""
 "\n"
 "When you give your photos and videos unique filenames, you'll never be "
 "confused as to \n"
 "which file is which. Using <b>sequence numbers</b> to make filenames unique "
 "is highly \n"
-"recommended!.\n"
+"recommended!\n"
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:309
+#: ../raphodo/didyouknow.py:338
 msgid ""
 "\n"
 "<p>Four types of sequence values are available to help you assign unique "
 "names to your photos and \n"
 "videos:\n"
 "<ol>\n"
-"<li><b>Downloads today</b>: tracks downloads completed during that day.</"
-"li>\n"
+"<li><b>Downloads today</b>: tracks downloads completed during that "
+"day.</li>\n"
 "<li><b>Stored number</b>: similar to Downloads today, but it is remembered "
 "from the last time the  \n"
 "program was run.</li>\n"
@@ -585,7 +979,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:327
+#: ../raphodo/didyouknow.py:356
 msgid ""
 "\n"
 "The <b>Rename</b> panel allows you to configure file renaming. To rename "
@@ -594,7 +988,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:334
+#: ../raphodo/didyouknow.py:363
 msgid ""
 "\n"
 "<p>The <b>Synchronize RAW + JPEG</b> option is useful if you use the RAW + "
@@ -613,7 +1007,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:348
+#: ../raphodo/didyouknow.py:377
 msgid ""
 "\n"
 "You can have your photos and videos backed up to multiple locations as they "
@@ -624,13 +1018,13 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:356
+#: ../raphodo/didyouknow.py:385
 msgid ""
 "In this example, the drive <b>photobackup</b> does not contain a folder "
 "named <tt>Videos</tt>, so videos will not be backed up to it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:362
+#: ../raphodo/didyouknow.py:391
 msgid ""
 "\n"
 "Several of the program's preferences can be set from the command line, "
@@ -641,7 +1035,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:372
+#: ../raphodo/didyouknow.py:396
+msgid "You can also import program preferences from the older 0.4 version."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:401
 msgid ""
 "\n"
 "Rapid Photo Downloader deals with three types of cache:\n"
@@ -651,8 +1049,8 @@ msgid ""
 "memory cards, and other devices.</li>\n"
 "<li>A <b>temporary cache</b> of files downloaded from a camera, one for "
 "photos and another for \n"
-"videos. They are located in temporary subfolders in the download destination."
-"</li>\n"
+"videos. They are located in temporary subfolders in the download "
+"destination.</li>\n"
 "<li>The <b>desktop's thumbnail cache</b>, in which Rapid Photo Downloader "
 "stores thumbnails of \n"
 "RAW and TIFF photos once they have been downloaded. File browsers like Gnome "
@@ -667,23 +1065,23 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:431
+#: ../raphodo/didyouknow.py:460
 msgid "Tip of the Day"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:439
+#: ../raphodo/didyouknow.py:468
 msgid "Did you know...?"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:466
+#: ../raphodo/didyouknow.py:495
 msgid "Show tips on startup"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:470
+#: ../raphodo/didyouknow.py:499
 msgid "&Next"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:471
+#: ../raphodo/didyouknow.py:500
 msgid "&Previous"
 msgstr ""
 
@@ -790,68 +1188,68 @@ msgstr ""
 msgid "%(days)d days, %(hours)d hours"
 msgstr ""
 
-#: ../raphodo/errorlog.py:65
+#: ../raphodo/errorlog.py:66
 msgid "Find"
 msgstr ""
 
-#: ../raphodo/errorlog.py:135
+#: ../raphodo/errorlog.py:136
 msgid "Error Reports - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/errorlog.py:170
+#: ../raphodo/errorlog.py:171
 msgid "Find in reports"
 msgstr ""
 
-#: ../raphodo/errorlog.py:187
+#: ../raphodo/errorlog.py:188
 msgid "Find the previous occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:192
+#: ../raphodo/errorlog.py:193
 msgid "Find the next occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:194
+#: ../raphodo/errorlog.py:195
 msgid "&Highlight All"
 msgstr ""
 
-#: ../raphodo/errorlog.py:195
+#: ../raphodo/errorlog.py:196
 msgid "Highlight all occurrences of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:196
+#: ../raphodo/errorlog.py:197
 msgid "&Match Case"
 msgstr ""
 
-#: ../raphodo/errorlog.py:197
+#: ../raphodo/errorlog.py:198
 msgid "Search with case sensitivity"
 msgstr ""
 
-#: ../raphodo/errorlog.py:198
+#: ../raphodo/errorlog.py:199
 msgid "&Whole Words"
 msgstr ""
 
-#: ../raphodo/errorlog.py:199
+#: ../raphodo/errorlog.py:200
 msgid "Search whole words only"
 msgstr ""
 
-#: ../raphodo/errorlog.py:209 ../raphodo/errorlog.py:341
+#: ../raphodo/errorlog.py:210 ../raphodo/errorlog.py:345
 #, python-format
 msgid "%s of %s matches"
 msgstr ""
 
-#: ../raphodo/errorlog.py:228
+#: ../raphodo/errorlog.py:232
 msgid "Clear"
 msgstr ""
 
-#: ../raphodo/errorlog.py:328
+#: ../raphodo/errorlog.py:332
 msgid "Phrase not found"
 msgstr ""
 
-#: ../raphodo/errorlog.py:487
+#: ../raphodo/errorlog.py:491
 msgid "Search pending..."
 msgstr ""
 
-#: ../raphodo/errorlog.py:535
+#: ../raphodo/errorlog.py:539
 msgid ""
 "The number of new entries added to the Error Report since it was last open. "
 "Click to open the Error Report."
@@ -865,8 +1263,8 @@ msgstr ""
 #, python-brace-format
 msgid ""
 "<b>A problem occurred in Rapid Photo Downloader</b><br><br>\n"
-"    Please report the problem at <a href=\"{website}\">{website}</a>."
-"<br><br>\n"
+"    Please report the problem at <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
 "    Attach the log file <i>{log_file}</i> to your bug report (click\n"
 "    <a href=\"{log_path}\">here</a> to open the log directory).<br><br>If "
 "the same problem occurs\n"
@@ -887,7 +1285,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1601
+#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1643
 msgid "Open in File Browser..."
 msgstr ""
 
@@ -905,531 +1303,531 @@ msgstr ""
 msgid "%s (location does not exist)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:186
+#: ../raphodo/generatenameconfig.py:190
 msgid "Date time"
 msgstr "Ajankohta"
 
-#: ../raphodo/generatenameconfig.py:187
+#: ../raphodo/generatenameconfig.py:191
 msgid "Text"
 msgstr "Teksti"
 
-#: ../raphodo/generatenameconfig.py:188 ../raphodo/rapid.py:2053
+#: ../raphodo/generatenameconfig.py:192 ../raphodo/rapid.py:2125
 msgid "Filename"
 msgstr "Tiedostonimi"
 
-#: ../raphodo/generatenameconfig.py:189 ../raphodo/preferencedialog.py:488
+#: ../raphodo/generatenameconfig.py:193 ../raphodo/preferencedialog.py:724
 msgid "Metadata"
 msgstr "Metatieto"
 
-#: ../raphodo/generatenameconfig.py:190
+#: ../raphodo/generatenameconfig.py:194
 msgid "Sequences"
 msgstr "Numeroinnit"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: ../raphodo/generatenameconfig.py:193
+#: ../raphodo/generatenameconfig.py:197
 msgid "Job code"
 msgstr "Työkoodi"
 
-#: ../raphodo/generatenameconfig.py:194
+#: ../raphodo/generatenameconfig.py:198
 msgid "Image date"
 msgstr "Kuvan päivämäärä"
 
-#: ../raphodo/generatenameconfig.py:195
+#: ../raphodo/generatenameconfig.py:199
 msgid "Video date"
 msgstr "Videon päivämäärä"
 
-#: ../raphodo/generatenameconfig.py:196
+#: ../raphodo/generatenameconfig.py:200
 msgid "Today"
 msgstr "Tänään"
 
-#: ../raphodo/generatenameconfig.py:197
+#: ../raphodo/generatenameconfig.py:201
 msgid "Yesterday"
 msgstr "Huomenna"
 
 #. Translators: Download time is the time and date that the download started (when the
 #. user clicked the Download button)
-#: ../raphodo/generatenameconfig.py:200
+#: ../raphodo/generatenameconfig.py:204
 msgid "Download time"
 msgstr "Latausaika"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:203
+#: ../raphodo/generatenameconfig.py:207
 msgid "Name"
 msgstr "Nimi"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:206 ../raphodo/rapid.py:2054
+#: ../raphodo/generatenameconfig.py:210 ../raphodo/rapid.py:2126
 msgid "Extension"
 msgstr "Tiedostopääte"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:209
+#: ../raphodo/generatenameconfig.py:213
 msgid "Image number"
 msgstr "Kuvan numero"
 
-#: ../raphodo/generatenameconfig.py:210
+#: ../raphodo/generatenameconfig.py:214
 msgid "Video number"
 msgstr "Videon numero"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:213
+#: ../raphodo/generatenameconfig.py:217
 msgid "Aperture"
 msgstr "Aukko"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:216
+#: ../raphodo/generatenameconfig.py:220
 msgid "ISO"
 msgstr "Herkkyys"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:219
+#: ../raphodo/generatenameconfig.py:223
 msgid "Exposure time"
 msgstr "Valotusaika"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:222
+#: ../raphodo/generatenameconfig.py:226
 msgid "Focal length"
 msgstr "Polttoväli"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:225
+#: ../raphodo/generatenameconfig.py:229
 msgid "Camera make"
 msgstr "Kameran merkki"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:228
+#: ../raphodo/generatenameconfig.py:232
 msgid "Camera model"
 msgstr "Kameran malli"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:231
+#: ../raphodo/generatenameconfig.py:235
 msgid "Short camera model"
 msgstr "Lyhyt kameramalli"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:234
+#: ../raphodo/generatenameconfig.py:238
 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
-#: ../raphodo/generatenameconfig.py:237
+#: ../raphodo/generatenameconfig.py:241
 msgid "Serial number"
 msgstr "Sarjanumero"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:240
+#: ../raphodo/generatenameconfig.py:244
 msgid "Shutter count"
 msgstr "Suljinlaskuri"
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: ../raphodo/generatenameconfig.py:242
+#: ../raphodo/generatenameconfig.py:246
 msgid "File number"
 msgstr ""
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:244
+#: ../raphodo/generatenameconfig.py:248
 msgid "Folder only"
 msgstr ""
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:246
+#: ../raphodo/generatenameconfig.py:250
 msgid "Folder and file"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:249
+#: ../raphodo/generatenameconfig.py:253
 msgid "Owner name"
 msgstr "Omistajan nimi"
 
-#: ../raphodo/generatenameconfig.py:250
+#: ../raphodo/generatenameconfig.py:254
 msgid "Codec"
 msgstr "Koodekki"
 
-#: ../raphodo/generatenameconfig.py:251
+#: ../raphodo/generatenameconfig.py:255
 msgid "Width"
 msgstr "Leveys"
 
-#: ../raphodo/generatenameconfig.py:252
+#: ../raphodo/generatenameconfig.py:256
 msgid "Height"
 msgstr "Korkeus"
 
-#: ../raphodo/generatenameconfig.py:253
+#: ../raphodo/generatenameconfig.py:257
 msgid "Length"
 msgstr "Pituus"
 
-#: ../raphodo/generatenameconfig.py:254
+#: ../raphodo/generatenameconfig.py:258
 msgid "Frames Per Second"
 msgstr "Kuvataajuus"
 
-#: ../raphodo/generatenameconfig.py:255
+#: ../raphodo/generatenameconfig.py:259
 msgid "Artist"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:256
+#: ../raphodo/generatenameconfig.py:260
 msgid "Copyright"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:259
+#: ../raphodo/generatenameconfig.py:263
 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
-#: ../raphodo/generatenameconfig.py:262
+#: ../raphodo/generatenameconfig.py:266
 msgid "Session number"
 msgstr "Istuntonumero"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:265
+#: ../raphodo/generatenameconfig.py:269
 msgid "Subfolder number"
 msgstr "Alikansion numero"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:268
+#: ../raphodo/generatenameconfig.py:272
 msgid "Stored number"
 msgstr "Tallennettu numero"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: ../raphodo/generatenameconfig.py:271
+#: ../raphodo/generatenameconfig.py:275
 msgid "Sequence letter"
 msgstr "Kirjainsarja"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:274
+#: ../raphodo/generatenameconfig.py:278
 msgid "All digits"
 msgstr "Kaikki numerot"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:277
+#: ../raphodo/generatenameconfig.py:281
 msgid "Last digit"
 msgstr "Viimeinen numero"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:280
+#: ../raphodo/generatenameconfig.py:284
 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
-#: ../raphodo/generatenameconfig.py:283
+#: ../raphodo/generatenameconfig.py:287
 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
-#: ../raphodo/generatenameconfig.py:286
+#: ../raphodo/generatenameconfig.py:290
 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
-#: ../raphodo/generatenameconfig.py:289
+#: ../raphodo/generatenameconfig.py:293
 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
-#: ../raphodo/generatenameconfig.py:292
+#: ../raphodo/generatenameconfig.py:296
 msgid "UPPERCASE"
 msgstr "ISOT KIRJAIMET"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:295
+#: ../raphodo/generatenameconfig.py:299
 msgid "lowercase"
 msgstr "pienet kirjaimet"
 
-#: ../raphodo/generatenameconfig.py:296
+#: ../raphodo/generatenameconfig.py:300
 msgid "One digit"
 msgstr "Yksi numero"
 
-#: ../raphodo/generatenameconfig.py:297
+#: ../raphodo/generatenameconfig.py:301
 msgid "Two digits"
 msgstr "Kaksi numeroa"
 
-#: ../raphodo/generatenameconfig.py:298
+#: ../raphodo/generatenameconfig.py:302
 msgid "Three digits"
 msgstr "Kolme numeroa"
 
-#: ../raphodo/generatenameconfig.py:299
+#: ../raphodo/generatenameconfig.py:303
 msgid "Four digits"
 msgstr "Neljä numeroa"
 
-#: ../raphodo/generatenameconfig.py:300
+#: ../raphodo/generatenameconfig.py:304
 msgid "Five digits"
 msgstr "Viisi numeroa"
 
-#: ../raphodo/generatenameconfig.py:301
+#: ../raphodo/generatenameconfig.py:305
 msgid "Six digits"
 msgstr "Kuusi numeroa"
 
-#: ../raphodo/generatenameconfig.py:302
+#: ../raphodo/generatenameconfig.py:306
 msgid "Seven digits"
 msgstr "Seitsemän numeroa"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:305
+#: ../raphodo/generatenameconfig.py:309
 msgid "Subseconds"
 msgstr "sekunnin osat"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:308 ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:312 ../raphodo/generatenameconfig.py:393
 msgid "YYYYMMDD"
 msgstr "VVVVKKPP"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:311 ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:315 ../raphodo/generatenameconfig.py:394
 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
-#: ../raphodo/generatenameconfig.py:314 ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:318 ../raphodo/generatenameconfig.py:395
 msgid "YYYY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:317
+#: ../raphodo/generatenameconfig.py:321
 msgid "YYMMDD"
 msgstr "VVKKPP"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:320
+#: ../raphodo/generatenameconfig.py:324
 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
-#: ../raphodo/generatenameconfig.py:323
+#: ../raphodo/generatenameconfig.py:327
 msgid "YY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:326
+#: ../raphodo/generatenameconfig.py:330
 msgid "MMDDYYYY"
 msgstr "KKPPVVVV"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:329
+#: ../raphodo/generatenameconfig.py:333
 msgid "MMDDYY"
 msgstr "KKPPVV"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:332
+#: ../raphodo/generatenameconfig.py:336
 msgid "MMDD"
 msgstr "KKPP"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:335
+#: ../raphodo/generatenameconfig.py:339
 msgid "DDMMYYYY"
 msgstr "PPKKVVVV"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:338
+#: ../raphodo/generatenameconfig.py:342
 msgid "DDMMYY"
 msgstr "PPKKVV"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:341 ../raphodo/generatenameconfig.py:389
-#: ../raphodo/generatenameconfig.py:390 ../raphodo/generatenameconfig.py:391
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:345 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:394 ../raphodo/generatenameconfig.py:395
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:397
 msgid "YYYY"
 msgstr "VVVV"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:344
+#: ../raphodo/generatenameconfig.py:348
 msgid "YY"
 msgstr "VV"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:347
+#: ../raphodo/generatenameconfig.py:351
 msgid "MM"
 msgstr "KK"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:350
+#: ../raphodo/generatenameconfig.py:354
 msgid "DD"
 msgstr "PP"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:353
+#: ../raphodo/generatenameconfig.py:357
 msgid "Month (full)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:356
+#: ../raphodo/generatenameconfig.py:360
 msgid "Month (abbreviated)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:359
+#: ../raphodo/generatenameconfig.py:363
 msgid "HHMMSS"
 msgstr "hhmmss"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:362
+#: ../raphodo/generatenameconfig.py:366
 msgid "HHMM"
 msgstr "hhmm"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:365
+#: ../raphodo/generatenameconfig.py:369
 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
-#: ../raphodo/generatenameconfig.py:368
+#: ../raphodo/generatenameconfig.py:372
 msgid "HH-MM"
 msgstr "TT-MM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:371
+#: ../raphodo/generatenameconfig.py:375
 msgid "HH"
 msgstr "TT"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:374
+#: ../raphodo/generatenameconfig.py:378
 msgid "MM (minutes)"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:377
+#: ../raphodo/generatenameconfig.py:381
 msgid "SS"
 msgstr "SS"
 
-#: ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:393
 msgid "Date"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:394
 msgid "Date (hyphens)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:395
 msgid "Date (underscores)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:438
-#: ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:442
+#: ../raphodo/generatenameconfig.py:537
 msgid "Date and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392
+#: ../raphodo/generatenameconfig.py:396
 msgid "YYYYMM_Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "Date and Job Code Subfolder"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "YYYYMM"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393 ../raphodo/jobcodepanel.py:198
-#: ../raphodo/nameeditor.py:827 ../raphodo/rapid.py:1809
+#: ../raphodo/generatenameconfig.py:397 ../raphodo/jobcodepanel.py:199
+#: ../raphodo/nameeditor.py:833 ../raphodo/rapid.py:1852
 #: ../raphodo/renamepanel.py:83 ../raphodo/renamepanel.py:241
 msgid "Job Code"
 msgstr "Työkoodi"
 
-#: ../raphodo/generatenameconfig.py:433 ../raphodo/generatenameconfig.py:512
+#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:532
 msgid "Original Filename"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "Date-Time and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "YYYYMMDD-HHMM-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "Date and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "YYYYMMDD-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "Date-Time and Image number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "YYYYMMDD-1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "Date-Time and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "YYYYMMDD-HHMM-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:442 ../raphodo/generatenameconfig.py:537
 msgid "YYYYMMDD-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "Date-Time and Video number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "YYYYMMDD_1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "Resolution"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "YYYYMMDD-HHMM-1-1920x1080"
 msgstr ""
 
@@ -1488,76 +1886,77 @@ msgstr ""
 msgid "&Remember this choice"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:185
+#: ../raphodo/jobcodepanel.py:186
 msgid ""
 "Select photos and videos to be able to apply a new or existing Job Code to "
 "them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:186
-msgid "The new Job Code will be applied to all selected photos and/or videos."
+#: ../raphodo/jobcodepanel.py:187
+msgid ""
+"The new Job Code will be applied to all selected photos and/or videos."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:187
+#: ../raphodo/jobcodepanel.py:188
 msgid ""
 "Click the Apply button to apply the current Job Code to all selected photos "
 "and/or videos. You can also simply double click the Job Code."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:189
+#: ../raphodo/jobcodepanel.py:190
 msgid ""
 "Removing a Job Code removes it only from the list of saved Job Codes, not "
 "from any photos or videos that it may have been applied to."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:191
+#: ../raphodo/jobcodepanel.py:192
 msgid ""
 "If you want to use Job Codes, configure file renaming or destination "
 "subfolder names to use them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:197
+#: ../raphodo/jobcodepanel.py:198
 msgid "Last Used"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:202
+#: ../raphodo/jobcodepanel.py:203
 msgid "Job Code Sort:"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:205 ../raphodo/rapid.py:2061
+#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2133
 msgid "Ascending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2062
+#: ../raphodo/jobcodepanel.py:207 ../raphodo/rapid.py:2134
 msgid "Descending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:216
+#: ../raphodo/jobcodepanel.py:217
 msgid "&New..."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:220
+#: ../raphodo/jobcodepanel.py:221
 msgid "&Apply"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:224
+#: ../raphodo/jobcodepanel.py:225
 msgid "&Remove"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:228 ../raphodo/preferencedialog.py:125
-#: ../raphodo/preferencedialog.py:154 ../raphodo/preferencedialog.py:433
+#: ../raphodo/jobcodepanel.py:229 ../raphodo/preferencedialog.py:200
+#: ../raphodo/preferencedialog.py:229 ../raphodo/preferencedialog.py:531
 msgid "Remove All"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:427
+#: ../raphodo/jobcodepanel.py:428
 msgid "Do you really want to remove all the Job Codes?"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:429
+#: ../raphodo/jobcodepanel.py:430
 msgid "Remove all Job Codes"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:492
+#: ../raphodo/jobcodepanel.py:493
 msgid "Job Codes"
 msgstr "Työkoodit"
 
@@ -1568,42 +1967,58 @@ msgstr "Työkoodit"
 msgid "<i><b>Hint:</b> %(message)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:418 ../raphodo/nameeditor.py:432
+#: ../raphodo/nameeditor.py:423 ../raphodo/nameeditor.py:437
 #, python-format
 msgid "%(description)s - %(elements)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:512
+#: ../raphodo/nameeditor.py:517
 msgid "Save New Custom Preset..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:513
+#: ../raphodo/nameeditor.py:518
 msgid "Remove All Custom Presets..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:559
+#: ../raphodo/nameeditor.py:564
 msgid "(New Custom Preset)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:576
+#: ../raphodo/nameeditor.py:581
 #, python-format
 msgid "%s (edited)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:579 ../raphodo/nameeditor.py:1370
+#: ../raphodo/nameeditor.py:584 ../raphodo/nameeditor.py:1379
 #, python-format
 msgid "Update Custom Preset \"%s\""
 msgstr ""
 
-#: ../raphodo/nameeditor.py:667
+#: ../raphodo/nameeditor.py:672
 msgid "Save New Custom Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:675
+#: ../raphodo/nameeditor.py:680
 msgid "Preset Name:"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:836
+#: ../raphodo/nameeditor.py:799
+msgid "Photo Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:805
+msgid "Video Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:811
+msgid "Photo Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:817
+msgid "Video Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:842
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>There is insufficient data to "
 "fully generate the name. Please use other renaming options.</i>"
@@ -1612,7 +2027,7 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees.
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:846
+#: ../raphodo/nameeditor.py:853
 #, python-format
 msgid "The character</i> %(separator)s <i>creates a new subfolder level."
 msgstr ""
@@ -1620,50 +2035,50 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:851
+#: ../raphodo/nameeditor.py:858
 #, python-format
 msgid ""
 "There is no need start or end with the folder separator </i> "
 "%(separator)s<i>, because it is added automatically."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:859
+#: ../raphodo/nameeditor.py:866
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>Unique filenames may not be "
 "generated. Make filenames unique by using Sequence values.</i>"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:882 ../raphodo/renamepanel.py:121
+#: ../raphodo/nameeditor.py:889 ../raphodo/renamepanel.py:121
 msgid "Preset:"
 msgstr ""
 
 #. Translators: appears in a combobox, e.g. Image Date (YYYY)
-#: ../raphodo/nameeditor.py:959 ../raphodo/nameeditor.py:980
+#: ../raphodo/nameeditor.py:966 ../raphodo/nameeditor.py:987
 #, python-brace-format
 msgid "{choice} ({variant})"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1005 ../raphodo/preferencedialog.py:530
+#: ../raphodo/nameeditor.py:1012 ../raphodo/preferencedialog.py:783
 msgid "Get help online..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1025
+#: ../raphodo/nameeditor.py:1034
 msgid "Insert"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1351
+#: ../raphodo/nameeditor.py:1360
 msgid "Save Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1356
+#: ../raphodo/nameeditor.py:1365
 msgid ""
-"<b>Do you want to save the changes in a new custom preset?</"
-"b><br><br>Creating a custom preset is not required, but can help you keep "
-"organized.<br><br>The changes to the preferences will still be applied "
-"regardless of whether you create a new custom preset or not."
+"<b>Do you want to save the changes in a new custom "
+"preset?</b><br><br>Creating a custom preset is not required, but can help "
+"you keep organized.<br><br>The changes to the preferences will still be "
+"applied regardless of whether you create a new custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1365
+#: ../raphodo/nameeditor.py:1374
 msgid ""
 "<b>Do you want to save the changes in a custom preset?</b><br><br>If you "
 "like, you can create a new custom preset or update the existing custom "
@@ -1671,136 +2086,167 @@ msgid ""
 "regardless of whether you save a custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1372
+#: ../raphodo/nameeditor.py:1381
 msgid "Save New Custom Preset"
 msgstr ""
 
-#: ../raphodo/newversion.py:306
+#: ../raphodo/newversion.py:312
 msgid "Checking for new version..."
 msgstr ""
 
-#: ../raphodo/newversion.py:307
+#: ../raphodo/newversion.py:313
 msgid "You are running the latest version."
 msgstr ""
 
-#: ../raphodo/newversion.py:308
+#: ../raphodo/newversion.py:314
 msgid "Failed to contact the update server."
 msgstr ""
 
-#: ../raphodo/newversion.py:310
+#: ../raphodo/newversion.py:316
 #, python-format
 msgid "A new version of Rapid Photo Downloader (%s) is available."
 msgstr ""
 
-#: ../raphodo/newversion.py:312
+#: ../raphodo/newversion.py:318
 msgid "Do you want to download the new version?"
 msgstr ""
 
-#: ../raphodo/newversion.py:313
+#: ../raphodo/newversion.py:319
 #, python-format
 msgid "Changes in the new release can be viewed <a href=\"%s\">here</a>."
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the s key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:340 ../raphodo/newversion.py:353
+#: ../raphodo/newversion.py:348 ../raphodo/newversion.py:363
 msgid "&Skip this release"
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the o key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:356
+#: ../raphodo/newversion.py:366
 msgid "&Open Download Page"
 msgstr ""
 
-#: ../raphodo/newversion.py:376
+#: ../raphodo/newversion.py:386
 msgid "Rapid Photo Downloader updates"
 msgstr ""
 
 #. Translators: shows how much of a file has been downloaded e.g  123 KB of 1.3 MB
-#: ../raphodo/newversion.py:478
+#: ../raphodo/newversion.py:488
 #, python-format
 msgid "%(downloaded)s of %(total)s"
 msgstr ""
 
-#: ../raphodo/newversion.py:495
+#: ../raphodo/newversion.py:507
 msgid "Downloading..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:76
+#: ../raphodo/preferencedialog.py:86
 msgid "Preferences"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Automation"
 msgstr "Automatisointi"
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85 ../raphodo/preferencedialog.py:343
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/preferencedialog.py:428
 msgid "Error Handling"
 msgstr "Virheenkäsittely"
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:109
+msgid "Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:109 ../raphodo/preferencedialog.py:119
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:94
+#: ../raphodo/preferencedialog.py:147
 msgid "Device Scanning"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:96
+#: ../raphodo/preferencedialog.py:148
 msgid "Scan only external devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:98
+#: ../raphodo/preferencedialog.py:150
 msgid ""
 "Scan for photos and videos only on devices that are external to the "
 "computer,\n"
 "including cameras, memory cards, external hard drives, and USB flash drives."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:102
-msgid "Scan non-camera devices lacking a DCIM folder"
+#: ../raphodo/preferencedialog.py:153
+msgid "Scan only specific folders on devices"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:155
+msgid ""
+"Scan for photos and videos only in the folders specified below (except "
+"paths\n"
+"specified in Ignored Paths).\n"
+"\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:161
+msgid "Folders to scan:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:104
+#: ../raphodo/preferencedialog.py:164
 msgid ""
-"Scan the entirety of a device for photos and videos, irrespective of whether "
-"it contains a DCIM folder,\n"
-"as opposed to only scanning within a DCIM folder.\n"
+"Folders at the base level of device file systems that will be scanned\n"
+"for photos and videos."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:167 ../raphodo/preferencedialog.py:219
+msgid "Add..."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:169
+msgid ""
+"Add a folder to the list of folders to scan for photos and videos.\n"
 "\n"
-"Changing this setting causes all devices to be scanned again.\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:172 ../raphodo/preferencedialog.py:198
+#: ../raphodo/preferencedialog.py:224 ../raphodo/preferencedialog.py:529
+msgid "Remove"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:174
+msgid ""
+"Remove a folder from the list of folders to scan for photos and videos.\n"
 "\n"
-"Note: With cameras, only the DCIM folder is scanned."
+"Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:116
+#: ../raphodo/preferencedialog.py:191
 msgid "Devices that have been set to automatically ignore or download from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:117
+#: ../raphodo/preferencedialog.py:192
 msgid "Remembered Devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:121
+#: ../raphodo/preferencedialog.py:196
 msgid ""
 "Remove a device from the list of devices to automatically ignore or download "
 "from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:123 ../raphodo/preferencedialog.py:149
-#: ../raphodo/preferencedialog.py:431
-msgid "Remove"
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:127
+#: ../raphodo/preferencedialog.py:202
 msgid ""
 "Clear the list of devices from which to automatically ignore or download "
 "from.\n"
@@ -1808,315 +2254,436 @@ msgid ""
 "Note: Changes take effect when the computer is next scanned for devices."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:140
+#: ../raphodo/preferencedialog.py:215
 msgid "Ignored Paths"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:141
+#: ../raphodo/preferencedialog.py:216
 msgid ""
 "The end part of a path that should never be scanned for photos or videos."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:144
-msgid "Add..."
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:146
+#: ../raphodo/preferencedialog.py:221
 msgid ""
 "Add a path to the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:151
+#: ../raphodo/preferencedialog.py:226
 msgid ""
 "Remove a path from the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:156
+#: ../raphodo/preferencedialog.py:231
 msgid ""
 "Clear the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:164
+#: ../raphodo/preferencedialog.py:239
 msgid ""
-"Use python-style <a href=\"http://damonlynch.net/rapid/documentation/"
-"#regularexpressions\">regular expressions</a>"
+"Use python-style <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">regula"
+"r expressions</a>"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:168
+#: ../raphodo/preferencedialog.py:243
 msgid ""
 "Use regular expressions in the list of ignored paths.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:208
+#: ../raphodo/preferencedialog.py:283
 msgid "Program Automation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:209
+#: ../raphodo/preferencedialog.py:284
 msgid "Start downloading at program startup"
 msgstr "Aloita lataus kun ohjelma käynnistetään"
 
-#: ../raphodo/preferencedialog.py:210
+#: ../raphodo/preferencedialog.py:285
 msgid "Start downloading upon device insertion"
 msgstr "Aloita lataaminen kun laite kiinnitetään"
 
-#: ../raphodo/preferencedialog.py:211
+#: ../raphodo/preferencedialog.py:286
 msgid "Unmount (eject) device upon download completion"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:212
+#: ../raphodo/preferencedialog.py:287
 msgid "Exit program when download completes"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:213
+#: ../raphodo/preferencedialog.py:288
 msgid "Exit program even if download had warnings or errors"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:240
+#: ../raphodo/preferencedialog.py:315
 msgid "Thumbnail Generation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:241
+#: ../raphodo/preferencedialog.py:316
 msgid "Generate thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:242
+#: ../raphodo/preferencedialog.py:318
 msgid "Generate thumbnails to show in the main program window"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:244
+#: ../raphodo/preferencedialog.py:320
 msgid "Cache thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:245
+#: ../raphodo/preferencedialog.py:323
 msgid ""
 "Save thumbnails shown in the main program window in a thumbnail cache unique "
 "to Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:247
+#: ../raphodo/preferencedialog.py:327
 msgid "Generate system thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:248
+#: ../raphodo/preferencedialog.py:330
 msgid ""
 "While downloading, save thumbnails that can be used by desktop file managers "
 "and other programs"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:255
+#: ../raphodo/preferencedialog.py:339
 msgid "Number of CPU cores used to generate thumbnails."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:256
+#: ../raphodo/preferencedialog.py:340
 msgid "CPU cores:"
 msgstr ""
 
 #. Translators: the * acts as an asterisk to denote a reference to an annotation
 #. such as '* Takes effect upon program restart'
-#: ../raphodo/preferencedialog.py:271 ../raphodo/preferencedialog.py:317
+#: ../raphodo/preferencedialog.py:355 ../raphodo/preferencedialog.py:401
 msgid "*"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:294
+#: ../raphodo/preferencedialog.py:378
 msgid "Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:296
+#: ../raphodo/preferencedialog.py:380
 msgid "Calculating..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:302
+#: ../raphodo/preferencedialog.py:386
 msgid "days"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:303
+#: ../raphodo/preferencedialog.py:387
 msgid "forever"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:308
+#: ../raphodo/preferencedialog.py:392
 msgid "Cache size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:310
+#: ../raphodo/preferencedialog.py:394
 msgid "Number of thumbnails:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:312
+#: ../raphodo/preferencedialog.py:396
 msgid "Database size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:314
+#: ../raphodo/preferencedialog.py:398
 msgid "Cache unaccessed thumbnails for:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:322
+#: ../raphodo/preferencedialog.py:406
 msgid "Purge Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:323
+#: ../raphodo/preferencedialog.py:408
 msgid "Optimize Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:336
+#: ../raphodo/preferencedialog.py:421
 msgid "* Takes effect upon program restart"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:346
+#: ../raphodo/preferencedialog.py:431
 msgid "Skip download"
 msgstr "Ohita lataus"
 
-#: ../raphodo/preferencedialog.py:347
+#: ../raphodo/preferencedialog.py:432
 msgid "Don't download the file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:348
+#: ../raphodo/preferencedialog.py:433
 msgid "Add unique identifier"
 msgstr "Lisää yksilöllinen tunniste"
 
-#: ../raphodo/preferencedialog.py:349
+#: ../raphodo/preferencedialog.py:436
 msgid ""
 "Add an identifier like _1 or _2 to the end of the filename, immediately "
 "before the file's extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:355
+#: ../raphodo/preferencedialog.py:444
 msgid "Overwrite"
 msgstr "Ylikirjoita"
 
-#: ../raphodo/preferencedialog.py:356
+#: ../raphodo/preferencedialog.py:445
 msgid "Overwrite the previously backed up file"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:357
+#: ../raphodo/preferencedialog.py:446
 msgid "Skip"
 msgstr "Ohita"
 
-#: ../raphodo/preferencedialog.py:358
+#: ../raphodo/preferencedialog.py:448
 msgid "Don't overwrite the backup file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:364
+#: ../raphodo/preferencedialog.py:455
 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 identifier:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:378
+#: ../raphodo/preferencedialog.py:464
+msgid ""
+"Using sequence numbers to automatically generate unique filenames is "
+"strongly recommended. Configure file renaming in the Rename panel in the "
+"main window."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:473
 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 ""
 
-#: ../raphodo/preferencedialog.py:398
+#: ../raphodo/preferencedialog.py:494
 msgid "Program Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:399
+#: ../raphodo/preferencedialog.py:495
 msgid "Show a warning when:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:402
+#: ../raphodo/preferencedialog.py:498
 msgid "Downloading files currently not displayed"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:403
+#: ../raphodo/preferencedialog.py:499
 msgid ""
 "Warn when about to download files that are not displayed in the main window."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:405
+#: ../raphodo/preferencedialog.py:501
 msgid "Backup destinations are missing"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:406
-msgid "Warn before starting a download if it is not possible to back up files."
+#: ../raphodo/preferencedialog.py:502
+msgid ""
+"Warn before starting a download if it is not possible to back up files."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:408
+#: ../raphodo/preferencedialog.py:504
 msgid "Program libraries are missing or broken"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:409
+#: ../raphodo/preferencedialog.py:505
 msgid ""
 "Warn if a software library used by Rapid Photo Downloader is missing or not "
 "functioning."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:412
+#: ../raphodo/preferencedialog.py:508
 msgid "Filesystem metadata cannot be set"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:413
+#: ../raphodo/preferencedialog.py:509
 msgid ""
 "Warn if there is an error setting a file's filesystem metadata, such as its "
 "modification time."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:416
+#: ../raphodo/preferencedialog.py:512
 msgid "Encountering unhandled files"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:417
+#: ../raphodo/preferencedialog.py:513
 msgid ""
 "Warn after scanning a device or this computer if there are unrecognized "
 "files that will not be included in the download."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:420
+#: ../raphodo/preferencedialog.py:517
 msgid "Do not warn about unhandled files with extensions:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:424
+#: ../raphodo/preferencedialog.py:522
 msgid ""
 "File extensions are case insensitive and do not need to include the leading "
 "dot."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:427
+#: ../raphodo/preferencedialog.py:525
 msgid "Add"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:428
+#: ../raphodo/preferencedialog.py:526
 msgid ""
 "Add a file extension to the list of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:430
+#: ../raphodo/preferencedialog.py:528
 msgid ""
 "Remove a file extension from the list of unhandled file types to not warn "
 "about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:434
+#: ../raphodo/preferencedialog.py:532
 msgid ""
 "Clear the list of file extensions of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:469
+#: ../raphodo/preferencedialog.py:568
+msgid "Photo and Video Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:571
+msgid "Consolidate files across devices and downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:574
+msgid ""
+"Analyze the results of device scans looking for duplicate files and matching "
+"RAW and JPEG pairs,\n"
+"comparing them across multiple devices and download sessions."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:580
+msgid "Treat matching RAW and JPEG files as:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:581
+msgid "One photo"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:582
+msgid "Two photos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:584
+msgid ""
+"Display matching pairs of RAW and JPEG photos as one photo, and if marked, "
+"download both."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:589
+msgid ""
+"Display matching pairs of RAW and JPEG photos as two different photos. You "
+"can still synchronize their sequence numbers."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:598
+msgid "With matching RAW and JPEG photos:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:600
+msgid "Do not mark JPEG for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:601
+msgid "Do not mark RAW for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:602
+msgid "Mark both for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:609
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"JPEG for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:614
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"RAW for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:619
+msgid ""
+"When matching RAW and JPEG photos are found, automatically mark both for "
+"download."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:625
+msgid ""
+"If you disable file consolidation, choose what to do when a download device "
+"is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:631
+msgid ""
+"When a download device is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:642
+msgid "Clear completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:643
+msgid "Keep displaying completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:644
+msgid "Prompt for what to do"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:649
+msgid ""
+"Automatically clear the display of completed downloads whenever a new "
+"download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:654
+msgid ""
+"Keep displaying completed downloads whenever a new download device is "
+"inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:658
+msgid ""
+"Prompt whether to keep displaying completed downloads or clear them whenever "
+"a new download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:702
 msgid "Version Check"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:470
+#: ../raphodo/preferencedialog.py:703
 msgid "Check for new version at startup"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:471
+#: ../raphodo/preferencedialog.py:705
 msgid "Check for a new version of the program each time the program starts."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:473
+#: ../raphodo/preferencedialog.py:707
 msgid "Include development releases"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:474
+#: ../raphodo/preferencedialog.py:709
 msgid ""
 "Include alpha, beta and other development releases when checking for a new "
 "version of the program.\n"
@@ -2125,11 +2692,11 @@ msgid ""
 "occur."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:489
+#: ../raphodo/preferencedialog.py:725
 msgid "Ignore DNG date/time metadata on MTP devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:490
+#: ../raphodo/preferencedialog.py:727
 msgid ""
 "Ignore date/time metadata in DNG files located on MTP devices, and use the "
 "file's modification time instead.\n"
@@ -2138,70 +2705,86 @@ msgid ""
 "metadata."
 msgstr ""
 
+#: ../raphodo/preferencedialog.py:741
+msgid "Completed Downloads"
+msgstr ""
+
 #. Translators: substituted value is a description for the set of preferences
 #. shown in the preference dialog window, e.g. Devices, Automation, etc.
 #. This string is shown in a tooltip for the "Restore Defaults" button
-#: ../raphodo/preferencedialog.py:710
+#: ../raphodo/preferencedialog.py:1067
 #, python-format
 msgid "Restores default %s preference values"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:832
+#: ../raphodo/preferencedialog.py:1208
 msgid ""
 "Do you want to purge the thumbnail cache? The cache will be purged when the "
 "program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:835
+#: ../raphodo/preferencedialog.py:1212
 msgid "Purge Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:847
+#: ../raphodo/preferencedialog.py:1225
 msgid ""
 "Do you want to optimize the thumbnail cache? The cache will be optimized "
 "when the program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:850
+#: ../raphodo/preferencedialog.py:1229
 msgid "Optimize Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1045
+#: ../raphodo/preferencedialog.py:1481
+msgid "Enter a Folder to Scan"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1482
+msgid "Specify a folder that will be scanned for photos and videos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1483
+msgid "Folder:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1497
 msgid "Enter a Path to Ignore"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1046
+#: ../raphodo/preferencedialog.py:1498
 msgid "Specify a path that will never be scanned for photos or videos"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1047
+#: ../raphodo/preferencedialog.py:1499
 msgid "Path:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1061
+#: ../raphodo/preferencedialog.py:1513
 msgid "Enter a File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1062
+#: ../raphodo/preferencedialog.py:1514
 msgid "Specify a file extension (without the leading dot)"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1063 ../raphodo/renamepanel.py:122
+#: ../raphodo/preferencedialog.py:1515 ../raphodo/renamepanel.py:122
 msgid "Extension:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1078
+#: ../raphodo/preferencedialog.py:1530
 msgid "Invalid File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1079
+#: ../raphodo/preferencedialog.py:1531
 #, python-format
 msgid ""
 "The file extension <b>%s</b> is recognized by Rapid Photo Downloader, so it "
 "makes no sense to warn about its presence."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1081
+#: ../raphodo/preferencedialog.py:1533
 #, python-format
 msgid ""
 "Recognized file types:\n"
@@ -2227,104 +2810,103 @@ msgstr ""
 msgid "Birthday"
 msgstr ""
 
-#: ../raphodo/preferences.py:614
+#: ../raphodo/preferences.py:624
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Alikansioiiden asetusten ei tulisi alkaa %s"
 
-#: ../raphodo/preferences.py:617
+#: ../raphodo/preferences.py:627
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Alikansioiden asetusten ei tulisi loppua %s"
 
-#: ../raphodo/preferences.py:622
+#: ../raphodo/preferences.py:632
 #, 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"
 
-#. self.setFlat(True)
 #: ../raphodo/primarybutton.py:72
 msgid "Download 8 Photos and 10 Videos"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:86 ../raphodo/problemnotification.py:208
+#: ../raphodo/problemnotification.py:87 ../raphodo/problemnotification.py:209
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:89
+#: ../raphodo/problemnotification.py:90
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:116
+#: ../raphodo/problemnotification.py:117
 #, python-format
 msgid "GPhoto2 Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:124
+#: ../raphodo/problemnotification.py:125
 msgid ""
 "Unable to initialize the camera, probably because another program is using "
 "it. No files were copied from it."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:134
+#: ../raphodo/problemnotification.py:135
 #, python-format
 msgid "Unable to read directory %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:140
+#: ../raphodo/problemnotification.py:141
 #, python-format
 msgid "Unable to access modification time or size from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:146
+#: ../raphodo/problemnotification.py:147
 #, python-format
 msgid "Unable to read file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:152
+#: ../raphodo/problemnotification.py:153
 #, python-format
 msgid "Unable to write file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:158
+#: ../raphodo/problemnotification.py:159
 #, python-format
 msgid "Unable to move file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:164
+#: ../raphodo/problemnotification.py:165
 #, python-format
 msgid "Unable to remove file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:170
+#: ../raphodo/problemnotification.py:171
 #, python-format
 msgid "Unable to copy file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:176
+#: ../raphodo/problemnotification.py:177
 #, python-format
 msgid "Zero length file %s will not be downloaded"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:182
+#: ../raphodo/problemnotification.py:183
 #, python-format
 msgid "Could not determine filesystem modification time for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:188
+#: ../raphodo/problemnotification.py:189
 #, python-format
 msgid "Unable to load metadata from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:194
+#: ../raphodo/problemnotification.py:195
 #, python-format
 msgid ""
 "Unable to load metadata from %(name)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:202
+#: ../raphodo/problemnotification.py:203
 #, python-format
 msgid ""
 "An error occurred setting a file's filesystem metadata on the filesystem %s. "
@@ -2332,212 +2914,212 @@ msgid ""
 "again."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:216
+#: ../raphodo/problemnotification.py:217
 #, python-format
 msgid "Encountered unhandled file %s. It will not be downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:223
+#: ../raphodo/problemnotification.py:224
 #, python-format
 msgid "%(filetype)s %(destination)s already exists."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:234 ../raphodo/problemnotification.py:262
+#: ../raphodo/problemnotification.py:235 ../raphodo/problemnotification.py:263
 #, python-format
 msgid ""
 "The existing %(filetype)s %(destination)s was last modified on %(date)s at "
 "%(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:245
+#: ../raphodo/problemnotification.py:246
 #, python-format
 msgid "The %(filetype)s %(source)s was not downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:273
+#: ../raphodo/problemnotification.py:274
 #, python-format
 msgid "The %(filetype)s %(source)s was downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:282
+#: ../raphodo/problemnotification.py:283
 #, python-format
 msgid "The unique identifier '%s' was added to the filename."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:298
+#: ../raphodo/problemnotification.py:299
 #, python-format
 msgid ""
 "The existing backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:309
+#: ../raphodo/problemnotification.py:310
 #, python-format
 msgid "The %(filetype)s %(source)s was not backed up from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:326
+#: ../raphodo/problemnotification.py:327
 #, python-format
 msgid ""
 "The previous backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:337
+#: ../raphodo/problemnotification.py:338
 #, python-format
 msgid ""
 "The %(filetype)s %(source)s from %(device)s was backed up, overwriting the "
 "previous backup %(filetype)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:356
+#: ../raphodo/problemnotification.py:357
 #, python-format
 msgid ""
 "When synchronizing RAW + JPEG sequence values, a duplicate %(filetype)s "
 "%(file)s was encountered, and was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:366
+#: ../raphodo/problemnotification.py:367
 msgid ""
 "When synchronizing RAW + JPEG sequence values, photos were detected with the "
 "same filenames, but taken at different times:"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:373
+#: ../raphodo/problemnotification.py:374
 #, 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 ""
 
-#: ../raphodo/problemnotification.py:389
+#: ../raphodo/problemnotification.py:390
 #, python-format
 msgid "Unable to finalize the filename for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:424
+#: ../raphodo/problemnotification.py:425
 #, python-format
 msgid ""
 "The filename %(destination)s was not fully generated for %(filetype)s "
 "%(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:433
+#: ../raphodo/problemnotification.py:434
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:439
+#: ../raphodo/problemnotification.py:440
 #, python-format
 msgid "The following metadata is missing: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:445
+#: ../raphodo/problemnotification.py:446
 #, python-format
 msgid "Date/time conversion failed: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:451
+#: ../raphodo/problemnotification.py:452
 msgid ""
 "Could not extract valid date/time metadata or determine the file "
 "modification time."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:457
+#: ../raphodo/problemnotification.py:458
 msgid "Filename does not have an extension."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:460
+#: ../raphodo/problemnotification.py:461
 msgid "Filename does not have a number component."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:464
+#: ../raphodo/problemnotification.py:465
 #, python-format
 msgid "Error generating component %(component)s. Error: %(error)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:477
+#: ../raphodo/problemnotification.py:478
 #, python-format
 msgid ""
 "The download subfolders %(folder)s were only partially generated for "
 "%(filetype)s %(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:486
+#: ../raphodo/problemnotification.py:487
 #, python-format
 msgid ""
 "There is no data with which to generate the %(subfolder_file)s for "
 "%(filename)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:499
+#: ../raphodo/problemnotification.py:500
 #, python-format
 msgid ""
 "Unable to create the %(filetype)s %(destination)s in %(folder)s. The "
 "download file was %(source)s in %(device)s. It was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:514
+#: ../raphodo/problemnotification.py:515
 #, python-format
 msgid "Unable to create the download subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:526
+#: ../raphodo/problemnotification.py:527
 #, python-format
 msgid "Unable to create the backup subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:577
+#: ../raphodo/problemnotification.py:578
 #, python-format
 msgid "Problems scanning %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:584
+#: ../raphodo/problemnotification.py:585
 #, python-format
 msgid "Problems copying from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:591
+#: ../raphodo/problemnotification.py:592
 msgid "Problems while finalizing filenames and generating subfolders"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:598
+#: ../raphodo/problemnotification.py:599
 #, python-format
 msgid "Problems backing up to %s"
 msgstr ""
 
-#. Translators: for example Nov 3 or Dec 31
-#. The start and end dates are on a different day
-#. Translators: for example Nov 3 or Dec 31
-#: ../raphodo/proximity.py:105 ../raphodo/proximity.py:221
-#: ../raphodo/proximity.py:224 ../raphodo/proximity.py:828
+#. Translators: for example Nov 3 2015, 11:25 AM
+#. Translators: for example, Nov 3, 12:15 PM
+#: ../raphodo/proximity.py:188 ../raphodo/proximity.py:213
+#: ../raphodo/proximity.py:236 ../raphodo/proximity.py:239
 #, python-format
-msgid "%(month)s %(numeric_day)s"
+msgid "%(date)s, %(time)s"
 msgstr ""
 
-#. Translators: for example Nov 15 2015
-#. Translators: for example Nov 3 2015
-#: ../raphodo/proximity.py:109 ../raphodo/proximity.py:230
-#: ../raphodo/proximity.py:231 ../raphodo/proximity.py:831
+#: ../raphodo/proximity.py:204
 #, python-format
-msgid "%(date)s %(year)s"
+msgid "%(starttime)s - %(endtime)s"
 msgstr ""
 
-#. Translators: for example Nov 3 2015, 11:25 AM
-#. Translators: for example, Nov 3, 12:15 PM
-#: ../raphodo/proximity.py:197 ../raphodo/proximity.py:215
-#: ../raphodo/proximity.py:234 ../raphodo/proximity.py:236
+#. The start and end dates are on a different day
+#. Translators: for example Nov 3 or Dec 31
+#: ../raphodo/proximity.py:221 ../raphodo/proximity.py:225
+#: ../raphodo/proximity.py:980 ../raphodo/timeutils.py:105
 #, python-format
-msgid "%(date)s, %(time)s"
+msgid "%(month)s %(numeric_day)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:209
+#. Translators: for example Nov 3 2015
+#. Translators: for example Nov 2 2015
+#. Translators: for example Nov 15 2015
+#: ../raphodo/proximity.py:232 ../raphodo/proximity.py:233
+#: ../raphodo/proximity.py:985 ../raphodo/timeutils.py:110
 #, python-format
-msgid "%(starttime)s - %(endtime)s"
+msgid "%(date)s %(year)s"
 msgstr ""
 
 #. Translators: for example, Nov 3, 12:15 PM - Nov 4, 1:00 AM
-#: ../raphodo/proximity.py:241
+#: ../raphodo/proximity.py:245
 #, python-format
 msgid "%(earlier_time)s - %(later_time)s"
 msgstr ""
@@ -2546,25 +3128,25 @@ msgstr ""
 #. Nov 3 2012, 12:15 PM -
 #. Nov 4 2012, 1:00 AM
 #. (please keep the line break signified by \n)
-#: ../raphodo/proximity.py:248
+#: ../raphodo/proximity.py:253
 #, python-format
 msgid ""
 "%(earlier_time)s -\n"
 "%(later_time)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:359
+#: ../raphodo/proximity.py:382
 #, python-format
 msgid "%(month)s  %(year)s"
 msgstr ""
 
 #. Translators: for example Nov 2015
-#: ../raphodo/proximity.py:833
+#: ../raphodo/proximity.py:987
 #, python-format
 msgid "%(month)s %(year)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:1344
+#: ../raphodo/proximity.py:1595
 msgid ""
 "The time elapsed between consecutive photos and videos that is used to build "
 "the Timeline"
@@ -2574,47 +3156,47 @@ msgstr ""
 #. Replace the very last character (after the d) with the correct
 #. localized value, keeping everything else. In other words, change
 #. only the m character.
-#: ../raphodo/proximity.py:1406
+#: ../raphodo/proximity.py:1652
 #, python-format
 msgid "%(minutes)dm"
 msgstr ""
 
 #. Translators: i.e. "1.5h", which is short for 1.5 hours.
 #. Replace the entire string with the correct localized value
-#: ../raphodo/proximity.py:1410
+#: ../raphodo/proximity.py:1656
 msgid "1.5h"
 msgstr ""
 
 #. Translators: e.g. "5h", which is short for 5 hours.
 #. Replace the very last character (after the d) with the correct localized value,
 #. keeping everything else. In other words, change only the h character.
-#: ../raphodo/proximity.py:1415
+#: ../raphodo/proximity.py:1661
 #, python-format
 msgid "%(hours)dh"
 msgstr ""
 
-#: ../raphodo/proximity.py:1461
+#: ../raphodo/proximity.py:1710
 msgid ""
 "The Timeline groups photos and videos based on how much time elapsed between "
 "consecutive shots. Use it to identify photos and videos taken at different "
 "periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/proximity.py:1464
+#: ../raphodo/proximity.py:1715
 msgid ""
 "Use the slider (below) to adjust the time elapsed between consecutive shots "
 "that is used to build the Timeline."
 msgstr ""
 
-#: ../raphodo/proximity.py:1466
+#: ../raphodo/proximity.py:1718
 msgid "Timeline build pending..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1467
+#: ../raphodo/proximity.py:1719
 msgid "Timeline is building..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1468
+#: ../raphodo/proximity.py:1721
 msgid ""
 "The Timeline needs to be rebuilt because the file modification time does not "
 "match the time a shot was taken for one or more shots.<br><br>The Timeline "
@@ -2626,61 +3208,61 @@ msgid ""
 "downloading, which is when the metadata is read."
 msgstr ""
 
-#: ../raphodo/rapid.py:485 ../raphodo/rapid.py:2461 ../raphodo/rapid.py:3728
-#: ../raphodo/rapid.py:3846 ../raphodo/rapid.py:3850 ../raphodo/rapid.py:3870
-#: ../raphodo/rapid.py:3874 ../raphodo/rapid.py:3998 ../raphodo/rapid.py:4007
-#: ../raphodo/rapid.py:4495 ../raphodo/rapid.py:4888 ../raphodo/rapid.py:5722
-#: ../raphodo/rememberthisdialog.py:97
+#: ../raphodo/rapid.py:493 ../raphodo/rapid.py:2555 ../raphodo/rapid.py:3934
+#: ../raphodo/rapid.py:4065 ../raphodo/rapid.py:4069 ../raphodo/rapid.py:4092
+#: ../raphodo/rapid.py:4096 ../raphodo/rapid.py:4226 ../raphodo/rapid.py:4237
+#: ../raphodo/rapid.py:4743 ../raphodo/rapid.py:5195 ../raphodo/rapid.py:5997
+#: ../raphodo/rememberthisdialog.py:99
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:3
 msgid "Rapid Photo Downloader"
 msgstr "Nopea kuvien lataus"
 
-#: ../raphodo/rapid.py:1100
+#: ../raphodo/rapid.py:1131
 msgid ""
 "<b>ExifTool has a problem</b><br><br> Rapid Photo Downloader uses ExifTool "
 "to get metadata from videos and photos. The program will run without it, but "
 "installing it is <b>highly</b> recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1110 ../raphodo/rapid.py:1130
+#: ../raphodo/rapid.py:1141 ../raphodo/rapid.py:1161
 msgid "Problem with libmediainfo"
 msgstr ""
 
-#: ../raphodo/rapid.py:1119
+#: ../raphodo/rapid.py:1150
 msgid ""
 "<b>The library libmediainfo appears to be missing</b><br><br> Rapid Photo "
 "Downloader uses libmediainfo to get the date and time a video was shot. The "
 "program will run  without it, but installing it is recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1417
+#: ../raphodo/rapid.py:1448
 msgid "Download failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1419
+#: ../raphodo/rapid.py:1450
 msgid ""
 "Sorry, the download of the new version of Rapid Photo Downloader failed."
 msgstr ""
 
-#: ../raphodo/rapid.py:1425
+#: ../raphodo/rapid.py:1457
 msgid ""
 "The new version was successfully downloaded. Do you want to close Rapid "
 "Photo Downloader and install it now?"
 msgstr ""
 
-#: ../raphodo/rapid.py:1428
+#: ../raphodo/rapid.py:1461
 msgid "Update Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:1432
+#: ../raphodo/rapid.py:1465
 msgid "Install"
 msgstr ""
 
-#: ../raphodo/rapid.py:1450
+#: ../raphodo/rapid.py:1483
 msgid "New version saved"
 msgstr ""
 
-#: ../raphodo/rapid.py:1451
+#: ../raphodo/rapid.py:1485
 #, python-format
 msgid ""
 "The tar file and installer script are saved at:\n"
@@ -2688,163 +3270,163 @@ msgid ""
 " %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:1468
+#: ../raphodo/rapid.py:1502
 msgid "Upgrade failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1469
+#: ../raphodo/rapid.py:1505
 msgid ""
 "Sorry, upgrading Rapid Photo Downloader failed because there was an error "
 "opening the installer."
 msgstr ""
 
-#: ../raphodo/rapid.py:1667 ../raphodo/rapid.py:2331
+#: ../raphodo/rapid.py:1709 ../raphodo/rapid.py:2425
 msgid "Download"
 msgstr ""
 
-#: ../raphodo/rapid.py:1671
+#: ../raphodo/rapid.py:1713
 msgid "&Refresh..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1675
+#: ../raphodo/rapid.py:1717
 msgid "&Preferences"
 msgstr ""
 
-#: ../raphodo/rapid.py:1679
+#: ../raphodo/rapid.py:1721
 msgid "&Quit"
 msgstr ""
 
-#: ../raphodo/rapid.py:1683
+#: ../raphodo/rapid.py:1725
 msgid "Error &Reports"
 msgstr ""
 
-#: ../raphodo/rapid.py:1687
+#: ../raphodo/rapid.py:1729
 msgid "Clear Completed Downloads"
 msgstr ""
 
-#: ../raphodo/rapid.py:1691
+#: ../raphodo/rapid.py:1733
 msgid "Get Help Online..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1695
+#: ../raphodo/rapid.py:1737
 msgid "&Tip of the Day..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1699
+#: ../raphodo/rapid.py:1741
 msgid "Report a Problem..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1703
+#: ../raphodo/rapid.py:1745
 msgid "Make a Donation..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1707
+#: ../raphodo/rapid.py:1749
 msgid "Translate this Application..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1711
+#: ../raphodo/rapid.py:1753
 msgid "&About..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1715
+#: ../raphodo/rapid.py:1757
 msgid "Check for Updates..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1797
+#: ../raphodo/rapid.py:1840
 msgid "Timeline"
 msgstr ""
 
-#: ../raphodo/rapid.py:1807
+#: ../raphodo/rapid.py:1850
 msgid "Destination"
 msgstr ""
 
-#: ../raphodo/rapid.py:1808
+#: ../raphodo/rapid.py:1851
 msgid "Rename"
 msgstr ""
 
-#: ../raphodo/rapid.py:1810
+#: ../raphodo/rapid.py:1853
 msgid "Back Up"
 msgstr ""
 
 #. Devices Header and View
-#: ../raphodo/rapid.py:1926
+#: ../raphodo/rapid.py:1977
 msgid ""
 "Turn on or off the use of devices attached to this computer as download "
 "sources"
 msgstr ""
 
 #. This Computer Header and View
-#: ../raphodo/rapid.py:1940
+#: ../raphodo/rapid.py:1994
 msgid ""
 "Turn on or off the use of a folder on this computer as a download source"
 msgstr ""
 
-#: ../raphodo/rapid.py:1941
+#: ../raphodo/rapid.py:1996
 msgid "This Computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:1952
+#: ../raphodo/rapid.py:2009
 msgid "Select a source folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:1975
+#: ../raphodo/rapid.py:2038
 msgid "Projected Storage Use"
 msgstr ""
 
-#: ../raphodo/rapid.py:1989 ../raphodo/rapid.py:1997
+#: ../raphodo/rapid.py:2056 ../raphodo/rapid.py:2068
 msgid "Select a destination folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:2045
+#: ../raphodo/rapid.py:2117
 msgid "All"
 msgstr ""
 
-#: ../raphodo/rapid.py:2046
+#: ../raphodo/rapid.py:2118
 msgid "New"
 msgstr ""
 
-#: ../raphodo/rapid.py:2048
+#: ../raphodo/rapid.py:2120
 msgid "Show:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2051
+#: ../raphodo/rapid.py:2123
 msgid "Modification Time"
 msgstr ""
 
-#: ../raphodo/rapid.py:2052
+#: ../raphodo/rapid.py:2124
 msgid "Checked State"
 msgstr ""
 
-#: ../raphodo/rapid.py:2055
+#: ../raphodo/rapid.py:2127
 msgid "File Type"
 msgstr ""
 
-#: ../raphodo/rapid.py:2056
+#: ../raphodo/rapid.py:2128
 msgid "Device"
 msgstr "Laite"
 
-#: ../raphodo/rapid.py:2058
+#: ../raphodo/rapid.py:2130
 msgid "Sort:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2069
+#: ../raphodo/rapid.py:2141
 msgid "Select All:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2311
+#: ../raphodo/rapid.py:2405
 #, python-format
 msgid "Download %(files)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2327
+#: ../raphodo/rapid.py:2421
 msgid "Resume Download"
 msgstr ""
 
-#: ../raphodo/rapid.py:2329
+#: ../raphodo/rapid.py:2423
 msgid "Pause"
 msgstr ""
 
-#: ../raphodo/rapid.py:2417
+#: ../raphodo/rapid.py:2511
 #, python-brace-format
 msgid ""
 "Please report the problem at <a href=\"{website}\">{website}</a>.<br><br>\n"
@@ -2853,11 +3435,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/rapid.py:2431
+#: ../raphodo/rapid.py:2525
 msgid "Thank you for reporting a problem in Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:2529
+#: ../raphodo/rapid.py:2624
 #, python-format
 msgid ""
 "<b>Changing This Computer source path</b><br><br>Do you really want to "
@@ -2866,30 +3448,29 @@ msgid ""
 "from This Computer will be cancelled."
 msgstr ""
 
-#: ../raphodo/rapid.py:2595
+#: ../raphodo/rapid.py:2694
 msgid "You cannot change the download destination while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:2604
+#: ../raphodo/rapid.py:2704
 #, python-format
 msgid ""
 "<b>Confirm Download Destination</b><br><br>Are you sure you want to set the "
 "%(file_type)s download destination to %(path)s?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2682
+#: ../raphodo/rapid.py:2785
 msgid ""
+"\n"
 "<b>Downloading all files</b><br><br>\n"
-"                    A download always includes all files that are checked "
-"for download,\n"
-"                    including those that are not currently displayed because "
-"the Timeline\n"
-"                    is being used or because only new files are being shown."
-"<br><br>\n"
-"                    Do you want to proceed with the download?"
+"A download always includes all files that are checked for download,\n"
+"including those that are not currently displayed because the Timeline\n"
+"is being used or because only new files are being shown.<br><br>\n"
+"Do you want to proceed with the download?\n"
+"                        "
 msgstr ""
 
-#: ../raphodo/rapid.py:2820
+#: ../raphodo/rapid.py:2937
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -2897,206 +3478,200 @@ msgid ""
 "%(folder2)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2824
+#: ../raphodo/rapid.py:2940
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
 "%s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2827
+#: ../raphodo/rapid.py:2943
 msgid "Download Failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:2828
+#: ../raphodo/rapid.py:2944
 msgid "The download cannot proceed."
 msgstr ""
 
-#: ../raphodo/rapid.py:2842
+#: ../raphodo/rapid.py:2962
 msgid ""
 "Photos and videos will not be backed up because there is nowhere to back "
 "them up. Do you still want to start the download?"
 msgstr ""
 
-#. Translators: filetype will be replaced with 'photos' or 'videos'
-#: ../raphodo/rapid.py:2847 ../raphodo/rapid.py:2854
+#: ../raphodo/rapid.py:2969 ../raphodo/rapid.py:2979
 #, python-format
 msgid ""
 "No backup device exists for backing up %(filetype)s. Do you still want to "
 "start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2848 ../raphodo/rpdfile.py:228
+#: ../raphodo/rapid.py:2971 ../raphodo/rpdfile.py:228
 msgid "photos"
 msgstr "kuvat"
 
-#: ../raphodo/rapid.py:2855 ../raphodo/rpdfile.py:223
+#: ../raphodo/rapid.py:2981 ../raphodo/rpdfile.py:223
 msgid "videos"
 msgstr "videot"
 
-#: ../raphodo/rapid.py:2861
+#: ../raphodo/rapid.py:2989
 msgid ""
 "<b>The photo and video backup destinations do not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2869 ../raphodo/rapid.py:2876
+#: ../raphodo/rapid.py:2999 ../raphodo/rapid.py:3008
 #, python-format
 msgid ""
 "<b>The %(filetype)s backup destination does not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2871 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:818
+#: ../raphodo/rapid.py:3001 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:843
 msgid "photo"
 msgstr "kuva"
 
-#: ../raphodo/rapid.py:2878 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:858
+#: ../raphodo/rapid.py:3010 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:883
 msgid "video"
 msgstr "video"
 
-#: ../raphodo/rapid.py:2886
+#: ../raphodo/rapid.py:3018
 msgid "Backup problem"
 msgstr ""
 
-#. Translators - in the middle is a unicode em dash - please retain it
-#. This string is displayed in the status bar when the download is running
-#: ../raphodo/rapid.py:3571
+#: ../raphodo/rapid.py:3756
 #, python-format
 msgid "%(downloading_from)s — %(time_left)s left (%(speed)s)"
 msgstr ""
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3640
+#: ../raphodo/rapid.py:3828
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s ladattu"
 
-#. Translators: e.g. 2 videos failed to download
-#: ../raphodo/rapid.py:3645
+#: ../raphodo/rapid.py:3836
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "%(noFiles)s %(filetypes)s ei voitu ladata"
 
-#: ../raphodo/rapid.py:3650 ../raphodo/rapid.py:3723
+#: ../raphodo/rapid.py:3842 ../raphodo/rapid.py:3927
 msgid "warnings"
 msgstr "varoitukset"
 
-#: ../raphodo/rapid.py:3679
+#: ../raphodo/rapid.py:3873
 msgid "All downloads complete"
 msgstr "Kaikki lataukset valmiita"
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3686 ../raphodo/rapid.py:3695 ../raphodo/rapid.py:3704
-#: ../raphodo/rapid.py:3713 ../raphodo/rapid.py:3721
+#: ../raphodo/rapid.py:3881 ../raphodo/rapid.py:3892 ../raphodo/rapid.py:3903
+#: ../raphodo/rapid.py:3914 ../raphodo/rapid.py:3924
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3688 ../raphodo/rapid.py:3706
+#: ../raphodo/rapid.py:3884 ../raphodo/rapid.py:3906
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s ladattu"
 
-#: ../raphodo/rapid.py:3697 ../raphodo/rapid.py:3715
+#: ../raphodo/rapid.py:3895 ../raphodo/rapid.py:3917
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "%(filetype)s lataus ei onnistunut"
 
-#: ../raphodo/rapid.py:3742
+#: ../raphodo/rapid.py:3950
 msgid "1 failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:3744
+#: ../raphodo/rapid.py:3952
 #, python-format
 msgid "%d failures"
 msgstr ""
 
-#: ../raphodo/rapid.py:3749
+#: ../raphodo/rapid.py:3957
 msgid "1 warning"
 msgstr ""
 
-#: ../raphodo/rapid.py:3751
+#: ../raphodo/rapid.py:3959
 #, python-format
 msgid "%d warnings"
 msgstr ""
 
-#: ../raphodo/rapid.py:3771
+#: ../raphodo/rapid.py:3981
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3774
+#: ../raphodo/rapid.py:3985
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3779
+#: ../raphodo/rapid.py:3989
 #, python-format
 msgid "No files downloaded — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3781
+#: ../raphodo/rapid.py:3991
 msgid "No files downloaded"
 msgstr ""
 
-#: ../raphodo/rapid.py:3805
+#: ../raphodo/rapid.py:4021
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3809
+#: ../raphodo/rapid.py:4026
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3812
+#: ../raphodo/rapid.py:4031
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3820
+#: ../raphodo/rapid.py:4039
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3833
+#: ../raphodo/rapid.py:4052
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3837
+#: ../raphodo/rapid.py:4056
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3841
+#: ../raphodo/rapid.py:4060
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices"
 msgstr ""
 
-#: ../raphodo/rapid.py:3867
+#: ../raphodo/rapid.py:4087
 msgid "The Destination subfolders and Timeline have been rebuilt"
 msgstr ""
 
-#: ../raphodo/rapid.py:3922
+#: ../raphodo/rapid.py:4144
 msgid "Program preferences are invalid"
 msgstr ""
 
-#: ../raphodo/rapid.py:3999
+#: ../raphodo/rapid.py:4228
 #, python-format
 msgid ""
 "<b>All files on the %(camera)s are inaccessible</b>.<br><br>It may be locked "
@@ -3106,179 +3681,205 @@ msgid ""
 "ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4008
+#: ../raphodo/rapid.py:4239
 #, python-format
 msgid ""
-"<b>The %(camera)s appears to be in use by another application.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again.<br><br>Alternatively, you can ignore this "
-"device."
+"<b>The %(camera)s appears to be in use by another "
+"application.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again.<br><br>Alternatively, you "
+"can ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4019
+#: ../raphodo/rapid.py:4250
 msgid "&Try Again"
 msgstr ""
 
-#: ../raphodo/rapid.py:4020
+#: ../raphodo/rapid.py:4251
 msgid "&Ignore This Device"
 msgstr ""
 
-#: ../raphodo/rapid.py:4086
+#: ../raphodo/rapid.py:4323
 #, python-format
 msgid "Sorry, an unexpected problem occurred while scanning %s."
 msgstr ""
 
-#: ../raphodo/rapid.py:4087
+#: ../raphodo/rapid.py:4324
 msgid "Unfortunately you cannot download from this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4091
+#: ../raphodo/rapid.py:4328
 msgid ""
 "A possible workaround for the problem might be downloading from the camera's "
 "memory card using a card reader."
 msgstr ""
 
-#: ../raphodo/rapid.py:4096
+#: ../raphodo/rapid.py:4333
 msgid "Device scan failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:4472
+#: ../raphodo/rapid.py:4720
 #, python-format
 msgid ""
-"<b>The %(camera)s cannot be scanned because it cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again."
+"<b>The %(camera)s cannot be scanned because it cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again."
 msgstr ""
 
-#: ../raphodo/rapid.py:4496
+#: ../raphodo/rapid.py:4745
 #, python-format
 msgid ""
-"<b>The download cannot start because the %(camera)s cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again, and choose which files you want to "
-"download from it."
+"<b>The download cannot start because the %(camera)s cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again, and choose which files "
+"you want to download from it."
+msgstr ""
+
+#: ../raphodo/rapid.py:4842
+msgid "Completed Downloads Present"
 msgstr ""
 
-#: ../raphodo/rapid.py:4635
+#: ../raphodo/rapid.py:4844
+#, python-format
+msgid "%s whose download have completed are displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4846
+msgid "Do you want to clear the completed downloads?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4848
+msgid "Completed Download Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4850
+#, python-format
+msgid "%s whose download has completed is displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4852
+msgid "Do you want to clear the completed download?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4933
 #, python-format
 msgid ""
 "Do you want to download photos and videos from the device <i>%(device)s</i>?"
 msgstr ""
 
-#: ../raphodo/rapid.py:4877
+#: ../raphodo/rapid.py:5183
 #, python-format
 msgid "<b>Do you want to ignore the %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4879
+#: ../raphodo/rapid.py:5186
 msgid ""
 "All cameras, phones and tablets with the same model name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:4883
+#: ../raphodo/rapid.py:5190
 #, python-format
 msgid ""
 "<b>Do you want to ignore the device %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4885
+#: ../raphodo/rapid.py:5192
 msgid "Any device with the same name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:5178
+#: ../raphodo/rapid.py:5492
 #, python-format
 msgid "Downloading from %(location)s on This Computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5180
+#: ../raphodo/rapid.py:5496
 msgid ""
 "Do you really want to download from here?<br><br>On some systems, scanning "
 "this location can take a very long time."
 msgstr ""
 
-#: ../raphodo/rapid.py:5224
+#: ../raphodo/rapid.py:5537
 #, python-format
 msgid "Generating thumbnails for %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5227
+#: ../raphodo/rapid.py:5540
 #, python-format
 msgid "Scanning %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5237
+#: ../raphodo/rapid.py:5551
 #, python-format
 msgid ""
 "%(number)s of %(available files)s checked for download (%(hidden)s hidden)"
 msgstr ""
 
-#: ../raphodo/rapid.py:5243
+#: ../raphodo/rapid.py:5559
 #, python-format
 msgid "%(number)s of %(available files)s checked for download"
 msgstr ""
 
-#: ../raphodo/rapid.py:5494
+#: ../raphodo/rapid.py:5764
 msgid "Display program information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5496
+#: ../raphodo/rapid.py:5766
 msgid "Display debugging information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5499
+#: ../raphodo/rapid.py:5769
 msgid "List photo and video file extensions the program recognizes and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5502
+#: ../raphodo/rapid.py:5772
 msgid "Turn on or off the the renaming of photos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5504
+#: ../raphodo/rapid.py:5774
 msgid "turn on or off the the renaming of videos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5506
+#: ../raphodo/rapid.py:5776
 msgid ""
 "Turn on or off the automatic detection of devices from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5510
+#: ../raphodo/rapid.py:5780
 msgid "Turn on or off downloading from this computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5512 ../raphodo/rapid.py:5515 ../raphodo/rapid.py:5518
-#: ../raphodo/rapid.py:5539 ../raphodo/rapid.py:5543
+#: ../raphodo/rapid.py:5782 ../raphodo/rapid.py:5785 ../raphodo/rapid.py:5788
+#: ../raphodo/rapid.py:5809 ../raphodo/rapid.py:5813
 msgid "PATH"
 msgstr ""
 
-#: ../raphodo/rapid.py:5513
+#: ../raphodo/rapid.py:5783
 msgid "The PATH on this computer from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5516
+#: ../raphodo/rapid.py:5786
 msgid "The PATH where photos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5519
+#: ../raphodo/rapid.py:5789
 msgid "The PATH where videos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5521
+#: ../raphodo/rapid.py:5791
 msgid "Turn on or off the backing up of photos and videos while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:5525
+#: ../raphodo/rapid.py:5795
 msgid "Turn on or off the automatic detection of backup devices."
 msgstr ""
 
-#: ../raphodo/rapid.py:5527 ../raphodo/rapid.py:5533
+#: ../raphodo/rapid.py:5797 ../raphodo/rapid.py:5803
 msgid "FOLDER"
 msgstr ""
 
-#: ../raphodo/rapid.py:5528
+#: ../raphodo/rapid.py:5798
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected photo "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3286,7 +3887,7 @@ msgid ""
 "photos up to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5534
+#: ../raphodo/rapid.py:5804
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected video "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3294,115 +3895,124 @@ msgid ""
 "up videos to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5540
+#: ../raphodo/rapid.py:5810
 msgid ""
 "The PATH where photos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5544
+#: ../raphodo/rapid.py:5814
 msgid ""
 "The PATH where videos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5547
+#: ../raphodo/rapid.py:5817
 #, python-format
 msgid "Ignore photos with the following extensions: %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5551
-msgid "Turn on or off starting downloads as soon as the program itself starts."
+#: ../raphodo/rapid.py:5821
+msgid ""
+"Turn on or off starting downloads as soon as the program itself starts."
 msgstr ""
 
-#: ../raphodo/rapid.py:5554
+#: ../raphodo/rapid.py:5824
 msgid "Turn on or off starting downloads as soon as a device is inserted."
 msgstr ""
 
-#: ../raphodo/rapid.py:5557
+#: ../raphodo/rapid.py:5827
 msgid ""
 "Turn on or off use of the Rapid Photo Downloader Thumbnail Cache. Turning it "
 "off does not delete existing cache contents."
 msgstr ""
 
-#: ../raphodo/rapid.py:5561
+#: ../raphodo/rapid.py:5831
 msgid ""
 "Delete all thumbnails in the Rapid Photo Downloader Thumbnail Cache, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5565
+#: ../raphodo/rapid.py:5835
 msgid "Forget which files have been previously downloaded, and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5568
+#: ../raphodo/rapid.py:5838
 msgid ""
 "Import preferences from an old program version and exit. Requires the "
 "command line program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5571
+#: ../raphodo/rapid.py:5841
 msgid ""
 "Reset all program settings to their default values, delete all thumbnails in "
 "the Thumbnail cache, forget which files have been previously downloaded, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5575
+#: ../raphodo/rapid.py:5845
 msgid "Include gphoto2 debugging information in log files."
 msgstr ""
 
-#: ../raphodo/rapid.py:5579
+#: ../raphodo/rapid.py:5849
 msgid "Print information to the terminal about attached cameras and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5640
+#: ../raphodo/rapid.py:5911
 msgid ""
 "To import preferences from the old version of Rapid Photo Downloader, you "
 "must install the program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5649
+#: ../raphodo/rapid.py:5920
 msgid "No prior program preferences detected: exiting"
 msgstr ""
 
-#: ../raphodo/rapid.py:5652
+#: ../raphodo/rapid.py:5923
 #, python-format
 msgid "Importing preferences from Rapid Photo Downloader %(version)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5714
+#: ../raphodo/rapid.py:5989
 #, python-format
-msgid "Do you want to copy the stored sequence number, which has the value %d?"
+msgid ""
+"Do you want to copy the stored sequence number, which has the value %d?"
 msgstr ""
 
-#: ../raphodo/rapid.py:5726
+#: ../raphodo/rapid.py:6000
 msgid "Program aborting."
 msgstr ""
 
-#: ../raphodo/rapid.py:5736
+#: ../raphodo/rapid.py:6010
 msgid "Never run this program as the sudo / root user."
 msgstr ""
 
-#: ../raphodo/rapid.py:5740
+#: ../raphodo/rapid.py:6014
 msgid "You must install ExifTool to run Rapid Photo Downloader."
 msgstr ""
 
-#: ../raphodo/rapid.py:5794
+#: ../raphodo/rapid.py:6026
+msgid ""
+"Rapid Photo Downloader is installed in multiple locations.\n"
+"\n"
+"Uninstall all copies except the version you want to run."
+msgstr ""
+
+#: ../raphodo/rapid.py:6083
 msgid ""
 "When specifying a path on the command line, do not also specify an\n"
 "option for device auto detection or a path on \"This Computer\"."
 msgstr ""
 
-#: ../raphodo/rapid.py:5950
+#: ../raphodo/rapid.py:6243
 msgid "All settings and caches have been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5958
+#: ../raphodo/rapid.py:6251
 msgid "Thumbnail Cache has been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5964
+#: ../raphodo/rapid.py:6257
 msgid "Remembered files have been forgotten"
 msgstr ""
 
@@ -3418,15 +4028,15 @@ msgstr ""
 msgid "&Don't warn me again about missing or broken program libraries"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:546
+#: ../raphodo/renameandmovefile.py:554
 msgid "subfolder and filename"
 msgstr "alikansio ja tiedstonimi"
 
-#: ../raphodo/renameandmovefile.py:548
+#: ../raphodo/renameandmovefile.py:556
 msgid "filename"
 msgstr "tiedostonimi"
 
-#: ../raphodo/renameandmovefile.py:550
+#: ../raphodo/renameandmovefile.py:558
 msgid "subfolder"
 msgstr "alikansio"
 
@@ -3506,160 +4116,237 @@ msgstr "kuvat ja videot"
 msgid "photos or videos"
 msgstr "kuvat ja videot"
 
-#: ../raphodo/rpdfile.py:306
+#: ../raphodo/rpdfile.py:315
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: ../raphodo/rpdfile.py:318
+#. translators: natural language expression signifying a single video
+#: ../raphodo/rpdfile.py:337
+msgid "a video"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:339
 msgid "1 Video"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:323
+#. translators: natural language expression signifying a single photo
+#: ../raphodo/rpdfile.py:346
+msgid "a photo"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:348
 msgid "1 Photo"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:803
+#: ../raphodo/rpdfile.py:828
 #, python-format
 msgid "%(path)s on %(camera)s"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:819
+#: ../raphodo/rpdfile.py:844
 msgid "Photo"
 msgstr "Kuva"
 
-#: ../raphodo/rpdfile.py:859
+#: ../raphodo/rpdfile.py:884
 msgid "Video"
 msgstr "Video"
 
-#: ../raphodo/storage.py:138
+#: ../raphodo/storage.py:141
 msgid "File system root"
 msgstr ""
 
 #. translators: the name of the Pictures folder
-#: ../raphodo/storage.py:433
+#: ../raphodo/storage.py:437
 msgid "Pictures"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:426
+#: ../raphodo/thumbnaildisplay.py:432
 #, python-format
 msgid "Taken on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:431
+#: ../raphodo/thumbnaildisplay.py:439
 #, python-format
 msgid "Modified on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:437 ../raphodo/thumbnaildisplay.py:466
+#: ../raphodo/thumbnaildisplay.py:447 ../raphodo/thumbnaildisplay.py:481
 #, python-format
 msgid "%(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:451
+#: ../raphodo/thumbnaildisplay.py:464
 #, python-format
 msgid "Memory cards: %s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:457
+#: ../raphodo/thumbnaildisplay.py:468
+#, python-format
+msgid "Memory card: %s"
+msgstr ""
+
+#: ../raphodo/thumbnaildisplay.py:473
 msgid "Downloaded as:"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:472
+#: ../raphodo/thumbnaildisplay.py:489
 #, python-format
 msgid "<br><br>Previous download:<br>%(filename)s<br>%(path)s<br>%(date)s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:1603
+#: ../raphodo/thumbnaildisplay.py:1645
 msgid "Copy Path"
 msgstr ""
 
+#. Translators: these values are file size suffixes like B representing bytes, KB representing
+#. kilobytes, etc.
+#: ../raphodo/utilities.py:170
+msgid "B"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "KB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "MB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "GB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "TB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "PB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "EB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "ZB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "YB"
+msgstr ""
+
 #. two things in a list e.g. "device1 and device2"
-#: ../raphodo/utilities.py:391
+#: ../raphodo/utilities.py:394
 #, python-format
 msgid "%(first_item)s and %(last_item)s"
 msgstr ""
 
-#: ../raphodo/utilities.py:464
+#: ../raphodo/utilities.py:468
 msgid "one"
 msgstr ""
 
-#: ../raphodo/utilities.py:465
+#: ../raphodo/utilities.py:469
 msgid "two"
 msgstr ""
 
-#: ../raphodo/utilities.py:466
+#: ../raphodo/utilities.py:470
 msgid "three"
 msgstr ""
 
-#: ../raphodo/utilities.py:467
+#: ../raphodo/utilities.py:471
 msgid "four"
 msgstr ""
 
-#: ../raphodo/utilities.py:468
+#: ../raphodo/utilities.py:472
 msgid "five"
 msgstr ""
 
-#: ../raphodo/utilities.py:469
+#: ../raphodo/utilities.py:473
 msgid "six"
 msgstr ""
 
-#: ../raphodo/utilities.py:470
+#: ../raphodo/utilities.py:474
 msgid "seven"
 msgstr ""
 
-#: ../raphodo/utilities.py:471
+#: ../raphodo/utilities.py:475
 msgid "eight"
 msgstr ""
 
-#: ../raphodo/utilities.py:472
+#: ../raphodo/utilities.py:476
 msgid "nine"
 msgstr ""
 
-#: ../raphodo/utilities.py:473
+#: ../raphodo/utilities.py:477
 msgid "ten"
 msgstr ""
 
-#: ../raphodo/utilities.py:474
+#: ../raphodo/utilities.py:478
 msgid "eleven"
 msgstr ""
 
-#: ../raphodo/utilities.py:475
+#: ../raphodo/utilities.py:479
 msgid "twelve"
 msgstr ""
 
-#: ../raphodo/utilities.py:476
+#: ../raphodo/utilities.py:480
 msgid "thirteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:477
+#: ../raphodo/utilities.py:481
 msgid "fourteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:478
+#: ../raphodo/utilities.py:482
 msgid "fifteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:479
+#: ../raphodo/utilities.py:483
 msgid "sixteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:480
+#: ../raphodo/utilities.py:484
 msgid "seventeen"
 msgstr ""
 
-#: ../raphodo/utilities.py:481
+#: ../raphodo/utilities.py:485
 msgid "eighteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:482
+#: ../raphodo/utilities.py:486
 msgid "ninenteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:483
+#: ../raphodo/utilities.py:487
 msgid "twenty"
 msgstr ""
 
+#: ../raphodo/viewutils.py:240
+msgid "&OK"
+msgstr ""
+
+#: ../raphodo/viewutils.py:243
+msgid "&Save"
+msgstr ""
+
+#: ../raphodo/viewutils.py:244
+msgid "&Help"
+msgstr ""
+
+#: ../raphodo/viewutils.py:245
+msgid "Restore Defaults"
+msgstr ""
+
+#: ../raphodo/viewutils.py:246
+msgid "&Yes"
+msgstr ""
+
+#: ../raphodo/viewutils.py:247
+msgid "&No"
+msgstr ""
+
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:1
 msgid ""
 "Rapid Photo Downloader imports photos and videos from cameras, phones, "
@@ -3713,8 +4400,8 @@ msgstr ""
 #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:5
 msgid ""
-"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;"
-"memory;card;"
+"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;memory"
+";card;"
 msgstr ""
 
 #: ../data/kde/net.damonlynch.rapid-photo-downloader.desktop.in.h:1
@@ -3724,6 +4411,7 @@ msgstr ""
 #~ msgid "scanning..."
 #~ msgstr "etsii..."
 
+#, python-format
 #~ msgid "<i>Example: %s</i>"
 #~ msgstr "<i>Esimerkki: %s</i>"
 
@@ -3754,9 +4442,11 @@ msgstr ""
 #~ msgid "Using backup devices"
 #~ msgstr "Käyttää varmuuskopiolaitteita"
 
+#, python-format
 #~ msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 #~ msgstr "Noin %(minutes)i:%(seconds)02i minuuttia jäljellä"
 
+#, python-format
 #~ msgid "About %i seconds remaining"
 #~ msgstr "Noin %i sekuntia jäljellä"
 
@@ -3769,6 +4459,7 @@ msgstr ""
 #~ msgid "About 1 second remaining"
 #~ msgstr "Noin 1 sekunti jäljellä"
 
+#, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
 #~ "Destination: %(destination)s"
@@ -3779,9 +4470,11 @@ msgstr ""
 #~ msgid "only output errors to the command line"
 #~ msgstr "tulosta vain virheet komentoriville"
 
+#, python-format
 #~ msgid "and %s"
 #~ msgstr "ja %s"
 
+#, python-format
 #~ msgid ""
 #~ "display program information on the command line as the program runs "
 #~ "(default: %default)"
@@ -3845,9 +4538,8 @@ msgstr ""
 #~ "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."
+#~ "Valitse latauskansio. Alikansiot ladatuille kuville tehdään automaattisesti "
+#~ "tähän kansioon käyttäen alla määriteltyä rakennetta käyttäen."
 
 #~ msgid "Download / Pause"
 #~ msgstr "Lataa / Keskeytä"
@@ -3973,6 +4665,7 @@ msgstr ""
 #~ msgid "Warsaw"
 #~ msgstr "Varsova"
 
+#, python-format
 #~ msgid "Source: %(source)s"
 #~ msgstr "Lähde: %(source)s"
 
@@ -3991,6 +4684,7 @@ msgstr ""
 #~ msgid "Synchronize RAW + JPEG sequence numbers"
 #~ msgstr "Yhtenäistä RAW + JPEG järjestysnumerot"
 
+#, python-format
 #~ msgid "Destination directory could not be created: %(directory)s\n"
 #~ msgstr "Kohdekansiota ei voitu luoda: %(directory)s\n"
 
@@ -4003,16 +4697,18 @@ msgstr ""
 #~ msgid "Select a folder to download videos to"
 #~ msgstr "valitse johon videot ladataan"
 
+#, python-format
 #~ msgid "Select a folder containing %(file_types)s"
 #~ msgstr "valitse kansio joka sisältää %(file_types)s tiedostoja"
 
+#, 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"
+#~ "Annetut alikansioasetukset %(filetype)s tiedostoille olivat väärät ja niitä "
+#~ "ei voi käyttää.\n"
 #~ "Asetukset palautetaan oletusarvoihin."
 
 #~ msgid "Photos:"
@@ -4047,6 +4743,7 @@ msgstr ""
 #~ "Should this device or partition be used to download photos or videos from?"
 #~ msgstr "Tulisiko tätä laitetta tai osiota käyttää kuvalaitteena?"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s"
 #~ msgstr "%(number)s/%(total)s %(filetypes)s"
 
@@ -4060,6 +4757,7 @@ msgstr ""
 #~ msgstr ""
 #~ "listaa kuva- ja videotiedostopäätteitä joita ohjelma tunnistaa ja poistu"
 
+#, python-format
 #~ msgid "Backing up to %(path)s"
 #~ msgstr "Varmuuskopioidaan kohteeseen %(path)s"
 
@@ -4118,8 +4816,8 @@ msgstr ""
 #~ "<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>"
+#~ "<i><b>Varoitus:</b> Tiedostossa ei ole riittävästi metatietoja alikansioiden "
+#~ "luomiseksi. Käytä muita alikansion nimeämisvalintoja.</i>"
 
 #~ msgid "<b>Photo and Video Name Conflicts</b>"
 #~ msgstr "<b>Kuva- ja videonimien ristiriidat</b>"
@@ -4149,8 +4847,8 @@ msgstr ""
 #~ "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>"
+#~ "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"
@@ -4158,12 +4856,15 @@ msgstr ""
 #~ "varmuuskopiointiin. Luo jokaiseen laitteeseen mitä haluat käyttää "
 #~ "varmuuskopiointiin, kansio käyttäen yhtä näistä nimistä.</i>"
 
+#, python-format
 #~ msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
+#, python-format
 #~ msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
+#, python-format
 #~ msgid ""
 #~ "%(date)s\n"
 #~ "%(time)s"
@@ -4171,13 +4872,14 @@ msgstr ""
 #~ "%(date)s\n"
 #~ "%(time)s"
 
+#, python-format
 #~ msgid "%(date)s %(time)s"
 #~ msgstr "%(date)s %(time)s"
 
-#~ msgid ""
-#~ "Photos detected with the same filenames, but taken at different times"
+#~ msgid "Photos detected with the same filenames, but taken at different times"
 #~ msgstr "Saman niminen kuva havaittu, mutta kuvat on otettu eri aikaan"
 
+#, python-format
 #~ msgid "Error: %(inst)s"
 #~ msgstr "Virhe: %(inst)s"
 
@@ -4190,6 +4892,7 @@ msgstr ""
 #~ msgid "_Select"
 #~ msgstr "_Valitse"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 #~ msgstr "%(number)s / %(total)s %(filetypes)s (%(remaining)s jäljellä)"
 
@@ -4200,9 +4903,8 @@ msgstr ""
 #~ msgstr "Valitse kaikki työ_koodittomat"
 
 #~ 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."
+#~ "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."
@@ -4210,11 +4912,14 @@ msgstr ""
 #~ msgid "display debugging information when run from the command line"
 #~ msgstr "näytä vianhakutietoja suorittaessa komentoriviltä"
 
+#, python-format
 #~ msgid "Backup of %(file_type)s already exists"
 #~ msgstr "%(file_type)s varmuuskopio on jo olemassa"
 
+#, python-format
 #~ msgid "Backup %(file_type)s overwritten"
 #~ msgstr "%(file_type)s Varmuuskopio ylikirjoitettiin"
 
+#, python-format
 #~ msgid "%(file_type)s not backed up"
 #~ msgstr "%(file_type)s ei varmuuskopioida"
diff --git a/po/fr.po b/po/fr.po
index 4c85780..0a64591 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,35 +8,446 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: damonlynch@gmail.com\n"
-"POT-Creation-Date: 2017-07-08 19:16-0500\n"
-"PO-Revision-Date: 2017-07-08 17:14+0000\n"
+"POT-Creation-Date: 2017-09-12 17:01-0400\n"
+"PO-Revision-Date: 2017-09-23 13:19+0000\n"
 "Last-Translator: Jean-Marc <Unknown>\n"
 "Language-Team: Français <null>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-07-09 00:08+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-09-26 22:04+0000\n"
+"X-Generator: Launchpad (build 18463)\n"
+"Language: \n"
+
+#: ../install.py:65
+msgid "Rapid Photo Downloader installer"
+msgstr "Programme d'installation de Rapid Photo Downloader"
+
+#: ../install.py:66
+msgid "Download and install latest version of Rapid Photo Downloader."
+msgstr ""
+"Télécharger et installer la dernière version de Rapid Photo Downloader."
+
+#: ../install.py:236 ../install.py:1732
+msgid "Installer not found:"
+msgstr "Programme d'installation non trouvé :"
+
+#. Translators: do not translate the term tar.gz
+#: ../install.py:240 ../install.py:1736
+msgid "Installer not in tar.gz format:"
+msgstr "Le programme d'installation n'est pas au format tar.gz :"
+
+#: ../install.py:465
+msgid ""
+"Incorrect folder ownership detected. Changing ownership of and resetting "
+"permissions for"
+msgstr ""
+"Détection d'une propriété de dossier incorrecte. Modification de la "
+"propriété et réinitialisation des autorisations pour"
+
+#: ../install.py:540
+msgid "The following command will be run:"
+msgstr "La commande suivante sera exécutée :"
+
+#: ../install.py:543 ../install.py:1479 ../install.py:1484
+msgid "sudo may prompt you for the sudo password."
+msgstr "Sudo peut vous demander le mot de passe sudo."
+
+#: ../install.py:547
+msgid "Would you like to run the command now?"
+msgstr "Voulez-vous exécuter la commande maintenant ?"
+
+#: ../install.py:549
+msgid "Answer is not yes, exiting."
+msgstr "La réponse n'est pas oui, sortie."
+
+#: ../install.py:559 ../install.py:751 ../install.py:966
+msgid "Command failed"
+msgstr "La commande a échoué"
+
+#: ../install.py:561 ../install.py:752 ../install.py:967
+msgid "Exiting"
+msgstr "Sortie"
+
+#: ../install.py:582
+msgid "The Universe repository must be enabled."
+msgstr "Le dépôt « Universe » doit être activé."
+
+#: ../install.py:606
+msgid ""
+"Do you want to to uninstall the previous version of Rapid Photo Downloader:"
+msgstr ""
+"Voulez-vous désinstaller la précédente version de Rapid Photo Downloader :"
+
+#: ../install.py:715 ../install.py:740
+msgid ""
+"Querying package system to see if an older version of Rapid Photo Downloader "
+"is installed (this may take a while)..."
+msgstr ""
+"Consultation du système de paquets pour voir si une ancienne version de "
+"Rapid Photo Downloader est installée (cela peut prendre un certain temps)..."
+
+#: ../install.py:726
+msgid ""
+"Unable to query package system. Please check your Internet connection and "
+"try again"
+msgstr ""
+"Impossible d'interroger le système de paquets. Veuillez vérifier votre "
+"connexion à internet et réessayez"
+
+#: ../install.py:756
+msgid "Checking if previous version installed with pip..."
+msgstr "Vérifie si la version précédente a été installée avec pip..."
+
+#: ../install.py:850
+msgid "The following package is unknown on your system: {}\n"
+msgstr "Le paquet suivant est inconnu sur votre système : {}\n"
+
+#: ../install.py:857 ../install.py:929 ../install.py:974
+msgid ""
+"To continue, some packages required to run the application will be installed."
+msgstr ""
+"Pour continuer, certains paquets requis pour exécuter l'application seront "
+"installés."
+
+#: ../install.py:886
+msgid "Querying installed and available packages (this may take a while)"
+msgstr ""
+"Consultation des paquets installés et disponibles (cela peut prendre un "
+"certain temps)"
+
+#: ../install.py:958
+msgid ""
+"Querying zypper to see if any required packages are already installed (this "
+"may take a while)... "
+msgstr ""
+"Demande à zypper de voir si des paquets requis sont déjà installés (cela "
+"peut prendre un moment)... "
+
+#: ../install.py:1004
+msgid "Query to confirm action at each step."
+msgstr "Interroger pour confirmer l'action à chaque étape."
+
+#: ../install.py:1011
+msgid ""
+"When downloading the latest version, install the development version if it "
+"is newer than the stable version."
+msgstr ""
+"Lors du téléchargement de la dernière version, installer la version de "
+"développement si elle est plus récente que la version stable."
+
+#: ../install.py:1020
+msgid ""
+"Optional tar.gz Rapid Photo Downloader installer archive. If not specified, "
+"the latest version is downloaded from the Internet."
+msgstr ""
+"Archive d'installation optionnelle tar.gz de Rapid Photo Dowloader. Si non "
+"spécifiée, la dernière version est téléchargée depuis internet."
+
+#: ../install.py:1043
+msgid ""
+"Do not run the installer in the tar.gz Rapid Photo Downloader installer "
+"archive if it is newer than this version ({}). The default is to run "
+"whichever installer is newer."
+msgstr ""
+
+#: ../install.py:1050
+msgid ""
+"Uninstall Rapid Photo Downloader that was installed with pip, keeping its "
+"dependencies."
+msgstr ""
+"Désinstaller Rapid Photo Downloader qui a été installé avec pip, en "
+"conservant ses dépendances."
+
+#: ../install.py:1054
+msgid ""
+"Uninstall the dependencies installed by pip during Rapid Photo Downloader's "
+"installation, and Rapid Photo Downloader itself, then exit."
+msgstr ""
+"Désinstaller les dépendances installées par pip durant l'installation de "
+"Rapid Photo Downloader, et Rapid Photo Dowloader lui-même, puis quitter."
+
+#: ../install.py:1059
+msgid ""
+"Note: this will not uninstall any version of Rapid Photo Downloader "
+"installed by your Linux distribution's package manager."
+msgstr ""
+"Note : ceci ne désinstallera aucune version de Rapid Photo Downloader "
+"installée par le gestionnaire de paquets de votre distribution Linux."
+
+#: ../install.py:1066
+msgid ""
+"Dependencies will only be removed if they are not required by other programs."
+msgstr ""
+"Les dépendances ne seront supprimées que si elles ne sont pas requises par "
+"d'autres programmes."
+
+#: ../install.py:1072
+msgid ""
+"Note: this option will remove the dependencies regardless of whether they "
+"are required by another program pip has installed. Upgrade to pip 9.0 or "
+"above if you want to avoid this behavior. You can do so using the command "
+"'python3 -m pip install pip -U --user'. Also note that any version of Rapid "
+"Photo Downloader installed by your Linux distribution's package manager will "
+"not be uninstalled."
+msgstr ""
+"Note: cette option supprime les dépendances sans tenir compte du fait "
+"qu'elles sont requises par d'autres programmes installés par pip. Mettez à "
+"niveau pip en version 9.0 ou plus si vous souhaitez éviter ce comportement. "
+"Vous pouvez le faire avec la commande 'python3 -m pip install pip -U --"
+"user'. Notez également que toute version de Rapid Photo Downloader installée "
+"via le gestionnaire de paquets de votre distribution ne sera pas "
+"désinstallée."
+
+#: ../install.py:1122
+msgid "Failed to download versions file"
+msgstr "Impossible de télécharger le fichier de versions"
+
+#: ../install.py:1126
+msgid "Got error code {} while accessing versions file"
+msgstr "Code d'erreur {} lors de l'accès au fichier de versions"
+
+#: ../install.py:1234
+msgid ""
+"Sorry, could not locate installer. Please check your Internet connection and "
+"verify if you can reach https://www.damonlynch.net\n"
+"\n"
+"Exiting.\n"
+msgstr ""
+"Désolé, l'installateur ne peut être trouvé. Merci de vérifier votre "
+"connexion internet et que vous pouvez ouvrir https://www.damonlynch.net\n"
+"\n"
+"Fermeture\n"
+
+#: ../install.py:1408
+msgid "Installing application requirements..."
+msgstr "Installation des applications requises..."
+
+#: ../install.py:1424
+msgid "Received error code"
+msgstr "Code erreur reçu"
 
-#. type: QPushButton
-#: ../raphodo/aboutdialog.py:217
+#: ../install.py:1425
+msgid "Failed to install application requirements: exiting"
+msgstr "Échec de l'installation des applications requises; Fermeture"
+
+#: ../install.py:1428
+msgid "Installing application..."
+msgstr "Installation de l'application..."
+
+#: ../install.py:1441
+msgid "Failed to install application: exiting..."
+msgstr "Impossible d'installer l'application : sortie..."
+
+#: ../install.py:1465
+msgid ""
+"You may have to restart the computer to be able to run the program from the "
+"commmand line or application launcher."
+msgstr ""
+"Vous devrez peut-être redémarrer l'ordinateur pour pouvoir exécuter le "
+"programme en ligne de commande ou depuis le lanceur d'applications."
+
+#: ../install.py:1476
+msgid "Do you want to install the application's man pages?"
+msgstr "Voulez-vous installer les pages de manuel de l'application ?"
+
+#: ../install.py:1477
+msgid "They will be installed into {}"
+msgstr "Elles seront installées dans {}"
+
+#: ../install.py:1478 ../install.py:1483
+msgid "If you uninstall the application, remove these manpages yourself."
+msgstr ""
+"Si vous désinstallez l'application, supprimez ces pages de manuel vous-même."
+
+#: ../install.py:1480
+msgid "Do want to install the man pages?"
+msgstr "Voulez-vous installer les pages de manuel ?"
+
+#: ../install.py:1482
+msgid "Installing man pages into {}"
+msgstr "Installation des pages de manuel dans {}"
+
+#: ../install.py:1499
+msgid "Failed to create man page directory: exiting"
+msgstr "Impossible de créer le répertoire de pages de manuel : sortie"
+
+#: ../install.py:1511
+msgid "Failed to copy man page."
+msgstr "Impossible de copier la page de manuel."
+
+#: ../install.py:1521
+msgid "(If a segmentation fault occurs at exit, you can ignore it...)"
+msgstr ""
+"(Si un défaut de segmentation survient en quittant, vous pouvez l'ignorer...)"
+
+#: ../install.py:1534
+msgid ""
+"The python3 tool pip is required to uninstall a version of Rapid Photo "
+"Downloader that was installed with pip.\n"
+"Cannot continue. Exiting."
+msgstr ""
+"L'outil python3 pip est requis pour désinstaller une version de Rapid Photo "
+"Downloader qui a été installée avec pip.\n"
+"Impossible de continuer. Fermeture."
+
+#: ../install.py:1575
+msgid ""
+"Do not run this installer script as sudo / root user.\n"
+"Run it using the user who will run the program.\n"
+msgstr ""
+"Ne lancez par le script d'installation avec  sudo ou en tant qu'utilisateur "
+"root\n"
+"Lancez le en tant que l'utilisateur qui exécutera le programme.\n"
+
+#: ../install.py:1585 ../install.py:1599
+msgid "Do not include any other command line arguments when specifying"
+msgstr ""
+
+#: ../install.py:1614
+msgid ""
+"Sorry, this installer does not support a custom python installation.\n"
+"Exiting..."
+msgstr ""
+"Désolé, ce programme d'installation ne prend pas en charge une installation "
+"python personnalisée.\n"
+"Sortie..."
+
+#: ../install.py:1620
+msgid "Restarting script using system python..."
+msgstr ""
+
+#: ../install.py:1651
+msgid "Exiting..."
+msgstr "Fermeture..."
+
+#. Translators: do not translate the term python3-apt
+#: ../install.py:1670
+msgid "To continue, the package python3-apt must be installed."
+msgstr "Pour continuer, le paquet python3-apt doit être installé."
+
+#: ../install.py:1689
+msgid ""
+"Install the following packages using your Linux distribution's standard "
+"package manager, and then rerun this installer"
+msgstr ""
+
+#: ../install.py:1698
+msgid ""
+"To run this program, programs to assist Python 3 and its package management "
+"must be installed."
+msgstr ""
+"Pour exécuter ce programme, les programmes pour assister Python 3 et sa "
+"gestion de paquets doivent être installés."
+
+#. Translators: do not translate the terms Python 3, pip and setuptools
+#: ../install.py:1713
+msgid "Python 3's pip and setuptools must be upgraded for your user."
+msgstr ""
+"Python 3 pip et setuptools doivent être mis à jour pour votre utilisateur."
+
+#. Translators: do not translate the term python or requests
+#: ../install.py:1726
+msgid "Installing python requests"
+msgstr "Installation des requêtes Python"
+
+#: ../upgrade.py:79
+msgid "Upgrade Rapid Photo Downloader"
+msgstr "Mettre à niveau Rapid Photo Downloader"
+
+#: ../upgrade.py:401 ../raphodo/viewutils.py:242
+msgid "&Cancel"
+msgstr "&Annuler"
+
+#: ../upgrade.py:405
+msgid "&Upgrade"
+msgstr "&Mise à niveau"
+
+#: ../upgrade.py:410
+#, python-format
+msgid "Click the Upgrade button to upgrade to version %s."
+msgstr ""
+"Cliquez sur le bouton  « Mettre à niveau » pour passer à la version %s."
+
+#: ../upgrade.py:413
+msgid "Click the Upgrade button to start the upgrade."
+msgstr "Cliquer sur le bouton « Mettre à niveau » pour mettre à niveau."
+
+#: ../upgrade.py:416 ../upgrade.py:422 ../raphodo/viewutils.py:241
+msgid "&Close"
+msgstr "&Fermer"
+
+#: ../upgrade.py:417
+msgid "&Run"
+msgstr "&Exécuter"
+
+#: ../upgrade.py:447
+msgid "Close Rapid Photo Downloader before running this upgrade"
+msgstr "Fermer Rapid Photo Downloader avant d'exécuter cette mise à niveau"
+
+#: ../upgrade.py:450
+msgid "Upgrade running..."
+msgstr "Exécution de la mise à niveau..."
+
+#: ../upgrade.py:486
+#, python-format
+msgid ""
+"Successfully upgraded to %s. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+"Mise à niveau vers %s réussie. Cliquez sur Fermer pour quitter ou Exécuter "
+"pour lancer le programme."
+
+#: ../upgrade.py:491
+msgid ""
+"Upgrade finished successfully. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+"Mise à niveau réussie. Cliquez sur Fermer pour quitter ou Exécuter pour "
+"lancer le programme."
+
+#: ../upgrade.py:495
+msgid "Upgrade failed. Click Close to exit."
+msgstr "Échec de la mise à niveau. Cliquer sur « Fermer » pour sortir."
+
+#: ../upgrade.py:6967
+#, python-format
+msgid "Upgrading %s..."
+msgstr "Mise à niveau de %s..."
+
+#: ../upgrade.py:6969
+msgid "Press any key to continue..."
+msgstr "Appuyez sur une touche pour continuer…"
+
+#: ../upgrade.py:6982
+msgid "Rapid Photo Downloader upgrade failed"
+msgstr "Mise à niveau de Rapid Photo Downloader échouée"
+
+#: ../upgrade.py:6984
+#, python-format
+msgid ""
+"The python package %s could not be updated. The upgrade cannot continue."
+msgstr ""
+"Le paquet python %s n'a pas pu être mis à jour. La mise à niveau ne peut pas "
+"continuer."
+
+#: ../raphodo/aboutdialog.py:225
 msgid "Credits"
 msgstr "Crédits"
 
-#: ../raphodo/backuppanel.py:239
+#: ../raphodo/backuppanel.py:240
 msgid "Backups are not configured"
 msgstr "Les sauvegardes ne sont pas configurées"
 
-#: ../raphodo/backuppanel.py:241
+#: ../raphodo/backuppanel.py:242
 msgid "No backup devices detected"
 msgstr "Aucun volume de sauvegarde détecté"
 
-#: ../raphodo/backuppanel.py:243
+#: ../raphodo/backuppanel.py:244
 msgid "Valid backup locations not yet specified"
 msgstr "Les emplacements de sauvegarde valides ne sont pas encore spécifiés"
 
-#: ../raphodo/backuppanel.py:401
+#: ../raphodo/backuppanel.py:404
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
@@ -44,18 +455,18 @@ msgstr ""
 "Vous pouvez archiver vos photos et vidéos vers des emplacements multiples "
 "dès lors qu'elles sont transférées, sur différents disques durs par exemple."
 
-#: ../raphodo/backuppanel.py:407
+#: ../raphodo/backuppanel.py:412
 msgid "Back up photos and videos when downloading"
 msgstr "Sauvegarder les photos et les vidéos lors du transfert"
 
-#: ../raphodo/backuppanel.py:413
+#: ../raphodo/backuppanel.py:418
 msgid "Automatically detect backup devices"
 msgstr "Détecter automatiquement les volumes de sauvegarde"
 
-#: ../raphodo/backuppanel.py:417
+#: ../raphodo/backuppanel.py:424
 msgid ""
-"Specify the folder in which backups are stored on the device."
-"<br><br><i>Note: the presence of a folder with this name is used to "
+"Specify the folder in which backups are stored on the "
+"device.<br><br><i>Note: the presence of a folder with this name is used to "
 "determine if 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 folder names. By "
 "adding both folders, the same device can be used to back up both photos and "
@@ -69,79 +480,88 @@ msgstr ""
 "les deux dossiers, le même appareil peut être utilisé pour sauvegarder des "
 "photos et des vidéos.</i>"
 
-#: ../raphodo/backuppanel.py:428
+#: ../raphodo/backuppanel.py:439
 msgid "Photo folder name:"
 msgstr "Nom du dossier photo :"
 
-#: ../raphodo/backuppanel.py:433
+#: ../raphodo/backuppanel.py:444
 msgid "Video folder name:"
 msgstr "Nom du dossier vidéo :"
 
-#: ../raphodo/backuppanel.py:438 ../raphodo/nameeditor.py:883
+#: ../raphodo/backuppanel.py:449 ../raphodo/nameeditor.py:890
 #: ../raphodo/renamepanel.py:123
 msgid "Example:"
 msgstr "Exemple :"
 
-#: ../raphodo/backuppanel.py:448
-msgid "If you disable automatic detection, choose the exact backup locations."
+#: ../raphodo/backuppanel.py:460
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
 "Si vous désactivez la détection automatique, choisissez les emplacements "
 "exacts des sauvegardes."
 
-#: ../raphodo/backuppanel.py:452
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:468
 msgid "Photo backup location:"
 msgstr "Emplacement de sauvegarde des photos :"
 
-#: ../raphodo/backuppanel.py:454
+#: ../raphodo/backuppanel.py:474
 msgid "Select Photo Backup Location"
 msgstr "Sélectionnez l'emplacement de la sauvegarde photo"
 
-#: ../raphodo/backuppanel.py:460
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:485
 msgid "Video backup location:"
 msgstr "Emplacement de sauvegarde des vidéos :"
 
-#: ../raphodo/backuppanel.py:462
+#: ../raphodo/backuppanel.py:491
 msgid "Select Video Backup Location"
 msgstr "Sélectionnez l'emplacement de la sauvegarde vidéo"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:564
+#: ../raphodo/backuppanel.py:595
 msgid "drive1"
 msgstr "lecteur1"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:567
+#: ../raphodo/backuppanel.py:598
 msgid "drive2"
 msgstr "lecteur2"
 
-#: ../raphodo/backuppanel.py:628
+#: ../raphodo/backuppanel.py:663
 msgid "Projected Backup Storage Use"
 msgstr "Utilisation projetée de stockage de sauvegarde"
 
-#: ../raphodo/backuppanel.py:632
+#: ../raphodo/backuppanel.py:669
 msgid "Backup Options"
 msgstr "Options de sauvegarde"
 
 #. translators: refers to the video thumbnail file that some
 #. cameras generate -- it has a .THM file extension
-#: ../raphodo/copyfiles.py:476
+#: ../raphodo/copyfiles.py:491
 msgid "video THM"
 msgstr "vidéo THM"
 
-#: ../raphodo/copyfiles.py:482
+#: ../raphodo/copyfiles.py:497
 msgid "audio"
 msgstr "audio"
 
 #: ../raphodo/destinationdisplay.py:78 ../raphodo/devicedisplay.py:1079
-#: ../raphodo/rpdfile.py:321
+#: ../raphodo/rpdfile.py:342
 #, python-format
 msgid "%(no_photos)s Photos"
 msgstr "%(no_photos)s Photos"
 
 #: ../raphodo/destinationdisplay.py:82 ../raphodo/devicedisplay.py:1081
-#: ../raphodo/rpdfile.py:316
+#: ../raphodo/rpdfile.py:333
 #, python-format
 msgid "%(no_videos)s Videos"
 msgstr "%(no_videos)s Vidéos"
@@ -169,15 +589,15 @@ msgid "%(size_free)s free of %(size_total)s"
 msgstr "%(size_free)s libre sur %(size_total)s"
 
 #: ../raphodo/destinationdisplay.py:190 ../raphodo/devicedisplay.py:993
-#: ../raphodo/rapid.py:1964 ../raphodo/rapid.py:2079 ../raphodo/rapid.py:5753
-#: ../raphodo/rpdfile.py:905
+#: ../raphodo/rapid.py:2023 ../raphodo/rapid.py:2151 ../raphodo/rapid.py:6043
+#: ../raphodo/rpdfile.py:930
 msgid "Photos"
 msgstr "Photos"
 
 #. translators: the name of the Videos folder
 #: ../raphodo/destinationdisplay.py:191 ../raphodo/devicedisplay.py:994
-#: ../raphodo/rapid.py:1967 ../raphodo/rapid.py:2080 ../raphodo/rapid.py:5754
-#: ../raphodo/rpdfile.py:933 ../raphodo/storage.py:445
+#: ../raphodo/rapid.py:2028 ../raphodo/rapid.py:2152 ../raphodo/rapid.py:6044
+#: ../raphodo/rpdfile.py:958 ../raphodo/storage.py:449
 msgid "Videos"
 msgstr "Vidéos"
 
@@ -185,7 +605,7 @@ msgstr "Vidéos"
 msgid "Projected storage use after download"
 msgstr "Utilisation prévue du stockage après transfert"
 
-#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:516
+#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:521
 msgid "Custom..."
 msgstr "Personnalisé..."
 
@@ -223,59 +643,60 @@ msgstr "Analyser à nouveau"
 msgid "%s full"
 msgstr "%s plein"
 
-#: ../raphodo/devices.py:459
+#: ../raphodo/devices.py:463
 msgid "Cameras"
 msgstr "Appareils photo"
 
-#: ../raphodo/devices.py:460 ../raphodo/devices.py:920
-#: ../raphodo/preferencedialog.py:85 ../raphodo/rapid.py:1927
+#: ../raphodo/devices.py:464 ../raphodo/devices.py:927
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/rapid.py:1979
 msgid "Devices"
 msgstr "Périphériques"
 
-#: ../raphodo/devices.py:720
+#: ../raphodo/devices.py:724
 #, python-format
 msgid "Downloading from %(device_names)s"
 msgstr "Transfert à partir de %(device_names)s"
 
 #. Translators: e.g. Three Devices
-#: ../raphodo/devices.py:780
+#: ../raphodo/devices.py:784
 #, python-format
 msgid "%(no_devices)s %(device_type)s"
 msgstr "%(no_devices)s %(device_type)s"
 
-#: ../raphodo/devices.py:905 ../raphodo/rapid.py:1764
+#: ../raphodo/devices.py:912 ../raphodo/rapid.py:1807
 msgid "Select Source"
 msgstr "Sélectionner une source"
 
-#: ../raphodo/devices.py:936 ../raphodo/devices.py:947
+#: ../raphodo/devices.py:943 ../raphodo/devices.py:954
 #, python-format
 msgid "%(device1)s + %(device2)s"
 msgstr "%(device1)s + %(device2)s"
 
 #. Number of cameras e.g. 3 Cameras
-#: ../raphodo/devices.py:958
+#: ../raphodo/devices.py:965
 #, python-format
 msgid "%(no_cameras)s Cameras"
 msgstr "%(no_cameras)s Appareils photo"
 
-#: ../raphodo/devices.py:963
+#: ../raphodo/devices.py:970
 #, python-format
 msgid "%(no_devices)s Devices"
 msgstr "%(no_devices)s Périphériques"
 
 #. Translators: two folder names, separated by a plus sign
-#: ../raphodo/devices.py:1258
+#: ../raphodo/devices.py:1265
 #, python-format
 msgid "%s + %s"
 msgstr "%s + %s"
 
-#: ../raphodo/didyouknow.py:44
+#: ../raphodo/didyouknow.py:45
 msgid "Click on a file's checkbox to mark or unmark it for download."
 msgstr ""
 "Cliquer sur la case à cocher d'un fichier à transférer pour le sélectionner "
 "ou le désélectionner."
 
-#: ../raphodo/didyouknow.py:50
+#: ../raphodo/didyouknow.py:51
 msgid ""
 "Files that have already been downloaded are remembered. You can still mark "
 "previously downloaded files to download again, but they are unchecked by "
@@ -288,7 +709,7 @@ msgstr ""
 "puissiez les différencier des fichiers qui ne doivent pas encore être "
 "transférés."
 
-#: ../raphodo/didyouknow.py:59
+#: ../raphodo/didyouknow.py:60
 msgid ""
 "If more than one file is selected, they'll all take the mark of the file "
 "whose checkbox was clicked, regardless of whether they previously had a "
@@ -297,7 +718,7 @@ msgstr ""
 "Si plus d'un fichier est sélectionné, ils prendront tous la marque du "
 "fichier dont la case à cocher a été cliquée, qu'ils aient été cochés ou non."
 
-#: ../raphodo/didyouknow.py:67
+#: ../raphodo/didyouknow.py:68
 msgid ""
 "Click on a device's checkbox to quickly mark or unmark all its files for "
 "downloading."
@@ -305,7 +726,63 @@ msgstr ""
 "Cliquer sur la case à cocher d'un périphérique pour sélectionner ou "
 "désélectionner rapidement tous ses fichiers pour le transfert."
 
-#: ../raphodo/didyouknow.py:74
+#: ../raphodo/didyouknow.py:75
+msgid ""
+"After a download finishes, an icon replaces the thumbnail's checkbox. The "
+"icon's color indicates whether the download was successful (green), had file "
+"renaming problems (yellow/orange), or failed (red)."
+msgstr ""
+"Après la fin du transfert, une icone remplace la case à cocher de la "
+"vignette. La couleur de l'icone indique si le transfert a réussi (vert), a "
+"rencontré un problème de renommage de fichier (jaune/orange), ou a échoué "
+"(rouge)."
+
+#: ../raphodo/didyouknow.py:83
+msgid ""
+"\n"
+"            In case of any problems, a red icon will appear at the bottom of "
+"the window\n"
+"            indicating how many error reports there are. Clicking on it "
+"opens the Error Report \n"
+"            window.\n"
+"            "
+msgstr ""
+"\n"
+"            Au moindre problème, une icone rouge apparaîtra en bas de la "
+"fenêtre\n"
+"            indiquant le nombre d'erreur. Cliquer dessus ouvrira la fenêtre "
+"du \n"
+"            rapport d'erreur.\n"
+"            "
+
+#: ../raphodo/didyouknow.py:91
+msgid ""
+"\n"
+"            The Error Report window lists any problems encountered before, "
+"during or after the \n"
+"            download. An orange triangle represents a warning, a red circle "
+"indicates a failure, \n"
+"            and a black circle indicates more serious failures. You can "
+"click on the hyperlinks to \n"
+"            open its file or device in a file manager. You can also search "
+"the reports using the \n"
+"            search box in the lower left of the Error Report window.\n"
+"            "
+msgstr ""
+"\n"
+"            La fenêtre du rapport d'erreur liste le moindre problème "
+"rencontré rencontré avant, pendant ou après le \n"
+"            transfert. Un triangle orange représente un avertissement, un "
+"cercle rouge indique un échec, \n"
+"            et un cercle noir indique une défaillance plus sérieuse. Vous "
+"pouvez cliquer sur l'hyperlien pour \n"
+"            ouvrir son fichier ou périphérique dans un gestionnaire de "
+"fichier. Vous pouvez aussi chercher les rapports à l'aide \n"
+"            du champ de recherche en bas à gauche de la fenêtre du rapport "
+"d'erreur.\n"
+"            "
+
+#: ../raphodo/didyouknow.py:103
 msgid ""
 "You can simultaneously download from multiple cameras, smartphones, memory "
 "cards, and hard drives&mdash;as many devices as your computer can handle at "
@@ -315,7 +792,7 @@ msgstr ""
 "smartphones, cartes mémoires et disques durs ;\r\n"
 "autant de périphériques que votre ordinateur peut en gérer en même temps."
 
-#: ../raphodo/didyouknow.py:81
+#: ../raphodo/didyouknow.py:110
 msgid ""
 "The <b>Timeline</b> groups photos and videos based on how much time elapsed "
 "between consecutive shots. Use it to identify photos and videos taken at "
@@ -326,7 +803,7 @@ msgstr ""
 "et les vidéos prises à différentes périodes dans une seule journée ou "
 "pendant plusieurs jours consécutifs."
 
-#: ../raphodo/didyouknow.py:88
+#: ../raphodo/didyouknow.py:117
 msgid ""
 "\n"
 "<p>In the illustration above, the first row of the Timeline is black because "
@@ -346,7 +823,7 @@ msgstr ""
 "la chronologie :</p>\n"
 "            "
 
-#: ../raphodo/didyouknow.py:99
+#: ../raphodo/didyouknow.py:128
 msgid ""
 "To view photos and videos for a particular time range, use the mouse "
 "(optionally in combination with the <tt>Shift</tt> or <tt>Ctrl</tt> keys) to "
@@ -359,7 +836,7 @@ msgstr ""
 "Lorsqu'une plage de temps est sélectionnée, le bouton chronologie du côté "
 "gauche de la fenêtre principale sera mis en surbrillance."
 
-#: ../raphodo/didyouknow.py:106
+#: ../raphodo/didyouknow.py:135
 msgid ""
 "A download always includes all files that are checked for download, "
 "including those that are not currently displayed because the Timeline is "
@@ -369,7 +846,7 @@ msgstr ""
 "téléchargement, y compris ceux qui ne sont pas affichés actuellement, car la "
 "chronologie est utilisée."
 
-#: ../raphodo/didyouknow.py:113
+#: ../raphodo/didyouknow.py:142
 msgid ""
 "You can hide or display the download sources by clicking on the name of the "
 "device you're downloading from at the top left of the program window."
@@ -378,7 +855,7 @@ msgstr ""
 "sur le nom du périphérique depuis lequel vous téléchargez en haut à gauche "
 "de la fenêtre du programme."
 
-#: ../raphodo/didyouknow.py:120
+#: ../raphodo/didyouknow.py:149
 msgid ""
 "\n"
 "          Thumbnails can be sorted using a variety of criteria:\n"
@@ -412,7 +889,7 @@ msgstr ""
 "vidéos sont transférées.</li>\n"
 "</ol> "
 
-#: ../raphodo/didyouknow.py:137
+#: ../raphodo/didyouknow.py:166
 msgid ""
 "One of Rapid Photo Downloader's most useful features is its ability to "
 "automatically generate download subfolders and rename files as it downloads, "
@@ -423,7 +900,7 @@ msgstr ""
 "renommer les fichiers au fur et à mesure qu'il télécharge, en utilisant un "
 "schéma de votre choix."
 
-#: ../raphodo/didyouknow.py:143
+#: ../raphodo/didyouknow.py:172
 msgid ""
 "To specify where you want your files downloaded and how you want them named, "
 "open the appropriate panel on the right-side of the application window: "
@@ -431,22 +908,22 @@ msgid ""
 msgstr ""
 "Pour spécifier l'endroit où vous voulez que vos fichiers soient transférés "
 "et comment vous souhaitez les nommer, ouvrez le panneau approprié sur le "
-"côté droit de la fenêtre de l'application : <b>Destination</b>, <b>Renommer</"
-"b> ou <b>Étiquette de transfert</b>."
+"côté droit de la fenêtre de l'application : <b>Destination</b>, "
+"<b>Renommer</b> ou <b>Étiquette de transfert</b>."
 
-#: ../raphodo/didyouknow.py:150
+#: ../raphodo/didyouknow.py:179
 msgid ""
 "\n"
 "When thinking about your download directory structure, keep in mind two "
 "different types\n"
 "of directory:\n"
 "<ol>\n"
-"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, &quot;"
-"Photos&quot;, or\n"
+"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, "
+"&quot;Photos&quot;, or\n"
 "&quot;Videos&quot;. This directory should already exist on your computer. In "
 "the illustration \n"
-"below, the destination folders are &quot;Pictures&quot; and &quot;"
-"Videos&quot;. The\n"
+"below, the destination folders are &quot;Pictures&quot; and "
+"&quot;Videos&quot;. The\n"
 "name of the destination folder is displayed in the grey bar directly above "
 "the folder tree, \n"
 "with a folder icon to its left and a gear icon to its far right.</li>\n"
@@ -458,8 +935,30 @@ msgid ""
 "</ol>\n"
 "            "
 msgstr ""
+"\n"
+"Lorsque que vous pensez à la structure de vos dossiers de transfert, garder "
+"à l'esprit deux types\n"
+"de dossier :\n"
+"<ol>\n"
+"<li>Le <b>dossier de destination</b>, e.g. &quot;Images&quot;, "
+"&quot;Photos&quot;, ou\n"
+"&quot;Vidéos&quot;. Ce dossier doit déjà exister sur votre ordinateur. Sur "
+"l'illustration \n"
+"ci dessous, les dossiers de destination sont &quot;Pictures&quot; et "
+"&quot;Videos&quot;. Le \n"
+"nom du dossier de destination est affiché dans la barre grise juste au "
+"dessus de l'arborescence des dossiers, \n"
+"avec une icone de dossier à gauche et une icone d'engrenage tout à fait à "
+"droite.</li>\n"
+"<li>Les <b>sous-dossiers de transfert</b>, qui sont des répertoires "
+"automatiquement créés \n"
+"par Rapid Photo Downloader. Ils peuvent déjà exister sur votre ordinateur, "
+"mais n'ont pas besoin de l'être.\n"
+"Ils seront générés dans le dossier de destination.</li>\n"
+"</ol>\n"
+"            "
 
-#: ../raphodo/didyouknow.py:167
+#: ../raphodo/didyouknow.py:196
 msgid ""
 "\n"
 "You can download photos and videos to the same destination folder, or "
@@ -471,8 +970,17 @@ msgid ""
 "type.            \n"
 "            "
 msgstr ""
+"\n"
+"Vous pouvez transférer les photos et vidéos vers le même dossier de "
+"destination, ou spécifier des dossiers \n"
+"de destination différents pour chaque type. De même que pour les sous-"
+"dossiers de transfert photos et \n"
+"les vidéos&mdash;Transférez photos et vidéos vers les mêmes sous-dossiers, "
+"ou utilisez des structures différentes pour chaque \n"
+"type.            \n"
+"            "
 
-#: ../raphodo/didyouknow.py:177
+#: ../raphodo/didyouknow.py:206
 msgid ""
 "Automatically generated download subfolders can contain further "
 "automatically generated subfolders if need be. A common scheme is to create "
@@ -483,7 +991,7 @@ msgstr ""
 "est de créer un sous-dossier d'une année et ensuite une série de sous-"
 "dossiers année-mois-jour à l'intérieur."
 
-#: ../raphodo/didyouknow.py:186
+#: ../raphodo/didyouknow.py:215
 msgid ""
 "\n"
 "Whenever possible, the program previews the download subfolders of photos "
@@ -501,7 +1009,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:201
+#: ../raphodo/didyouknow.py:230
 msgid ""
 "\n"
 "Download subfolder names are typically generated using some or all of the "
@@ -525,7 +1033,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:219
+#: ../raphodo/didyouknow.py:248
 msgid ""
 "\n"
 "To automatically create download subfolders as you download, \n"
@@ -542,7 +1050,7 @@ msgstr ""
 "l'icône en forme d'engrenage pour afficher un menu déroulant :            \n"
 "            "
 
-#: ../raphodo/didyouknow.py:227
+#: ../raphodo/didyouknow.py:256
 msgid ""
 "\n"
 "Using the drop-down menu, select a built-in preset or click on <b>Custom</b> "
@@ -558,7 +1066,7 @@ msgstr ""
 "de sous-dossiers de photos ou de vidéos :             \n"
 "            "
 
-#: ../raphodo/didyouknow.py:237
+#: ../raphodo/didyouknow.py:266
 msgid ""
 "It's easy to download raw images into one folder, and jpeg images into "
 "another. Simply use the <b>Filename Extension</b> as part of your download "
@@ -568,15 +1076,15 @@ msgstr ""
 "JPEG dans un autre. Utilisez simplement l'<b>Extension de nom de fichier</b> "
 "dans le cadre de votre système de génération de sous-dossier de transfert :"
 
-#: ../raphodo/didyouknow.py:242
+#: ../raphodo/didyouknow.py:271
 msgid ""
 "This illustration shows a saved custom preset named &quot;My custom "
 "preset&quot;."
 msgstr ""
-"Cette illustration montre un préréglage personnalisé enregistré nommé &quot;"
-"Mon préréglage personnalisé&quot;."
+"Cette illustration montre un préréglage personnalisé enregistré nommé "
+"&quot;Mon préréglage personnalisé&quot;."
 
-#: ../raphodo/didyouknow.py:246
+#: ../raphodo/didyouknow.py:275
 msgid ""
 "\n"
 "You do not have to create nested download subfolders. This illustration "
@@ -594,7 +1102,7 @@ msgstr ""
 "étiquette de transfert :\n"
 "            "
 
-#: ../raphodo/didyouknow.py:256
+#: ../raphodo/didyouknow.py:285
 msgid ""
 "\n"
 "Although there are many built-in date/time naming options, you may find that "
@@ -608,7 +1116,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:265
+#: ../raphodo/didyouknow.py:294
 msgid ""
 "\n"
 "Read more about all the ways you can generate download subfolder names and "
@@ -619,13 +1127,13 @@ msgid ""
 msgstr ""
 "\n"
 "Pour en savoir plus sur toutes les façons dont vous pouvez générer des noms "
-"de sous-dossiers de transfert et des noms de fichiers, rendez-vous sur la "
-"<a \n"
-"href=\"http://damonlynch.net/rapid/documentation/#renamedateandtime"
-"\">documentation en ligne</a>.\n"
+"de sous-dossiers de transfert et des noms de fichiers, rendez-vous sur la <a "
+"\n"
+"href=\"http://damonlynch.net/rapid/documentation/#renamedateandtime\">documen"
+"tation en ligne</a>.\n"
 "            "
 
-#: ../raphodo/didyouknow.py:273
+#: ../raphodo/didyouknow.py:302
 msgid ""
 "\n"
 "<b>Job Codes</b> let you easily enter text that describes sets of photos and "
@@ -645,7 +1153,7 @@ msgstr ""
 "l'étiquette \n"
 "&quot;Green Bazaar&quot;: \n"
 
-#: ../raphodo/didyouknow.py:282
+#: ../raphodo/didyouknow.py:311
 msgid ""
 "\n"
 "You can apply new or existing Job Codes before you start a download. If "
@@ -663,13 +1171,13 @@ msgstr ""
 "une étiquette de transfert avant que ne débute le transfert.\n"
 "            "
 
-#: ../raphodo/didyouknow.py:291
+#: ../raphodo/didyouknow.py:320
 msgid "Look for hints to guide you when working with Job Codes:"
 msgstr ""
 "Recherchez des conseils pour vous guider lorsque vous travaillez avec des "
 "étiquettes de transfert :"
 
-#: ../raphodo/didyouknow.py:295
+#: ../raphodo/didyouknow.py:324
 msgid ""
 "Hints will vary depending on the context, such as when the mouse is hovering "
 "over a button."
@@ -677,33 +1185,26 @@ msgstr ""
 "Les astuces varient en fonction du contexte, par exemple lorsque la souris "
 "survol un bouton."
 
-#: ../raphodo/didyouknow.py:301
+#: ../raphodo/didyouknow.py:330
 msgid ""
 "\n"
 "When you give your photos and videos unique filenames, you'll never be "
 "confused as to \n"
 "which file is which. Using <b>sequence numbers</b> to make filenames unique "
 "is highly \n"
-"recommended!.\n"
+"recommended!\n"
 "            "
 msgstr ""
-"\n"
-"Lorsque vous donnez des noms de fichiers uniques à vos photos et vidéos, "
-"vous éviter les \n"
-"risques d'erreur. L'utilisation de <b>nombres de séquence</b> pour rendre "
-"les noms de fichiers uniques est vivement \n"
-"recommandé !\n"
-"            "
 
-#: ../raphodo/didyouknow.py:309
+#: ../raphodo/didyouknow.py:338
 msgid ""
 "\n"
 "<p>Four types of sequence values are available to help you assign unique "
 "names to your photos and \n"
 "videos:\n"
 "<ol>\n"
-"<li><b>Downloads today</b>: tracks downloads completed during that day.</"
-"li>\n"
+"<li><b>Downloads today</b>: tracks downloads completed during that "
+"day.</li>\n"
 "<li><b>Stored number</b>: similar to Downloads today, but it is remembered "
 "from the last time the  \n"
 "program was run.</li>\n"
@@ -717,7 +1218,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:327
+#: ../raphodo/didyouknow.py:356
 msgid ""
 "\n"
 "The <b>Rename</b> panel allows you to configure file renaming. To rename "
@@ -728,11 +1229,11 @@ msgstr ""
 "\n"
 "Le panneau <b>Renommer</b> vous permet de configurer le renommage de "
 "fichier. Pour renommer vos fichiers, vous pouvez choisir\n"
-"parmi les préréglages de renommage existants ou définir le "
-"vôtre.              \n"
+"parmi les préréglages de renommage existants ou définir le vôtre.            "
+"  \n"
 "            "
 
-#: ../raphodo/didyouknow.py:334
+#: ../raphodo/didyouknow.py:363
 msgid ""
 "\n"
 "<p>The <b>Synchronize RAW + JPEG</b> option is useful if you use the RAW + "
@@ -751,7 +1252,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:348
+#: ../raphodo/didyouknow.py:377
 msgid ""
 "\n"
 "You can have your photos and videos backed up to multiple locations as they "
@@ -769,7 +1270,7 @@ msgstr ""
 "spécifiés.\n"
 "            "
 
-#: ../raphodo/didyouknow.py:356
+#: ../raphodo/didyouknow.py:385
 msgid ""
 "In this example, the drive <b>photobackup</b> does not contain a folder "
 "named <tt>Videos</tt>, so videos will not be backed up to it."
@@ -777,7 +1278,7 @@ msgstr ""
 "Dans cet exemple, l'emplacement <b>sauvegardephoto</b> ne contient pas de "
 "dossier nommé <tt>Vidéos</tt>, donc les vidéos ne seront pas sauvegardées."
 
-#: ../raphodo/didyouknow.py:362
+#: ../raphodo/didyouknow.py:391
 msgid ""
 "\n"
 "Several of the program's preferences can be set from the command line, "
@@ -795,7 +1296,12 @@ msgstr ""
 "état par défaut et les caches et fichiers mémorisés effacés.            \n"
 "            "
 
-#: ../raphodo/didyouknow.py:372
+#: ../raphodo/didyouknow.py:396
+msgid "You can also import program preferences from the older 0.4 version."
+msgstr ""
+"Vous pouvez aussi importer les préférences depuis l'ancienne version 0.4."
+
+#: ../raphodo/didyouknow.py:401
 msgid ""
 "\n"
 "Rapid Photo Downloader deals with three types of cache:\n"
@@ -805,8 +1311,8 @@ msgid ""
 "memory cards, and other devices.</li>\n"
 "<li>A <b>temporary cache</b> of files downloaded from a camera, one for "
 "photos and another for \n"
-"videos. They are located in temporary subfolders in the download destination."
-"</li>\n"
+"videos. They are located in temporary subfolders in the download "
+"destination.</li>\n"
 "<li>The <b>desktop's thumbnail cache</b>, in which Rapid Photo Downloader "
 "stores thumbnails of \n"
 "RAW and TIFF photos once they have been downloaded. File browsers like Gnome "
@@ -821,23 +1327,23 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:431
+#: ../raphodo/didyouknow.py:460
 msgid "Tip of the Day"
 msgstr "Astuce du jour"
 
-#: ../raphodo/didyouknow.py:439
+#: ../raphodo/didyouknow.py:468
 msgid "Did you know...?"
 msgstr "Le saviez-vous ?"
 
-#: ../raphodo/didyouknow.py:466
+#: ../raphodo/didyouknow.py:495
 msgid "Show tips on startup"
 msgstr "Afficher les astuces au démarrage"
 
-#: ../raphodo/didyouknow.py:470
+#: ../raphodo/didyouknow.py:499
 msgid "&Next"
 msgstr "&Suivant"
 
-#: ../raphodo/didyouknow.py:471
+#: ../raphodo/didyouknow.py:500
 msgid "&Previous"
 msgstr "&Précédent"
 
@@ -944,68 +1450,68 @@ msgstr "%d jours, 1 heure"
 msgid "%(days)d days, %(hours)d hours"
 msgstr "%(days)d jours, %(hours)d heures"
 
-#: ../raphodo/errorlog.py:65
+#: ../raphodo/errorlog.py:66
 msgid "Find"
 msgstr "Rechercher"
 
-#: ../raphodo/errorlog.py:135
+#: ../raphodo/errorlog.py:136
 msgid "Error Reports - Rapid Photo Downloader"
 msgstr "Rapports d'erreur - Rapid Photo Downloader"
 
-#: ../raphodo/errorlog.py:170
+#: ../raphodo/errorlog.py:171
 msgid "Find in reports"
 msgstr "Rechercher dans les rapports"
 
-#: ../raphodo/errorlog.py:187
+#: ../raphodo/errorlog.py:188
 msgid "Find the previous occurrence of the phrase"
 msgstr "Rechercher l'occurrence précédente de la phrase"
 
-#: ../raphodo/errorlog.py:192
+#: ../raphodo/errorlog.py:193
 msgid "Find the next occurrence of the phrase"
 msgstr "Rechercher la prochaine occurrence de la phrase"
 
-#: ../raphodo/errorlog.py:194
+#: ../raphodo/errorlog.py:195
 msgid "&Highlight All"
 msgstr "&Surligner tout"
 
-#: ../raphodo/errorlog.py:195
+#: ../raphodo/errorlog.py:196
 msgid "Highlight all occurrences of the phrase"
 msgstr "Surligner toutes les occurrences de la phrase"
 
-#: ../raphodo/errorlog.py:196
+#: ../raphodo/errorlog.py:197
 msgid "&Match Case"
 msgstr "&Casse identique"
 
-#: ../raphodo/errorlog.py:197
+#: ../raphodo/errorlog.py:198
 msgid "Search with case sensitivity"
 msgstr "Recherche sensible à la casse"
 
-#: ../raphodo/errorlog.py:198
+#: ../raphodo/errorlog.py:199
 msgid "&Whole Words"
 msgstr "&Mots entiers"
 
-#: ../raphodo/errorlog.py:199
+#: ../raphodo/errorlog.py:200
 msgid "Search whole words only"
 msgstr "Rechercher uniquement les mots entiers"
 
-#: ../raphodo/errorlog.py:209 ../raphodo/errorlog.py:341
+#: ../raphodo/errorlog.py:210 ../raphodo/errorlog.py:345
 #, python-format
 msgid "%s of %s matches"
 msgstr "%s corespondances sur %s"
 
-#: ../raphodo/errorlog.py:228
+#: ../raphodo/errorlog.py:232
 msgid "Clear"
 msgstr "Effacer"
 
-#: ../raphodo/errorlog.py:328
+#: ../raphodo/errorlog.py:332
 msgid "Phrase not found"
 msgstr "Phrase introuvable"
 
-#: ../raphodo/errorlog.py:487
+#: ../raphodo/errorlog.py:491
 msgid "Search pending..."
 msgstr "Recherche..."
 
-#: ../raphodo/errorlog.py:535
+#: ../raphodo/errorlog.py:539
 msgid ""
 "The number of new entries added to the Error Report since it was last open. "
 "Click to open the Error Report."
@@ -1021,8 +1527,8 @@ msgstr "Problème dans Rapid Photo Downloader"
 #, python-brace-format
 msgid ""
 "<b>A problem occurred in Rapid Photo Downloader</b><br><br>\n"
-"    Please report the problem at <a href=\"{website}\">{website}</a>."
-"<br><br>\n"
+"    Please report the problem at <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
 "    Attach the log file <i>{log_file}</i> to your bug report (click\n"
 "    <a href=\"{log_path}\">here</a> to open the log directory).<br><br>If "
 "the same problem occurs\n"
@@ -1030,12 +1536,12 @@ msgid ""
 "    "
 msgstr ""
 "<b>Un problème s'est produit dans Rapid Photo Downloader</b><br><br>\n"
-"    Veuillez signaler le problème à <a href=\"{website}\">{website}</a>."
-"<br><br>\n"
+"    Veuillez signaler le problème à <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
 "    Joindre le fichier journal <i>{log_file}</i> à votre rapport de bogue "
 "(cliquer\n"
-"    <a href=\"{log_path}\">ici</a> pour ouvrir le dossier journal)."
-"<br><br>Si le même problème survient\n"
+"    <a href=\"{log_path}\">ici</a> pour ouvrir le dossier "
+"journal).<br><br>Si le même problème survient\n"
 "    avant que le programme ne ferme, ce sera la seule notification.\n"
 "    "
 
@@ -1057,7 +1563,7 @@ msgstr ""
 "{log_path}\n"
 "\n"
 
-#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1601
+#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1643
 msgid "Open in File Browser..."
 msgstr "Ouvrir dans l'explorateur de fichiers"
 
@@ -1075,531 +1581,531 @@ msgstr "Autre..."
 msgid "%s (location does not exist)"
 msgstr "%s (l'emplacement n'existe pas)"
 
-#: ../raphodo/generatenameconfig.py:186
+#: ../raphodo/generatenameconfig.py:190
 msgid "Date time"
 msgstr "Date/heure"
 
-#: ../raphodo/generatenameconfig.py:187
+#: ../raphodo/generatenameconfig.py:191
 msgid "Text"
 msgstr "Texte"
 
-#: ../raphodo/generatenameconfig.py:188 ../raphodo/rapid.py:2053
+#: ../raphodo/generatenameconfig.py:192 ../raphodo/rapid.py:2125
 msgid "Filename"
 msgstr "Nom de fichier"
 
-#: ../raphodo/generatenameconfig.py:189 ../raphodo/preferencedialog.py:488
+#: ../raphodo/generatenameconfig.py:193 ../raphodo/preferencedialog.py:724
 msgid "Metadata"
 msgstr "Métadonnées"
 
-#: ../raphodo/generatenameconfig.py:190
+#: ../raphodo/generatenameconfig.py:194
 msgid "Sequences"
 msgstr "Séquences"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: ../raphodo/generatenameconfig.py:193
+#: ../raphodo/generatenameconfig.py:197
 msgid "Job code"
 msgstr "Étiquette de transfert"
 
-#: ../raphodo/generatenameconfig.py:194
+#: ../raphodo/generatenameconfig.py:198
 msgid "Image date"
 msgstr "Date de l'image"
 
-#: ../raphodo/generatenameconfig.py:195
+#: ../raphodo/generatenameconfig.py:199
 msgid "Video date"
 msgstr "Date de la vidéo"
 
-#: ../raphodo/generatenameconfig.py:196
+#: ../raphodo/generatenameconfig.py:200
 msgid "Today"
 msgstr "Aujourd'hui"
 
-#: ../raphodo/generatenameconfig.py:197
+#: ../raphodo/generatenameconfig.py:201
 msgid "Yesterday"
 msgstr "Hier"
 
 #. Translators: Download time is the time and date that the download started (when the
 #. user clicked the Download button)
-#: ../raphodo/generatenameconfig.py:200
+#: ../raphodo/generatenameconfig.py:204
 msgid "Download time"
 msgstr "Date du transfert"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:203
+#: ../raphodo/generatenameconfig.py:207
 msgid "Name"
 msgstr "Nom"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:206 ../raphodo/rapid.py:2054
+#: ../raphodo/generatenameconfig.py:210 ../raphodo/rapid.py:2126
 msgid "Extension"
 msgstr "Extension"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:209
+#: ../raphodo/generatenameconfig.py:213
 msgid "Image number"
 msgstr "Numéro d'image"
 
-#: ../raphodo/generatenameconfig.py:210
+#: ../raphodo/generatenameconfig.py:214
 msgid "Video number"
 msgstr "Numéro de vidéo"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:213
+#: ../raphodo/generatenameconfig.py:217
 msgid "Aperture"
 msgstr "Ouverture"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:216
+#: ../raphodo/generatenameconfig.py:220
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:219
+#: ../raphodo/generatenameconfig.py:223
 msgid "Exposure time"
 msgstr "Vitesse d'obturation"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:222
+#: ../raphodo/generatenameconfig.py:226
 msgid "Focal length"
 msgstr "Longueur focale"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:225
+#: ../raphodo/generatenameconfig.py:229
 msgid "Camera make"
 msgstr "Marque de l'appareil"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:228
+#: ../raphodo/generatenameconfig.py:232
 msgid "Camera model"
 msgstr "Modèle de l'appareil"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:231
+#: ../raphodo/generatenameconfig.py:235
 msgid "Short camera model"
 msgstr "Modèle de l'appareil (version courte)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:234
+#: ../raphodo/generatenameconfig.py:238
 msgid "Hyphenated short camera model"
 msgstr "Nom court de l'appareil photo avec trait d'union"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:237
+#: ../raphodo/generatenameconfig.py:241
 msgid "Serial number"
 msgstr "Numéro de série"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:240
+#: ../raphodo/generatenameconfig.py:244
 msgid "Shutter count"
 msgstr "Nombre de déclenchements de l'obturateur"
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: ../raphodo/generatenameconfig.py:242
+#: ../raphodo/generatenameconfig.py:246
 msgid "File number"
 msgstr "Numéro de fichier"
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:244
+#: ../raphodo/generatenameconfig.py:248
 msgid "Folder only"
 msgstr "Répertoire seulement"
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:246
+#: ../raphodo/generatenameconfig.py:250
 msgid "Folder and file"
 msgstr "Répertoire et fichier"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:249
+#: ../raphodo/generatenameconfig.py:253
 msgid "Owner name"
 msgstr "Nom du propriétaire"
 
-#: ../raphodo/generatenameconfig.py:250
+#: ../raphodo/generatenameconfig.py:254
 msgid "Codec"
 msgstr "Codec"
 
-#: ../raphodo/generatenameconfig.py:251
+#: ../raphodo/generatenameconfig.py:255
 msgid "Width"
 msgstr "Largeur"
 
-#: ../raphodo/generatenameconfig.py:252
+#: ../raphodo/generatenameconfig.py:256
 msgid "Height"
 msgstr "Hauteur"
 
-#: ../raphodo/generatenameconfig.py:253
+#: ../raphodo/generatenameconfig.py:257
 msgid "Length"
 msgstr "Longueur"
 
-#: ../raphodo/generatenameconfig.py:254
+#: ../raphodo/generatenameconfig.py:258
 msgid "Frames Per Second"
 msgstr "Images par seconde"
 
-#: ../raphodo/generatenameconfig.py:255
+#: ../raphodo/generatenameconfig.py:259
 msgid "Artist"
 msgstr "Artiste"
 
-#: ../raphodo/generatenameconfig.py:256
+#: ../raphodo/generatenameconfig.py:260
 msgid "Copyright"
 msgstr "Droits d’auteur"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:259
+#: ../raphodo/generatenameconfig.py:263
 msgid "Downloads today"
 msgstr "Transferts journaliers"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:262
+#: ../raphodo/generatenameconfig.py:266
 msgid "Session number"
 msgstr "Numéro de session"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:265
+#: ../raphodo/generatenameconfig.py:269
 msgid "Subfolder number"
 msgstr "Numéro de sous-dossier"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:268
+#: ../raphodo/generatenameconfig.py:272
 msgid "Stored number"
 msgstr "Nombres stockés"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: ../raphodo/generatenameconfig.py:271
+#: ../raphodo/generatenameconfig.py:275
 msgid "Sequence letter"
 msgstr "Séquence alphabétique"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:274
+#: ../raphodo/generatenameconfig.py:278
 msgid "All digits"
 msgstr "Tous les chiffres"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:277
+#: ../raphodo/generatenameconfig.py:281
 msgid "Last digit"
 msgstr "Dernier chiffre"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:280
+#: ../raphodo/generatenameconfig.py:284
 msgid "Last 2 digits"
 msgstr "2 derniers chiffres"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:283
+#: ../raphodo/generatenameconfig.py:287
 msgid "Last 3 digits"
 msgstr "3 derniers chiffres"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:286
+#: ../raphodo/generatenameconfig.py:290
 msgid "Last 4 digits"
 msgstr "4 derniers chiffres"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:289
+#: ../raphodo/generatenameconfig.py:293
 msgid "Original Case"
 msgstr "Casse originale"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:292
+#: ../raphodo/generatenameconfig.py:296
 msgid "UPPERCASE"
 msgstr "MAJUSCULES"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:295
+#: ../raphodo/generatenameconfig.py:299
 msgid "lowercase"
 msgstr "minuscules"
 
-#: ../raphodo/generatenameconfig.py:296
+#: ../raphodo/generatenameconfig.py:300
 msgid "One digit"
 msgstr "Un chiffre"
 
-#: ../raphodo/generatenameconfig.py:297
+#: ../raphodo/generatenameconfig.py:301
 msgid "Two digits"
 msgstr "Deux chiffres"
 
-#: ../raphodo/generatenameconfig.py:298
+#: ../raphodo/generatenameconfig.py:302
 msgid "Three digits"
 msgstr "Trois chiffres"
 
-#: ../raphodo/generatenameconfig.py:299
+#: ../raphodo/generatenameconfig.py:303
 msgid "Four digits"
 msgstr "Quatre chiffres"
 
-#: ../raphodo/generatenameconfig.py:300
+#: ../raphodo/generatenameconfig.py:304
 msgid "Five digits"
 msgstr "Cinq chiffres"
 
-#: ../raphodo/generatenameconfig.py:301
+#: ../raphodo/generatenameconfig.py:305
 msgid "Six digits"
 msgstr "Six chiffres"
 
-#: ../raphodo/generatenameconfig.py:302
+#: ../raphodo/generatenameconfig.py:306
 msgid "Seven digits"
 msgstr "Sept chiffres"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:305
+#: ../raphodo/generatenameconfig.py:309
 msgid "Subseconds"
 msgstr "Sous-secondes"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:308 ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:312 ../raphodo/generatenameconfig.py:393
 msgid "YYYYMMDD"
 msgstr "AAAAMMJJ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:311 ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:315 ../raphodo/generatenameconfig.py:394
 msgid "YYYY-MM-DD"
 msgstr "AAAA-MM-JJ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:314 ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:318 ../raphodo/generatenameconfig.py:395
 msgid "YYYY_MM_DD"
 msgstr "AAAA_MM_JJ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:317
+#: ../raphodo/generatenameconfig.py:321
 msgid "YYMMDD"
 msgstr "AAMMJJ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:320
+#: ../raphodo/generatenameconfig.py:324
 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
-#: ../raphodo/generatenameconfig.py:323
+#: ../raphodo/generatenameconfig.py:327
 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
-#: ../raphodo/generatenameconfig.py:326
+#: ../raphodo/generatenameconfig.py:330
 msgid "MMDDYYYY"
 msgstr "MMJJAAAA"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:329
+#: ../raphodo/generatenameconfig.py:333
 msgid "MMDDYY"
 msgstr "MMJJAA"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:332
+#: ../raphodo/generatenameconfig.py:336
 msgid "MMDD"
 msgstr "MMJJ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:335
+#: ../raphodo/generatenameconfig.py:339
 msgid "DDMMYYYY"
 msgstr "JJMMAAAA"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:338
+#: ../raphodo/generatenameconfig.py:342
 msgid "DDMMYY"
 msgstr "JJMMAA"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:341 ../raphodo/generatenameconfig.py:389
-#: ../raphodo/generatenameconfig.py:390 ../raphodo/generatenameconfig.py:391
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:345 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:394 ../raphodo/generatenameconfig.py:395
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:397
 msgid "YYYY"
 msgstr "AAAA"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:344
+#: ../raphodo/generatenameconfig.py:348
 msgid "YY"
 msgstr "AA"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:347
+#: ../raphodo/generatenameconfig.py:351
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:350
+#: ../raphodo/generatenameconfig.py:354
 msgid "DD"
 msgstr "JJ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:353
+#: ../raphodo/generatenameconfig.py:357
 msgid "Month (full)"
 msgstr "Mois (complet)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:356
+#: ../raphodo/generatenameconfig.py:360
 msgid "Month (abbreviated)"
 msgstr "Mois (en abrégé)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:359
+#: ../raphodo/generatenameconfig.py:363
 msgid "HHMMSS"
 msgstr "HHMMSS"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:362
+#: ../raphodo/generatenameconfig.py:366
 msgid "HHMM"
 msgstr "HHMM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:365
+#: ../raphodo/generatenameconfig.py:369
 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
-#: ../raphodo/generatenameconfig.py:368
+#: ../raphodo/generatenameconfig.py:372
 msgid "HH-MM"
 msgstr "HH-MM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:371
+#: ../raphodo/generatenameconfig.py:375
 msgid "HH"
 msgstr "HH"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:374
+#: ../raphodo/generatenameconfig.py:378
 msgid "MM (minutes)"
 msgstr "MM (minutes)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:377
+#: ../raphodo/generatenameconfig.py:381
 msgid "SS"
 msgstr "SS"
 
-#: ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:393
 msgid "Date"
 msgstr "Date"
 
-#: ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:394
 msgid "Date (hyphens)"
 msgstr "Date (tirets)"
 
-#: ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:395
 msgid "Date (underscores)"
 msgstr "Date (tirets bas)"
 
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:438
-#: ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:442
+#: ../raphodo/generatenameconfig.py:537
 msgid "Date and Job Code"
 msgstr "Date et étiquette"
 
-#: ../raphodo/generatenameconfig.py:392
+#: ../raphodo/generatenameconfig.py:396
 msgid "YYYYMM_Job Code"
 msgstr "AAAAMM_étiquette"
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "Date and Job Code Subfolder"
 msgstr "Sous-répertoire date et étiquette"
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "YYYYMM"
 msgstr "AAAAMM"
 
-#: ../raphodo/generatenameconfig.py:393 ../raphodo/jobcodepanel.py:198
-#: ../raphodo/nameeditor.py:827 ../raphodo/rapid.py:1809
+#: ../raphodo/generatenameconfig.py:397 ../raphodo/jobcodepanel.py:199
+#: ../raphodo/nameeditor.py:833 ../raphodo/rapid.py:1852
 #: ../raphodo/renamepanel.py:83 ../raphodo/renamepanel.py:241
 msgid "Job Code"
 msgstr "Étiquette de transfert"
 
-#: ../raphodo/generatenameconfig.py:433 ../raphodo/generatenameconfig.py:512
+#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:532
 msgid "Original Filename"
 msgstr "Nom de fichier originel"
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "Date-Time and Downloads today"
 msgstr "Date / heure et transferts aujourd'hui"
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "YYYYMMDD-HHMM-1"
 msgstr "AAAAMMJJ-HHMM-1"
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "Date and Downloads today"
 msgstr "Date et transferts aujourd'hui"
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "YYYYMMDD-1"
 msgstr "AAAAMMJJ-1"
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "Date-Time and Image number"
 msgstr "Date - heure et numéro d'image"
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "YYYYMMDD-1234"
 msgstr "AAAAMMJJ-1234"
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "Date-Time and Job Code"
 msgstr "Date-heure et étiquette de transfert"
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "YYYYMMDD-HHMM-Job Code-1"
 msgstr "AAAAMMJJ-HHMM-étiquette de transfert-1"
 
-#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:442 ../raphodo/generatenameconfig.py:537
 msgid "YYYYMMDD-Job Code-1"
 msgstr "AAAAMMJJ-étiquette de transfert-1"
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "Date-Time and Video number"
 msgstr "Date - heure et numéro de vidéo"
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "YYYYMMDD_1234"
 msgstr "AAAAMMJJ_1234"
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "Resolution"
 msgstr "Résolution"
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "YYYYMMDD-HHMM-1-1920x1080"
 msgstr "AAAAMMJJ-HHMM-1-1920 x 1080"
 
@@ -1662,7 +2168,7 @@ msgstr "&Étiquette de transfert :"
 msgid "&Remember this choice"
 msgstr "&Se souvenir de ce choix"
 
-#: ../raphodo/jobcodepanel.py:185
+#: ../raphodo/jobcodepanel.py:186
 msgid ""
 "Select photos and videos to be able to apply a new or existing Job Code to "
 "them."
@@ -1670,12 +2176,14 @@ msgstr ""
 "Sélectionnez des photos et des vidéos pour pouvoir leur appliquer une "
 "nouvelle étiquette ou une existante."
 
-#: ../raphodo/jobcodepanel.py:186
-msgid "The new Job Code will be applied to all selected photos and/or videos."
-msgstr "La nouvelle étiquette sera appliquée à toutes les photos et/ou vidéos."
-
 #: ../raphodo/jobcodepanel.py:187
 msgid ""
+"The new Job Code will be applied to all selected photos and/or videos."
+msgstr ""
+"La nouvelle étiquette sera appliquée à toutes les photos et/ou vidéos."
+
+#: ../raphodo/jobcodepanel.py:188
+msgid ""
 "Click the Apply button to apply the current Job Code to all selected photos "
 "and/or videos. You can also simply double click the Job Code."
 msgstr ""
@@ -1683,7 +2191,7 @@ msgstr ""
 "les photos et/ou vidéos sélectionnées. Vous pouvez également double-cliquer "
 "sur l'étiquette."
 
-#: ../raphodo/jobcodepanel.py:189
+#: ../raphodo/jobcodepanel.py:190
 msgid ""
 "Removing a Job Code removes it only from the list of saved Job Codes, not "
 "from any photos or videos that it may have been applied to."
@@ -1692,7 +2200,7 @@ msgstr ""
 "sauvegardées, et non des photos ou des vidéos auxquels elle a pu être "
 "appliquée."
 
-#: ../raphodo/jobcodepanel.py:191
+#: ../raphodo/jobcodepanel.py:192
 msgid ""
 "If you want to use Job Codes, configure file renaming or destination "
 "subfolder names to use them."
@@ -1700,48 +2208,49 @@ msgstr ""
 "Si vous souhaitez utiliser les étiquettes de transfert, configurez le "
 "renommage de fichier ou les noms de sous-dossiers de destination."
 
-#: ../raphodo/jobcodepanel.py:197
+#: ../raphodo/jobcodepanel.py:198
 msgid "Last Used"
 msgstr "Derniers utilisés"
 
-#: ../raphodo/jobcodepanel.py:202
+#: ../raphodo/jobcodepanel.py:203
 msgid "Job Code Sort:"
 msgstr "Types d'étiquettes :"
 
-#: ../raphodo/jobcodepanel.py:205 ../raphodo/rapid.py:2061
+#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2133
 msgid "Ascending"
 msgstr "Ordre croissant"
 
-#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2062
+#: ../raphodo/jobcodepanel.py:207 ../raphodo/rapid.py:2134
 msgid "Descending"
 msgstr "Ordre décroissant"
 
-#: ../raphodo/jobcodepanel.py:216
+#: ../raphodo/jobcodepanel.py:217
 msgid "&New..."
 msgstr "&Nouveau..."
 
-#: ../raphodo/jobcodepanel.py:220
+#: ../raphodo/jobcodepanel.py:221
 msgid "&Apply"
 msgstr "&Appliquer"
 
-#: ../raphodo/jobcodepanel.py:224
+#: ../raphodo/jobcodepanel.py:225
 msgid "&Remove"
 msgstr "&Supprimer"
 
-#: ../raphodo/jobcodepanel.py:228 ../raphodo/preferencedialog.py:125
-#: ../raphodo/preferencedialog.py:154 ../raphodo/preferencedialog.py:433
+#: ../raphodo/jobcodepanel.py:229 ../raphodo/preferencedialog.py:200
+#: ../raphodo/preferencedialog.py:229 ../raphodo/preferencedialog.py:531
 msgid "Remove All"
 msgstr "Tout supprimer"
 
-#: ../raphodo/jobcodepanel.py:427
+#: ../raphodo/jobcodepanel.py:428
 msgid "Do you really want to remove all the Job Codes?"
-msgstr "Souhaitez-vous vraiment supprimer toutes les étiquettes de transfert ?"
+msgstr ""
+"Souhaitez-vous vraiment supprimer toutes les étiquettes de transfert ?"
 
-#: ../raphodo/jobcodepanel.py:429
+#: ../raphodo/jobcodepanel.py:430
 msgid "Remove all Job Codes"
 msgstr "Supprimer toutes les étiquettes de transfert"
 
-#: ../raphodo/jobcodepanel.py:492
+#: ../raphodo/jobcodepanel.py:493
 msgid "Job Codes"
 msgstr "Étiquettes de transfert"
 
@@ -1752,42 +2261,59 @@ msgstr "Étiquettes de transfert"
 msgid "<i><b>Hint:</b> %(message)s"
 msgstr "<i><b>Astuce :</b> %(message)s"
 
-#: ../raphodo/nameeditor.py:418 ../raphodo/nameeditor.py:432
+#: ../raphodo/nameeditor.py:423 ../raphodo/nameeditor.py:437
 #, python-format
 msgid "%(description)s - %(elements)s"
 msgstr "%(description)s - %(elements)s"
 
-#: ../raphodo/nameeditor.py:512
+#: ../raphodo/nameeditor.py:517
 msgid "Save New Custom Preset..."
 msgstr "Enregistrer un nouveau préréglage personnalisé..."
 
-#: ../raphodo/nameeditor.py:513
+#: ../raphodo/nameeditor.py:518
 msgid "Remove All Custom Presets..."
 msgstr "Supprimer tous les préréglages personnalisés..."
 
-#: ../raphodo/nameeditor.py:559
+#: ../raphodo/nameeditor.py:564
 msgid "(New Custom Preset)"
 msgstr "(Nouveau préréglage personnalisé)"
 
-#: ../raphodo/nameeditor.py:576
+#: ../raphodo/nameeditor.py:581
 #, python-format
 msgid "%s (edited)"
 msgstr "%s (modifié)"
 
-#: ../raphodo/nameeditor.py:579 ../raphodo/nameeditor.py:1370
+#: ../raphodo/nameeditor.py:584 ../raphodo/nameeditor.py:1379
 #, python-format
 msgid "Update Custom Preset \"%s\""
 msgstr "Mettre à jour le préréglage personnalisé « %s »"
 
-#: ../raphodo/nameeditor.py:667
+#: ../raphodo/nameeditor.py:672
 msgid "Save New Custom Preset - Rapid Photo Downloader"
-msgstr "Enregister le nouveau préréglage personnalisé - Rapid Photo Downloader"
+msgstr ""
+"Enregister le nouveau préréglage personnalisé - Rapid Photo Downloader"
 
-#: ../raphodo/nameeditor.py:675
+#: ../raphodo/nameeditor.py:680
 msgid "Preset Name:"
 msgstr "Nom du préréglage :"
 
-#: ../raphodo/nameeditor.py:836
+#: ../raphodo/nameeditor.py:799
+msgid "Photo Subfolder Generation Editor"
+msgstr "Éditeur de sous-répertoires photo"
+
+#: ../raphodo/nameeditor.py:805
+msgid "Video Subfolder Generation Editor"
+msgstr "Éditeur de sous-répertoires vidéo"
+
+#: ../raphodo/nameeditor.py:811
+msgid "Photo Renaming Editor"
+msgstr "Renommage de photos"
+
+#: ../raphodo/nameeditor.py:817
+msgid "Video Renaming Editor"
+msgstr "Renommage de vidéos"
+
+#: ../raphodo/nameeditor.py:842
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>There is insufficient data to "
 "fully generate the name. Please use other renaming options.</i>"
@@ -1799,7 +2325,7 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees.
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:846
+#: ../raphodo/nameeditor.py:853
 #, python-format
 msgid "The character</i> %(separator)s <i>creates a new subfolder level."
 msgstr ""
@@ -1808,7 +2334,7 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:851
+#: ../raphodo/nameeditor.py:858
 #, python-format
 msgid ""
 "There is no need start or end with the folder separator </i> "
@@ -1817,40 +2343,40 @@ msgstr ""
 "Il n'est pas nécessaire de commencer ou de finir avec le séparateur de "
 "dossiers </i> %(separator)s<i>, car il est ajouté automatiquement."
 
-#: ../raphodo/nameeditor.py:859
+#: ../raphodo/nameeditor.py:866
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>Unique filenames may not be "
 "generated. Make filenames unique by using Sequence values.</i>"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:882 ../raphodo/renamepanel.py:121
+#: ../raphodo/nameeditor.py:889 ../raphodo/renamepanel.py:121
 msgid "Preset:"
 msgstr "Préréglage :"
 
 #. Translators: appears in a combobox, e.g. Image Date (YYYY)
-#: ../raphodo/nameeditor.py:959 ../raphodo/nameeditor.py:980
+#: ../raphodo/nameeditor.py:966 ../raphodo/nameeditor.py:987
 #, python-brace-format
 msgid "{choice} ({variant})"
 msgstr "{choice} ({variant})"
 
-#: ../raphodo/nameeditor.py:1005 ../raphodo/preferencedialog.py:530
+#: ../raphodo/nameeditor.py:1012 ../raphodo/preferencedialog.py:783
 msgid "Get help online..."
 msgstr "Obtenir de l'aide en ligne..."
 
-#: ../raphodo/nameeditor.py:1025
+#: ../raphodo/nameeditor.py:1034
 msgid "Insert"
 msgstr "Insérer"
 
-#: ../raphodo/nameeditor.py:1351
+#: ../raphodo/nameeditor.py:1360
 msgid "Save Preset - Rapid Photo Downloader"
 msgstr "Enregistrer le préréglage - Rapid Photo Downloader"
 
-#: ../raphodo/nameeditor.py:1356
+#: ../raphodo/nameeditor.py:1365
 msgid ""
-"<b>Do you want to save the changes in a new custom preset?</"
-"b><br><br>Creating a custom preset is not required, but can help you keep "
-"organized.<br><br>The changes to the preferences will still be applied "
-"regardless of whether you create a new custom preset or not."
+"<b>Do you want to save the changes in a new custom "
+"preset?</b><br><br>Creating a custom preset is not required, but can help "
+"you keep organized.<br><br>The changes to the preferences will still be "
+"applied regardless of whether you create a new custom preset or not."
 msgstr ""
 "<b>Voulez-vous enregistrer les modifications dans un nouveau préréglage "
 "personnalisé ?</b><br><br>La création d'un préréglage personnalisé n'est pas "
@@ -1858,46 +2384,46 @@ msgstr ""
 "apportées aux préférences seront toujours appliquées indépendamment de la "
 "création ou non d'un nouveau préréglage personnalisé."
 
-#: ../raphodo/nameeditor.py:1365
+#: ../raphodo/nameeditor.py:1374
 msgid ""
 "<b>Do you want to save the changes in a custom preset?</b><br><br>If you "
 "like, you can create a new custom preset or update the existing custom "
 "preset.<br><br>The changes to the preferences will still be applied "
 "regardless of whether you save a custom preset or not."
 msgstr ""
-"<b>Voulez-vous enregistrer les modifications dans un préréglage "
-"personnalisé ?</b><br><br>Si vous le souhaitez, vous pouvez créer un nouveau "
-"préréglage personnalisé ou mettre à jour le préréglage personnalisé existant."
-"<br><br>Les modifications apportées aux préférences seront toujours "
+"<b>Voulez-vous enregistrer les modifications dans un préréglage personnalisé "
+"?</b><br><br>Si vous le souhaitez, vous pouvez créer un nouveau préréglage "
+"personnalisé ou mettre à jour le préréglage personnalisé "
+"existant.<br><br>Les modifications apportées aux préférences seront toujours "
 "appliquées indépendamment de la sauvegarde d'un préréglage personnalisé ou "
 "non."
 
-#: ../raphodo/nameeditor.py:1372
+#: ../raphodo/nameeditor.py:1381
 msgid "Save New Custom Preset"
 msgstr "Enregister le nouveau préréglage personnalisé"
 
-#: ../raphodo/newversion.py:306
+#: ../raphodo/newversion.py:312
 msgid "Checking for new version..."
 msgstr "Recherche d'une nouvelle version..."
 
-#: ../raphodo/newversion.py:307
+#: ../raphodo/newversion.py:313
 msgid "You are running the latest version."
 msgstr "Vous utilisez la dernière version"
 
-#: ../raphodo/newversion.py:308
+#: ../raphodo/newversion.py:314
 msgid "Failed to contact the update server."
 msgstr "Impossible de contacter le serveur de mise à jour"
 
-#: ../raphodo/newversion.py:310
+#: ../raphodo/newversion.py:316
 #, python-format
 msgid "A new version of Rapid Photo Downloader (%s) is available."
 msgstr "Une nouvelle version de Rapid Photo Downloader (%s) est disponible."
 
-#: ../raphodo/newversion.py:312
+#: ../raphodo/newversion.py:318
 msgid "Do you want to download the new version?"
 msgstr "Voulez-vous télécharger la nouvelle version ?"
 
-#: ../raphodo/newversion.py:313
+#: ../raphodo/newversion.py:319
 #, python-format
 msgid "Changes in the new release can be viewed <a href=\"%s\">here</a>."
 msgstr ""
@@ -1906,63 +2432,68 @@ msgstr ""
 
 #. Translators: this text appears in a button - the & sets the s key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:340 ../raphodo/newversion.py:353
+#: ../raphodo/newversion.py:348 ../raphodo/newversion.py:363
 msgid "&Skip this release"
 msgstr "&Passer cette version"
 
 #. Translators: this text appears in a button - the & sets the o key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:356
+#: ../raphodo/newversion.py:366
 msgid "&Open Download Page"
 msgstr "&Ouvrir la page de transfert"
 
-#: ../raphodo/newversion.py:376
+#: ../raphodo/newversion.py:386
 msgid "Rapid Photo Downloader updates"
 msgstr "Mises à jour de Rapid Photo Downloader"
 
 #. Translators: shows how much of a file has been downloaded e.g  123 KB of 1.3 MB
-#: ../raphodo/newversion.py:478
+#: ../raphodo/newversion.py:488
 #, python-format
 msgid "%(downloaded)s of %(total)s"
 msgstr "%(downloaded)s sur %(total)s"
 
-#: ../raphodo/newversion.py:495
+#: ../raphodo/newversion.py:507
 msgid "Downloading..."
 msgstr "Transfert..."
 
-#: ../raphodo/preferencedialog.py:76
+#: ../raphodo/preferencedialog.py:86
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Automation"
 msgstr "Automatisation"
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Thumbnails"
 msgstr "Miniatures"
 
-#: ../raphodo/preferencedialog.py:85 ../raphodo/preferencedialog.py:343
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/preferencedialog.py:428
 msgid "Error Handling"
 msgstr "Gestion des erreurs"
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Warnings"
 msgstr "Avertissements"
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:109
+msgid "Consolidation"
+msgstr "Consolidation"
+
+#: ../raphodo/preferencedialog.py:109 ../raphodo/preferencedialog.py:119
 msgid "Miscellaneous"
 msgstr "Divers"
 
-#: ../raphodo/preferencedialog.py:94
+#: ../raphodo/preferencedialog.py:147
 msgid "Device Scanning"
 msgstr "Analyse de périphérique"
 
-#: ../raphodo/preferencedialog.py:96
+#: ../raphodo/preferencedialog.py:148
 msgid "Scan only external devices"
 msgstr "Analyser uniquement les périphériques externes"
 
-#: ../raphodo/preferencedialog.py:98
+#: ../raphodo/preferencedialog.py:150
 msgid ""
 "Scan for photos and videos only on devices that are external to the "
 "computer,\n"
@@ -1973,51 +2504,67 @@ msgstr ""
 "y compris les appareils photo, les cartes mémoire, les disques durs externes "
 "et les lecteurs flash USB."
 
-#: ../raphodo/preferencedialog.py:102
-msgid "Scan non-camera devices lacking a DCIM folder"
-msgstr ""
-"Analyser les périphériques autres que les appareils photo qui ne disposent "
-"pas d'un dossier DCIM"
+#: ../raphodo/preferencedialog.py:153
+msgid "Scan only specific folders on devices"
+msgstr "Analyser uniquement les dossiers spécifiques sur les périphériques"
 
-#: ../raphodo/preferencedialog.py:104
+#: ../raphodo/preferencedialog.py:155
 msgid ""
-"Scan the entirety of a device for photos and videos, irrespective of whether "
-"it contains a DCIM folder,\n"
-"as opposed to only scanning within a DCIM folder.\n"
+"Scan for photos and videos only in the folders specified below (except "
+"paths\n"
+"specified in Ignored Paths).\n"
 "\n"
-"Changing this setting causes all devices to be scanned again.\n"
-"\n"
-"Note: With cameras, only the DCIM folder is scanned."
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:161
+msgid "Folders to scan:"
+msgstr "Dossiers à analyser :"
+
+#: ../raphodo/preferencedialog.py:164
+msgid ""
+"Folders at the base level of device file systems that will be scanned\n"
+"for photos and videos."
 msgstr ""
-"Analysez l'intégralité d'un périphérique pour les photos et les vidéos, "
-"indépendamment du fait qu'il contienne un dossier DCIM,\n"
-"par opposition à l'analyse uniquement dans un dossier DCIM.\n"
+
+#: ../raphodo/preferencedialog.py:167 ../raphodo/preferencedialog.py:219
+msgid "Add..."
+msgstr "Ajouter..."
+
+#: ../raphodo/preferencedialog.py:169
+msgid ""
+"Add a folder to the list of folders to scan for photos and videos.\n"
 "\n"
-"La modification de ce paramètre entraîne l'analyse de tous les "
-"périphériques.\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:172 ../raphodo/preferencedialog.py:198
+#: ../raphodo/preferencedialog.py:224 ../raphodo/preferencedialog.py:529
+msgid "Remove"
+msgstr "Supprimer"
+
+#: ../raphodo/preferencedialog.py:174
+msgid ""
+"Remove a folder from the list of folders to scan for photos and videos.\n"
 "\n"
-"Note : avec les appareils photo, seul le dossier DCIM est analysé."
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
 
-#: ../raphodo/preferencedialog.py:116
+#: ../raphodo/preferencedialog.py:191
 msgid "Devices that have been set to automatically ignore or download from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:117
+#: ../raphodo/preferencedialog.py:192
 msgid "Remembered Devices"
 msgstr "Périphériques mémorisés"
 
-#: ../raphodo/preferencedialog.py:121
+#: ../raphodo/preferencedialog.py:196
 msgid ""
 "Remove a device from the list of devices to automatically ignore or download "
 "from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:123 ../raphodo/preferencedialog.py:149
-#: ../raphodo/preferencedialog.py:431
-msgid "Remove"
-msgstr "Supprimer"
-
-#: ../raphodo/preferencedialog.py:127
+#: ../raphodo/preferencedialog.py:202
 msgid ""
 "Clear the list of devices from which to automatically ignore or download "
 "from.\n"
@@ -2025,22 +2572,18 @@ msgid ""
 "Note: Changes take effect when the computer is next scanned for devices."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:140
+#: ../raphodo/preferencedialog.py:215
 msgid "Ignored Paths"
 msgstr "Emplacements exclus"
 
-#: ../raphodo/preferencedialog.py:141
+#: ../raphodo/preferencedialog.py:216
 msgid ""
 "The end part of a path that should never be scanned for photos or videos."
 msgstr ""
 "La fin d'un chemin qui ne devrait jamais être analysé pour des photos ou des "
 "vidéos."
 
-#: ../raphodo/preferencedialog.py:144
-msgid "Add..."
-msgstr "Ajouter..."
-
-#: ../raphodo/preferencedialog.py:146
+#: ../raphodo/preferencedialog.py:221
 msgid ""
 "Add a path to the list of paths to ignore.\n"
 "\n"
@@ -2050,7 +2593,7 @@ msgstr ""
 "\n"
 "La modification de ce paramètre entraîne l'analyse de tous les périphériques."
 
-#: ../raphodo/preferencedialog.py:151
+#: ../raphodo/preferencedialog.py:226
 msgid ""
 "Remove a path from the list of paths to ignore.\n"
 "\n"
@@ -2060,7 +2603,7 @@ msgstr ""
 "\n"
 "La modification de ce paramètre entraîne l'analyse de tous les périphériques."
 
-#: ../raphodo/preferencedialog.py:156
+#: ../raphodo/preferencedialog.py:231
 msgid ""
 "Clear the list of paths to ignore.\n"
 "\n"
@@ -2070,15 +2613,17 @@ msgstr ""
 "\n"
 "La modification de ce paramètre entraîne l'analyse de tous les périphériques."
 
-#: ../raphodo/preferencedialog.py:164
+#: ../raphodo/preferencedialog.py:239
 msgid ""
-"Use python-style <a href=\"http://damonlynch.net/rapid/documentation/"
-"#regularexpressions\">regular expressions</a>"
+"Use python-style <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">regula"
+"r expressions</a>"
 msgstr ""
-"Utiliser les <a href=\"http://damonlynch.net/rapid/documentation/"
-"#regularexpressions\">expressions régulières</a> de style Python"
+"Utiliser les <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">expres"
+"sions régulières</a> de style Python"
 
-#: ../raphodo/preferencedialog.py:168
+#: ../raphodo/preferencedialog.py:243
 msgid ""
 "Use regular expressions in the list of ignored paths.\n"
 "\n"
@@ -2088,50 +2633,50 @@ msgstr ""
 "\n"
 "La modification de ce paramètre entraîne l'analyse de tous les périphériques."
 
-#: ../raphodo/preferencedialog.py:208
+#: ../raphodo/preferencedialog.py:283
 msgid "Program Automation"
 msgstr "Automatisation du programme"
 
-#: ../raphodo/preferencedialog.py:209
+#: ../raphodo/preferencedialog.py:284
 msgid "Start downloading at program startup"
 msgstr "Démarrer le transfert au démarrage de l'application"
 
-#: ../raphodo/preferencedialog.py:210
+#: ../raphodo/preferencedialog.py:285
 msgid "Start downloading upon device insertion"
 msgstr "Commencer le transfert lors de l'insertion d'un périphérique"
 
-#: ../raphodo/preferencedialog.py:211
+#: ../raphodo/preferencedialog.py:286
 msgid "Unmount (eject) device upon download completion"
 msgstr "Démonter (éjecter) le périphérique à la fin du transfert"
 
-#: ../raphodo/preferencedialog.py:212
+#: ../raphodo/preferencedialog.py:287
 msgid "Exit program when download completes"
 msgstr "Quitter l'application après un transfert réussi"
 
-#: ../raphodo/preferencedialog.py:213
+#: ../raphodo/preferencedialog.py:288
 msgid "Exit program even if download had warnings or errors"
 msgstr ""
 "Quitter l'application même si des avertissements ou des erreurs ont été "
 "signalés lors du transfert"
 
-#: ../raphodo/preferencedialog.py:240
+#: ../raphodo/preferencedialog.py:315
 msgid "Thumbnail Generation"
 msgstr "Génération de miniatures"
 
-#: ../raphodo/preferencedialog.py:241
+#: ../raphodo/preferencedialog.py:316
 msgid "Generate thumbnails"
 msgstr "Générer des miniatures"
 
-#: ../raphodo/preferencedialog.py:242
+#: ../raphodo/preferencedialog.py:318
 msgid "Generate thumbnails to show in the main program window"
 msgstr ""
 "Générer des miniatures pour afficher dans la fenêtre principale du programme"
 
-#: ../raphodo/preferencedialog.py:244
+#: ../raphodo/preferencedialog.py:320
 msgid "Cache thumbnails"
 msgstr "Mettre en cache les miniatures"
 
-#: ../raphodo/preferencedialog.py:245
+#: ../raphodo/preferencedialog.py:323
 msgid ""
 "Save thumbnails shown in the main program window in a thumbnail cache unique "
 "to Rapid Photo Downloader"
@@ -2139,11 +2684,11 @@ msgstr ""
 "Enregistrez les miniatures présentées dans la fenêtre du programme principal "
 "dans un cache de vignette unique à Rapid Photo Downloader"
 
-#: ../raphodo/preferencedialog.py:247
+#: ../raphodo/preferencedialog.py:327
 msgid "Generate system thumbnails"
 msgstr "Générer des miniatures système"
 
-#: ../raphodo/preferencedialog.py:248
+#: ../raphodo/preferencedialog.py:330
 msgid ""
 "While downloading, save thumbnails that can be used by desktop file managers "
 "and other programs"
@@ -2151,77 +2696,77 @@ msgstr ""
 "Pendant le transfert, enregistrez les miniatures qui peuvent être utilisées "
 "par les gestionnaires de fichiers de bureau et d'autres programmes"
 
-#: ../raphodo/preferencedialog.py:255
+#: ../raphodo/preferencedialog.py:339
 msgid "Number of CPU cores used to generate thumbnails."
 msgstr "Nombre de cœurs de processeur utilisés pour générer des miniatures."
 
-#: ../raphodo/preferencedialog.py:256
+#: ../raphodo/preferencedialog.py:340
 msgid "CPU cores:"
 msgstr "Cœurs de processeur :"
 
 #. Translators: the * acts as an asterisk to denote a reference to an annotation
 #. such as '* Takes effect upon program restart'
-#: ../raphodo/preferencedialog.py:271 ../raphodo/preferencedialog.py:317
+#: ../raphodo/preferencedialog.py:355 ../raphodo/preferencedialog.py:401
 msgid "*"
 msgstr "*"
 
-#: ../raphodo/preferencedialog.py:294
+#: ../raphodo/preferencedialog.py:378
 msgid "Thumbnail Cache"
 msgstr "Cache des miniatures"
 
-#: ../raphodo/preferencedialog.py:296
+#: ../raphodo/preferencedialog.py:380
 msgid "Calculating..."
 msgstr "Calcul..."
 
-#: ../raphodo/preferencedialog.py:302
+#: ../raphodo/preferencedialog.py:386
 msgid "days"
 msgstr "jours"
 
-#: ../raphodo/preferencedialog.py:303
+#: ../raphodo/preferencedialog.py:387
 msgid "forever"
 msgstr "indéfiniment"
 
-#: ../raphodo/preferencedialog.py:308
+#: ../raphodo/preferencedialog.py:392
 msgid "Cache size:"
 msgstr "Taille du cache :"
 
-#: ../raphodo/preferencedialog.py:310
+#: ../raphodo/preferencedialog.py:394
 msgid "Number of thumbnails:"
 msgstr "Nombre de miniatures :"
 
-#: ../raphodo/preferencedialog.py:312
+#: ../raphodo/preferencedialog.py:396
 msgid "Database size:"
 msgstr "Taille de la base de données :"
 
-#: ../raphodo/preferencedialog.py:314
+#: ../raphodo/preferencedialog.py:398
 msgid "Cache unaccessed thumbnails for:"
 msgstr "Cacher les miniatures non traitées pour :"
 
-#: ../raphodo/preferencedialog.py:322
+#: ../raphodo/preferencedialog.py:406
 msgid "Purge Cache..."
 msgstr "Purger le cache..."
 
-#: ../raphodo/preferencedialog.py:323
+#: ../raphodo/preferencedialog.py:408
 msgid "Optimize Cache..."
 msgstr "Optimiser le cache..."
 
-#: ../raphodo/preferencedialog.py:336
+#: ../raphodo/preferencedialog.py:421
 msgid "* Takes effect upon program restart"
 msgstr "* Prend effet au prochain démarrage"
 
-#: ../raphodo/preferencedialog.py:346
+#: ../raphodo/preferencedialog.py:431
 msgid "Skip download"
 msgstr "Passer le transfert"
 
-#: ../raphodo/preferencedialog.py:347
+#: ../raphodo/preferencedialog.py:432
 msgid "Don't download the file, and issue an error message"
 msgstr "Ne pas transférer le fichier et émettre un message d'erreur"
 
-#: ../raphodo/preferencedialog.py:348
+#: ../raphodo/preferencedialog.py:433
 msgid "Add unique identifier"
 msgstr "Ajouter un identifiant unique"
 
-#: ../raphodo/preferencedialog.py:349
+#: ../raphodo/preferencedialog.py:436
 msgid ""
 "Add an identifier like _1 or _2 to the end of the filename, immediately "
 "before the file's extension"
@@ -2229,23 +2774,24 @@ msgstr ""
 "Ajouter un identifiant comme _1 ou _2 à la fin du nom de fichier, "
 "immédiatement avant l'extension du fichier"
 
-#: ../raphodo/preferencedialog.py:355
+#: ../raphodo/preferencedialog.py:444
 msgid "Overwrite"
 msgstr "Écraser"
 
-#: ../raphodo/preferencedialog.py:356
+#: ../raphodo/preferencedialog.py:445
 msgid "Overwrite the previously backed up file"
 msgstr "Écraser le fichier précédemment sauvegardé"
 
-#: ../raphodo/preferencedialog.py:357
+#: ../raphodo/preferencedialog.py:446
 msgid "Skip"
 msgstr "Passer"
 
-#: ../raphodo/preferencedialog.py:358
+#: ../raphodo/preferencedialog.py:448
 msgid "Don't overwrite the backup file, and issue an error message"
-msgstr "Ne pas écraser le fichier de sauvegarde et émettre un message d'erreur"
+msgstr ""
+"Ne pas écraser le fichier de sauvegarde et émettre un message d'erreur"
 
-#: ../raphodo/preferencedialog.py:364
+#: ../raphodo/preferencedialog.py:455
 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 identifier:"
@@ -2253,7 +2799,17 @@ msgstr ""
 "Lorsqu'une photo ou une vidéo du même nom a déjà été transférée, choisissez "
 "d'ignorer le ttransfert du fichier ou d'ajouter un identifiant unique :"
 
-#: ../raphodo/preferencedialog.py:378
+#: ../raphodo/preferencedialog.py:464
+msgid ""
+"Using sequence numbers to automatically generate unique filenames is "
+"strongly recommended. Configure file renaming in the Rename panel in the "
+"main window."
+msgstr ""
+"Utiliser des nombres séquentiels pour générer des noms de fichiers uniques "
+"est fortement recommandé. Configurez le renommage de fichier depuis le "
+"panneau Renommer de la fenêtre principale."
+
+#: ../raphodo/preferencedialog.py:473
 msgid ""
 "When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up:"
@@ -2261,40 +2817,41 @@ msgstr ""
 "Lors de la sauvegarde, choisissez d'écraser le fichier qui possède le même "
 "nom sur le périphérique de sauvegarde ou de passer la sauvegarde :"
 
-#: ../raphodo/preferencedialog.py:398
+#: ../raphodo/preferencedialog.py:494
 msgid "Program Warnings"
 msgstr "Avertissements de programme"
 
-#: ../raphodo/preferencedialog.py:399
+#: ../raphodo/preferencedialog.py:495
 msgid "Show a warning when:"
 msgstr "Afficher un avertissement lorsque :"
 
-#: ../raphodo/preferencedialog.py:402
+#: ../raphodo/preferencedialog.py:498
 msgid "Downloading files currently not displayed"
 msgstr "Transfert des fichiers actuellement non affichés"
 
-#: ../raphodo/preferencedialog.py:403
+#: ../raphodo/preferencedialog.py:499
 msgid ""
 "Warn when about to download files that are not displayed in the main window."
 msgstr ""
 "Avertir lorsque sur le point de transférer des fichiers qui ne sont pas "
 "affichés dans la fenêtre principale."
 
-#: ../raphodo/preferencedialog.py:405
+#: ../raphodo/preferencedialog.py:501
 msgid "Backup destinations are missing"
 msgstr "Les destinations de sauvegarde sont manquantes"
 
-#: ../raphodo/preferencedialog.py:406
-msgid "Warn before starting a download if it is not possible to back up files."
+#: ../raphodo/preferencedialog.py:502
+msgid ""
+"Warn before starting a download if it is not possible to back up files."
 msgstr ""
 "Avertir avant de commencer un transfert s'il n'est pas possible de "
 "sauvegarder les fichiers."
 
-#: ../raphodo/preferencedialog.py:408
+#: ../raphodo/preferencedialog.py:504
 msgid "Program libraries are missing or broken"
 msgstr "Les bibliothèques de programme sont manquantes ou cassées"
 
-#: ../raphodo/preferencedialog.py:409
+#: ../raphodo/preferencedialog.py:505
 msgid ""
 "Warn if a software library used by Rapid Photo Downloader is missing or not "
 "functioning."
@@ -2302,11 +2859,11 @@ msgstr ""
 "Avertir si une bibliothèque de logiciels utilisée par Rapid Photo Downloader "
 "est manquante ou ne fonctionne pas."
 
-#: ../raphodo/preferencedialog.py:412
+#: ../raphodo/preferencedialog.py:508
 msgid "Filesystem metadata cannot be set"
 msgstr "Les métadonnées du système de fichiers ne peuvent pas être définies"
 
-#: ../raphodo/preferencedialog.py:413
+#: ../raphodo/preferencedialog.py:509
 msgid ""
 "Warn if there is an error setting a file's filesystem metadata, such as its "
 "modification time."
@@ -2314,11 +2871,11 @@ msgstr ""
 "Avertir s'il y a une erreur dans la définition des métadonnées du système de "
 "fichiers d'un fichier, comme sa date de modification."
 
-#: ../raphodo/preferencedialog.py:416
+#: ../raphodo/preferencedialog.py:512
 msgid "Encountering unhandled files"
 msgstr "Fichiers non gérés rencontrés"
 
-#: ../raphodo/preferencedialog.py:417
+#: ../raphodo/preferencedialog.py:513
 msgid ""
 "Warn after scanning a device or this computer if there are unrecognized "
 "files that will not be included in the download."
@@ -2326,11 +2883,11 @@ msgstr ""
 "Avertir après l'analyse d'un périphérique ou de cet ordinateur s'il existe "
 "des fichiers non reconnus qui ne seront pas inclus dans le transfert."
 
-#: ../raphodo/preferencedialog.py:420
+#: ../raphodo/preferencedialog.py:517
 msgid "Do not warn about unhandled files with extensions:"
 msgstr "Ne pas avertir à propos des fichiers non gérés avec des extensions :"
 
-#: ../raphodo/preferencedialog.py:424
+#: ../raphodo/preferencedialog.py:522
 msgid ""
 "File extensions are case insensitive and do not need to include the leading "
 "dot."
@@ -2338,43 +2895,172 @@ msgstr ""
 "Les extensions de fichiers ne sont pas sensibles à la casse et ne doivent "
 "pas inclure le point de séparation."
 
-#: ../raphodo/preferencedialog.py:427
+#: ../raphodo/preferencedialog.py:525
 msgid "Add"
 msgstr "Ajouter"
 
-#: ../raphodo/preferencedialog.py:428
+#: ../raphodo/preferencedialog.py:526
 msgid ""
 "Add a file extension to the list of unhandled file types to not warn about."
 msgstr ""
+"Ajoutez une extension de fichier à la liste des types de fichiers non pris "
+"en charge à ne pas traiter."
 
-#: ../raphodo/preferencedialog.py:430
+#: ../raphodo/preferencedialog.py:528
 msgid ""
 "Remove a file extension from the list of unhandled file types to not warn "
 "about."
 msgstr ""
+"Retirez une extension de fichier de la liste des types de fichiers non pris "
+"en charge à ne pas traiter."
 
-#: ../raphodo/preferencedialog.py:434
+#: ../raphodo/preferencedialog.py:532
 msgid ""
 "Clear the list of file extensions of unhandled file types to not warn about."
 msgstr ""
+"Videz la liste des types de fichiers non pris en charge à ne pas traiter."
+
+#: ../raphodo/preferencedialog.py:568
+msgid "Photo and Video Consolidation"
+msgstr "Consolidation de photos et de vidéos"
+
+#: ../raphodo/preferencedialog.py:571
+msgid "Consolidate files across devices and downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:574
+msgid ""
+"Analyze the results of device scans looking for duplicate files and matching "
+"RAW and JPEG pairs,\n"
+"comparing them across multiple devices and download sessions."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:580
+msgid "Treat matching RAW and JPEG files as:"
+msgstr "Traiter les fichiers RAW et JPEG en tant que :"
+
+#: ../raphodo/preferencedialog.py:581
+msgid "One photo"
+msgstr "Une photo"
+
+#: ../raphodo/preferencedialog.py:582
+msgid "Two photos"
+msgstr "Deux photos"
+
+#: ../raphodo/preferencedialog.py:584
+msgid ""
+"Display matching pairs of RAW and JPEG photos as one photo, and if marked, "
+"download both."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:589
+msgid ""
+"Display matching pairs of RAW and JPEG photos as two different photos. You "
+"can still synchronize their sequence numbers."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:598
+msgid "With matching RAW and JPEG photos:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:600
+msgid "Do not mark JPEG for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:601
+msgid "Do not mark RAW for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:602
+msgid "Mark both for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:609
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"JPEG for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:614
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"RAW for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:619
+msgid ""
+"When matching RAW and JPEG photos are found, automatically mark both for "
+"download."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:625
+msgid ""
+"If you disable file consolidation, choose what to do when a download device "
+"is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:631
+msgid ""
+"When a download device is inserted while completed downloads are displayed:"
+msgstr ""
+"Lorsqu'un périphérique de transfert est inséré lorsque les transferts "
+"effectués sont affichés :"
+
+#: ../raphodo/preferencedialog.py:642
+msgid "Clear completed downloads"
+msgstr "effacer les transferts terminés"
+
+#: ../raphodo/preferencedialog.py:643
+msgid "Keep displaying completed downloads"
+msgstr "conserver l'affichage des transferts terminés"
+
+#: ../raphodo/preferencedialog.py:644
+msgid "Prompt for what to do"
+msgstr "demander ce qu'il faut faire"
+
+#: ../raphodo/preferencedialog.py:649
+msgid ""
+"Automatically clear the display of completed downloads whenever a new "
+"download device is inserted."
+msgstr ""
+"Effacer automatiquement l'affichage des transferts terminés chaque fois "
+"qu'un nouveau périphérique de transfert est inséré."
+
+#: ../raphodo/preferencedialog.py:654
+msgid ""
+"Keep displaying completed downloads whenever a new download device is "
+"inserted."
+msgstr ""
+"Continuez à afficher les transferts terminés chaque fois qu'un nouveau "
+"périphérique de transfert est inséré."
 
-#: ../raphodo/preferencedialog.py:469
+#: ../raphodo/preferencedialog.py:658
+msgid ""
+"Prompt whether to keep displaying completed downloads or clear them whenever "
+"a new download device is inserted."
+msgstr ""
+"Demander s'il faut continuer à afficher les transferts terminés ou les "
+"effacer chaque fois qu'un nouveau périphérique de transfert est inséré."
+
+#: ../raphodo/preferencedialog.py:702
 msgid "Version Check"
 msgstr "Vérification de la version"
 
-#: ../raphodo/preferencedialog.py:470
+#: ../raphodo/preferencedialog.py:703
 msgid "Check for new version at startup"
 msgstr "Vérifier l'existence d'une nouvelle version au démarrage"
 
-#: ../raphodo/preferencedialog.py:471
+#: ../raphodo/preferencedialog.py:705
 msgid "Check for a new version of the program each time the program starts."
 msgstr "Rechercher une nouvelle version du programme à chaque démarrage."
 
-#: ../raphodo/preferencedialog.py:473
+#: ../raphodo/preferencedialog.py:707
 msgid "Include development releases"
 msgstr "Inclure les versions de développement"
 
-#: ../raphodo/preferencedialog.py:474
+#: ../raphodo/preferencedialog.py:709
 msgid ""
 "Include alpha, beta and other development releases when checking for a new "
 "version of the program.\n"
@@ -2388,11 +3074,12 @@ msgstr ""
 "Si vous exécutez actuellement une version de développement, la vérification "
 "s'effectuera toujours."
 
-#: ../raphodo/preferencedialog.py:489
+#: ../raphodo/preferencedialog.py:725
 msgid "Ignore DNG date/time metadata on MTP devices"
-msgstr "Ignorer les métadonnées de date / heure DNG sur les périphériques MTP"
+msgstr ""
+"Ignorer les métadonnées de date / heure DNG sur les périphériques MTP"
 
-#: ../raphodo/preferencedialog.py:490
+#: ../raphodo/preferencedialog.py:727
 msgid ""
 "Ignore date/time metadata in DNG files located on MTP devices, and use the "
 "file's modification time instead.\n"
@@ -2406,15 +3093,19 @@ msgstr ""
 "Utile pour les périphériques comme certains téléphones et tablettes qui "
 "créent des métadonnées DNG incorrectes."
 
+#: ../raphodo/preferencedialog.py:741
+msgid "Completed Downloads"
+msgstr "Transferts terminés"
+
 #. Translators: substituted value is a description for the set of preferences
 #. shown in the preference dialog window, e.g. Devices, Automation, etc.
 #. This string is shown in a tooltip for the "Restore Defaults" button
-#: ../raphodo/preferencedialog.py:710
+#: ../raphodo/preferencedialog.py:1067
 #, python-format
 msgid "Restores default %s preference values"
 msgstr "Rétablit les valeurs de préférence %s par défaut"
 
-#: ../raphodo/preferencedialog.py:832
+#: ../raphodo/preferencedialog.py:1208
 msgid ""
 "Do you want to purge the thumbnail cache? The cache will be purged when the "
 "program is next started."
@@ -2422,11 +3113,11 @@ msgstr ""
 "Voulez-vous purger le cache des miniatures ? Le cache sera purgé au prochain "
 "redémarrage."
 
-#: ../raphodo/preferencedialog.py:835
+#: ../raphodo/preferencedialog.py:1212
 msgid "Purge Thumbnail Cache"
 msgstr "Purger le cache des miniatures"
 
-#: ../raphodo/preferencedialog.py:847
+#: ../raphodo/preferencedialog.py:1225
 msgid ""
 "Do you want to optimize the thumbnail cache? The cache will be optimized "
 "when the program is next started."
@@ -2434,41 +3125,53 @@ msgstr ""
 "Voulez-vous optimiser le cache des miniatures ? Le cache sera optimisé au "
 "prochain redémarrage."
 
-#: ../raphodo/preferencedialog.py:850
+#: ../raphodo/preferencedialog.py:1229
 msgid "Optimize Thumbnail Cache"
 msgstr "Optimiser le cache des miniatures"
 
-#: ../raphodo/preferencedialog.py:1045
+#: ../raphodo/preferencedialog.py:1481
+msgid "Enter a Folder to Scan"
+msgstr "Saisir un dossier à analyser"
+
+#: ../raphodo/preferencedialog.py:1482
+msgid "Specify a folder that will be scanned for photos and videos"
+msgstr "Spécifiez un dossier qui sera analysé"
+
+#: ../raphodo/preferencedialog.py:1483
+msgid "Folder:"
+msgstr "Dossier :"
+
+#: ../raphodo/preferencedialog.py:1497
 msgid "Enter a Path to Ignore"
 msgstr "Saisissez un emplacement à exclure"
 
-#: ../raphodo/preferencedialog.py:1046
+#: ../raphodo/preferencedialog.py:1498
 msgid "Specify a path that will never be scanned for photos or videos"
 msgstr ""
 "Saisissez un emplacement pour lequel les photos et les vidéos ne seront pas "
 "recherchées"
 
-#: ../raphodo/preferencedialog.py:1047
+#: ../raphodo/preferencedialog.py:1499
 msgid "Path:"
 msgstr "Emplacement :"
 
-#: ../raphodo/preferencedialog.py:1061
+#: ../raphodo/preferencedialog.py:1513
 msgid "Enter a File Extension"
 msgstr "Saisir une extension de fichier"
 
-#: ../raphodo/preferencedialog.py:1062
+#: ../raphodo/preferencedialog.py:1514
 msgid "Specify a file extension (without the leading dot)"
 msgstr "Spécifier une extension de fichier (sans le point)"
 
-#: ../raphodo/preferencedialog.py:1063 ../raphodo/renamepanel.py:122
+#: ../raphodo/preferencedialog.py:1515 ../raphodo/renamepanel.py:122
 msgid "Extension:"
 msgstr "Extension :"
 
-#: ../raphodo/preferencedialog.py:1078
+#: ../raphodo/preferencedialog.py:1530
 msgid "Invalid File Extension"
 msgstr "Extension de fichier non valide"
 
-#: ../raphodo/preferencedialog.py:1079
+#: ../raphodo/preferencedialog.py:1531
 #, python-format
 msgid ""
 "The file extension <b>%s</b> is recognized by Rapid Photo Downloader, so it "
@@ -2477,7 +3180,7 @@ msgstr ""
 "L'extension de fichier <b>%s</b> est reconnue par Rapid Photo Downloader, il "
 "est donc inutile de prévenir de sa présence."
 
-#: ../raphodo/preferencedialog.py:1081
+#: ../raphodo/preferencedialog.py:1533
 #, python-format
 msgid ""
 "Recognized file types:\n"
@@ -2516,44 +3219,44 @@ msgstr "Mariage"
 msgid "Birthday"
 msgstr "Anniversaire"
 
-#: ../raphodo/preferences.py:614
+#: ../raphodo/preferences.py:624
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
-msgstr "Les préférences de sous-dossier ne devraient pas commencer avec un %s"
+msgstr ""
+"Les préférences de sous-dossier ne devraient pas commencer avec un %s"
 
-#: ../raphodo/preferences.py:617
+#: ../raphodo/preferences.py:627
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr ""
 "Les préférences de sous-dossier ne devraient pas se terminer avec un %s"
 
-#: ../raphodo/preferences.py:622
+#: ../raphodo/preferences.py:632
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
 "Les préférences de sous-dossier ne devraient pas contenir deux %s consécutifs"
 
-#. self.setFlat(True)
 #: ../raphodo/primarybutton.py:72
 msgid "Download 8 Photos and 10 Videos"
 msgstr "Transférer 8 photos et 10 vidéos"
 
-#: ../raphodo/problemnotification.py:86 ../raphodo/problemnotification.py:208
+#: ../raphodo/problemnotification.py:87 ../raphodo/problemnotification.py:209
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr "Erreur : %(errno)s %(strerror)s"
 
-#: ../raphodo/problemnotification.py:89
+#: ../raphodo/problemnotification.py:90
 #, python-format
 msgid "Error: %s"
 msgstr "Erreur : %s"
 
-#: ../raphodo/problemnotification.py:116
+#: ../raphodo/problemnotification.py:117
 #, python-format
 msgid "GPhoto2 Error: %s"
 msgstr "Erreur GPhoto2 : %s"
 
-#: ../raphodo/problemnotification.py:124
+#: ../raphodo/problemnotification.py:125
 msgid ""
 "Unable to initialize the camera, probably because another program is using "
 "it. No files were copied from it."
@@ -2561,59 +3264,59 @@ msgstr ""
 "Impossible d'initialiser l'appareil photo, probablement parce qu'un autre "
 "programme l'utilise. Aucun fichier n'a été copié."
 
-#: ../raphodo/problemnotification.py:134
+#: ../raphodo/problemnotification.py:135
 #, python-format
 msgid "Unable to read directory %s"
 msgstr "Impossible de lire le répertoire %s"
 
-#: ../raphodo/problemnotification.py:140
+#: ../raphodo/problemnotification.py:141
 #, python-format
 msgid "Unable to access modification time or size from %s"
 msgstr "Impossible d'accéder à la date de modification ou à la taille de %s"
 
-#: ../raphodo/problemnotification.py:146
+#: ../raphodo/problemnotification.py:147
 #, python-format
 msgid "Unable to read file %s"
 msgstr "Impossible de lire le fichier %s"
 
-#: ../raphodo/problemnotification.py:152
+#: ../raphodo/problemnotification.py:153
 #, python-format
 msgid "Unable to write file %s"
 msgstr "Impossible d'écrire le fichier %s"
 
-#: ../raphodo/problemnotification.py:158
+#: ../raphodo/problemnotification.py:159
 #, python-format
 msgid "Unable to move file %s"
 msgstr "Impossible de déplacer le fichier %s"
 
-#: ../raphodo/problemnotification.py:164
+#: ../raphodo/problemnotification.py:165
 #, python-format
 msgid "Unable to remove file %s"
 msgstr "Impossible de supprimer le fichier %s"
 
-#: ../raphodo/problemnotification.py:170
+#: ../raphodo/problemnotification.py:171
 #, python-format
 msgid "Unable to copy file %s"
 msgstr "Impossible de copier le fichier %s"
 
-#: ../raphodo/problemnotification.py:176
+#: ../raphodo/problemnotification.py:177
 #, python-format
 msgid "Zero length file %s will not be downloaded"
 msgstr "Le fichier de longueur zéro %s ne sera pas téléchargé"
 
-#: ../raphodo/problemnotification.py:182
+#: ../raphodo/problemnotification.py:183
 #, python-format
 msgid "Could not determine filesystem modification time for %s"
 msgstr ""
 "Impossible de déterminer la date de modification du système de fichiers pour "
 "%s"
 
-#: ../raphodo/problemnotification.py:188
+#: ../raphodo/problemnotification.py:189
 #, python-format
 msgid "Unable to load metadata from %s"
 msgstr "Impossible de charger les métadonnées depuis %s"
 
-#: ../raphodo/problemnotification.py:194
+#: ../raphodo/problemnotification.py:195
 #, python-format
 msgid ""
 "Unable to load metadata from %(name)s. The %(filetype)s was not downloaded."
@@ -2621,7 +3324,7 @@ msgstr ""
 "Impossible de charger les métadonnées depuis %(name)s. Le %(filetype)s n'a "
 "pas été téléchargé."
 
-#: ../raphodo/problemnotification.py:202
+#: ../raphodo/problemnotification.py:203
 #, python-format
 msgid ""
 "An error occurred setting a file's filesystem metadata on the filesystem %s. "
@@ -2633,17 +3336,17 @@ msgstr ""
 "survient à nouveau sur le même système de fichiers, elle ne sera plus "
 "signalée."
 
-#: ../raphodo/problemnotification.py:216
+#: ../raphodo/problemnotification.py:217
 #, python-format
 msgid "Encountered unhandled file %s. It will not be downloaded."
 msgstr "Fichier %s non géré rencontré. Il ne sera pas transférer."
 
-#: ../raphodo/problemnotification.py:223
+#: ../raphodo/problemnotification.py:224
 #, python-format
 msgid "%(filetype)s %(destination)s already exists."
 msgstr "%(filetype)s %(destination)s existe déjà."
 
-#: ../raphodo/problemnotification.py:234 ../raphodo/problemnotification.py:262
+#: ../raphodo/problemnotification.py:235 ../raphodo/problemnotification.py:263
 #, python-format
 msgid ""
 "The existing %(filetype)s %(destination)s was last modified on %(date)s at "
@@ -2651,23 +3354,23 @@ msgid ""
 msgstr ""
 "La %(destination)s de %(filetype)s a été modifiée le %(date)s à %(time)s."
 
-#: ../raphodo/problemnotification.py:245
+#: ../raphodo/problemnotification.py:246
 #, python-format
 msgid "The %(filetype)s %(source)s was not downloaded from %(device)s."
 msgstr ""
 "La %(source)s de %(filetype)s n'a pas été transférée depuis %(device)s."
 
-#: ../raphodo/problemnotification.py:273
+#: ../raphodo/problemnotification.py:274
 #, python-format
 msgid "The %(filetype)s %(source)s was downloaded from %(device)s."
 msgstr "La %(source)s de %(filetype)s a été transférée depuis %(device)s."
 
-#: ../raphodo/problemnotification.py:282
+#: ../raphodo/problemnotification.py:283
 #, python-format
 msgid "The unique identifier '%s' was added to the filename."
 msgstr "L'identifiant unique « %s » a été ajouté au nom de fichier."
 
-#: ../raphodo/problemnotification.py:298
+#: ../raphodo/problemnotification.py:299
 #, python-format
 msgid ""
 "The existing backup %(filetype)s %(destination)s was last modified on "
@@ -2676,13 +3379,13 @@ msgstr ""
 "La %(destination)s de sauvegarde existante de %(filetype)s a été modifiée le "
 "%(date)s à %(time)s."
 
-#: ../raphodo/problemnotification.py:309
+#: ../raphodo/problemnotification.py:310
 #, python-format
 msgid "The %(filetype)s %(source)s was not backed up from %(device)s."
 msgstr ""
 "La %(source)s de %(filetype)s n'a pas été sauvegardée depuis %(device)s."
 
-#: ../raphodo/problemnotification.py:326
+#: ../raphodo/problemnotification.py:327
 #, python-format
 msgid ""
 "The previous backup %(filetype)s %(destination)s was last modified on "
@@ -2691,27 +3394,27 @@ msgstr ""
 "La précédente %(destination)s de sauvegarde de %(filetype)s a été modifiée "
 "le %(date)s à %(time)s."
 
-#: ../raphodo/problemnotification.py:337
+#: ../raphodo/problemnotification.py:338
 #, python-format
 msgid ""
 "The %(filetype)s %(source)s from %(device)s was backed up, overwriting the "
 "previous backup %(filetype)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:356
+#: ../raphodo/problemnotification.py:357
 #, python-format
 msgid ""
 "When synchronizing RAW + JPEG sequence values, a duplicate %(filetype)s "
 "%(file)s was encountered, and was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:366
+#: ../raphodo/problemnotification.py:367
 msgid ""
 "When synchronizing RAW + JPEG sequence values, photos were detected with the "
 "same filenames, but taken at different times:"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:373
+#: ../raphodo/problemnotification.py:374
 #, python-format
 msgid ""
 "%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
@@ -2720,34 +3423,34 @@ msgstr ""
 "%(image1)s a été prise le %(image1_date)s à %(image1_time)s, et %(image2)s "
 "le %(image2_date)s à %(image2_time)s."
 
-#: ../raphodo/problemnotification.py:389
+#: ../raphodo/problemnotification.py:390
 #, python-format
 msgid "Unable to finalize the filename for %s"
 msgstr "Impossible de finaliser le nom de fichier pour %s"
 
-#: ../raphodo/problemnotification.py:424
+#: ../raphodo/problemnotification.py:425
 #, python-format
 msgid ""
 "The filename %(destination)s was not fully generated for %(filetype)s "
 "%(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:433
+#: ../raphodo/problemnotification.py:434
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr "La métadonnée %(type)s est manquante."
 
-#: ../raphodo/problemnotification.py:439
+#: ../raphodo/problemnotification.py:440
 #, python-format
 msgid "The following metadata is missing: %s."
 msgstr "Les métadonnées suivantes sont manquantes : %s."
 
-#: ../raphodo/problemnotification.py:445
+#: ../raphodo/problemnotification.py:446
 #, python-format
 msgid "Date/time conversion failed: %s."
 msgstr "Conversion de date / heure échouée : %s."
 
-#: ../raphodo/problemnotification.py:451
+#: ../raphodo/problemnotification.py:452
 msgid ""
 "Could not extract valid date/time metadata or determine the file "
 "modification time."
@@ -2755,28 +3458,28 @@ msgstr ""
 "Impossible d'extraire les métadonnées de date / heure valides ou de "
 "déterminer l'heure de modification du fichier."
 
-#: ../raphodo/problemnotification.py:457
+#: ../raphodo/problemnotification.py:458
 msgid "Filename does not have an extension."
 msgstr "Le nom de fichier n'a pas d'extension."
 
-#: ../raphodo/problemnotification.py:460
+#: ../raphodo/problemnotification.py:461
 msgid "Filename does not have a number component."
 msgstr "Le nom du fichier n'a pas de composante unique."
 
-#: ../raphodo/problemnotification.py:464
+#: ../raphodo/problemnotification.py:465
 #, python-format
 msgid "Error generating component %(component)s. Error: %(error)s"
 msgstr ""
 "Erreur lors de la génération du composant %(component)s. Erreur : %(error)s"
 
-#: ../raphodo/problemnotification.py:477
+#: ../raphodo/problemnotification.py:478
 #, python-format
 msgid ""
 "The download subfolders %(folder)s were only partially generated for "
 "%(filetype)s %(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:486
+#: ../raphodo/problemnotification.py:487
 #, python-format
 msgid ""
 "There is no data with which to generate the %(subfolder_file)s for "
@@ -2785,76 +3488,76 @@ msgstr ""
 "Il n'y a pas de données pour générer le %(subfolder_file)s pour "
 "%(filename)s. Le %(filetype)s n'a pas été téléchargé."
 
-#: ../raphodo/problemnotification.py:499
+#: ../raphodo/problemnotification.py:500
 #, python-format
 msgid ""
 "Unable to create the %(filetype)s %(destination)s in %(folder)s. The "
 "download file was %(source)s in %(device)s. It was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:514
+#: ../raphodo/problemnotification.py:515
 #, python-format
 msgid "Unable to create the download subfolder %s."
 msgstr "Impossible de créer le sous-dossier de téléchargement %s"
 
-#: ../raphodo/problemnotification.py:526
+#: ../raphodo/problemnotification.py:527
 #, python-format
 msgid "Unable to create the backup subfolder %s."
 msgstr "Impossible de créer le sous-dossier de sauvegarde %s."
 
-#: ../raphodo/problemnotification.py:577
+#: ../raphodo/problemnotification.py:578
 #, python-format
 msgid "Problems scanning %s"
 msgstr "Problèmes durant l'analyse de %s"
 
-#: ../raphodo/problemnotification.py:584
+#: ../raphodo/problemnotification.py:585
 #, python-format
 msgid "Problems copying from %s"
 msgstr "Problèmes de copie depuis %s"
 
-#: ../raphodo/problemnotification.py:591
+#: ../raphodo/problemnotification.py:592
 msgid "Problems while finalizing filenames and generating subfolders"
 msgstr ""
 "Problèmes lors de la finalisation des noms de fichiers et de la génération "
 "de sous-dossiers"
 
-#: ../raphodo/problemnotification.py:598
+#: ../raphodo/problemnotification.py:599
 #, python-format
 msgid "Problems backing up to %s"
 msgstr "Problèmes de sauvegarde vers %s"
 
-#. Translators: for example Nov 3 or Dec 31
+#. Translators: for example Nov 3 2015, 11:25 AM
+#. Translators: for example, Nov 3, 12:15 PM
+#: ../raphodo/proximity.py:188 ../raphodo/proximity.py:213
+#: ../raphodo/proximity.py:236 ../raphodo/proximity.py:239
+#, python-format
+msgid "%(date)s, %(time)s"
+msgstr "%(date)s, %(time)s"
+
+#: ../raphodo/proximity.py:204
+#, python-format
+msgid "%(starttime)s - %(endtime)s"
+msgstr "%(starttime)s - %(endtime)s"
+
 #. The start and end dates are on a different day
 #. Translators: for example Nov 3 or Dec 31
-#: ../raphodo/proximity.py:105 ../raphodo/proximity.py:221
-#: ../raphodo/proximity.py:224 ../raphodo/proximity.py:828
+#: ../raphodo/proximity.py:221 ../raphodo/proximity.py:225
+#: ../raphodo/proximity.py:980 ../raphodo/timeutils.py:105
 #, python-format
 msgid "%(month)s %(numeric_day)s"
 msgstr "%(month)s %(numeric_day)s"
 
-#. Translators: for example Nov 15 2015
 #. Translators: for example Nov 3 2015
-#: ../raphodo/proximity.py:109 ../raphodo/proximity.py:230
-#: ../raphodo/proximity.py:231 ../raphodo/proximity.py:831
+#. Translators: for example Nov 2 2015
+#. Translators: for example Nov 15 2015
+#: ../raphodo/proximity.py:232 ../raphodo/proximity.py:233
+#: ../raphodo/proximity.py:985 ../raphodo/timeutils.py:110
 #, python-format
 msgid "%(date)s %(year)s"
 msgstr "%(date)s %(year)s"
 
-#. Translators: for example Nov 3 2015, 11:25 AM
-#. Translators: for example, Nov 3, 12:15 PM
-#: ../raphodo/proximity.py:197 ../raphodo/proximity.py:215
-#: ../raphodo/proximity.py:234 ../raphodo/proximity.py:236
-#, python-format
-msgid "%(date)s, %(time)s"
-msgstr "%(date)s, %(time)s"
-
-#: ../raphodo/proximity.py:209
-#, python-format
-msgid "%(starttime)s - %(endtime)s"
-msgstr "%(starttime)s - %(endtime)s"
-
 #. Translators: for example, Nov 3, 12:15 PM - Nov 4, 1:00 AM
-#: ../raphodo/proximity.py:241
+#: ../raphodo/proximity.py:245
 #, python-format
 msgid "%(earlier_time)s - %(later_time)s"
 msgstr "%(earlier_time)s - %(later_time)s"
@@ -2863,7 +3566,7 @@ msgstr "%(earlier_time)s - %(later_time)s"
 #. Nov 3 2012, 12:15 PM -
 #. Nov 4 2012, 1:00 AM
 #. (please keep the line break signified by \n)
-#: ../raphodo/proximity.py:248
+#: ../raphodo/proximity.py:253
 #, python-format
 msgid ""
 "%(earlier_time)s -\n"
@@ -2872,18 +3575,18 @@ msgstr ""
 "%(earlier_time)s -\n"
 "%(later_time)s"
 
-#: ../raphodo/proximity.py:359
+#: ../raphodo/proximity.py:382
 #, python-format
 msgid "%(month)s  %(year)s"
 msgstr "%(month)s  %(year)s"
 
 #. Translators: for example Nov 2015
-#: ../raphodo/proximity.py:833
+#: ../raphodo/proximity.py:987
 #, python-format
 msgid "%(month)s %(year)s"
 msgstr "%(month)s %(year)s"
 
-#: ../raphodo/proximity.py:1344
+#: ../raphodo/proximity.py:1595
 msgid ""
 "The time elapsed between consecutive photos and videos that is used to build "
 "the Timeline"
@@ -2895,26 +3598,26 @@ msgstr ""
 #. Replace the very last character (after the d) with the correct
 #. localized value, keeping everything else. In other words, change
 #. only the m character.
-#: ../raphodo/proximity.py:1406
+#: ../raphodo/proximity.py:1652
 #, python-format
 msgid "%(minutes)dm"
 msgstr "%(minutes)dm"
 
 #. Translators: i.e. "1.5h", which is short for 1.5 hours.
 #. Replace the entire string with the correct localized value
-#: ../raphodo/proximity.py:1410
+#: ../raphodo/proximity.py:1656
 msgid "1.5h"
 msgstr "1,5 h"
 
 #. Translators: e.g. "5h", which is short for 5 hours.
 #. Replace the very last character (after the d) with the correct localized value,
 #. keeping everything else. In other words, change only the h character.
-#: ../raphodo/proximity.py:1415
+#: ../raphodo/proximity.py:1661
 #, python-format
 msgid "%(hours)dh"
 msgstr "%(hours)dh"
 
-#: ../raphodo/proximity.py:1461
+#: ../raphodo/proximity.py:1710
 msgid ""
 "The Timeline groups photos and videos based on how much time elapsed between "
 "consecutive shots. Use it to identify photos and videos taken at different "
@@ -2925,7 +3628,7 @@ msgstr ""
 "photos et les vidéos prises à différentes périodes dans une seule journée ou "
 "durant plusieurs jours consécutifs."
 
-#: ../raphodo/proximity.py:1464
+#: ../raphodo/proximity.py:1715
 msgid ""
 "Use the slider (below) to adjust the time elapsed between consecutive shots "
 "that is used to build the Timeline."
@@ -2933,15 +3636,15 @@ msgstr ""
 "Utilisez le curseur (ci-dessous) pour régler le temps écoulé entre les "
 "prises de vue consécutives utilisé pour construire la chronologie."
 
-#: ../raphodo/proximity.py:1466
+#: ../raphodo/proximity.py:1718
 msgid "Timeline build pending..."
 msgstr "Chronologie en construction..."
 
-#: ../raphodo/proximity.py:1467
+#: ../raphodo/proximity.py:1719
 msgid "Timeline is building..."
 msgstr "Construction de la chronologie"
 
-#: ../raphodo/proximity.py:1468
+#: ../raphodo/proximity.py:1721
 msgid ""
 "The Timeline needs to be rebuilt because the file modification time does not "
 "match the time a shot was taken for one or more shots.<br><br>The Timeline "
@@ -2953,16 +3656,16 @@ msgid ""
 "downloading, which is when the metadata is read."
 msgstr ""
 
-#: ../raphodo/rapid.py:485 ../raphodo/rapid.py:2461 ../raphodo/rapid.py:3728
-#: ../raphodo/rapid.py:3846 ../raphodo/rapid.py:3850 ../raphodo/rapid.py:3870
-#: ../raphodo/rapid.py:3874 ../raphodo/rapid.py:3998 ../raphodo/rapid.py:4007
-#: ../raphodo/rapid.py:4495 ../raphodo/rapid.py:4888 ../raphodo/rapid.py:5722
-#: ../raphodo/rememberthisdialog.py:97
+#: ../raphodo/rapid.py:493 ../raphodo/rapid.py:2555 ../raphodo/rapid.py:3934
+#: ../raphodo/rapid.py:4065 ../raphodo/rapid.py:4069 ../raphodo/rapid.py:4092
+#: ../raphodo/rapid.py:4096 ../raphodo/rapid.py:4226 ../raphodo/rapid.py:4237
+#: ../raphodo/rapid.py:4743 ../raphodo/rapid.py:5195 ../raphodo/rapid.py:5997
+#: ../raphodo/rememberthisdialog.py:99
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:3
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: ../raphodo/rapid.py:1100
+#: ../raphodo/rapid.py:1131
 msgid ""
 "<b>ExifTool has a problem</b><br><br> Rapid Photo Downloader uses ExifTool "
 "to get metadata from videos and photos. The program will run without it, but "
@@ -2973,11 +3676,11 @@ msgstr ""
 "programme fonctionnera sans, mais son installation est <b>vivement</b> "
 "recommandée."
 
-#: ../raphodo/rapid.py:1110 ../raphodo/rapid.py:1130
+#: ../raphodo/rapid.py:1141 ../raphodo/rapid.py:1161
 msgid "Problem with libmediainfo"
 msgstr "Problème avec libmediainfo"
 
-#: ../raphodo/rapid.py:1119
+#: ../raphodo/rapid.py:1150
 msgid ""
 "<b>The library libmediainfo appears to be missing</b><br><br> Rapid Photo "
 "Downloader uses libmediainfo to get the date and time a video was shot. The "
@@ -2988,18 +3691,18 @@ msgstr ""
 "une vidéo a été tournée. Le programme fonctionnera sans, mais son "
 "installation est recommandée."
 
-#: ../raphodo/rapid.py:1417
+#: ../raphodo/rapid.py:1448
 msgid "Download failed"
 msgstr "Le téléchargement a échoué"
 
-#: ../raphodo/rapid.py:1419
+#: ../raphodo/rapid.py:1450
 msgid ""
 "Sorry, the download of the new version of Rapid Photo Downloader failed."
 msgstr ""
 "Désolé, le téléchargement de la nouvelle version de Rapid Photo Downloader a "
 "échoué."
 
-#: ../raphodo/rapid.py:1425
+#: ../raphodo/rapid.py:1457
 msgid ""
 "The new version was successfully downloaded. Do you want to close Rapid "
 "Photo Downloader and install it now?"
@@ -3007,19 +3710,19 @@ msgstr ""
 "La nouvelle version a été téléchargée avec succès. Voulez-vous fermer Rapid "
 "Photo Downloader et l'installer maintenant ?"
 
-#: ../raphodo/rapid.py:1428
+#: ../raphodo/rapid.py:1461
 msgid "Update Rapid Photo Downloader"
 msgstr "Mise à jour de Rapid Photo Downloader"
 
-#: ../raphodo/rapid.py:1432
+#: ../raphodo/rapid.py:1465
 msgid "Install"
 msgstr "Installer"
 
-#: ../raphodo/rapid.py:1450
+#: ../raphodo/rapid.py:1483
 msgid "New version saved"
 msgstr "Nouvelle version enregistrée"
 
-#: ../raphodo/rapid.py:1451
+#: ../raphodo/rapid.py:1485
 #, python-format
 msgid ""
 "The tar file and installer script are saved at:\n"
@@ -3030,11 +3733,11 @@ msgstr ""
 "\n"
 " %s"
 
-#: ../raphodo/rapid.py:1468
+#: ../raphodo/rapid.py:1502
 msgid "Upgrade failed"
 msgstr "Échec de la mise à jour"
 
-#: ../raphodo/rapid.py:1469
+#: ../raphodo/rapid.py:1505
 msgid ""
 "Sorry, upgrading Rapid Photo Downloader failed because there was an error "
 "opening the installer."
@@ -3042,76 +3745,76 @@ msgstr ""
 "Désolé, la mise à niveau de Rapid Photo Downloader a échoué car une erreur "
 "s'est produite lors de l'ouverture du programme d'installation."
 
-#: ../raphodo/rapid.py:1667 ../raphodo/rapid.py:2331
+#: ../raphodo/rapid.py:1709 ../raphodo/rapid.py:2425
 msgid "Download"
 msgstr "Télécharger"
 
-#: ../raphodo/rapid.py:1671
+#: ../raphodo/rapid.py:1713
 msgid "&Refresh..."
 msgstr "&Actualiser..."
 
-#: ../raphodo/rapid.py:1675
+#: ../raphodo/rapid.py:1717
 msgid "&Preferences"
 msgstr "&Préférences"
 
-#: ../raphodo/rapid.py:1679
+#: ../raphodo/rapid.py:1721
 msgid "&Quit"
 msgstr "&Quitter"
 
-#: ../raphodo/rapid.py:1683
+#: ../raphodo/rapid.py:1725
 msgid "Error &Reports"
 msgstr "&Rapports d'erreur"
 
-#: ../raphodo/rapid.py:1687
+#: ../raphodo/rapid.py:1729
 msgid "Clear Completed Downloads"
 msgstr "Effacer les transferts terminés"
 
-#: ../raphodo/rapid.py:1691
+#: ../raphodo/rapid.py:1733
 msgid "Get Help Online..."
 msgstr "Obtenir de l'aide en ligne..."
 
-#: ../raphodo/rapid.py:1695
+#: ../raphodo/rapid.py:1737
 msgid "&Tip of the Day..."
 msgstr "&Astuce du jour..."
 
-#: ../raphodo/rapid.py:1699
+#: ../raphodo/rapid.py:1741
 msgid "Report a Problem..."
 msgstr "Signaler un problème..."
 
-#: ../raphodo/rapid.py:1703
+#: ../raphodo/rapid.py:1745
 msgid "Make a Donation..."
 msgstr "Faire un don..."
 
-#: ../raphodo/rapid.py:1707
+#: ../raphodo/rapid.py:1749
 msgid "Translate this Application..."
 msgstr "Traduire cette application..."
 
-#: ../raphodo/rapid.py:1711
+#: ../raphodo/rapid.py:1753
 msgid "&About..."
 msgstr "&À propos..."
 
-#: ../raphodo/rapid.py:1715
+#: ../raphodo/rapid.py:1757
 msgid "Check for Updates..."
 msgstr "Rechercher des mises à jour..."
 
-#: ../raphodo/rapid.py:1797
+#: ../raphodo/rapid.py:1840
 msgid "Timeline"
 msgstr "Chronologie"
 
-#: ../raphodo/rapid.py:1807
+#: ../raphodo/rapid.py:1850
 msgid "Destination"
 msgstr "Destination"
 
-#: ../raphodo/rapid.py:1808
+#: ../raphodo/rapid.py:1851
 msgid "Rename"
 msgstr "Renommer"
 
-#: ../raphodo/rapid.py:1810
+#: ../raphodo/rapid.py:1853
 msgid "Back Up"
 msgstr "Sauvegarde"
 
 #. Devices Header and View
-#: ../raphodo/rapid.py:1926
+#: ../raphodo/rapid.py:1977
 msgid ""
 "Turn on or off the use of devices attached to this computer as download "
 "sources"
@@ -3120,79 +3823,79 @@ msgstr ""
 "en tant que sources de transfert"
 
 #. This Computer Header and View
-#: ../raphodo/rapid.py:1940
+#: ../raphodo/rapid.py:1994
 msgid ""
 "Turn on or off the use of a folder on this computer as a download source"
 msgstr ""
 "Activer ou désactiver l'utilisation d'un répertoire sur cet ordinateur en "
 "tant que source de transfert"
 
-#: ../raphodo/rapid.py:1941
+#: ../raphodo/rapid.py:1996
 msgid "This Computer"
 msgstr "Cet ordinateur"
 
-#: ../raphodo/rapid.py:1952
+#: ../raphodo/rapid.py:2009
 msgid "Select a source folder"
 msgstr "Sélectionner un répertoire source"
 
-#: ../raphodo/rapid.py:1975
+#: ../raphodo/rapid.py:2038
 msgid "Projected Storage Use"
 msgstr "Utilisation projetée du stockage"
 
-#: ../raphodo/rapid.py:1989 ../raphodo/rapid.py:1997
+#: ../raphodo/rapid.py:2056 ../raphodo/rapid.py:2068
 msgid "Select a destination folder"
 msgstr "Sélectionner un répertoire de destination"
 
-#: ../raphodo/rapid.py:2045
+#: ../raphodo/rapid.py:2117
 msgid "All"
 msgstr "Tout"
 
-#: ../raphodo/rapid.py:2046
+#: ../raphodo/rapid.py:2118
 msgid "New"
 msgstr "Nouveau"
 
-#: ../raphodo/rapid.py:2048
+#: ../raphodo/rapid.py:2120
 msgid "Show:"
 msgstr "Afficher :"
 
-#: ../raphodo/rapid.py:2051
+#: ../raphodo/rapid.py:2123
 msgid "Modification Time"
 msgstr "Heure de modification"
 
-#: ../raphodo/rapid.py:2052
+#: ../raphodo/rapid.py:2124
 msgid "Checked State"
 msgstr "État enregistré"
 
-#: ../raphodo/rapid.py:2055
+#: ../raphodo/rapid.py:2127
 msgid "File Type"
 msgstr "Type de fichier"
 
-#: ../raphodo/rapid.py:2056
+#: ../raphodo/rapid.py:2128
 msgid "Device"
 msgstr "Périphérique"
 
-#: ../raphodo/rapid.py:2058
+#: ../raphodo/rapid.py:2130
 msgid "Sort:"
 msgstr "Tri :"
 
-#: ../raphodo/rapid.py:2069
+#: ../raphodo/rapid.py:2141
 msgid "Select All:"
 msgstr "Tout sélectionner :"
 
-#: ../raphodo/rapid.py:2311
+#: ../raphodo/rapid.py:2405
 #, python-format
 msgid "Download %(files)s"
 msgstr "Transférer %(files)s"
 
-#: ../raphodo/rapid.py:2327
+#: ../raphodo/rapid.py:2421
 msgid "Resume Download"
 msgstr "Reprendre le transfert"
 
-#: ../raphodo/rapid.py:2329
+#: ../raphodo/rapid.py:2423
 msgid "Pause"
 msgstr "Suspendre"
 
-#: ../raphodo/rapid.py:2417
+#: ../raphodo/rapid.py:2511
 #, python-brace-format
 msgid ""
 "Please report the problem at <a href=\"{website}\">{website}</a>.<br><br>\n"
@@ -3200,18 +3903,18 @@ msgid ""
 "            <a href=\"{log_path}\">here</a> to open the log directory).\n"
 "            "
 msgstr ""
-"Veuillez signaler le problème à <a href=\"{website}\">{website}</a>."
-"<br><br>\n"
+"Veuillez signaler le problème à <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
 "            Joindre le fichier journal <i>{log_file}</i> à votre rapport "
 "(cliquer\n"
 "            <a href=\"{log_path}\">ici</a> pour ouvrir le dossier journal).\n"
 "            "
 
-#: ../raphodo/rapid.py:2431
+#: ../raphodo/rapid.py:2525
 msgid "Thank you for reporting a problem in Rapid Photo Downloader"
 msgstr "Merci de signaler un problème dans Rapid Photo Downloader"
 
-#: ../raphodo/rapid.py:2529
+#: ../raphodo/rapid.py:2624
 #, python-format
 msgid ""
 "<b>Changing This Computer source path</b><br><br>Do you really want to "
@@ -3220,13 +3923,13 @@ msgid ""
 "from This Computer will be cancelled."
 msgstr ""
 
-#: ../raphodo/rapid.py:2595
+#: ../raphodo/rapid.py:2694
 msgid "You cannot change the download destination while downloading."
 msgstr ""
 "Vous ne pouvez pas changer la destination du transfert pendant qu'il "
 "s'exécute."
 
-#: ../raphodo/rapid.py:2604
+#: ../raphodo/rapid.py:2704
 #, python-format
 msgid ""
 "<b>Confirm Download Destination</b><br><br>Are you sure you want to set the "
@@ -3235,27 +3938,18 @@ msgstr ""
 "<b>Confirmation de la destination du transfert</b><br><br>Voulez-vous "
 "vraiment définir la destination du transfert %(file_type)s en %(path)s ?"
 
-#: ../raphodo/rapid.py:2682
+#: ../raphodo/rapid.py:2785
 msgid ""
+"\n"
 "<b>Downloading all files</b><br><br>\n"
-"                    A download always includes all files that are checked "
-"for download,\n"
-"                    including those that are not currently displayed because "
-"the Timeline\n"
-"                    is being used or because only new files are being shown."
-"<br><br>\n"
-"                    Do you want to proceed with the download?"
-msgstr ""
-"<b>Transfert de tous les fichiers</b><br><br>\n"
-"                    Un transfert inclut toujours tous les fichiers marqués "
-"pour transfert,\n"
-"                    y compris ceux qui ne sont pas actuellement affichés car "
-"la chronologie\n"
-"                    est utilisée ou parce que seuls les nouveaux fichiers "
-"sont affichés.<br><br>\n"
-"                    Voulez-vous procéder au transfert ?"
-
-#: ../raphodo/rapid.py:2820
+"A download always includes all files that are checked for download,\n"
+"including those that are not currently displayed because the Timeline\n"
+"is being used or because only new files are being shown.<br><br>\n"
+"Do you want to proceed with the download?\n"
+"                        "
+msgstr ""
+
+#: ../raphodo/rapid.py:2937
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -3266,7 +3960,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: ../raphodo/rapid.py:2824
+#: ../raphodo/rapid.py:2940
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -3275,15 +3969,15 @@ msgstr ""
 "Ce répertoire de destination n'est pas valide :\n"
 "%s"
 
-#: ../raphodo/rapid.py:2827
+#: ../raphodo/rapid.py:2943
 msgid "Download Failure"
 msgstr "Échec de transfert"
 
-#: ../raphodo/rapid.py:2828
+#: ../raphodo/rapid.py:2944
 msgid "The download cannot proceed."
 msgstr "Le transfert ne peut pas se dérouler."
 
-#: ../raphodo/rapid.py:2842
+#: ../raphodo/rapid.py:2962
 msgid ""
 "Photos and videos will not be backed up because there is nowhere to back "
 "them up. Do you still want to start the download?"
@@ -3292,8 +3986,7 @@ msgstr ""
 "d'emplacement pour les sauvegarder. Voulez-vous toujours commencer le "
 "transfert ?"
 
-#. Translators: filetype will be replaced with 'photos' or 'videos'
-#: ../raphodo/rapid.py:2847 ../raphodo/rapid.py:2854
+#: ../raphodo/rapid.py:2969 ../raphodo/rapid.py:2979
 #, python-format
 msgid ""
 "No backup device exists for backing up %(filetype)s. Do you still want to "
@@ -3302,15 +3995,15 @@ msgstr ""
 "Il n'existe aucun périphérique de sauvegarde pour la sauvegarde de "
 "%(filetype)s. Voulez-vous toujours lancer le transfert ?"
 
-#: ../raphodo/rapid.py:2848 ../raphodo/rpdfile.py:228
+#: ../raphodo/rapid.py:2971 ../raphodo/rpdfile.py:228
 msgid "photos"
 msgstr "photos"
 
-#: ../raphodo/rapid.py:2855 ../raphodo/rpdfile.py:223
+#: ../raphodo/rapid.py:2981 ../raphodo/rpdfile.py:223
 msgid "videos"
 msgstr "vidéos"
 
-#: ../raphodo/rapid.py:2861
+#: ../raphodo/rapid.py:2989
 msgid ""
 "<b>The photo and video backup destinations do not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
@@ -3319,7 +4012,7 @@ msgstr ""
 "ne peuvent pas être écrites.</b><br><br>Voulez-vous toujours lancer le "
 "transfert ?"
 
-#: ../raphodo/rapid.py:2869 ../raphodo/rapid.py:2876
+#: ../raphodo/rapid.py:2999 ../raphodo/rapid.py:3008
 #, python-format
 msgid ""
 "<b>The %(filetype)s backup destination does not exist or cannot be written "
@@ -3328,100 +4021,95 @@ msgstr ""
 "<b>La destination de sauvegarde%(filetype)s n'existe pas ou ne peut pas être "
 "écrite.</b><br><br>Voulez-vous toujours lancer le transfert ?"
 
-#: ../raphodo/rapid.py:2871 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:818
+#: ../raphodo/rapid.py:3001 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:843
 msgid "photo"
 msgstr "photo"
 
-#: ../raphodo/rapid.py:2878 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:858
+#: ../raphodo/rapid.py:3010 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:883
 msgid "video"
 msgstr "vidéo"
 
-#: ../raphodo/rapid.py:2886
+#: ../raphodo/rapid.py:3018
 msgid "Backup problem"
 msgstr "Problème de sauvegarde"
 
-#. Translators - in the middle is a unicode em dash - please retain it
-#. This string is displayed in the status bar when the download is running
-#: ../raphodo/rapid.py:3571
+#: ../raphodo/rapid.py:3756
 #, python-format
 msgid "%(downloading_from)s — %(time_left)s left (%(speed)s)"
 msgstr "%(downloading_from)s — %(time_left)s left (%(speed)s)"
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3640
+#: ../raphodo/rapid.py:3828
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s transférés"
 
-#. Translators: e.g. 2 videos failed to download
-#: ../raphodo/rapid.py:3645
+#: ../raphodo/rapid.py:3836
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "erreur lors du transfert de %(noFiles)s %(filetypes)s"
 
-#: ../raphodo/rapid.py:3650 ../raphodo/rapid.py:3723
+#: ../raphodo/rapid.py:3842 ../raphodo/rapid.py:3927
 msgid "warnings"
 msgstr "avertissements"
 
-#: ../raphodo/rapid.py:3679
+#: ../raphodo/rapid.py:3873
 msgid "All downloads complete"
 msgstr "Tous les transferts sont terminés"
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3686 ../raphodo/rapid.py:3695 ../raphodo/rapid.py:3704
-#: ../raphodo/rapid.py:3713 ../raphodo/rapid.py:3721
+#: ../raphodo/rapid.py:3881 ../raphodo/rapid.py:3892 ../raphodo/rapid.py:3903
+#: ../raphodo/rapid.py:3914 ../raphodo/rapid.py:3924
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: ../raphodo/rapid.py:3688 ../raphodo/rapid.py:3706
+#: ../raphodo/rapid.py:3884 ../raphodo/rapid.py:3906
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s transféré"
 
-#: ../raphodo/rapid.py:3697 ../raphodo/rapid.py:3715
+#: ../raphodo/rapid.py:3895 ../raphodo/rapid.py:3917
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "Échec de transfert pour %(filetype)s"
 
-#: ../raphodo/rapid.py:3742
+#: ../raphodo/rapid.py:3950
 msgid "1 failure"
 msgstr "1 échec"
 
-#: ../raphodo/rapid.py:3744
+#: ../raphodo/rapid.py:3952
 #, python-format
 msgid "%d failures"
 msgstr "%d échecs"
 
-#: ../raphodo/rapid.py:3749
+#: ../raphodo/rapid.py:3957
 msgid "1 warning"
 msgstr "1 avertissement"
 
-#: ../raphodo/rapid.py:3751
+#: ../raphodo/rapid.py:3959
 #, python-format
 msgid "%d warnings"
 msgstr "%d avertissements"
 
-#: ../raphodo/rapid.py:3771
+#: ../raphodo/rapid.py:3981
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s"
 msgstr "%(no_files_and_types)s transférés de %(devices)s"
 
-#: ../raphodo/rapid.py:3774
+#: ../raphodo/rapid.py:3985
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s — %(failures)s"
 msgstr "%(no_files_and_types)s transférés de %(devices)s — %(failures)s"
 
-#: ../raphodo/rapid.py:3779
+#: ../raphodo/rapid.py:3989
 #, python-format
 msgid "No files downloaded — %(failures)s"
 msgstr "Aucun fichier transféré — %(failures)s"
 
-#: ../raphodo/rapid.py:3781
+#: ../raphodo/rapid.py:3991
 msgid "No files downloaded"
 msgstr "Aucun fichier transféré"
 
-#: ../raphodo/rapid.py:3805
+#: ../raphodo/rapid.py:4021
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
@@ -3430,7 +4118,7 @@ msgstr ""
 "Les sous-répertoires de destination et la chronologie seront reconstruits "
 "après la génération de toutes les miniatures pour l'appareil photo %(camera)s"
 
-#: ../raphodo/rapid.py:3809
+#: ../raphodo/rapid.py:4026
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for this computer"
@@ -3438,7 +4126,7 @@ msgstr ""
 "Les sous-répertoires de destination et la chronologie seront reconstruits "
 "après la génération de toutes les miniatures pour cet ordinateur"
 
-#: ../raphodo/rapid.py:3812
+#: ../raphodo/rapid.py:4031
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
@@ -3447,7 +4135,7 @@ msgstr ""
 "Les sous-répertoires de destination et la chronologie seront reconstruits "
 "après la génération de toutes les miniatures pour %(device)s"
 
-#: ../raphodo/rapid.py:3820
+#: ../raphodo/rapid.py:4039
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
@@ -3457,7 +4145,7 @@ msgstr ""
 "après la génération de toutes les miniatures pour %(number_devices)s "
 "périphériques et cet ordinateur"
 
-#: ../raphodo/rapid.py:3833
+#: ../raphodo/rapid.py:4052
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
@@ -3467,7 +4155,7 @@ msgstr ""
 "après la génération de toutes les miniatures pour l'appareil photo "
 "%(camera)s et cet ordinateur"
 
-#: ../raphodo/rapid.py:3837
+#: ../raphodo/rapid.py:4056
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
@@ -3477,7 +4165,7 @@ msgstr ""
 "après la génération de toutes les miniatures pour %(device)s et cet "
 "ordinateur"
 
-#: ../raphodo/rapid.py:3841
+#: ../raphodo/rapid.py:4060
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
@@ -3487,16 +4175,16 @@ msgstr ""
 "après la génération de toutes les miniatures pour %(number_devices)s "
 "périphériques"
 
-#: ../raphodo/rapid.py:3867
+#: ../raphodo/rapid.py:4087
 msgid "The Destination subfolders and Timeline have been rebuilt"
 msgstr ""
 "Les sous-répertoires de destination et la chronologie ont été reconstruits"
 
-#: ../raphodo/rapid.py:3922
+#: ../raphodo/rapid.py:4144
 msgid "Program preferences are invalid"
 msgstr "Les préférences de l'application ne sont pas valides"
 
-#: ../raphodo/rapid.py:3999
+#: ../raphodo/rapid.py:4228
 #, python-format
 msgid ""
 "<b>All files on the %(camera)s are inaccessible</b>.<br><br>It may be locked "
@@ -3506,14 +4194,14 @@ msgid ""
 "ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4008
+#: ../raphodo/rapid.py:4239
 #, python-format
 msgid ""
-"<b>The %(camera)s appears to be in use by another application.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again.<br><br>Alternatively, you can ignore this "
-"device."
+"<b>The %(camera)s appears to be in use by another "
+"application.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again.<br><br>Alternatively, you "
+"can ignore this device."
 msgstr ""
 "<b>%(camera)s semble utilisé par une autre application.</b><br><br>Vous "
 "pouvez fermer toute autre application (comme un navigateur de fichiers) qui "
@@ -3521,24 +4209,25 @@ msgstr ""
 "l'ordinateur et rebranchez-le.<br><br>Sinon, vous pouvez ignorer ce "
 "périphérique."
 
-#: ../raphodo/rapid.py:4019
+#: ../raphodo/rapid.py:4250
 msgid "&Try Again"
 msgstr "&Réessayer"
 
-#: ../raphodo/rapid.py:4020
+#: ../raphodo/rapid.py:4251
 msgid "&Ignore This Device"
 msgstr "&Ignorer ce périphérique"
 
-#: ../raphodo/rapid.py:4086
+#: ../raphodo/rapid.py:4323
 #, python-format
 msgid "Sorry, an unexpected problem occurred while scanning %s."
 msgstr "Désolé, un problème inattendu s'est produit lors de l'analyse de %s."
 
-#: ../raphodo/rapid.py:4087
+#: ../raphodo/rapid.py:4324
 msgid "Unfortunately you cannot download from this device."
-msgstr "Malheureusement, vous ne pouvez pas transférer depuis ce périphérique."
+msgstr ""
+"Malheureusement, vous ne pouvez pas transférer depuis ce périphérique."
 
-#: ../raphodo/rapid.py:4091
+#: ../raphodo/rapid.py:4328
 msgid ""
 "A possible workaround for the problem might be downloading from the camera's "
 "memory card using a card reader."
@@ -3546,31 +4235,31 @@ msgstr ""
 "Une solution pour régler le problème pourrait être un transfert depuis la "
 "carte mémoire de l'appareil photo à l'aide d'un lecteur de carte."
 
-#: ../raphodo/rapid.py:4096
+#: ../raphodo/rapid.py:4333
 msgid "Device scan failed"
 msgstr "Analyse du périphérique échouée"
 
-#: ../raphodo/rapid.py:4472
+#: ../raphodo/rapid.py:4720
 #, python-format
 msgid ""
-"<b>The %(camera)s cannot be scanned because it cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again."
+"<b>The %(camera)s cannot be scanned because it cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again."
 msgstr ""
-"<b>%(camera)s ne peut pas être analysé car il ne peut pas être démonté.</"
-"b><br><br>Vous pouvez fermer toute autre application (comme un navigateur de "
-"fichiers) qui l'utilise et réessayez. Si cela ne fonctionne pas, débranchez "
-"%(camera)s de l'ordinateur et rebranchez-le."
+"<b>%(camera)s ne peut pas être analysé car il ne peut pas être "
+"démonté.</b><br><br>Vous pouvez fermer toute autre application (comme un "
+"navigateur de fichiers) qui l'utilise et réessayez. Si cela ne fonctionne "
+"pas, débranchez %(camera)s de l'ordinateur et rebranchez-le."
 
-#: ../raphodo/rapid.py:4496
+#: ../raphodo/rapid.py:4745
 #, python-format
 msgid ""
-"<b>The download cannot start because the %(camera)s cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again, and choose which files you want to "
-"download from it."
+"<b>The download cannot start because the %(camera)s cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again, and choose which files "
+"you want to download from it."
 msgstr ""
 "<b>Le téléchargement ne peut pas démarrer car %(camera)s ne peut pas être "
 "démonté.</b><br><br>Vous pouvez fermer toute autre application (comme un "
@@ -3578,28 +4267,54 @@ msgstr ""
 "pas, débranchez %(camera)s de l'ordinateur et rallumez-le, puis, choisissez "
 "les fichiers que vous souhaitez télécharger."
 
-#: ../raphodo/rapid.py:4635
+#: ../raphodo/rapid.py:4842
+msgid "Completed Downloads Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4844
+#, python-format
+msgid "%s whose download have completed are displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4846
+msgid "Do you want to clear the completed downloads?"
+msgstr "Voulez-vous effacer les transferts terminés ?"
+
+#: ../raphodo/rapid.py:4848
+msgid "Completed Download Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4850
+#, python-format
+msgid "%s whose download has completed is displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4852
+msgid "Do you want to clear the completed download?"
+msgstr "Voulez-vous effacer le transfert terminé ?"
+
+#: ../raphodo/rapid.py:4933
 #, python-format
 msgid ""
 "Do you want to download photos and videos from the device <i>%(device)s</i>?"
 msgstr ""
-"Voulez-vous transférer des photos et des vidéos depuis le périphérique <i>"
-"%(device)s</i> ?"
+"Voulez-vous transférer des photos et des vidéos depuis le périphérique "
+"<i>%(device)s</i> ?"
 
-#: ../raphodo/rapid.py:4877
+#: ../raphodo/rapid.py:5183
 #, python-format
 msgid "<b>Do you want to ignore the %s whenever this program is run?</b>"
 msgstr ""
 "<b>Voulez-vous ignorer les %s chaque fois que ce programme est exécuté ?</b>"
 
-#: ../raphodo/rapid.py:4879
+#: ../raphodo/rapid.py:5186
 msgid ""
 "All cameras, phones and tablets with the same model name will be ignored."
 msgstr ""
 "Tous les appareils photo, téléphones et tablettes portant le même nom de "
 "modèle seront ignorés."
 
-#: ../raphodo/rapid.py:4883
+#: ../raphodo/rapid.py:5190
 #, python-format
 msgid ""
 "<b>Do you want to ignore the device %s whenever this program is run?</b>"
@@ -3607,16 +4322,16 @@ msgstr ""
 "<b>Voulez-vous ignorer le périphérique %s à chaque fois que ce programme est "
 "exécuté ?</b>"
 
-#: ../raphodo/rapid.py:4885
+#: ../raphodo/rapid.py:5192
 msgid "Any device with the same name will be ignored."
 msgstr "Tout périphérique portant le même nom sera ignoré."
 
-#: ../raphodo/rapid.py:5178
+#: ../raphodo/rapid.py:5492
 #, python-format
 msgid "Downloading from %(location)s on This Computer."
 msgstr "Transfert de %(location)s vers cet ordinateur."
 
-#: ../raphodo/rapid.py:5180
+#: ../raphodo/rapid.py:5496
 msgid ""
 "Do you really want to download from here?<br><br>On some systems, scanning "
 "this location can take a very long time."
@@ -3624,17 +4339,17 @@ msgstr ""
 "Voulez-vous vraiment transférer à partir d'ici ?<br><br>Sur certains "
 "systèmes, l'analyse de cet emplacement peut prendre beaucoup de temps."
 
-#: ../raphodo/rapid.py:5224
+#: ../raphodo/rapid.py:5537
 #, python-format
 msgid "Generating thumbnails for %s"
 msgstr "Génération des miniatures pour %s"
 
-#: ../raphodo/rapid.py:5227
+#: ../raphodo/rapid.py:5540
 #, python-format
 msgid "Scanning %s"
 msgstr "Analyse de %s"
 
-#: ../raphodo/rapid.py:5237
+#: ../raphodo/rapid.py:5551
 #, python-format
 msgid ""
 "%(number)s of %(available files)s checked for download (%(hidden)s hidden)"
@@ -3642,81 +4357,81 @@ msgstr ""
 "%(number)s sur %(available files)s contrôlés pour transfert (%(hidden)s "
 "hidden)"
 
-#: ../raphodo/rapid.py:5243
+#: ../raphodo/rapid.py:5559
 #, python-format
 msgid "%(number)s of %(available files)s checked for download"
 msgstr "%(number)s de %(available files)s contrôlés pour transfert"
 
-#: ../raphodo/rapid.py:5494
+#: ../raphodo/rapid.py:5764
 msgid "Display program information when run from the command line."
 msgstr ""
 "Afficher les informations du programme lors de l'exécution à partir de la "
 "ligne de commande."
 
-#: ../raphodo/rapid.py:5496
+#: ../raphodo/rapid.py:5766
 msgid "Display debugging information when run from the command line."
 msgstr ""
 "Afficher les informations de débogage lorsque exécuté en ligne de commande."
 
-#: ../raphodo/rapid.py:5499
+#: ../raphodo/rapid.py:5769
 msgid "List photo and video file extensions the program recognizes and exit."
 msgstr ""
 "Lister les extensions de fichiers photo et vidéo que le programme reconnaît "
 "et quitter."
 
-#: ../raphodo/rapid.py:5502
+#: ../raphodo/rapid.py:5772
 msgid "Turn on or off the the renaming of photos."
 msgstr "Activer ou désactiver le renommage de photos"
 
-#: ../raphodo/rapid.py:5504
+#: ../raphodo/rapid.py:5774
 msgid "turn on or off the the renaming of videos."
 msgstr "Activer ou désactiver le renommage de vidéos"
 
-#: ../raphodo/rapid.py:5506
+#: ../raphodo/rapid.py:5776
 msgid ""
 "Turn on or off the automatic detection of devices from which to download."
 msgstr ""
 "Activer ou désactiver la détection automatique des périphériques à partir "
 "desquels transférer."
 
-#: ../raphodo/rapid.py:5510
+#: ../raphodo/rapid.py:5780
 msgid "Turn on or off downloading from this computer."
 msgstr "Activer ou désactiver le transfert à partir de cet ordinateur."
 
-#: ../raphodo/rapid.py:5512 ../raphodo/rapid.py:5515 ../raphodo/rapid.py:5518
-#: ../raphodo/rapid.py:5539 ../raphodo/rapid.py:5543
+#: ../raphodo/rapid.py:5782 ../raphodo/rapid.py:5785 ../raphodo/rapid.py:5788
+#: ../raphodo/rapid.py:5809 ../raphodo/rapid.py:5813
 msgid "PATH"
 msgstr "CHEMIN"
 
-#: ../raphodo/rapid.py:5513
+#: ../raphodo/rapid.py:5783
 msgid "The PATH on this computer from which to download."
 msgstr "Le CHEMIN sur cet ordinateur depuis lequel transférer."
 
-#: ../raphodo/rapid.py:5516
+#: ../raphodo/rapid.py:5786
 msgid "The PATH where photos will be downloaded to."
 msgstr "Le CHEMIN vers lequel les photos seront transférées."
 
-#: ../raphodo/rapid.py:5519
+#: ../raphodo/rapid.py:5789
 msgid "The PATH where videos will be downloaded to."
 msgstr "Le CHEMIN vers lequel les vidéos seront transférées."
 
-#: ../raphodo/rapid.py:5521
+#: ../raphodo/rapid.py:5791
 msgid "Turn on or off the backing up of photos and videos while downloading."
 msgstr ""
 "Activer ou désactiver la sauvegarde de photos et de vidéos pendant le "
 "transfert."
 
-#: ../raphodo/rapid.py:5525
+#: ../raphodo/rapid.py:5795
 msgid "Turn on or off the automatic detection of backup devices."
 msgstr ""
 "Activer ou désactiver la détection automatique des périphériques de "
 "sauvegarde."
 
-#: ../raphodo/rapid.py:5527 ../raphodo/rapid.py:5533
+#: ../raphodo/rapid.py:5797 ../raphodo/rapid.py:5803
 msgid "FOLDER"
 msgstr "RÉPERTOIRE"
 
-#: ../raphodo/rapid.py:5528
+#: ../raphodo/rapid.py:5798
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected photo "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3729,7 +4444,7 @@ msgstr ""
 "sauvegardes. Pour chaque périphérique que vous souhaitez utiliser pour "
 "sauvegarder des photos, créez un dossier avec ce nom."
 
-#: ../raphodo/rapid.py:5534
+#: ../raphodo/rapid.py:5804
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected video "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3742,7 +4457,7 @@ msgstr ""
 "Pour chaque périphérique que vous souhaitez utiliser pour sauvegarder des "
 "vidéos, créez un dossier avec ce nom."
 
-#: ../raphodo/rapid.py:5540
+#: ../raphodo/rapid.py:5810
 msgid ""
 "The PATH where photos will be backed up when automatic detection of backup "
 "devices is turned off."
@@ -3750,7 +4465,7 @@ msgstr ""
 "Le CHEMIN où les photos seront sauvegardées lorsque la détection automatique "
 "des périphériques de sauvegarde est désactivée."
 
-#: ../raphodo/rapid.py:5544
+#: ../raphodo/rapid.py:5814
 msgid ""
 "The PATH where videos will be backed up when automatic detection of backup "
 "devices is turned off."
@@ -3758,24 +4473,25 @@ msgstr ""
 "Le CHEMIN où les vidéos seront sauvegardées lorsque la détection automatique "
 "des périphériques de sauvegarde est désactivée."
 
-#: ../raphodo/rapid.py:5547
+#: ../raphodo/rapid.py:5817
 #, python-format
 msgid "Ignore photos with the following extensions: %s"
 msgstr "Ignorer les photos avec l'extension suivante : %s"
 
-#: ../raphodo/rapid.py:5551
-msgid "Turn on or off starting downloads as soon as the program itself starts."
+#: ../raphodo/rapid.py:5821
+msgid ""
+"Turn on or off starting downloads as soon as the program itself starts."
 msgstr ""
 "Activer ou désactiver le démarrage des transferts dès que le programme "
 "démarre lui-même."
 
-#: ../raphodo/rapid.py:5554
+#: ../raphodo/rapid.py:5824
 msgid "Turn on or off starting downloads as soon as a device is inserted."
 msgstr ""
 "Activer ou désactiver le démarrage des transferts dès qu'un périphérique est "
 "connecté."
 
-#: ../raphodo/rapid.py:5557
+#: ../raphodo/rapid.py:5827
 msgid ""
 "Turn on or off use of the Rapid Photo Downloader Thumbnail Cache. Turning it "
 "off does not delete existing cache contents."
@@ -3783,7 +4499,7 @@ msgstr ""
 "Activer ou désactiver l'utilisation du cache des miniatures de Rapid Photo "
 "Downloader. L'éteindre ne supprime pas le contenu du cache existant."
 
-#: ../raphodo/rapid.py:5561
+#: ../raphodo/rapid.py:5831
 msgid ""
 "Delete all thumbnails in the Rapid Photo Downloader Thumbnail Cache, and "
 "exit."
@@ -3791,11 +4507,11 @@ msgstr ""
 "Supprimer toutes les miniatures dans le cache de miniatures de Rapid Photo "
 "Downloader et quitter."
 
-#: ../raphodo/rapid.py:5565
+#: ../raphodo/rapid.py:5835
 msgid "Forget which files have been previously downloaded, and exit."
 msgstr "Oublier les fichiers précédemment transférés et quitter."
 
-#: ../raphodo/rapid.py:5568
+#: ../raphodo/rapid.py:5838
 msgid ""
 "Import preferences from an old program version and exit. Requires the "
 "command line program gconftool-2."
@@ -3803,7 +4519,7 @@ msgstr ""
 "Importer les préférences à partir d'une ancienne version de programme et "
 "quitter. Nécessite le programme en ligne de commande gconftool-2."
 
-#: ../raphodo/rapid.py:5571
+#: ../raphodo/rapid.py:5841
 msgid ""
 "Reset all program settings to their default values, delete all thumbnails in "
 "the Thumbnail cache, forget which files have been previously downloaded, and "
@@ -3813,18 +4529,18 @@ msgstr ""
 "supprimer toutes les miniatures dans le cache des miniatures, oublier les "
 "fichiers précédemment transférés et quitter."
 
-#: ../raphodo/rapid.py:5575
+#: ../raphodo/rapid.py:5845
 msgid "Include gphoto2 debugging information in log files."
 msgstr ""
 "Inclure les information de débogage de gphoto2 dans les fichiers journaux."
 
-#: ../raphodo/rapid.py:5579
+#: ../raphodo/rapid.py:5849
 msgid "Print information to the terminal about attached cameras and exit."
 msgstr ""
 "Imprimer les informations sur le terminal à propos des appareils photo "
 "connectés et quitter."
 
-#: ../raphodo/rapid.py:5640
+#: ../raphodo/rapid.py:5911
 msgid ""
 "To import preferences from the old version of Rapid Photo Downloader, you "
 "must install the program gconftool-2."
@@ -3832,49 +4548,60 @@ msgstr ""
 "Pour importer des préférences à partir de l'ancienne version de Rapid Photo "
 "Downloader, vous devez installer le programme gconftool-2."
 
-#: ../raphodo/rapid.py:5649
+#: ../raphodo/rapid.py:5920
 msgid "No prior program preferences detected: exiting"
 msgstr "Aucune préférence de programme préalable détectée : sortie"
 
-#: ../raphodo/rapid.py:5652
+#: ../raphodo/rapid.py:5923
 #, python-format
 msgid "Importing preferences from Rapid Photo Downloader %(version)s"
 msgstr ""
 "Importation de préférences à partir de Rapid Photo Downloader %(version)s"
 
-#: ../raphodo/rapid.py:5714
+#: ../raphodo/rapid.py:5989
 #, python-format
-msgid "Do you want to copy the stored sequence number, which has the value %d?"
+msgid ""
+"Do you want to copy the stored sequence number, which has the value %d?"
 msgstr ""
 "Voulez-vous copier le numéro de séquence mémorisé, qui a la valeur %d ?"
 
-#: ../raphodo/rapid.py:5726
+#: ../raphodo/rapid.py:6000
 msgid "Program aborting."
 msgstr "Abandon du programme."
 
-#: ../raphodo/rapid.py:5736
+#: ../raphodo/rapid.py:6010
 msgid "Never run this program as the sudo / root user."
 msgstr "Ne jamais exécuter ce programme en tant qu'utilisateur sudo / root."
 
-#: ../raphodo/rapid.py:5740
+#: ../raphodo/rapid.py:6014
 msgid "You must install ExifTool to run Rapid Photo Downloader."
 msgstr "Vous devez installer ExifTool pour exécuter Rapid Photo Downloader."
 
-#: ../raphodo/rapid.py:5794
+#: ../raphodo/rapid.py:6026
+msgid ""
+"Rapid Photo Downloader is installed in multiple locations.\n"
+"\n"
+"Uninstall all copies except the version you want to run."
+msgstr ""
+"Rapid Photo Downloader est installé à plusieurs endroits.\n"
+"\n"
+"Désinstallez toutes les copies sauf la version que vous souhaitez exécuter."
+
+#: ../raphodo/rapid.py:6083
 msgid ""
 "When specifying a path on the command line, do not also specify an\n"
 "option for device auto detection or a path on \"This Computer\"."
 msgstr ""
 
-#: ../raphodo/rapid.py:5950
+#: ../raphodo/rapid.py:6243
 msgid "All settings and caches have been reset"
 msgstr "Tous les paramètres et caches ont été réinitialisés"
 
-#: ../raphodo/rapid.py:5958
+#: ../raphodo/rapid.py:6251
 msgid "Thumbnail Cache has been reset"
 msgstr "Le cache des miniatures a été réinitialisé"
 
-#: ../raphodo/rapid.py:5964
+#: ../raphodo/rapid.py:6257
 msgid "Remembered files have been forgotten"
 msgstr "Les fichiers mémorisés ont été oubliés"
 
@@ -3892,15 +4619,15 @@ msgstr ""
 "&Ne plus avertir à propos des bibliothèques de programmes manquantes ou "
 "cassées"
 
-#: ../raphodo/renameandmovefile.py:546
+#: ../raphodo/renameandmovefile.py:554
 msgid "subfolder and filename"
 msgstr "Sous-dossier et nom de fichier"
 
-#: ../raphodo/renameandmovefile.py:548
+#: ../raphodo/renameandmovefile.py:556
 msgid "filename"
 msgstr "nom de fichier"
 
-#: ../raphodo/renameandmovefile.py:550
+#: ../raphodo/renameandmovefile.py:558
 msgid "subfolder"
 msgstr "sous-dossier"
 
@@ -3988,160 +4715,238 @@ msgstr "photos et vidéos"
 msgid "photos or videos"
 msgstr "photos ou vidéos"
 
-#: ../raphodo/rpdfile.py:306
+#: ../raphodo/rpdfile.py:315
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: ../raphodo/rpdfile.py:318
+#. translators: natural language expression signifying a single video
+#: ../raphodo/rpdfile.py:337
+msgid "a video"
+msgstr "une vidéo"
+
+#: ../raphodo/rpdfile.py:339
 msgid "1 Video"
 msgstr "1 Vidéo"
 
-#: ../raphodo/rpdfile.py:323
+#. translators: natural language expression signifying a single photo
+#: ../raphodo/rpdfile.py:346
+msgid "a photo"
+msgstr "une photo"
+
+#: ../raphodo/rpdfile.py:348
 msgid "1 Photo"
 msgstr "1 Photo"
 
-#: ../raphodo/rpdfile.py:803
+#: ../raphodo/rpdfile.py:828
 #, python-format
 msgid "%(path)s on %(camera)s"
 msgstr "%(path)s sur %(camera)s"
 
-#: ../raphodo/rpdfile.py:819
+#: ../raphodo/rpdfile.py:844
 msgid "Photo"
 msgstr "Photo"
 
-#: ../raphodo/rpdfile.py:859
+#: ../raphodo/rpdfile.py:884
 msgid "Video"
 msgstr "Vidéo"
 
-#: ../raphodo/storage.py:138
+#: ../raphodo/storage.py:141
 msgid "File system root"
 msgstr "Racine du système de fichiers"
 
 #. translators: the name of the Pictures folder
-#: ../raphodo/storage.py:433
+#: ../raphodo/storage.py:437
 msgid "Pictures"
 msgstr "Images"
 
-#: ../raphodo/thumbnaildisplay.py:426
+#: ../raphodo/thumbnaildisplay.py:432
 #, python-format
 msgid "Taken on %(date_time)s (%(human_readable)s)"
 msgstr "Prise le %(date_time)s (%(human_readable)s)"
 
-#: ../raphodo/thumbnaildisplay.py:431
+#: ../raphodo/thumbnaildisplay.py:439
 #, python-format
 msgid "Modified on %(date_time)s (%(human_readable)s)"
 msgstr "Modifiée le %(date_time)s (%(human_readable)s)"
 
-#: ../raphodo/thumbnaildisplay.py:437 ../raphodo/thumbnaildisplay.py:466
+#: ../raphodo/thumbnaildisplay.py:447 ../raphodo/thumbnaildisplay.py:481
 #, python-format
 msgid "%(date_time)s (%(human_readable)s)"
 msgstr "%(date_time)s (%(human_readable)s)"
 
-#: ../raphodo/thumbnaildisplay.py:451
+#: ../raphodo/thumbnaildisplay.py:464
 #, python-format
 msgid "Memory cards: %s"
 msgstr "Cartes mémoire : %s"
 
-#: ../raphodo/thumbnaildisplay.py:457
+#: ../raphodo/thumbnaildisplay.py:468
+#, python-format
+msgid "Memory card: %s"
+msgstr "Carte mémoire : %s"
+
+#: ../raphodo/thumbnaildisplay.py:473
 msgid "Downloaded as:"
 msgstr "Transféré comme :"
 
-#: ../raphodo/thumbnaildisplay.py:472
+#: ../raphodo/thumbnaildisplay.py:489
 #, python-format
 msgid "<br><br>Previous download:<br>%(filename)s<br>%(path)s<br>%(date)s"
-msgstr "<br><br>Transfert précédent :<br>%(filename)s<br>%(path)s<br>%(date)s"
+msgstr ""
+"<br><br>Transfert précédent :<br>%(filename)s<br>%(path)s<br>%(date)s"
 
-#: ../raphodo/thumbnaildisplay.py:1603
+#: ../raphodo/thumbnaildisplay.py:1645
 msgid "Copy Path"
 msgstr "Copier le chemin"
 
+#. Translators: these values are file size suffixes like B representing bytes, KB representing
+#. kilobytes, etc.
+#: ../raphodo/utilities.py:170
+msgid "B"
+msgstr "o"
+
+#: ../raphodo/utilities.py:170
+msgid "KB"
+msgstr "ko"
+
+#: ../raphodo/utilities.py:170
+msgid "MB"
+msgstr "Mo"
+
+#: ../raphodo/utilities.py:170
+msgid "GB"
+msgstr "Go"
+
+#: ../raphodo/utilities.py:170
+msgid "TB"
+msgstr "To"
+
+#: ../raphodo/utilities.py:170
+msgid "PB"
+msgstr "Po"
+
+#: ../raphodo/utilities.py:170
+msgid "EB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "ZB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "YB"
+msgstr ""
+
 #. two things in a list e.g. "device1 and device2"
-#: ../raphodo/utilities.py:391
+#: ../raphodo/utilities.py:394
 #, python-format
 msgid "%(first_item)s and %(last_item)s"
 msgstr "%(first_item)s et %(last_item)s"
 
-#: ../raphodo/utilities.py:464
+#: ../raphodo/utilities.py:468
 msgid "one"
 msgstr "un"
 
-#: ../raphodo/utilities.py:465
+#: ../raphodo/utilities.py:469
 msgid "two"
 msgstr "deux"
 
-#: ../raphodo/utilities.py:466
+#: ../raphodo/utilities.py:470
 msgid "three"
 msgstr "trois"
 
-#: ../raphodo/utilities.py:467
+#: ../raphodo/utilities.py:471
 msgid "four"
 msgstr "quatre"
 
-#: ../raphodo/utilities.py:468
+#: ../raphodo/utilities.py:472
 msgid "five"
 msgstr "cinq"
 
-#: ../raphodo/utilities.py:469
+#: ../raphodo/utilities.py:473
 msgid "six"
 msgstr "six"
 
-#: ../raphodo/utilities.py:470
+#: ../raphodo/utilities.py:474
 msgid "seven"
 msgstr "sept"
 
-#: ../raphodo/utilities.py:471
+#: ../raphodo/utilities.py:475
 msgid "eight"
 msgstr "huit"
 
-#: ../raphodo/utilities.py:472
+#: ../raphodo/utilities.py:476
 msgid "nine"
 msgstr "neuf"
 
-#: ../raphodo/utilities.py:473
+#: ../raphodo/utilities.py:477
 msgid "ten"
 msgstr "dix"
 
-#: ../raphodo/utilities.py:474
+#: ../raphodo/utilities.py:478
 msgid "eleven"
 msgstr "onze"
 
-#: ../raphodo/utilities.py:475
+#: ../raphodo/utilities.py:479
 msgid "twelve"
 msgstr "douze"
 
-#: ../raphodo/utilities.py:476
+#: ../raphodo/utilities.py:480
 msgid "thirteen"
 msgstr "treize"
 
-#: ../raphodo/utilities.py:477
+#: ../raphodo/utilities.py:481
 msgid "fourteen"
 msgstr "quatorze"
 
-#: ../raphodo/utilities.py:478
+#: ../raphodo/utilities.py:482
 msgid "fifteen"
 msgstr "quinze"
 
-#: ../raphodo/utilities.py:479
+#: ../raphodo/utilities.py:483
 msgid "sixteen"
 msgstr "seize"
 
-#: ../raphodo/utilities.py:480
+#: ../raphodo/utilities.py:484
 msgid "seventeen"
 msgstr "dix-sept"
 
-#: ../raphodo/utilities.py:481
+#: ../raphodo/utilities.py:485
 msgid "eighteen"
 msgstr "dix-huit"
 
-#: ../raphodo/utilities.py:482
+#: ../raphodo/utilities.py:486
 msgid "ninenteen"
 msgstr "dix-neuf"
 
-#: ../raphodo/utilities.py:483
+#: ../raphodo/utilities.py:487
 msgid "twenty"
 msgstr "vingt"
 
+#: ../raphodo/viewutils.py:240
+msgid "&OK"
+msgstr "&Valider"
+
+#: ../raphodo/viewutils.py:243
+msgid "&Save"
+msgstr "&Enregistrer"
+
+#: ../raphodo/viewutils.py:244
+msgid "&Help"
+msgstr "&Aide"
+
+#: ../raphodo/viewutils.py:245
+msgid "Restore Defaults"
+msgstr "Rétablir les valeurs par défaut"
+
+#: ../raphodo/viewutils.py:246
+msgid "&Yes"
+msgstr "&Oui"
+
+#: ../raphodo/viewutils.py:247
+msgid "&No"
+msgstr "&Non"
+
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:1
 msgid ""
 "Rapid Photo Downloader imports photos and videos from cameras, phones, "
@@ -4213,8 +5018,8 @@ msgstr "Transfert d'images"
 #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:5
 msgid ""
-"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;"
-"memory;card;"
+"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;memory"
+";card;"
 msgstr ""
 "photo;télécharger;transférer;photographie;importation;vidéo;RAW;appareil "
 "photo;téléphone;sauvegarde;mémoire;carte;"
@@ -4226,6 +5031,7 @@ msgstr "Transférer des photos et des vidéos avec Rapid Photo Downloader"
 #~ msgid "Backing up error"
 #~ msgstr "Erreur lors de la sauvegarde"
 
+#, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
 #~ "Destination: %(destination)s"
@@ -4254,9 +5060,11 @@ msgstr "Transférer des photos et des vidéos avec Rapid Photo Downloader"
 #~ msgid "Using backup devices"
 #~ msgstr "Utilisation des volumes de sauvegarde"
 
+#, python-format
 #~ msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 #~ msgstr "Environ %(minutes)i:%(seconds)02i restantes"
 
+#, python-format
 #~ msgid "About %i seconds remaining"
 #~ msgstr "Environ %i secondes restantes"
 
@@ -4266,18 +5074,20 @@ msgstr "Transférer des photos et des vidéos avec Rapid Photo Downloader"
 #~ msgid "About 1 second remaining"
 #~ msgstr "Environ 1 seconde restante"
 
+#, python-format
 #~ msgid "and %s"
 #~ msgstr "et %s"
 
 #~ msgid "only output errors to the command line"
 #~ msgstr "n'affiche que les erreurs sur la ligne de commande"
 
+#, python-format
 #~ msgid ""
 #~ "display program information on the command line as the program runs "
 #~ "(default: %default)"
 #~ msgstr ""
-#~ "affiche les informations de l'application sur la ligne de commande "
-#~ "lorsque l'application est active (défaut: %default)"
+#~ "affiche les informations de l'application sur la ligne de commande lorsque "
+#~ "l'application est active (défaut: %default)"
 
 #~ msgid "Name + extension"
 #~ msgstr "Nom + extension"
@@ -4329,8 +5139,8 @@ msgstr "Transférer des photos et des vidéos avec Rapid Photo Downloader"
 #~ "automatically created in this folder using the structure specified below."
 #~ msgstr ""
 #~ "Choisissez le dossier de destination. Les sous-dossiers pour les photos "
-#~ "transférées seront automatiquement crées dans ce dossier selon la "
-#~ "structure spécifiée ci-dessous."
+#~ "transférées seront automatiquement crées dans ce dossier selon la structure "
+#~ "spécifiée ci-dessous."
 
 #~ msgid "Download folder:"
 #~ msgstr "Dossier de destination :"
@@ -4350,6 +5160,7 @@ msgstr "Transférer des photos et des vidéos avec Rapid Photo Downloader"
 #~ msgid "_Help"
 #~ msgstr "_Aide"
 
+#, python-format
 #~ msgid "<i>Example: %s</i>"
 #~ msgstr "<i>Exemple : %s</i>"
 
@@ -4463,6 +5274,7 @@ msgstr "Transférer des photos et des vidéos avec Rapid Photo Downloader"
 #~ msgid "_Add..."
 #~ msgstr "_Ajouter..."
 
+#, python-format
 #~ msgid "Source: %(source)s"
 #~ msgstr "Source : %(source)s"
 
@@ -4470,6 +5282,7 @@ msgstr "Transférer des photos et des vidéos avec Rapid Photo Downloader"
 #~ msgstr ""
 #~ "Synchroniser les séquences numériques pour les paires d'images RAW + JPEG"
 
+#, 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"
 
@@ -4480,6 +5293,7 @@ msgstr "Transférer des photos et des vidéos avec Rapid Photo Downloader"
 #~ msgstr ""
 #~ "Êtes-vous sûr de vouloir supprimer toutes les étiquettes de transfert ?"
 
+#, python-format
 #~ msgid "Select a folder containing %(file_types)s"
 #~ msgstr "Sélectionnez un dossier contenant %(file_types)s"
 
@@ -4493,19 +5307,20 @@ msgstr "Transférer des photos et des vidéos avec Rapid Photo Downloader"
 #~ msgstr "Erreur dans les préférences de renommage des photos"
 
 #~ msgid "Error in Video Download Subfolders preferences"
-#~ msgstr ""
-#~ "Erreur dans les préférences des sous-dossiers de transfert de vidéos"
+#~ msgstr "Erreur dans les préférences des sous-dossiers de transfert de vidéos"
 
 #~ msgid "Error in Photo Download Subfolders preferences"
-#~ msgstr ""
-#~ "Erreur dans les préférences des sous-dossiers de transfert de photos"
+#~ msgstr "Erreur dans les préférences des sous-dossiers de transfert de photos"
 
+#, python-format
 #~ msgid "%(date)s %(time)s"
 #~ msgstr "%(date)s %(time)s"
 
+#, python-format
 #~ msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
+#, python-format
 #~ msgid ""
 #~ "%(date)s\n"
 #~ "%(time)s"
@@ -4520,38 +5335,42 @@ msgstr "Transférer des photos et des vidéos avec Rapid Photo Downloader"
 #~ "<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>"
 
+#, python-format
 #~ msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
-#~ msgid ""
-#~ "Photos detected with the same filenames, but taken at different times"
+#~ 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"
 
+#, 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 ""
-#~ "Les préférences de dossier %(filetype)s entrées sont invalides et ne "
-#~ "peuvent être utilisées.\n"
+#~ "Les préférences de dossier %(filetype)s entrées sont invalides et ne peuvent "
+#~ "être utilisées.\n"
 #~ "Elles vont être réinitialiseées à leurs valeurs par défaut."
 
 #~ msgid ""
 #~ "<i><b>Warning:</b> There is insufficient metadata to fully generate "
 #~ "subfolders. Please use other subfolder naming options.</i>"
 #~ msgstr ""
-#~ "<i><b>Attention :</b> Il n'y a pas suffisamment de métadonnées pour "
-#~ "générer les sous-dossiers correctement. Veuillez utiliser d'autres "
-#~ "options pour nommer les sous-dossiers.</i>"
+#~ "<i><b>Attention :</b> Il n'y a pas suffisamment de métadonnées pour générer "
+#~ "les sous-dossiers correctement. Veuillez utiliser d'autres options pour "
+#~ "nommer les sous-dossiers.</i>"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 #~ msgstr "%(number)s sur %(total)s %(filetypes)s (%(remaining)s restants)"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s"
 #~ msgstr "%(number)s sur %(total)s %(filetypes)s"
 
+#, python-format
 #~ msgid "Error: %(inst)s"
 #~ msgstr "Erreur : %(inst)s"
 
@@ -4578,8 +5397,7 @@ msgstr "Transférer des photos et des vidéos avec Rapid Photo Downloader"
 #~ msgstr "<b>Renommage des phtoos</b>"
 
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Renommage des photos</span>\t"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Renommage des photos</span>\t"
 
 #~ msgid "<i>Example: /home/user/Pictures</i>"
 #~ msgstr "<i>Exemple : /home/utilisateur/Images</i>"
@@ -4595,8 +5413,7 @@ msgstr "Transférer des photos et des vidéos avec Rapid Photo Downloader"
 #~ "vidéos</span>"
 
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Renommage des vidéos</span>\t"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Renommage des vidéos</span>\t"
 
 #~ msgid "Automatically detect devices"
 #~ msgstr "Détecter les périphériques automatiquement"
@@ -4628,18 +5445,23 @@ msgstr "Transférer des photos et des vidéos avec Rapid Photo Downloader"
 #~ msgid "."
 #~ msgstr "."
 
+#, python-format
 #~ msgid "(%(file_type)s)"
 #~ msgstr "(%(file_type)s)"
 
+#, python-format
 #~ msgid "%(free)s %(file_type)s"
 #~ msgstr "%(free)s %(file_type)s"
 
+#, python-format
 #~ msgid "%(free)s free"
 #~ msgstr "%(free)s disponibles"
 
+#, python-format
 #~ msgid "Error generating component %s."
 #~ msgstr "Erreur lors de la génération de la composante %s."
 
+#, python-format
 #~ msgid ""
 #~ "Photos detected with the same filenames, but taken at different times: "
 #~ "%(details)s"
@@ -4647,15 +5469,18 @@ msgstr "Transférer des photos et des vidéos avec Rapid Photo Downloader"
 #~ "Des photos ayant des noms de fichiers indentiques mais ayant été prises à "
 #~ "des moments différents ont été détectées : %(details)s"
 
+#, python-format
 #~ msgid "Error: %(errorno)s %(strerror)s"
 #~ msgstr "Erreur : %(errorno)s %(strerror)s"
 
 #~ msgid "The metadata might be corrupt."
 #~ msgstr "Les métadonnées sont peut-être corrompues"
 
+#, python-format
 #~ msgid "%s, "
 #~ msgstr "%s, "
 
+#, python-format
 #~ msgid "Problems in %s generation"
 #~ msgstr "Problèmes lors de la génération de %s"
 
@@ -4665,6 +5490,7 @@ msgstr "Transférer des photos et des vidéos avec Rapid Photo Downloader"
 #~ msgid "Problem in subfolder and filename generation"
 #~ msgstr "Problème lors de la génération du sous-dossier et du nom de fichier"
 
+#, python-format
 #~ msgid "Problem in %s generation"
 #~ msgstr "Problème lors de la génération de %s"
 
@@ -4704,30 +5530,37 @@ msgstr "Transférer des photos et des vidéos avec Rapid Photo Downloader"
 #~ msgid "Video Rename"
 #~ msgstr "Renommage des vidéos"
 
+#, python-format
 #~ msgid "Backup overwritten on %(volume)s."
 #~ msgstr "Sauvegarde écrasée sur %(volume)s."
 
+#, python-format
 #~ msgid "%(volume)s, "
 #~ msgstr "%(volume)s, "
 
+#, python-format
 #~ msgid "%(volume)s (%(inst)s), "
 #~ msgstr "%(volume)s (%(inst)s), "
 
 #~ msgid "Backups already exist in these locations: "
 #~ msgstr "Des sauvegardes existent déjà aux emplacements suivants : "
 
+#, python-format
 #~ msgid "%(volumes)s and %(volume)s."
 #~ msgstr "%(volumes)s et %(volume)s."
 
+#, python-format
 #~ msgid "%(volumes)s and %(volume)s (%(inst)s)."
 #~ msgstr "%(volumes)s et %(volume)s (%(inst)s)."
 
+#, python-format
 #~ msgid "Backup already exists on %(volume)s."
 #~ msgstr "Une sauvegarde existe déjà sur %(volume)s."
 
 #~ msgid "Backups overwritten on these devices: "
 #~ msgstr "Sauvegardes écrasées sur les périphériques suivants : "
 
+#, 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 "
@@ -4740,14 +5573,14 @@ msgstr "Transférer des photos et des vidéos avec Rapid Photo Downloader"
 #~ msgstr "_Inclure dans le transfert"
 
 #~ 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."
+#~ "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 ""
 #~ "Lorsqu'une photo ou une vidéo portant le même nom a déjà été transférée, "
-#~ "choisissez si vous souhaitez sauter le transfert ou si vous préférez "
-#~ "ajouter un identifiant unique."
+#~ "choisissez si vous souhaitez sauter le transfert ou si vous préférez ajouter "
+#~ "un identifiant unique."
 
+#, python-format
 #~ msgid "Backing up to %(path)s"
 #~ msgstr "Sauvegarde sur %(path)s"
 
@@ -4760,9 +5593,11 @@ msgstr "Transférer des photos et des vidéos avec Rapid Photo Downloader"
 #~ msgid "_Select"
 #~ msgstr "_Sélection"
 
+#, python-format
 #~ msgid "Folder: %s"
 #~ msgstr "Répertoire: %s"
 
+#, python-format
 #~ msgid ""
 #~ "%(problem)s\n"
 #~ "File: %(file)s"
@@ -4770,6 +5605,7 @@ msgstr "Transférer des photos et des vidéos avec Rapid Photo Downloader"
 #~ "%(problem)s\n"
 #~ "Fichier: %(file)s"
 
+#, python-format
 #~ msgid ""
 #~ "%(filetype)s could not be backed up because no suitable backup locations "
 #~ "were found."
@@ -4777,81 +5613,99 @@ msgstr "Transférer des photos et des vidéos avec Rapid Photo Downloader"
 #~ "%(filetype)s n'a pu être sauvegardé car aucun emplacement approprié nà pu "
 #~ "être trouvé."
 
+#, python-format
 #~ msgid "%(filetype)s already exists"
 #~ msgstr "%(filetype)s existe déjà"
 
+#, python-format
 #~ msgid "%(filetype)s metadata cannot be read"
 #~ msgstr "%(filetype)s metadonné(e) illisible(s)"
 
+#, python-format
 #~ msgid "An error occurred when copying the %(filetype)s"
 #~ msgstr "Une erreur s'est produite lors de la copie de %(filetype)s"
 
+#, python-format
 #~ msgid "%(filetype)s %(area)s could not be generated"
 #~ msgstr "%(filetype)s %(area)s n'a pu être généré"
 
+#, python-format
 #~ msgid "Date time value %s appears invalid."
 #~ msgstr "La valeur de date et heure %s semble non valable."
 
+#, python-format
 #~ msgid "%(freespace)s. %(backuppaths)s."
 #~ msgstr "%(freespace)s. %(backuppaths)s."
 
+#, 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."
 
+#, 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."
+#~ "La dernière modification du fichier existant %(filetype)s a été effectuée le "
+#~ "%(date)s à %(time)s."
 
+#, python-format
 #~ msgid ""
-#~ "The existing %(filetype)s was last modified on %(date)s at %(time)s. "
-#~ "Unique identifier '%(identifier)s' added."
+#~ "The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
+#~ "identifier '%(identifier)s' added."
 #~ 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é."
+#~ "La dernière modification du fichier existant %(filetype)s a été effectuée le "
+#~ "%(date)s à %(time)s. L'identifiant unique '%(identifier)s' ajouté."
 
+#, 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."
 
+#, 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."
 
+#, python-format
 #~ msgid "%(previousproblem)s Additionally, %(newproblem)s"
 #~ msgstr "%(previousproblem)s Ainsi que, %(newproblem)s"
 
+#, python-format
 #~ msgid " It was backed up to %(volume)s"
 #~ msgstr " Il a été archivé sur %(volume)s"
 
+#, python-format
 #~ msgid "%(volumes)s and %(final_volume)s."
 #~ msgstr "%(volumes)s et %(final_volume)s."
 
+#, python-format
 #~ msgid "%(filetype)s already exists, but it was backed up"
 #~ msgstr "%(filetype)s existe déjà, mais cela a été archivé"
 
+#, python-format
 #~ msgid "%(previousproblem)s, and %(backinguperror)s"
 #~ msgstr "%(previousproblem)s, et %(backinguperror)s"
 
-#~ msgid ""
-#~ "An error occurred when copying the %(filetype)s, but it was backed up"
+#, 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é"
+#~ "Une erreur s'est produite lors de la copie de %(filetype)s, mais cela a été "
+#~ "archivé"
 
 #~ msgid "The following metadata is missing: "
 #~ msgstr "la métadonnée suivante est manquante: "
 
-#~ msgid ""
-#~ "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
-#~ msgstr ""
-#~ "%(missing_metadata_elements)s et %(final_missing_metadata_element)s."
+#, python-format
+#~ msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
+#~ msgstr "%(missing_metadata_elements)s et %(final_missing_metadata_element)s."
 
+#, python-format
 #~ msgid " Furthermore, there was a %(problem)s."
 #~ msgstr " En outre, il y avait un %(problem)s."
 
+#, python-format
 #~ msgid " Furthermore, there were %(problems)s."
 #~ msgstr " En outre, il y avait des %(problems)s."
 
+#, python-format
 #~ msgid "Path: %s"
 #~ msgstr "Chemin: %s"
 
@@ -4875,6 +5729,7 @@ msgstr "Transférer des photos et des vidéos avec Rapid Photo Downloader"
 #~ msgid "_View"
 #~ msgstr "_Voir"
 
+#, python-format
 #~ msgid "%(device)s did not unmount"
 #~ msgstr "Le périphérique %(device)s n'a pas été démonté"
 
@@ -4891,8 +5746,8 @@ msgstr "Transférer des photos et des vidéos avec Rapid Photo Downloader"
 #~ "When backing up, choose whether to overwrite a file on the backup device "
 #~ "that has the same name, or skip backing it up."
 #~ msgstr ""
-#~ "Lors de l'archivage, choisir s'il faut écraser ou passer un fichier ayant "
-#~ "le même nom sur le volume de sauvegarde."
+#~ "Lors de l'archivage, choisir s'il faut écraser ou passer un fichier ayant le "
+#~ "même nom sur le volume de sauvegarde."
 
 #~ msgid "Unmount (\"eject\") device upon download completion"
 #~ msgstr "Démonter (« éjecter ») le périphérique après un transfert réussi"
@@ -4901,15 +5756,15 @@ msgstr "Transférer des photos et des vidéos avec Rapid Photo Downloader"
 #~ "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>"
+#~ "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 ""
-#~ "Spécifier le dossier dans lequel l'archivage est stocké sur le "
-#~ "périphérique.  \n"
+#~ "Spécifier le dossier dans lequel l'archivage est stocké sur le périphérique. "
+#~ " \n"
 #~ "\n"
 #~ "<i>Note: ceci sera également utilisé pour déterminer si oui ou non le "
-#~ "périphérique est utilisé pour les sauvegardes. Créez un répertoire avec "
-#~ "un de ces noms sur chaque volume de sauvegarde.</i>"
+#~ "périphérique est utilisé pour les sauvegardes. Créez un répertoire avec un "
+#~ "de ces noms sur chaque volume de sauvegarde.</i>"
 
 #~ msgid "Errors occurred when backing up on the following backup devices: "
 #~ msgstr ""
@@ -4917,8 +5772,7 @@ msgstr "Transférer des photos et des vidéos avec Rapid Photo Downloader"
 #~ "sauvegarde suivant : "
 
 #~ msgid ""
-#~ "Errors occurred when creating directories on the following backup "
-#~ "devices: "
+#~ "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 : "
@@ -4930,8 +5784,8 @@ msgstr "Transférer des photos et des vidéos avec Rapid Photo Downloader"
 #~ msgstr "Dossiers photos"
 
 #~ msgid ""
-#~ "If you disable automatic detection, choose the exact location of the "
-#~ "photos and videos."
+#~ "If you disable automatic detection, choose the exact location of the photos "
+#~ "and videos."
 #~ msgstr ""
 #~ "Si vous désactivez la détection automatique, choisissez les emplacements "
 #~ "exacts des photos et vidéos."
@@ -4943,13 +5797,13 @@ msgstr "Transférer des photos et des vidéos avec Rapid Photo Downloader"
 #~ "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"
+#~ "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>"
+#~ "<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 ""
 #~ "Les périphériques sont les emplacements d'où sont chargés les photos et "
 #~ "vidéos, tels que les caméras, les cartes mémoire ou volumes de stockage "
@@ -4958,10 +5812,10 @@ msgstr "Transférer des photos et des vidéos avec Rapid Photo Downloader"
 #~ "Vous pouvez charger à partir de différents périphériques simultanément ou "
 #~ "vous pouvez spécifier un emplacement sur votre disque dur.\n"
 #~ "\n"
-#~ "<i>Charger directement à partir d'une caméra est actuellement une options "
-#~ "au stade expérimental. Si le chargement direct à partir de la caméra "
-#~ "fonctionnement lentement ou pas du tout, essayez le réglage en mode PTP. "
-#~ "Si c'est impossible, un lecteur de carte devra être utilisé.</i>"
+#~ "<i>Charger directement à partir d'une caméra est actuellement une options au "
+#~ "stade expérimental. Si le chargement direct à partir de la caméra "
+#~ "fonctionnement lentement ou pas du tout, essayez le réglage en mode PTP. Si "
+#~ "c'est impossible, un lecteur de carte devra être utilisé.</i>"
 
 #~ msgid "Invalid regular expression"
 #~ msgstr "Expression rationnelle non valide"
@@ -4972,18 +5826,20 @@ msgstr "Transférer des photos et des vidéos avec Rapid Photo Downloader"
 #~ msgid "Should all ignored paths be removed?"
 #~ msgstr "Enlever tous les exmplacements exclus ?"
 
+#, python-format
 #~ msgid ""
 #~ "The following regular expressions are invalid, and will be removed unless "
 #~ "you correct them:\n"
 #~ " %s"
 #~ msgstr ""
-#~ "Les expressions rationnelles ci-dessous sont invalides et seront enlevées "
-#~ "si vous ne les corrigez pas :\n"
+#~ "Les expressions rationnelles ci-dessous sont invalides et seront enlevées si "
+#~ "vous ne les corrigez pas :\n"
 #~ "%s"
 
+#, python-format
 #~ msgid ""
-#~ "This regular expression is invalid, and will be removed unless you "
-#~ "correct it:\n"
+#~ "This regular expression is invalid, and will be removed unless you correct "
+#~ "it:\n"
 #~ " %s"
 #~ msgstr ""
 #~ "Cette expression rationnelle est invalide et sera enlevée si vous ne la "
@@ -5015,12 +5871,12 @@ msgstr "Transférer des photos et des vidéos avec Rapid Photo Downloader"
 #~ "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."
+#~ "When this option is enabled, and a potential device is detected, you will be "
+#~ "prompted to determine if it should be scanned or not."
 #~ msgstr ""
-#~ "Si vous activez la détection automatique des volumes de stockage "
-#~ "amovibles, le périphérique sera scanné dans son intégralité. Pour les "
-#~ "grands volumes, cela peut prendre un certain temps.\n"
+#~ "Si vous activez la détection automatique des volumes de stockage amovibles, "
+#~ "le périphérique sera scanné dans son intégralité. Pour les grands volumes, "
+#~ "cela peut prendre un certain temps.\n"
 #~ "\n"
 #~ "Lorsque cette options est activée et qu'un périphérique potentiel est "
 #~ "détecté, il vous sera demandé s'il doit être scanné ou non."
@@ -5043,30 +5899,31 @@ msgstr "Transférer des photos et des vidéos avec Rapid Photo Downloader"
 #~ msgid "Should all remembered paths be removed?"
 #~ msgstr "Supprimer tous les emplacements mémorisés ?"
 
+#, 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"
 
+#, python-format
 #~ msgid "Backing up photos and videos to %(path)s"
 #~ msgstr "Sauvegarde des photos et vidéos vers %(path)s"
 
 #~ 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."
+#~ "Remembered paths are those associated with devices that you have chosen to "
+#~ "always scan or ignore when automatic detection of Portable Storage Devices "
+#~ "is enabled."
 #~ msgstr ""
 #~ "Les emplacements mémorisés sont associés aux périphériques que vous avez "
-#~ "choisis de toujours scanner ou ignorer lorsque la détection automatique "
-#~ "des périphériques de stockage amovible est activée."
+#~ "choisis de toujours scanner ou ignorer lorsque la détection automatique des "
+#~ "périphériques de stockage amovible est activée."
 
 #~ 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."
+#~ "devices for photos or videos. Any path ending with the values below will not "
+#~ "be scanned."
 #~ msgstr ""
-#~ "Spécifiez la portion finale de tout emplacement que vous souhaitez "
-#~ "ignorer lors d'une recherche de photos ou de vidéos sur un périphérique. "
-#~ "Tout emplacement se terminant par ces valeurs sera ignoré lors de la "
-#~ "recherche."
+#~ "Spécifiez la portion finale de tout emplacement que vous souhaitez ignorer "
+#~ "lors d'une recherche de photos ou de vidéos sur un périphérique. Tout "
+#~ "emplacement se terminant par ces valeurs sera ignoré lors de la recherche."
 
 #~ msgid "To"
 #~ msgstr "Vers"
@@ -5081,6 +5938,7 @@ msgstr "Transférer des photos et des vidéos avec Rapid Photo Downloader"
 #~ msgid "the root of the file system"
 #~ msgstr "Partition racine"
 
+#, python-format
 #~ msgid "Downloading from %(location)s."
 #~ msgstr "Transfert depuis %(location)s."
 
@@ -5100,20 +5958,23 @@ msgstr "Transférer des photos et des vidéos avec Rapid Photo Downloader"
 #~ msgstr "Pivoter automatiquement les images au format JPEG"
 
 #~ 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>."
+#~ "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 ""
 #~ "Désolé, la fonctionnalité de transfert de vidéos est désactivée. Afin de "
 #~ "l'activer, installez soit les modules python <i>hachoir metadata</i> et "
 #~ "<i>kaa metadata</i>, soit <i>exiftool</i>."
 
+#, python-format
 #~ msgid "%(file_type)s download folder is not writable"
 #~ msgstr "%(file_type)s répertoire de destination protégé en écriture"
 
+#, python-format
 #~ msgid "%(file_type)s download folder is invalid"
 #~ msgstr "%(file_type)s répertoire de destination n'est pas valide"
 
+#, python-format
 #~ msgid "%(file_type)s download folder does not exist"
 #~ msgstr "%(file_type)s répertoires de destination n'existe pas"
 
@@ -5123,6 +5984,7 @@ msgstr "Transférer des photos et des vidéos avec Rapid Photo Downloader"
 #~ "Est-ce qu'il faut transférer des photos et vidéos à partir de  ce "
 #~ "périphérique ou cette partition ?"
 
+#, python-format
 #~ msgid "%(filetype)s was already downloaded"
 #~ msgstr "%(filetype)s a déjà été transféré"
 
@@ -5130,8 +5992,8 @@ msgstr "Transférer des photos et des vidéos avec Rapid Photo Downloader"
 #~ "The filename, extension and Exif information indicate it has already been "
 #~ "downloaded."
 #~ msgstr ""
-#~ "Le nom de fichier, l'extension et l'information Exif indiquent qu'il a "
-#~ "déjà été transféré."
+#~ "Le nom de fichier, l'extension et l'information Exif indiquent qu'il a déjà "
+#~ "été transféré."
 
 #~ msgid "Failed to create download subfolder"
 #~ msgstr "Echec de création de sous-répertoire de destination"
@@ -5140,8 +6002,8 @@ msgstr "Transférer des photos et des vidéos avec Rapid Photo Downloader"
 #~ msgstr "La photo a déjà été transférée"
 
 #~ msgid ""
-#~ "manually specify the PATH of the device from which to download, "
-#~ "overwriting existing program preferences"
+#~ "manually specify the PATH of the device from which to download, overwriting "
+#~ "existing program preferences"
 #~ msgstr ""
 #~ "Spécifier manuellement le chemin des périphériques à partir desquels "
 #~ "télécharger, écraser les préférences du programme"
@@ -5153,6 +6015,7 @@ msgstr "Transférer des photos et des vidéos avec Rapid Photo Downloader"
 #~ "Détecter automatiquement les périphériques à partir desquels télécharger, "
 #~ "écraser les préférences du programme"
 
+#, 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"
 
@@ -5161,8 +6024,7 @@ msgstr "Transférer des photos et des vidéos avec Rapid Photo Downloader"
 #~ "from which to download, but do not do both."
 #~ 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."
+#~ "les périphériques à partir desquels télécharger mais ne faites pas les deux."
 
 #~ msgid "Help"
 #~ msgstr "Aide"
@@ -5191,19 +6053,23 @@ msgstr "Transférer des photos et des vidéos avec Rapid Photo Downloader"
 #~ msgid "_Report a Problem..."
 #~ msgstr "_Signaler un problème..."
 
+#, python-format
 #~ msgid "%(file_type)s not backed up"
 #~ msgstr "Les %(file_type)s n'ont pas été remplacées"
 
+#, python-format
 #~ msgid ""
-#~ "File verification failed on %(volume)s. The backed up version is "
-#~ "different from the downloaded version."
+#~ "File verification failed on %(volume)s. The backed up version is different "
+#~ "from the downloaded version."
 #~ msgstr ""
 #~ "Échec de vérification du fichier sur %(volume)s. La version sauvegardée "
 #~ "diffère de la version téléchargée."
 
+#, python-format
 #~ msgid "Backup %(file_type)s overwritten"
 #~ msgstr "Sauvegarde des %(file_type)s remplacée"
 
+#, python-format
 #~ msgid "Backup of %(file_type)s already exists"
 #~ msgstr "Une sauvegarde des %(file_type)s existe déjà."
 
@@ -5213,6 +6079,7 @@ msgstr "Transférer des photos et des vidéos avec Rapid Photo Downloader"
 #~ msgid "File verification failed on these devices: "
 #~ msgstr "Échec de vérification du fichier sur les périphériques suivants : "
 
+#, python-format
 #~ msgid "No backup device contains a valid folder for backing up %(filetype)s"
 #~ msgstr ""
 #~ "Aucun périphérique de sauvegarde contient un répertoire valide pour "
@@ -5228,5 +6095,6 @@ msgstr "Transférer des photos et des vidéos avec Rapid Photo Downloader"
 #~ msgid "Verify files as they are downloaded"
 #~ msgstr "Verifier les fichiers lorsqu'ils sont téléchargés"
 
+#, python-format
 #~ msgid "The %(filetype)s did not download correctly"
 #~ msgstr "Les %(filetype)s n'ont pas été téléchargés correctement"
diff --git a/po/hr.po b/po/hr.po
index c34cb1a..1957451 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,129 +7,489 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: damonlynch@gmail.com\n"
-"POT-Creation-Date: 2017-07-08 19:16-0500\n"
-"PO-Revision-Date: 2017-07-04 11:06+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2017-09-12 17:01-0400\n"
+"PO-Revision-Date: 2017-09-13 18:36+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
-"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-07-05 23:04+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-09-26 22:04+0000\n"
+"X-Generator: Launchpad (build 18463)\n"
+"Language: hr\n"
+
+#: ../install.py:65
+msgid "Rapid Photo Downloader installer"
+msgstr ""
+
+#: ../install.py:66
+msgid "Download and install latest version of Rapid Photo Downloader."
+msgstr ""
+
+#: ../install.py:236 ../install.py:1732
+msgid "Installer not found:"
+msgstr ""
+
+#. Translators: do not translate the term tar.gz
+#: ../install.py:240 ../install.py:1736
+msgid "Installer not in tar.gz format:"
+msgstr ""
+
+#: ../install.py:465
+msgid ""
+"Incorrect folder ownership detected. Changing ownership of and resetting "
+"permissions for"
+msgstr ""
+
+#: ../install.py:540
+msgid "The following command will be run:"
+msgstr ""
+
+#: ../install.py:543 ../install.py:1479 ../install.py:1484
+msgid "sudo may prompt you for the sudo password."
+msgstr ""
+
+#: ../install.py:547
+msgid "Would you like to run the command now?"
+msgstr ""
+
+#: ../install.py:549
+msgid "Answer is not yes, exiting."
+msgstr ""
+
+#: ../install.py:559 ../install.py:751 ../install.py:966
+msgid "Command failed"
+msgstr ""
+
+#: ../install.py:561 ../install.py:752 ../install.py:967
+msgid "Exiting"
+msgstr ""
+
+#: ../install.py:582
+msgid "The Universe repository must be enabled."
+msgstr ""
+
+#: ../install.py:606
+msgid ""
+"Do you want to to uninstall the previous version of Rapid Photo Downloader:"
+msgstr ""
+
+#: ../install.py:715 ../install.py:740
+msgid ""
+"Querying package system to see if an older version of Rapid Photo Downloader "
+"is installed (this may take a while)..."
+msgstr ""
+
+#: ../install.py:726
+msgid ""
+"Unable to query package system. Please check your Internet connection and "
+"try again"
+msgstr ""
+
+#: ../install.py:756
+msgid "Checking if previous version installed with pip..."
+msgstr ""
+
+#: ../install.py:850
+msgid "The following package is unknown on your system: {}\n"
+msgstr ""
+
+#: ../install.py:857 ../install.py:929 ../install.py:974
+msgid ""
+"To continue, some packages required to run the application will be installed."
+msgstr ""
+
+#: ../install.py:886
+msgid "Querying installed and available packages (this may take a while)"
+msgstr ""
+
+#: ../install.py:958
+msgid ""
+"Querying zypper to see if any required packages are already installed (this "
+"may take a while)... "
+msgstr ""
+
+#: ../install.py:1004
+msgid "Query to confirm action at each step."
+msgstr ""
+
+#: ../install.py:1011
+msgid ""
+"When downloading the latest version, install the development version if it "
+"is newer than the stable version."
+msgstr ""
+
+#: ../install.py:1020
+msgid ""
+"Optional tar.gz Rapid Photo Downloader installer archive. If not specified, "
+"the latest version is downloaded from the Internet."
+msgstr ""
+
+#: ../install.py:1043
+msgid ""
+"Do not run the installer in the tar.gz Rapid Photo Downloader installer "
+"archive if it is newer than this version ({}). The default is to run "
+"whichever installer is newer."
+msgstr ""
+
+#: ../install.py:1050
+msgid ""
+"Uninstall Rapid Photo Downloader that was installed with pip, keeping its "
+"dependencies."
+msgstr ""
+
+#: ../install.py:1054
+msgid ""
+"Uninstall the dependencies installed by pip during Rapid Photo Downloader's "
+"installation, and Rapid Photo Downloader itself, then exit."
+msgstr ""
+
+#: ../install.py:1059
+msgid ""
+"Note: this will not uninstall any version of Rapid Photo Downloader "
+"installed by your Linux distribution's package manager."
+msgstr ""
+
+#: ../install.py:1066
+msgid ""
+"Dependencies will only be removed if they are not required by other programs."
+msgstr ""
+
+#: ../install.py:1072
+msgid ""
+"Note: this option will remove the dependencies regardless of whether they "
+"are required by another program pip has installed. Upgrade to pip 9.0 or "
+"above if you want to avoid this behavior. You can do so using the command "
+"'python3 -m pip install pip -U --user'. Also note that any version of Rapid "
+"Photo Downloader installed by your Linux distribution's package manager will "
+"not be uninstalled."
+msgstr ""
+
+#: ../install.py:1122
+msgid "Failed to download versions file"
+msgstr ""
+
+#: ../install.py:1126
+msgid "Got error code {} while accessing versions file"
+msgstr ""
+
+#: ../install.py:1234
+msgid ""
+"Sorry, could not locate installer. Please check your Internet connection and "
+"verify if you can reach https://www.damonlynch.net\n"
+"\n"
+"Exiting.\n"
+msgstr ""
+
+#: ../install.py:1408
+msgid "Installing application requirements..."
+msgstr ""
+
+#: ../install.py:1424
+msgid "Received error code"
+msgstr ""
+
+#: ../install.py:1425
+msgid "Failed to install application requirements: exiting"
+msgstr ""
+
+#: ../install.py:1428
+msgid "Installing application..."
+msgstr ""
+
+#: ../install.py:1441
+msgid "Failed to install application: exiting..."
+msgstr ""
+
+#: ../install.py:1465
+msgid ""
+"You may have to restart the computer to be able to run the program from the "
+"commmand line or application launcher."
+msgstr ""
+
+#: ../install.py:1476
+msgid "Do you want to install the application's man pages?"
+msgstr ""
+
+#: ../install.py:1477
+msgid "They will be installed into {}"
+msgstr ""
+
+#: ../install.py:1478 ../install.py:1483
+msgid "If you uninstall the application, remove these manpages yourself."
+msgstr ""
+
+#: ../install.py:1480
+msgid "Do want to install the man pages?"
+msgstr ""
+
+#: ../install.py:1482
+msgid "Installing man pages into {}"
+msgstr ""
+
+#: ../install.py:1499
+msgid "Failed to create man page directory: exiting"
+msgstr ""
+
+#: ../install.py:1511
+msgid "Failed to copy man page."
+msgstr ""
+
+#: ../install.py:1521
+msgid "(If a segmentation fault occurs at exit, you can ignore it...)"
+msgstr ""
+
+#: ../install.py:1534
+msgid ""
+"The python3 tool pip is required to uninstall a version of Rapid Photo "
+"Downloader that was installed with pip.\n"
+"Cannot continue. Exiting."
+msgstr ""
+
+#: ../install.py:1575
+msgid ""
+"Do not run this installer script as sudo / root user.\n"
+"Run it using the user who will run the program.\n"
+msgstr ""
+
+#: ../install.py:1585 ../install.py:1599
+msgid "Do not include any other command line arguments when specifying"
+msgstr ""
+
+#: ../install.py:1614
+msgid ""
+"Sorry, this installer does not support a custom python installation.\n"
+"Exiting..."
+msgstr ""
+
+#: ../install.py:1620
+msgid "Restarting script using system python..."
+msgstr ""
+
+#: ../install.py:1651
+msgid "Exiting..."
+msgstr ""
+
+#. Translators: do not translate the term python3-apt
+#: ../install.py:1670
+msgid "To continue, the package python3-apt must be installed."
+msgstr ""
 
-#. type: QPushButton
-#: ../raphodo/aboutdialog.py:217
+#: ../install.py:1689
+msgid ""
+"Install the following packages using your Linux distribution's standard "
+"package manager, and then rerun this installer"
+msgstr ""
+
+#: ../install.py:1698
+msgid ""
+"To run this program, programs to assist Python 3 and its package management "
+"must be installed."
+msgstr ""
+
+#. Translators: do not translate the terms Python 3, pip and setuptools
+#: ../install.py:1713
+msgid "Python 3's pip and setuptools must be upgraded for your user."
+msgstr ""
+
+#. Translators: do not translate the term python or requests
+#: ../install.py:1726
+msgid "Installing python requests"
+msgstr ""
+
+#: ../upgrade.py:79
+msgid "Upgrade Rapid Photo Downloader"
+msgstr ""
+
+#: ../upgrade.py:401 ../raphodo/viewutils.py:242
+msgid "&Cancel"
+msgstr ""
+
+#: ../upgrade.py:405
+msgid "&Upgrade"
+msgstr ""
+
+#: ../upgrade.py:410
+#, python-format
+msgid "Click the Upgrade button to upgrade to version %s."
+msgstr ""
+
+#: ../upgrade.py:413
+msgid "Click the Upgrade button to start the upgrade."
+msgstr ""
+
+#: ../upgrade.py:416 ../upgrade.py:422 ../raphodo/viewutils.py:241
+msgid "&Close"
+msgstr ""
+
+#: ../upgrade.py:417
+msgid "&Run"
+msgstr ""
+
+#: ../upgrade.py:447
+msgid "Close Rapid Photo Downloader before running this upgrade"
+msgstr ""
+
+#: ../upgrade.py:450
+msgid "Upgrade running..."
+msgstr ""
+
+#: ../upgrade.py:486
+#, python-format
+msgid ""
+"Successfully upgraded to %s. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:491
+msgid ""
+"Upgrade finished successfully. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:495
+msgid "Upgrade failed. Click Close to exit."
+msgstr ""
+
+#: ../upgrade.py:6967
+#, python-format
+msgid "Upgrading %s..."
+msgstr ""
+
+#: ../upgrade.py:6969
+msgid "Press any key to continue..."
+msgstr ""
+
+#: ../upgrade.py:6982
+msgid "Rapid Photo Downloader upgrade failed"
+msgstr ""
+
+#: ../upgrade.py:6984
+#, python-format
+msgid ""
+"The python package %s could not be updated. The upgrade cannot continue."
+msgstr ""
+
+#: ../raphodo/aboutdialog.py:225
 msgid "Credits"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:239
+#: ../raphodo/backuppanel.py:240
 msgid "Backups are not configured"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:241
+#: ../raphodo/backuppanel.py:242
 msgid "No backup devices detected"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:243
+#: ../raphodo/backuppanel.py:244
 msgid "Valid backup locations not yet specified"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:401
+#: ../raphodo/backuppanel.py:404
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
 msgstr ""
 
-#: ../raphodo/backuppanel.py:407
+#: ../raphodo/backuppanel.py:412
 msgid "Back up photos and videos when downloading"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:413
+#: ../raphodo/backuppanel.py:418
 msgid "Automatically detect backup devices"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:417
+#: ../raphodo/backuppanel.py:424
 msgid ""
-"Specify the folder in which backups are stored on the device."
-"<br><br><i>Note: the presence of a folder with this name is used to "
+"Specify the folder in which backups are stored on the "
+"device.<br><br><i>Note: the presence of a folder with this name is used to "
 "determine if 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 folder names. By "
 "adding both folders, the same device can be used to back up both photos and "
 "videos.</i>"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:428
+#: ../raphodo/backuppanel.py:439
 msgid "Photo folder name:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:433
+#: ../raphodo/backuppanel.py:444
 msgid "Video folder name:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:438 ../raphodo/nameeditor.py:883
+#: ../raphodo/backuppanel.py:449 ../raphodo/nameeditor.py:890
 #: ../raphodo/renamepanel.py:123
 msgid "Example:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:448
-msgid "If you disable automatic detection, choose the exact backup locations."
+#: ../raphodo/backuppanel.py:460
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
 
-#: ../raphodo/backuppanel.py:452
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:468
 msgid "Photo backup location:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:454
+#: ../raphodo/backuppanel.py:474
 msgid "Select Photo Backup Location"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:460
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:485
 msgid "Video backup location:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:462
+#: ../raphodo/backuppanel.py:491
 msgid "Select Video Backup Location"
 msgstr ""
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:564
+#: ../raphodo/backuppanel.py:595
 msgid "drive1"
 msgstr ""
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:567
+#: ../raphodo/backuppanel.py:598
 msgid "drive2"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:628
+#: ../raphodo/backuppanel.py:663
 msgid "Projected Backup Storage Use"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:632
+#: ../raphodo/backuppanel.py:669
 msgid "Backup Options"
 msgstr ""
 
 #. translators: refers to the video thumbnail file that some
 #. cameras generate -- it has a .THM file extension
-#: ../raphodo/copyfiles.py:476
+#: ../raphodo/copyfiles.py:491
 msgid "video THM"
 msgstr ""
 
-#: ../raphodo/copyfiles.py:482
+#: ../raphodo/copyfiles.py:497
 msgid "audio"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:78 ../raphodo/devicedisplay.py:1079
-#: ../raphodo/rpdfile.py:321
+#: ../raphodo/rpdfile.py:342
 #, python-format
 msgid "%(no_photos)s Photos"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:82 ../raphodo/devicedisplay.py:1081
-#: ../raphodo/rpdfile.py:316
+#: ../raphodo/rpdfile.py:333
 #, python-format
 msgid "%(no_videos)s Videos"
 msgstr ""
@@ -157,15 +517,15 @@ msgid "%(size_free)s free of %(size_total)s"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:190 ../raphodo/devicedisplay.py:993
-#: ../raphodo/rapid.py:1964 ../raphodo/rapid.py:2079 ../raphodo/rapid.py:5753
-#: ../raphodo/rpdfile.py:905
+#: ../raphodo/rapid.py:2023 ../raphodo/rapid.py:2151 ../raphodo/rapid.py:6043
+#: ../raphodo/rpdfile.py:930
 msgid "Photos"
 msgstr ""
 
 #. translators: the name of the Videos folder
 #: ../raphodo/destinationdisplay.py:191 ../raphodo/devicedisplay.py:994
-#: ../raphodo/rapid.py:1967 ../raphodo/rapid.py:2080 ../raphodo/rapid.py:5754
-#: ../raphodo/rpdfile.py:933 ../raphodo/storage.py:445
+#: ../raphodo/rapid.py:2028 ../raphodo/rapid.py:2152 ../raphodo/rapid.py:6044
+#: ../raphodo/rpdfile.py:958 ../raphodo/storage.py:449
 msgid "Videos"
 msgstr ""
 
@@ -173,7 +533,7 @@ msgstr ""
 msgid "Projected storage use after download"
 msgstr ""
 
-#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:516
+#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:521
 msgid "Custom..."
 msgstr ""
 
@@ -211,57 +571,58 @@ msgstr ""
 msgid "%s full"
 msgstr ""
 
-#: ../raphodo/devices.py:459
+#: ../raphodo/devices.py:463
 msgid "Cameras"
 msgstr ""
 
-#: ../raphodo/devices.py:460 ../raphodo/devices.py:920
-#: ../raphodo/preferencedialog.py:85 ../raphodo/rapid.py:1927
+#: ../raphodo/devices.py:464 ../raphodo/devices.py:927
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/rapid.py:1979
 msgid "Devices"
 msgstr "Uređaji"
 
-#: ../raphodo/devices.py:720
+#: ../raphodo/devices.py:724
 #, python-format
 msgid "Downloading from %(device_names)s"
 msgstr ""
 
 #. Translators: e.g. Three Devices
-#: ../raphodo/devices.py:780
+#: ../raphodo/devices.py:784
 #, python-format
 msgid "%(no_devices)s %(device_type)s"
 msgstr ""
 
-#: ../raphodo/devices.py:905 ../raphodo/rapid.py:1764
+#: ../raphodo/devices.py:912 ../raphodo/rapid.py:1807
 msgid "Select Source"
 msgstr ""
 
-#: ../raphodo/devices.py:936 ../raphodo/devices.py:947
+#: ../raphodo/devices.py:943 ../raphodo/devices.py:954
 #, python-format
 msgid "%(device1)s + %(device2)s"
 msgstr ""
 
 #. Number of cameras e.g. 3 Cameras
-#: ../raphodo/devices.py:958
+#: ../raphodo/devices.py:965
 #, python-format
 msgid "%(no_cameras)s Cameras"
 msgstr ""
 
-#: ../raphodo/devices.py:963
+#: ../raphodo/devices.py:970
 #, python-format
 msgid "%(no_devices)s Devices"
 msgstr ""
 
 #. Translators: two folder names, separated by a plus sign
-#: ../raphodo/devices.py:1258
+#: ../raphodo/devices.py:1265
 #, python-format
 msgid "%s + %s"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:44
+#: ../raphodo/didyouknow.py:45
 msgid "Click on a file's checkbox to mark or unmark it for download."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:50
+#: ../raphodo/didyouknow.py:51
 msgid ""
 "Files that have already been downloaded are remembered. You can still mark "
 "previously downloaded files to download again, but they are unchecked by "
@@ -269,34 +630,67 @@ msgid ""
 "files that are yet to be downloaded."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:59
+#: ../raphodo/didyouknow.py:60
 msgid ""
 "If more than one file is selected, they'll all take the mark of the file "
 "whose checkbox was clicked, regardless of whether they previously had a "
 "checkmark or not."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:67
+#: ../raphodo/didyouknow.py:68
 msgid ""
 "Click on a device's checkbox to quickly mark or unmark all its files for "
 "downloading."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:74
+#: ../raphodo/didyouknow.py:75
+msgid ""
+"After a download finishes, an icon replaces the thumbnail's checkbox. The "
+"icon's color indicates whether the download was successful (green), had file "
+"renaming problems (yellow/orange), or failed (red)."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:83
+msgid ""
+"\n"
+"            In case of any problems, a red icon will appear at the bottom of "
+"the window\n"
+"            indicating how many error reports there are. Clicking on it "
+"opens the Error Report \n"
+"            window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:91
+msgid ""
+"\n"
+"            The Error Report window lists any problems encountered before, "
+"during or after the \n"
+"            download. An orange triangle represents a warning, a red circle "
+"indicates a failure, \n"
+"            and a black circle indicates more serious failures. You can "
+"click on the hyperlinks to \n"
+"            open its file or device in a file manager. You can also search "
+"the reports using the \n"
+"            search box in the lower left of the Error Report window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:103
 msgid ""
 "You can simultaneously download from multiple cameras, smartphones, memory "
 "cards, and hard drives&mdash;as many devices as your computer can handle at "
 "one time."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:81
+#: ../raphodo/didyouknow.py:110
 msgid ""
 "The <b>Timeline</b> groups photos and videos based on how much time elapsed "
 "between consecutive shots. Use it to identify photos and videos taken at "
 "different periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:88
+#: ../raphodo/didyouknow.py:117
 msgid ""
 "\n"
 "<p>In the illustration above, the first row of the Timeline is black because "
@@ -308,7 +702,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:99
+#: ../raphodo/didyouknow.py:128
 msgid ""
 "To view photos and videos for a particular time range, use the mouse "
 "(optionally in combination with the <tt>Shift</tt> or <tt>Ctrl</tt> keys) to "
@@ -316,20 +710,20 @@ msgid ""
 "the left side of the main window will be highlighted."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:106
+#: ../raphodo/didyouknow.py:135
 msgid ""
 "A download always includes all files that are checked for download, "
 "including those that are not currently displayed because the Timeline is "
 "being used."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:113
+#: ../raphodo/didyouknow.py:142
 msgid ""
 "You can hide or display the download sources by clicking on the name of the "
 "device you're downloading from at the top left of the program window."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:120
+#: ../raphodo/didyouknow.py:149
 msgid ""
 "\n"
 "          Thumbnails can be sorted using a variety of criteria:\n"
@@ -348,33 +742,33 @@ msgid ""
 "</ol> "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:137
+#: ../raphodo/didyouknow.py:166
 msgid ""
 "One of Rapid Photo Downloader's most useful features is its ability to "
 "automatically generate download subfolders and rename files as it downloads, "
 "using a scheme of your choosing."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:143
+#: ../raphodo/didyouknow.py:172
 msgid ""
 "To specify where you want your files downloaded and how you want them named, "
 "open the appropriate panel on the right-side of the application window: "
 "<b>Destination</b>, <b>Rename</b>, or <b>Job Code</b>."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:150
+#: ../raphodo/didyouknow.py:179
 msgid ""
 "\n"
 "When thinking about your download directory structure, keep in mind two "
 "different types\n"
 "of directory:\n"
 "<ol>\n"
-"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, &quot;"
-"Photos&quot;, or\n"
+"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, "
+"&quot;Photos&quot;, or\n"
 "&quot;Videos&quot;. This directory should already exist on your computer. In "
 "the illustration \n"
-"below, the destination folders are &quot;Pictures&quot; and &quot;"
-"Videos&quot;. The\n"
+"below, the destination folders are &quot;Pictures&quot; and "
+"&quot;Videos&quot;. The\n"
 "name of the destination folder is displayed in the grey bar directly above "
 "the folder tree, \n"
 "with a folder icon to its left and a gear icon to its far right.</li>\n"
@@ -387,7 +781,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:167
+#: ../raphodo/didyouknow.py:196
 msgid ""
 "\n"
 "You can download photos and videos to the same destination folder, or "
@@ -400,14 +794,14 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:177
+#: ../raphodo/didyouknow.py:206
 msgid ""
 "Automatically generated download subfolders can contain further "
 "automatically generated subfolders if need be. A common scheme is to create "
 "a year subfolder and then a series of year-month-day subfolders within it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:186
+#: ../raphodo/didyouknow.py:215
 msgid ""
 "\n"
 "Whenever possible, the program previews the download subfolders of photos "
@@ -425,7 +819,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:201
+#: ../raphodo/didyouknow.py:230
 msgid ""
 "\n"
 "Download subfolder names are typically generated using some or all of the "
@@ -449,7 +843,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:219
+#: ../raphodo/didyouknow.py:248
 msgid ""
 "\n"
 "To automatically create download subfolders as you download, \n"
@@ -459,7 +853,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:227
+#: ../raphodo/didyouknow.py:256
 msgid ""
 "\n"
 "Using the drop-down menu, select a built-in preset or click on <b>Custom</b> "
@@ -469,20 +863,20 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:237
+#: ../raphodo/didyouknow.py:266
 msgid ""
 "It's easy to download raw images into one folder, and jpeg images into "
 "another. Simply use the <b>Filename Extension</b> as part of your download "
 "subfolder generation scheme:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:242
+#: ../raphodo/didyouknow.py:271
 msgid ""
 "This illustration shows a saved custom preset named &quot;My custom "
 "preset&quot;."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:246
+#: ../raphodo/didyouknow.py:275
 msgid ""
 "\n"
 "You do not have to create nested download subfolders. This illustration "
@@ -493,7 +887,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:256
+#: ../raphodo/didyouknow.py:285
 msgid ""
 "\n"
 "Although there are many built-in date/time naming options, you may find that "
@@ -507,7 +901,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:265
+#: ../raphodo/didyouknow.py:294
 msgid ""
 "\n"
 "Read more about all the ways you can generate download subfolder names and "
@@ -517,7 +911,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:273
+#: ../raphodo/didyouknow.py:302
 msgid ""
 "\n"
 "<b>Job Codes</b> let you easily enter text that describes sets of photos and "
@@ -529,7 +923,7 @@ msgid ""
 "&quot;Green Bazaar&quot;: \n"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:282
+#: ../raphodo/didyouknow.py:311
 msgid ""
 "\n"
 "You can apply new or existing Job Codes before you start a download. If "
@@ -540,36 +934,36 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:291
+#: ../raphodo/didyouknow.py:320
 msgid "Look for hints to guide you when working with Job Codes:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:295
+#: ../raphodo/didyouknow.py:324
 msgid ""
 "Hints will vary depending on the context, such as when the mouse is hovering "
 "over a button."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:301
+#: ../raphodo/didyouknow.py:330
 msgid ""
 "\n"
 "When you give your photos and videos unique filenames, you'll never be "
 "confused as to \n"
 "which file is which. Using <b>sequence numbers</b> to make filenames unique "
 "is highly \n"
-"recommended!.\n"
+"recommended!\n"
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:309
+#: ../raphodo/didyouknow.py:338
 msgid ""
 "\n"
 "<p>Four types of sequence values are available to help you assign unique "
 "names to your photos and \n"
 "videos:\n"
 "<ol>\n"
-"<li><b>Downloads today</b>: tracks downloads completed during that day.</"
-"li>\n"
+"<li><b>Downloads today</b>: tracks downloads completed during that "
+"day.</li>\n"
 "<li><b>Stored number</b>: similar to Downloads today, but it is remembered "
 "from the last time the  \n"
 "program was run.</li>\n"
@@ -583,7 +977,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:327
+#: ../raphodo/didyouknow.py:356
 msgid ""
 "\n"
 "The <b>Rename</b> panel allows you to configure file renaming. To rename "
@@ -592,7 +986,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:334
+#: ../raphodo/didyouknow.py:363
 msgid ""
 "\n"
 "<p>The <b>Synchronize RAW + JPEG</b> option is useful if you use the RAW + "
@@ -611,7 +1005,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:348
+#: ../raphodo/didyouknow.py:377
 msgid ""
 "\n"
 "You can have your photos and videos backed up to multiple locations as they "
@@ -622,13 +1016,13 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:356
+#: ../raphodo/didyouknow.py:385
 msgid ""
 "In this example, the drive <b>photobackup</b> does not contain a folder "
 "named <tt>Videos</tt>, so videos will not be backed up to it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:362
+#: ../raphodo/didyouknow.py:391
 msgid ""
 "\n"
 "Several of the program's preferences can be set from the command line, "
@@ -639,7 +1033,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:372
+#: ../raphodo/didyouknow.py:396
+msgid "You can also import program preferences from the older 0.4 version."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:401
 msgid ""
 "\n"
 "Rapid Photo Downloader deals with three types of cache:\n"
@@ -649,8 +1047,8 @@ msgid ""
 "memory cards, and other devices.</li>\n"
 "<li>A <b>temporary cache</b> of files downloaded from a camera, one for "
 "photos and another for \n"
-"videos. They are located in temporary subfolders in the download destination."
-"</li>\n"
+"videos. They are located in temporary subfolders in the download "
+"destination.</li>\n"
 "<li>The <b>desktop's thumbnail cache</b>, in which Rapid Photo Downloader "
 "stores thumbnails of \n"
 "RAW and TIFF photos once they have been downloaded. File browsers like Gnome "
@@ -665,23 +1063,23 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:431
+#: ../raphodo/didyouknow.py:460
 msgid "Tip of the Day"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:439
+#: ../raphodo/didyouknow.py:468
 msgid "Did you know...?"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:466
+#: ../raphodo/didyouknow.py:495
 msgid "Show tips on startup"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:470
+#: ../raphodo/didyouknow.py:499
 msgid "&Next"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:471
+#: ../raphodo/didyouknow.py:500
 msgid "&Previous"
 msgstr ""
 
@@ -788,68 +1186,68 @@ msgstr ""
 msgid "%(days)d days, %(hours)d hours"
 msgstr ""
 
-#: ../raphodo/errorlog.py:65
+#: ../raphodo/errorlog.py:66
 msgid "Find"
 msgstr ""
 
-#: ../raphodo/errorlog.py:135
+#: ../raphodo/errorlog.py:136
 msgid "Error Reports - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/errorlog.py:170
+#: ../raphodo/errorlog.py:171
 msgid "Find in reports"
 msgstr ""
 
-#: ../raphodo/errorlog.py:187
+#: ../raphodo/errorlog.py:188
 msgid "Find the previous occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:192
+#: ../raphodo/errorlog.py:193
 msgid "Find the next occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:194
+#: ../raphodo/errorlog.py:195
 msgid "&Highlight All"
 msgstr ""
 
-#: ../raphodo/errorlog.py:195
+#: ../raphodo/errorlog.py:196
 msgid "Highlight all occurrences of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:196
+#: ../raphodo/errorlog.py:197
 msgid "&Match Case"
 msgstr ""
 
-#: ../raphodo/errorlog.py:197
+#: ../raphodo/errorlog.py:198
 msgid "Search with case sensitivity"
 msgstr ""
 
-#: ../raphodo/errorlog.py:198
+#: ../raphodo/errorlog.py:199
 msgid "&Whole Words"
 msgstr ""
 
-#: ../raphodo/errorlog.py:199
+#: ../raphodo/errorlog.py:200
 msgid "Search whole words only"
 msgstr ""
 
-#: ../raphodo/errorlog.py:209 ../raphodo/errorlog.py:341
+#: ../raphodo/errorlog.py:210 ../raphodo/errorlog.py:345
 #, python-format
 msgid "%s of %s matches"
 msgstr ""
 
-#: ../raphodo/errorlog.py:228
+#: ../raphodo/errorlog.py:232
 msgid "Clear"
 msgstr ""
 
-#: ../raphodo/errorlog.py:328
+#: ../raphodo/errorlog.py:332
 msgid "Phrase not found"
 msgstr ""
 
-#: ../raphodo/errorlog.py:487
+#: ../raphodo/errorlog.py:491
 msgid "Search pending..."
 msgstr ""
 
-#: ../raphodo/errorlog.py:535
+#: ../raphodo/errorlog.py:539
 msgid ""
 "The number of new entries added to the Error Report since it was last open. "
 "Click to open the Error Report."
@@ -863,8 +1261,8 @@ msgstr ""
 #, python-brace-format
 msgid ""
 "<b>A problem occurred in Rapid Photo Downloader</b><br><br>\n"
-"    Please report the problem at <a href=\"{website}\">{website}</a>."
-"<br><br>\n"
+"    Please report the problem at <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
 "    Attach the log file <i>{log_file}</i> to your bug report (click\n"
 "    <a href=\"{log_path}\">here</a> to open the log directory).<br><br>If "
 "the same problem occurs\n"
@@ -885,7 +1283,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1601
+#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1643
 msgid "Open in File Browser..."
 msgstr ""
 
@@ -903,531 +1301,531 @@ msgstr ""
 msgid "%s (location does not exist)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:186
+#: ../raphodo/generatenameconfig.py:190
 msgid "Date time"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:187
+#: ../raphodo/generatenameconfig.py:191
 msgid "Text"
 msgstr "Tekst"
 
-#: ../raphodo/generatenameconfig.py:188 ../raphodo/rapid.py:2053
+#: ../raphodo/generatenameconfig.py:192 ../raphodo/rapid.py:2125
 msgid "Filename"
 msgstr "Ime datoteke"
 
-#: ../raphodo/generatenameconfig.py:189 ../raphodo/preferencedialog.py:488
+#: ../raphodo/generatenameconfig.py:193 ../raphodo/preferencedialog.py:724
 msgid "Metadata"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:190
+#: ../raphodo/generatenameconfig.py:194
 msgid "Sequences"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: ../raphodo/generatenameconfig.py:193
+#: ../raphodo/generatenameconfig.py:197
 msgid "Job code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:194
+#: ../raphodo/generatenameconfig.py:198
 msgid "Image date"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:195
+#: ../raphodo/generatenameconfig.py:199
 msgid "Video date"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:196
+#: ../raphodo/generatenameconfig.py:200
 msgid "Today"
 msgstr "Danas"
 
-#: ../raphodo/generatenameconfig.py:197
+#: ../raphodo/generatenameconfig.py:201
 msgid "Yesterday"
 msgstr "Jučer"
 
 #. Translators: Download time is the time and date that the download started (when the
 #. user clicked the Download button)
-#: ../raphodo/generatenameconfig.py:200
+#: ../raphodo/generatenameconfig.py:204
 msgid "Download time"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:203
+#: ../raphodo/generatenameconfig.py:207
 msgid "Name"
 msgstr "Naziv"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:206 ../raphodo/rapid.py:2054
+#: ../raphodo/generatenameconfig.py:210 ../raphodo/rapid.py:2126
 msgid "Extension"
 msgstr "Ekstenzija"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:209
+#: ../raphodo/generatenameconfig.py:213
 msgid "Image number"
 msgstr "Broj slike"
 
-#: ../raphodo/generatenameconfig.py:210
+#: ../raphodo/generatenameconfig.py:214
 msgid "Video number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:213
+#: ../raphodo/generatenameconfig.py:217
 msgid "Aperture"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:216
+#: ../raphodo/generatenameconfig.py:220
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:219
+#: ../raphodo/generatenameconfig.py:223
 msgid "Exposure time"
 msgstr "Dužina ekspozicije"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:222
+#: ../raphodo/generatenameconfig.py:226
 msgid "Focal length"
 msgstr "Žarišna duljina"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:225
+#: ../raphodo/generatenameconfig.py:229
 msgid "Camera make"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:228
+#: ../raphodo/generatenameconfig.py:232
 msgid "Camera model"
 msgstr "Model fotoaparata"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:231
+#: ../raphodo/generatenameconfig.py:235
 msgid "Short camera model"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:234
+#: ../raphodo/generatenameconfig.py:238
 msgid "Hyphenated short camera model"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:237
+#: ../raphodo/generatenameconfig.py:241
 msgid "Serial number"
 msgstr "Serijski broj"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:240
+#: ../raphodo/generatenameconfig.py:244
 msgid "Shutter count"
 msgstr ""
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: ../raphodo/generatenameconfig.py:242
+#: ../raphodo/generatenameconfig.py:246
 msgid "File number"
 msgstr ""
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:244
+#: ../raphodo/generatenameconfig.py:248
 msgid "Folder only"
 msgstr ""
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:246
+#: ../raphodo/generatenameconfig.py:250
 msgid "Folder and file"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:249
+#: ../raphodo/generatenameconfig.py:253
 msgid "Owner name"
 msgstr "Ime vlasnika"
 
-#: ../raphodo/generatenameconfig.py:250
+#: ../raphodo/generatenameconfig.py:254
 msgid "Codec"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:251
+#: ../raphodo/generatenameconfig.py:255
 msgid "Width"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:252
+#: ../raphodo/generatenameconfig.py:256
 msgid "Height"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:253
+#: ../raphodo/generatenameconfig.py:257
 msgid "Length"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:254
+#: ../raphodo/generatenameconfig.py:258
 msgid "Frames Per Second"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:255
+#: ../raphodo/generatenameconfig.py:259
 msgid "Artist"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:256
+#: ../raphodo/generatenameconfig.py:260
 msgid "Copyright"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:259
+#: ../raphodo/generatenameconfig.py:263
 msgid "Downloads today"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:262
+#: ../raphodo/generatenameconfig.py:266
 msgid "Session number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:265
+#: ../raphodo/generatenameconfig.py:269
 msgid "Subfolder number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:268
+#: ../raphodo/generatenameconfig.py:272
 msgid "Stored number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: ../raphodo/generatenameconfig.py:271
+#: ../raphodo/generatenameconfig.py:275
 msgid "Sequence letter"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:274
+#: ../raphodo/generatenameconfig.py:278
 msgid "All digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:277
+#: ../raphodo/generatenameconfig.py:281
 msgid "Last digit"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:280
+#: ../raphodo/generatenameconfig.py:284
 msgid "Last 2 digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:283
+#: ../raphodo/generatenameconfig.py:287
 msgid "Last 3 digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:286
+#: ../raphodo/generatenameconfig.py:290
 msgid "Last 4 digits"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:289
+#: ../raphodo/generatenameconfig.py:293
 msgid "Original Case"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:292
+#: ../raphodo/generatenameconfig.py:296
 msgid "UPPERCASE"
 msgstr "VELIKA SLOVA"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:295
+#: ../raphodo/generatenameconfig.py:299
 msgid "lowercase"
 msgstr "mala slova"
 
-#: ../raphodo/generatenameconfig.py:296
+#: ../raphodo/generatenameconfig.py:300
 msgid "One digit"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:297
+#: ../raphodo/generatenameconfig.py:301
 msgid "Two digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:298
+#: ../raphodo/generatenameconfig.py:302
 msgid "Three digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:299
+#: ../raphodo/generatenameconfig.py:303
 msgid "Four digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:300
+#: ../raphodo/generatenameconfig.py:304
 msgid "Five digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:301
+#: ../raphodo/generatenameconfig.py:305
 msgid "Six digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:302
+#: ../raphodo/generatenameconfig.py:306
 msgid "Seven digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:305
+#: ../raphodo/generatenameconfig.py:309
 msgid "Subseconds"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:308 ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:312 ../raphodo/generatenameconfig.py:393
 msgid "YYYYMMDD"
 msgstr "GGGGMMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:311 ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:315 ../raphodo/generatenameconfig.py:394
 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
-#: ../raphodo/generatenameconfig.py:314 ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:318 ../raphodo/generatenameconfig.py:395
 msgid "YYYY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:317
+#: ../raphodo/generatenameconfig.py:321
 msgid "YYMMDD"
 msgstr "GGMMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:320
+#: ../raphodo/generatenameconfig.py:324
 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
-#: ../raphodo/generatenameconfig.py:323
+#: ../raphodo/generatenameconfig.py:327
 msgid "YY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:326
+#: ../raphodo/generatenameconfig.py:330
 msgid "MMDDYYYY"
 msgstr "MMDDGGGG"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:329
+#: ../raphodo/generatenameconfig.py:333
 msgid "MMDDYY"
 msgstr "MMDDGG"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:332
+#: ../raphodo/generatenameconfig.py:336
 msgid "MMDD"
 msgstr "MMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:335
+#: ../raphodo/generatenameconfig.py:339
 msgid "DDMMYYYY"
 msgstr "DDMMGGGG"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:338
+#: ../raphodo/generatenameconfig.py:342
 msgid "DDMMYY"
 msgstr "DDMMGG"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:341 ../raphodo/generatenameconfig.py:389
-#: ../raphodo/generatenameconfig.py:390 ../raphodo/generatenameconfig.py:391
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:345 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:394 ../raphodo/generatenameconfig.py:395
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:397
 msgid "YYYY"
 msgstr "GGGG"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:344
+#: ../raphodo/generatenameconfig.py:348
 msgid "YY"
 msgstr "GG"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:347
+#: ../raphodo/generatenameconfig.py:351
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:350
+#: ../raphodo/generatenameconfig.py:354
 msgid "DD"
 msgstr "DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:353
+#: ../raphodo/generatenameconfig.py:357
 msgid "Month (full)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:356
+#: ../raphodo/generatenameconfig.py:360
 msgid "Month (abbreviated)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:359
+#: ../raphodo/generatenameconfig.py:363
 msgid "HHMMSS"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:362
+#: ../raphodo/generatenameconfig.py:366
 msgid "HHMM"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:365
+#: ../raphodo/generatenameconfig.py:369
 msgid "HH-MM-SS"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:368
+#: ../raphodo/generatenameconfig.py:372
 msgid "HH-MM"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:371
+#: ../raphodo/generatenameconfig.py:375
 msgid "HH"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:374
+#: ../raphodo/generatenameconfig.py:378
 msgid "MM (minutes)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:377
+#: ../raphodo/generatenameconfig.py:381
 msgid "SS"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:393
 msgid "Date"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:394
 msgid "Date (hyphens)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:395
 msgid "Date (underscores)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:438
-#: ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:442
+#: ../raphodo/generatenameconfig.py:537
 msgid "Date and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392
+#: ../raphodo/generatenameconfig.py:396
 msgid "YYYYMM_Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "Date and Job Code Subfolder"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "YYYYMM"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393 ../raphodo/jobcodepanel.py:198
-#: ../raphodo/nameeditor.py:827 ../raphodo/rapid.py:1809
+#: ../raphodo/generatenameconfig.py:397 ../raphodo/jobcodepanel.py:199
+#: ../raphodo/nameeditor.py:833 ../raphodo/rapid.py:1852
 #: ../raphodo/renamepanel.py:83 ../raphodo/renamepanel.py:241
 msgid "Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:433 ../raphodo/generatenameconfig.py:512
+#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:532
 msgid "Original Filename"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "Date-Time and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "YYYYMMDD-HHMM-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "Date and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "YYYYMMDD-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "Date-Time and Image number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "YYYYMMDD-1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "Date-Time and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "YYYYMMDD-HHMM-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:442 ../raphodo/generatenameconfig.py:537
 msgid "YYYYMMDD-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "Date-Time and Video number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "YYYYMMDD_1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "Resolution"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "YYYYMMDD-HHMM-1-1920x1080"
 msgstr ""
 
@@ -1486,76 +1884,77 @@ msgstr ""
 msgid "&Remember this choice"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:185
+#: ../raphodo/jobcodepanel.py:186
 msgid ""
 "Select photos and videos to be able to apply a new or existing Job Code to "
 "them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:186
-msgid "The new Job Code will be applied to all selected photos and/or videos."
+#: ../raphodo/jobcodepanel.py:187
+msgid ""
+"The new Job Code will be applied to all selected photos and/or videos."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:187
+#: ../raphodo/jobcodepanel.py:188
 msgid ""
 "Click the Apply button to apply the current Job Code to all selected photos "
 "and/or videos. You can also simply double click the Job Code."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:189
+#: ../raphodo/jobcodepanel.py:190
 msgid ""
 "Removing a Job Code removes it only from the list of saved Job Codes, not "
 "from any photos or videos that it may have been applied to."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:191
+#: ../raphodo/jobcodepanel.py:192
 msgid ""
 "If you want to use Job Codes, configure file renaming or destination "
 "subfolder names to use them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:197
+#: ../raphodo/jobcodepanel.py:198
 msgid "Last Used"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:202
+#: ../raphodo/jobcodepanel.py:203
 msgid "Job Code Sort:"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:205 ../raphodo/rapid.py:2061
+#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2133
 msgid "Ascending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2062
+#: ../raphodo/jobcodepanel.py:207 ../raphodo/rapid.py:2134
 msgid "Descending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:216
+#: ../raphodo/jobcodepanel.py:217
 msgid "&New..."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:220
+#: ../raphodo/jobcodepanel.py:221
 msgid "&Apply"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:224
+#: ../raphodo/jobcodepanel.py:225
 msgid "&Remove"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:228 ../raphodo/preferencedialog.py:125
-#: ../raphodo/preferencedialog.py:154 ../raphodo/preferencedialog.py:433
+#: ../raphodo/jobcodepanel.py:229 ../raphodo/preferencedialog.py:200
+#: ../raphodo/preferencedialog.py:229 ../raphodo/preferencedialog.py:531
 msgid "Remove All"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:427
+#: ../raphodo/jobcodepanel.py:428
 msgid "Do you really want to remove all the Job Codes?"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:429
+#: ../raphodo/jobcodepanel.py:430
 msgid "Remove all Job Codes"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:492
+#: ../raphodo/jobcodepanel.py:493
 msgid "Job Codes"
 msgstr ""
 
@@ -1566,42 +1965,58 @@ msgstr ""
 msgid "<i><b>Hint:</b> %(message)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:418 ../raphodo/nameeditor.py:432
+#: ../raphodo/nameeditor.py:423 ../raphodo/nameeditor.py:437
 #, python-format
 msgid "%(description)s - %(elements)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:512
+#: ../raphodo/nameeditor.py:517
 msgid "Save New Custom Preset..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:513
+#: ../raphodo/nameeditor.py:518
 msgid "Remove All Custom Presets..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:559
+#: ../raphodo/nameeditor.py:564
 msgid "(New Custom Preset)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:576
+#: ../raphodo/nameeditor.py:581
 #, python-format
 msgid "%s (edited)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:579 ../raphodo/nameeditor.py:1370
+#: ../raphodo/nameeditor.py:584 ../raphodo/nameeditor.py:1379
 #, python-format
 msgid "Update Custom Preset \"%s\""
 msgstr ""
 
-#: ../raphodo/nameeditor.py:667
+#: ../raphodo/nameeditor.py:672
 msgid "Save New Custom Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:675
+#: ../raphodo/nameeditor.py:680
 msgid "Preset Name:"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:836
+#: ../raphodo/nameeditor.py:799
+msgid "Photo Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:805
+msgid "Video Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:811
+msgid "Photo Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:817
+msgid "Video Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:842
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>There is insufficient data to "
 "fully generate the name. Please use other renaming options.</i>"
@@ -1610,7 +2025,7 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees.
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:846
+#: ../raphodo/nameeditor.py:853
 #, python-format
 msgid "The character</i> %(separator)s <i>creates a new subfolder level."
 msgstr ""
@@ -1618,50 +2033,50 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:851
+#: ../raphodo/nameeditor.py:858
 #, python-format
 msgid ""
 "There is no need start or end with the folder separator </i> "
 "%(separator)s<i>, because it is added automatically."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:859
+#: ../raphodo/nameeditor.py:866
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>Unique filenames may not be "
 "generated. Make filenames unique by using Sequence values.</i>"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:882 ../raphodo/renamepanel.py:121
+#: ../raphodo/nameeditor.py:889 ../raphodo/renamepanel.py:121
 msgid "Preset:"
 msgstr ""
 
 #. Translators: appears in a combobox, e.g. Image Date (YYYY)
-#: ../raphodo/nameeditor.py:959 ../raphodo/nameeditor.py:980
+#: ../raphodo/nameeditor.py:966 ../raphodo/nameeditor.py:987
 #, python-brace-format
 msgid "{choice} ({variant})"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1005 ../raphodo/preferencedialog.py:530
+#: ../raphodo/nameeditor.py:1012 ../raphodo/preferencedialog.py:783
 msgid "Get help online..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1025
+#: ../raphodo/nameeditor.py:1034
 msgid "Insert"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1351
+#: ../raphodo/nameeditor.py:1360
 msgid "Save Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1356
+#: ../raphodo/nameeditor.py:1365
 msgid ""
-"<b>Do you want to save the changes in a new custom preset?</"
-"b><br><br>Creating a custom preset is not required, but can help you keep "
-"organized.<br><br>The changes to the preferences will still be applied "
-"regardless of whether you create a new custom preset or not."
+"<b>Do you want to save the changes in a new custom "
+"preset?</b><br><br>Creating a custom preset is not required, but can help "
+"you keep organized.<br><br>The changes to the preferences will still be "
+"applied regardless of whether you create a new custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1365
+#: ../raphodo/nameeditor.py:1374
 msgid ""
 "<b>Do you want to save the changes in a custom preset?</b><br><br>If you "
 "like, you can create a new custom preset or update the existing custom "
@@ -1669,136 +2084,167 @@ msgid ""
 "regardless of whether you save a custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1372
+#: ../raphodo/nameeditor.py:1381
 msgid "Save New Custom Preset"
 msgstr ""
 
-#: ../raphodo/newversion.py:306
+#: ../raphodo/newversion.py:312
 msgid "Checking for new version..."
 msgstr ""
 
-#: ../raphodo/newversion.py:307
+#: ../raphodo/newversion.py:313
 msgid "You are running the latest version."
 msgstr ""
 
-#: ../raphodo/newversion.py:308
+#: ../raphodo/newversion.py:314
 msgid "Failed to contact the update server."
 msgstr ""
 
-#: ../raphodo/newversion.py:310
+#: ../raphodo/newversion.py:316
 #, python-format
 msgid "A new version of Rapid Photo Downloader (%s) is available."
 msgstr ""
 
-#: ../raphodo/newversion.py:312
+#: ../raphodo/newversion.py:318
 msgid "Do you want to download the new version?"
 msgstr ""
 
-#: ../raphodo/newversion.py:313
+#: ../raphodo/newversion.py:319
 #, python-format
 msgid "Changes in the new release can be viewed <a href=\"%s\">here</a>."
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the s key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:340 ../raphodo/newversion.py:353
+#: ../raphodo/newversion.py:348 ../raphodo/newversion.py:363
 msgid "&Skip this release"
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the o key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:356
+#: ../raphodo/newversion.py:366
 msgid "&Open Download Page"
 msgstr ""
 
-#: ../raphodo/newversion.py:376
+#: ../raphodo/newversion.py:386
 msgid "Rapid Photo Downloader updates"
 msgstr ""
 
 #. Translators: shows how much of a file has been downloaded e.g  123 KB of 1.3 MB
-#: ../raphodo/newversion.py:478
+#: ../raphodo/newversion.py:488
 #, python-format
 msgid "%(downloaded)s of %(total)s"
 msgstr ""
 
-#: ../raphodo/newversion.py:495
+#: ../raphodo/newversion.py:507
 msgid "Downloading..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:76
+#: ../raphodo/preferencedialog.py:86
 msgid "Preferences"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Automation"
 msgstr "Automatizacija"
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85 ../raphodo/preferencedialog.py:343
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/preferencedialog.py:428
 msgid "Error Handling"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:109
+msgid "Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:109 ../raphodo/preferencedialog.py:119
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:94
+#: ../raphodo/preferencedialog.py:147
 msgid "Device Scanning"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:96
+#: ../raphodo/preferencedialog.py:148
 msgid "Scan only external devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:98
+#: ../raphodo/preferencedialog.py:150
 msgid ""
 "Scan for photos and videos only on devices that are external to the "
 "computer,\n"
 "including cameras, memory cards, external hard drives, and USB flash drives."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:102
-msgid "Scan non-camera devices lacking a DCIM folder"
+#: ../raphodo/preferencedialog.py:153
+msgid "Scan only specific folders on devices"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:155
+msgid ""
+"Scan for photos and videos only in the folders specified below (except "
+"paths\n"
+"specified in Ignored Paths).\n"
+"\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:161
+msgid "Folders to scan:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:164
+msgid ""
+"Folders at the base level of device file systems that will be scanned\n"
+"for photos and videos."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:167 ../raphodo/preferencedialog.py:219
+msgid "Add..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:104
+#: ../raphodo/preferencedialog.py:169
 msgid ""
-"Scan the entirety of a device for photos and videos, irrespective of whether "
-"it contains a DCIM folder,\n"
-"as opposed to only scanning within a DCIM folder.\n"
+"Add a folder to the list of folders to scan for photos and videos.\n"
 "\n"
-"Changing this setting causes all devices to be scanned again.\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:172 ../raphodo/preferencedialog.py:198
+#: ../raphodo/preferencedialog.py:224 ../raphodo/preferencedialog.py:529
+msgid "Remove"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:174
+msgid ""
+"Remove a folder from the list of folders to scan for photos and videos.\n"
 "\n"
-"Note: With cameras, only the DCIM folder is scanned."
+"Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:116
+#: ../raphodo/preferencedialog.py:191
 msgid "Devices that have been set to automatically ignore or download from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:117
+#: ../raphodo/preferencedialog.py:192
 msgid "Remembered Devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:121
+#: ../raphodo/preferencedialog.py:196
 msgid ""
 "Remove a device from the list of devices to automatically ignore or download "
 "from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:123 ../raphodo/preferencedialog.py:149
-#: ../raphodo/preferencedialog.py:431
-msgid "Remove"
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:127
+#: ../raphodo/preferencedialog.py:202
 msgid ""
 "Clear the list of devices from which to automatically ignore or download "
 "from.\n"
@@ -1806,315 +2252,436 @@ msgid ""
 "Note: Changes take effect when the computer is next scanned for devices."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:140
+#: ../raphodo/preferencedialog.py:215
 msgid "Ignored Paths"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:141
+#: ../raphodo/preferencedialog.py:216
 msgid ""
 "The end part of a path that should never be scanned for photos or videos."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:144
-msgid "Add..."
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:146
+#: ../raphodo/preferencedialog.py:221
 msgid ""
 "Add a path to the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:151
+#: ../raphodo/preferencedialog.py:226
 msgid ""
 "Remove a path from the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:156
+#: ../raphodo/preferencedialog.py:231
 msgid ""
 "Clear the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:164
+#: ../raphodo/preferencedialog.py:239
 msgid ""
-"Use python-style <a href=\"http://damonlynch.net/rapid/documentation/"
-"#regularexpressions\">regular expressions</a>"
+"Use python-style <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">regula"
+"r expressions</a>"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:168
+#: ../raphodo/preferencedialog.py:243
 msgid ""
 "Use regular expressions in the list of ignored paths.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:208
+#: ../raphodo/preferencedialog.py:283
 msgid "Program Automation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:209
+#: ../raphodo/preferencedialog.py:284
 msgid "Start downloading at program startup"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:210
+#: ../raphodo/preferencedialog.py:285
 msgid "Start downloading upon device insertion"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:211
+#: ../raphodo/preferencedialog.py:286
 msgid "Unmount (eject) device upon download completion"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:212
+#: ../raphodo/preferencedialog.py:287
 msgid "Exit program when download completes"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:213
+#: ../raphodo/preferencedialog.py:288
 msgid "Exit program even if download had warnings or errors"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:240
+#: ../raphodo/preferencedialog.py:315
 msgid "Thumbnail Generation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:241
+#: ../raphodo/preferencedialog.py:316
 msgid "Generate thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:242
+#: ../raphodo/preferencedialog.py:318
 msgid "Generate thumbnails to show in the main program window"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:244
+#: ../raphodo/preferencedialog.py:320
 msgid "Cache thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:245
+#: ../raphodo/preferencedialog.py:323
 msgid ""
 "Save thumbnails shown in the main program window in a thumbnail cache unique "
 "to Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:247
+#: ../raphodo/preferencedialog.py:327
 msgid "Generate system thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:248
+#: ../raphodo/preferencedialog.py:330
 msgid ""
 "While downloading, save thumbnails that can be used by desktop file managers "
 "and other programs"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:255
+#: ../raphodo/preferencedialog.py:339
 msgid "Number of CPU cores used to generate thumbnails."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:256
+#: ../raphodo/preferencedialog.py:340
 msgid "CPU cores:"
 msgstr ""
 
 #. Translators: the * acts as an asterisk to denote a reference to an annotation
 #. such as '* Takes effect upon program restart'
-#: ../raphodo/preferencedialog.py:271 ../raphodo/preferencedialog.py:317
+#: ../raphodo/preferencedialog.py:355 ../raphodo/preferencedialog.py:401
 msgid "*"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:294
+#: ../raphodo/preferencedialog.py:378
 msgid "Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:296
+#: ../raphodo/preferencedialog.py:380
 msgid "Calculating..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:302
+#: ../raphodo/preferencedialog.py:386
 msgid "days"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:303
+#: ../raphodo/preferencedialog.py:387
 msgid "forever"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:308
+#: ../raphodo/preferencedialog.py:392
 msgid "Cache size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:310
+#: ../raphodo/preferencedialog.py:394
 msgid "Number of thumbnails:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:312
+#: ../raphodo/preferencedialog.py:396
 msgid "Database size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:314
+#: ../raphodo/preferencedialog.py:398
 msgid "Cache unaccessed thumbnails for:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:322
+#: ../raphodo/preferencedialog.py:406
 msgid "Purge Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:323
+#: ../raphodo/preferencedialog.py:408
 msgid "Optimize Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:336
+#: ../raphodo/preferencedialog.py:421
 msgid "* Takes effect upon program restart"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:346
+#: ../raphodo/preferencedialog.py:431
 msgid "Skip download"
 msgstr "Preskoči preuzimanje"
 
-#: ../raphodo/preferencedialog.py:347
+#: ../raphodo/preferencedialog.py:432
 msgid "Don't download the file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:348
+#: ../raphodo/preferencedialog.py:433
 msgid "Add unique identifier"
 msgstr "Dodaj jedinstveni identifikator"
 
-#: ../raphodo/preferencedialog.py:349
+#: ../raphodo/preferencedialog.py:436
 msgid ""
 "Add an identifier like _1 or _2 to the end of the filename, immediately "
 "before the file's extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:355
+#: ../raphodo/preferencedialog.py:444
 msgid "Overwrite"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:356
+#: ../raphodo/preferencedialog.py:445
 msgid "Overwrite the previously backed up file"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:357
+#: ../raphodo/preferencedialog.py:446
 msgid "Skip"
 msgstr "Preskoči"
 
-#: ../raphodo/preferencedialog.py:358
+#: ../raphodo/preferencedialog.py:448
 msgid "Don't overwrite the backup file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:364
+#: ../raphodo/preferencedialog.py:455
 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 identifier:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:378
+#: ../raphodo/preferencedialog.py:464
+msgid ""
+"Using sequence numbers to automatically generate unique filenames is "
+"strongly recommended. Configure file renaming in the Rename panel in the "
+"main window."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:473
 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 ""
 
-#: ../raphodo/preferencedialog.py:398
+#: ../raphodo/preferencedialog.py:494
 msgid "Program Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:399
+#: ../raphodo/preferencedialog.py:495
 msgid "Show a warning when:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:402
+#: ../raphodo/preferencedialog.py:498
 msgid "Downloading files currently not displayed"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:403
+#: ../raphodo/preferencedialog.py:499
 msgid ""
 "Warn when about to download files that are not displayed in the main window."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:405
+#: ../raphodo/preferencedialog.py:501
 msgid "Backup destinations are missing"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:406
-msgid "Warn before starting a download if it is not possible to back up files."
+#: ../raphodo/preferencedialog.py:502
+msgid ""
+"Warn before starting a download if it is not possible to back up files."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:408
+#: ../raphodo/preferencedialog.py:504
 msgid "Program libraries are missing or broken"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:409
+#: ../raphodo/preferencedialog.py:505
 msgid ""
 "Warn if a software library used by Rapid Photo Downloader is missing or not "
 "functioning."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:412
+#: ../raphodo/preferencedialog.py:508
 msgid "Filesystem metadata cannot be set"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:413
+#: ../raphodo/preferencedialog.py:509
 msgid ""
 "Warn if there is an error setting a file's filesystem metadata, such as its "
 "modification time."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:416
+#: ../raphodo/preferencedialog.py:512
 msgid "Encountering unhandled files"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:417
+#: ../raphodo/preferencedialog.py:513
 msgid ""
 "Warn after scanning a device or this computer if there are unrecognized "
 "files that will not be included in the download."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:420
+#: ../raphodo/preferencedialog.py:517
 msgid "Do not warn about unhandled files with extensions:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:424
+#: ../raphodo/preferencedialog.py:522
 msgid ""
 "File extensions are case insensitive and do not need to include the leading "
 "dot."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:427
+#: ../raphodo/preferencedialog.py:525
 msgid "Add"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:428
+#: ../raphodo/preferencedialog.py:526
 msgid ""
 "Add a file extension to the list of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:430
+#: ../raphodo/preferencedialog.py:528
 msgid ""
 "Remove a file extension from the list of unhandled file types to not warn "
 "about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:434
+#: ../raphodo/preferencedialog.py:532
 msgid ""
 "Clear the list of file extensions of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:469
+#: ../raphodo/preferencedialog.py:568
+msgid "Photo and Video Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:571
+msgid "Consolidate files across devices and downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:574
+msgid ""
+"Analyze the results of device scans looking for duplicate files and matching "
+"RAW and JPEG pairs,\n"
+"comparing them across multiple devices and download sessions."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:580
+msgid "Treat matching RAW and JPEG files as:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:581
+msgid "One photo"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:582
+msgid "Two photos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:584
+msgid ""
+"Display matching pairs of RAW and JPEG photos as one photo, and if marked, "
+"download both."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:589
+msgid ""
+"Display matching pairs of RAW and JPEG photos as two different photos. You "
+"can still synchronize their sequence numbers."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:598
+msgid "With matching RAW and JPEG photos:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:600
+msgid "Do not mark JPEG for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:601
+msgid "Do not mark RAW for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:602
+msgid "Mark both for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:609
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"JPEG for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:614
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"RAW for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:619
+msgid ""
+"When matching RAW and JPEG photos are found, automatically mark both for "
+"download."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:625
+msgid ""
+"If you disable file consolidation, choose what to do when a download device "
+"is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:631
+msgid ""
+"When a download device is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:642
+msgid "Clear completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:643
+msgid "Keep displaying completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:644
+msgid "Prompt for what to do"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:649
+msgid ""
+"Automatically clear the display of completed downloads whenever a new "
+"download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:654
+msgid ""
+"Keep displaying completed downloads whenever a new download device is "
+"inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:658
+msgid ""
+"Prompt whether to keep displaying completed downloads or clear them whenever "
+"a new download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:702
 msgid "Version Check"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:470
+#: ../raphodo/preferencedialog.py:703
 msgid "Check for new version at startup"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:471
+#: ../raphodo/preferencedialog.py:705
 msgid "Check for a new version of the program each time the program starts."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:473
+#: ../raphodo/preferencedialog.py:707
 msgid "Include development releases"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:474
+#: ../raphodo/preferencedialog.py:709
 msgid ""
 "Include alpha, beta and other development releases when checking for a new "
 "version of the program.\n"
@@ -2123,11 +2690,11 @@ msgid ""
 "occur."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:489
+#: ../raphodo/preferencedialog.py:725
 msgid "Ignore DNG date/time metadata on MTP devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:490
+#: ../raphodo/preferencedialog.py:727
 msgid ""
 "Ignore date/time metadata in DNG files located on MTP devices, and use the "
 "file's modification time instead.\n"
@@ -2136,70 +2703,86 @@ msgid ""
 "metadata."
 msgstr ""
 
+#: ../raphodo/preferencedialog.py:741
+msgid "Completed Downloads"
+msgstr ""
+
 #. Translators: substituted value is a description for the set of preferences
 #. shown in the preference dialog window, e.g. Devices, Automation, etc.
 #. This string is shown in a tooltip for the "Restore Defaults" button
-#: ../raphodo/preferencedialog.py:710
+#: ../raphodo/preferencedialog.py:1067
 #, python-format
 msgid "Restores default %s preference values"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:832
+#: ../raphodo/preferencedialog.py:1208
 msgid ""
 "Do you want to purge the thumbnail cache? The cache will be purged when the "
 "program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:835
+#: ../raphodo/preferencedialog.py:1212
 msgid "Purge Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:847
+#: ../raphodo/preferencedialog.py:1225
 msgid ""
 "Do you want to optimize the thumbnail cache? The cache will be optimized "
 "when the program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:850
+#: ../raphodo/preferencedialog.py:1229
 msgid "Optimize Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1045
+#: ../raphodo/preferencedialog.py:1481
+msgid "Enter a Folder to Scan"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1482
+msgid "Specify a folder that will be scanned for photos and videos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1483
+msgid "Folder:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1497
 msgid "Enter a Path to Ignore"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1046
+#: ../raphodo/preferencedialog.py:1498
 msgid "Specify a path that will never be scanned for photos or videos"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1047
+#: ../raphodo/preferencedialog.py:1499
 msgid "Path:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1061
+#: ../raphodo/preferencedialog.py:1513
 msgid "Enter a File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1062
+#: ../raphodo/preferencedialog.py:1514
 msgid "Specify a file extension (without the leading dot)"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1063 ../raphodo/renamepanel.py:122
+#: ../raphodo/preferencedialog.py:1515 ../raphodo/renamepanel.py:122
 msgid "Extension:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1078
+#: ../raphodo/preferencedialog.py:1530
 msgid "Invalid File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1079
+#: ../raphodo/preferencedialog.py:1531
 #, python-format
 msgid ""
 "The file extension <b>%s</b> is recognized by Rapid Photo Downloader, so it "
 "makes no sense to warn about its presence."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1081
+#: ../raphodo/preferencedialog.py:1533
 #, python-format
 msgid ""
 "Recognized file types:\n"
@@ -2225,104 +2808,103 @@ msgstr ""
 msgid "Birthday"
 msgstr ""
 
-#: ../raphodo/preferences.py:614
+#: ../raphodo/preferences.py:624
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr ""
 
-#: ../raphodo/preferences.py:617
+#: ../raphodo/preferences.py:627
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr ""
 
-#: ../raphodo/preferences.py:622
+#: ../raphodo/preferences.py:632
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
 
-#. self.setFlat(True)
 #: ../raphodo/primarybutton.py:72
 msgid "Download 8 Photos and 10 Videos"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:86 ../raphodo/problemnotification.py:208
+#: ../raphodo/problemnotification.py:87 ../raphodo/problemnotification.py:209
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:89
+#: ../raphodo/problemnotification.py:90
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:116
+#: ../raphodo/problemnotification.py:117
 #, python-format
 msgid "GPhoto2 Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:124
+#: ../raphodo/problemnotification.py:125
 msgid ""
 "Unable to initialize the camera, probably because another program is using "
 "it. No files were copied from it."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:134
+#: ../raphodo/problemnotification.py:135
 #, python-format
 msgid "Unable to read directory %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:140
+#: ../raphodo/problemnotification.py:141
 #, python-format
 msgid "Unable to access modification time or size from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:146
+#: ../raphodo/problemnotification.py:147
 #, python-format
 msgid "Unable to read file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:152
+#: ../raphodo/problemnotification.py:153
 #, python-format
 msgid "Unable to write file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:158
+#: ../raphodo/problemnotification.py:159
 #, python-format
 msgid "Unable to move file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:164
+#: ../raphodo/problemnotification.py:165
 #, python-format
 msgid "Unable to remove file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:170
+#: ../raphodo/problemnotification.py:171
 #, python-format
 msgid "Unable to copy file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:176
+#: ../raphodo/problemnotification.py:177
 #, python-format
 msgid "Zero length file %s will not be downloaded"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:182
+#: ../raphodo/problemnotification.py:183
 #, python-format
 msgid "Could not determine filesystem modification time for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:188
+#: ../raphodo/problemnotification.py:189
 #, python-format
 msgid "Unable to load metadata from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:194
+#: ../raphodo/problemnotification.py:195
 #, python-format
 msgid ""
 "Unable to load metadata from %(name)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:202
+#: ../raphodo/problemnotification.py:203
 #, python-format
 msgid ""
 "An error occurred setting a file's filesystem metadata on the filesystem %s. "
@@ -2330,212 +2912,212 @@ msgid ""
 "again."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:216
+#: ../raphodo/problemnotification.py:217
 #, python-format
 msgid "Encountered unhandled file %s. It will not be downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:223
+#: ../raphodo/problemnotification.py:224
 #, python-format
 msgid "%(filetype)s %(destination)s already exists."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:234 ../raphodo/problemnotification.py:262
+#: ../raphodo/problemnotification.py:235 ../raphodo/problemnotification.py:263
 #, python-format
 msgid ""
 "The existing %(filetype)s %(destination)s was last modified on %(date)s at "
 "%(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:245
+#: ../raphodo/problemnotification.py:246
 #, python-format
 msgid "The %(filetype)s %(source)s was not downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:273
+#: ../raphodo/problemnotification.py:274
 #, python-format
 msgid "The %(filetype)s %(source)s was downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:282
+#: ../raphodo/problemnotification.py:283
 #, python-format
 msgid "The unique identifier '%s' was added to the filename."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:298
+#: ../raphodo/problemnotification.py:299
 #, python-format
 msgid ""
 "The existing backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:309
+#: ../raphodo/problemnotification.py:310
 #, python-format
 msgid "The %(filetype)s %(source)s was not backed up from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:326
+#: ../raphodo/problemnotification.py:327
 #, python-format
 msgid ""
 "The previous backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:337
+#: ../raphodo/problemnotification.py:338
 #, python-format
 msgid ""
 "The %(filetype)s %(source)s from %(device)s was backed up, overwriting the "
 "previous backup %(filetype)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:356
+#: ../raphodo/problemnotification.py:357
 #, python-format
 msgid ""
 "When synchronizing RAW + JPEG sequence values, a duplicate %(filetype)s "
 "%(file)s was encountered, and was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:366
+#: ../raphodo/problemnotification.py:367
 msgid ""
 "When synchronizing RAW + JPEG sequence values, photos were detected with the "
 "same filenames, but taken at different times:"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:373
+#: ../raphodo/problemnotification.py:374
 #, 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 ""
 
-#: ../raphodo/problemnotification.py:389
+#: ../raphodo/problemnotification.py:390
 #, python-format
 msgid "Unable to finalize the filename for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:424
+#: ../raphodo/problemnotification.py:425
 #, python-format
 msgid ""
 "The filename %(destination)s was not fully generated for %(filetype)s "
 "%(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:433
+#: ../raphodo/problemnotification.py:434
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:439
+#: ../raphodo/problemnotification.py:440
 #, python-format
 msgid "The following metadata is missing: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:445
+#: ../raphodo/problemnotification.py:446
 #, python-format
 msgid "Date/time conversion failed: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:451
+#: ../raphodo/problemnotification.py:452
 msgid ""
 "Could not extract valid date/time metadata or determine the file "
 "modification time."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:457
+#: ../raphodo/problemnotification.py:458
 msgid "Filename does not have an extension."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:460
+#: ../raphodo/problemnotification.py:461
 msgid "Filename does not have a number component."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:464
+#: ../raphodo/problemnotification.py:465
 #, python-format
 msgid "Error generating component %(component)s. Error: %(error)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:477
+#: ../raphodo/problemnotification.py:478
 #, python-format
 msgid ""
 "The download subfolders %(folder)s were only partially generated for "
 "%(filetype)s %(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:486
+#: ../raphodo/problemnotification.py:487
 #, python-format
 msgid ""
 "There is no data with which to generate the %(subfolder_file)s for "
 "%(filename)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:499
+#: ../raphodo/problemnotification.py:500
 #, python-format
 msgid ""
 "Unable to create the %(filetype)s %(destination)s in %(folder)s. The "
 "download file was %(source)s in %(device)s. It was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:514
+#: ../raphodo/problemnotification.py:515
 #, python-format
 msgid "Unable to create the download subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:526
+#: ../raphodo/problemnotification.py:527
 #, python-format
 msgid "Unable to create the backup subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:577
+#: ../raphodo/problemnotification.py:578
 #, python-format
 msgid "Problems scanning %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:584
+#: ../raphodo/problemnotification.py:585
 #, python-format
 msgid "Problems copying from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:591
+#: ../raphodo/problemnotification.py:592
 msgid "Problems while finalizing filenames and generating subfolders"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:598
+#: ../raphodo/problemnotification.py:599
 #, python-format
 msgid "Problems backing up to %s"
 msgstr ""
 
-#. Translators: for example Nov 3 or Dec 31
-#. The start and end dates are on a different day
-#. Translators: for example Nov 3 or Dec 31
-#: ../raphodo/proximity.py:105 ../raphodo/proximity.py:221
-#: ../raphodo/proximity.py:224 ../raphodo/proximity.py:828
+#. Translators: for example Nov 3 2015, 11:25 AM
+#. Translators: for example, Nov 3, 12:15 PM
+#: ../raphodo/proximity.py:188 ../raphodo/proximity.py:213
+#: ../raphodo/proximity.py:236 ../raphodo/proximity.py:239
 #, python-format
-msgid "%(month)s %(numeric_day)s"
+msgid "%(date)s, %(time)s"
 msgstr ""
 
-#. Translators: for example Nov 15 2015
-#. Translators: for example Nov 3 2015
-#: ../raphodo/proximity.py:109 ../raphodo/proximity.py:230
-#: ../raphodo/proximity.py:231 ../raphodo/proximity.py:831
+#: ../raphodo/proximity.py:204
 #, python-format
-msgid "%(date)s %(year)s"
+msgid "%(starttime)s - %(endtime)s"
 msgstr ""
 
-#. Translators: for example Nov 3 2015, 11:25 AM
-#. Translators: for example, Nov 3, 12:15 PM
-#: ../raphodo/proximity.py:197 ../raphodo/proximity.py:215
-#: ../raphodo/proximity.py:234 ../raphodo/proximity.py:236
+#. The start and end dates are on a different day
+#. Translators: for example Nov 3 or Dec 31
+#: ../raphodo/proximity.py:221 ../raphodo/proximity.py:225
+#: ../raphodo/proximity.py:980 ../raphodo/timeutils.py:105
 #, python-format
-msgid "%(date)s, %(time)s"
+msgid "%(month)s %(numeric_day)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:209
+#. Translators: for example Nov 3 2015
+#. Translators: for example Nov 2 2015
+#. Translators: for example Nov 15 2015
+#: ../raphodo/proximity.py:232 ../raphodo/proximity.py:233
+#: ../raphodo/proximity.py:985 ../raphodo/timeutils.py:110
 #, python-format
-msgid "%(starttime)s - %(endtime)s"
+msgid "%(date)s %(year)s"
 msgstr ""
 
 #. Translators: for example, Nov 3, 12:15 PM - Nov 4, 1:00 AM
-#: ../raphodo/proximity.py:241
+#: ../raphodo/proximity.py:245
 #, python-format
 msgid "%(earlier_time)s - %(later_time)s"
 msgstr ""
@@ -2544,25 +3126,25 @@ msgstr ""
 #. Nov 3 2012, 12:15 PM -
 #. Nov 4 2012, 1:00 AM
 #. (please keep the line break signified by \n)
-#: ../raphodo/proximity.py:248
+#: ../raphodo/proximity.py:253
 #, python-format
 msgid ""
 "%(earlier_time)s -\n"
 "%(later_time)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:359
+#: ../raphodo/proximity.py:382
 #, python-format
 msgid "%(month)s  %(year)s"
 msgstr ""
 
 #. Translators: for example Nov 2015
-#: ../raphodo/proximity.py:833
+#: ../raphodo/proximity.py:987
 #, python-format
 msgid "%(month)s %(year)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:1344
+#: ../raphodo/proximity.py:1595
 msgid ""
 "The time elapsed between consecutive photos and videos that is used to build "
 "the Timeline"
@@ -2572,47 +3154,47 @@ msgstr ""
 #. Replace the very last character (after the d) with the correct
 #. localized value, keeping everything else. In other words, change
 #. only the m character.
-#: ../raphodo/proximity.py:1406
+#: ../raphodo/proximity.py:1652
 #, python-format
 msgid "%(minutes)dm"
 msgstr ""
 
 #. Translators: i.e. "1.5h", which is short for 1.5 hours.
 #. Replace the entire string with the correct localized value
-#: ../raphodo/proximity.py:1410
+#: ../raphodo/proximity.py:1656
 msgid "1.5h"
 msgstr ""
 
 #. Translators: e.g. "5h", which is short for 5 hours.
 #. Replace the very last character (after the d) with the correct localized value,
 #. keeping everything else. In other words, change only the h character.
-#: ../raphodo/proximity.py:1415
+#: ../raphodo/proximity.py:1661
 #, python-format
 msgid "%(hours)dh"
 msgstr ""
 
-#: ../raphodo/proximity.py:1461
+#: ../raphodo/proximity.py:1710
 msgid ""
 "The Timeline groups photos and videos based on how much time elapsed between "
 "consecutive shots. Use it to identify photos and videos taken at different "
 "periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/proximity.py:1464
+#: ../raphodo/proximity.py:1715
 msgid ""
 "Use the slider (below) to adjust the time elapsed between consecutive shots "
 "that is used to build the Timeline."
 msgstr ""
 
-#: ../raphodo/proximity.py:1466
+#: ../raphodo/proximity.py:1718
 msgid "Timeline build pending..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1467
+#: ../raphodo/proximity.py:1719
 msgid "Timeline is building..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1468
+#: ../raphodo/proximity.py:1721
 msgid ""
 "The Timeline needs to be rebuilt because the file modification time does not "
 "match the time a shot was taken for one or more shots.<br><br>The Timeline "
@@ -2624,61 +3206,61 @@ msgid ""
 "downloading, which is when the metadata is read."
 msgstr ""
 
-#: ../raphodo/rapid.py:485 ../raphodo/rapid.py:2461 ../raphodo/rapid.py:3728
-#: ../raphodo/rapid.py:3846 ../raphodo/rapid.py:3850 ../raphodo/rapid.py:3870
-#: ../raphodo/rapid.py:3874 ../raphodo/rapid.py:3998 ../raphodo/rapid.py:4007
-#: ../raphodo/rapid.py:4495 ../raphodo/rapid.py:4888 ../raphodo/rapid.py:5722
-#: ../raphodo/rememberthisdialog.py:97
+#: ../raphodo/rapid.py:493 ../raphodo/rapid.py:2555 ../raphodo/rapid.py:3934
+#: ../raphodo/rapid.py:4065 ../raphodo/rapid.py:4069 ../raphodo/rapid.py:4092
+#: ../raphodo/rapid.py:4096 ../raphodo/rapid.py:4226 ../raphodo/rapid.py:4237
+#: ../raphodo/rapid.py:4743 ../raphodo/rapid.py:5195 ../raphodo/rapid.py:5997
+#: ../raphodo/rememberthisdialog.py:99
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:3
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: ../raphodo/rapid.py:1100
+#: ../raphodo/rapid.py:1131
 msgid ""
 "<b>ExifTool has a problem</b><br><br> Rapid Photo Downloader uses ExifTool "
 "to get metadata from videos and photos. The program will run without it, but "
 "installing it is <b>highly</b> recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1110 ../raphodo/rapid.py:1130
+#: ../raphodo/rapid.py:1141 ../raphodo/rapid.py:1161
 msgid "Problem with libmediainfo"
 msgstr ""
 
-#: ../raphodo/rapid.py:1119
+#: ../raphodo/rapid.py:1150
 msgid ""
 "<b>The library libmediainfo appears to be missing</b><br><br> Rapid Photo "
 "Downloader uses libmediainfo to get the date and time a video was shot. The "
 "program will run  without it, but installing it is recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1417
+#: ../raphodo/rapid.py:1448
 msgid "Download failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1419
+#: ../raphodo/rapid.py:1450
 msgid ""
 "Sorry, the download of the new version of Rapid Photo Downloader failed."
 msgstr ""
 
-#: ../raphodo/rapid.py:1425
+#: ../raphodo/rapid.py:1457
 msgid ""
 "The new version was successfully downloaded. Do you want to close Rapid "
 "Photo Downloader and install it now?"
 msgstr ""
 
-#: ../raphodo/rapid.py:1428
+#: ../raphodo/rapid.py:1461
 msgid "Update Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:1432
+#: ../raphodo/rapid.py:1465
 msgid "Install"
 msgstr ""
 
-#: ../raphodo/rapid.py:1450
+#: ../raphodo/rapid.py:1483
 msgid "New version saved"
 msgstr ""
 
-#: ../raphodo/rapid.py:1451
+#: ../raphodo/rapid.py:1485
 #, python-format
 msgid ""
 "The tar file and installer script are saved at:\n"
@@ -2686,163 +3268,163 @@ msgid ""
 " %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:1468
+#: ../raphodo/rapid.py:1502
 msgid "Upgrade failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1469
+#: ../raphodo/rapid.py:1505
 msgid ""
 "Sorry, upgrading Rapid Photo Downloader failed because there was an error "
 "opening the installer."
 msgstr ""
 
-#: ../raphodo/rapid.py:1667 ../raphodo/rapid.py:2331
+#: ../raphodo/rapid.py:1709 ../raphodo/rapid.py:2425
 msgid "Download"
 msgstr ""
 
-#: ../raphodo/rapid.py:1671
+#: ../raphodo/rapid.py:1713
 msgid "&Refresh..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1675
+#: ../raphodo/rapid.py:1717
 msgid "&Preferences"
 msgstr ""
 
-#: ../raphodo/rapid.py:1679
+#: ../raphodo/rapid.py:1721
 msgid "&Quit"
 msgstr ""
 
-#: ../raphodo/rapid.py:1683
+#: ../raphodo/rapid.py:1725
 msgid "Error &Reports"
 msgstr ""
 
-#: ../raphodo/rapid.py:1687
+#: ../raphodo/rapid.py:1729
 msgid "Clear Completed Downloads"
 msgstr ""
 
-#: ../raphodo/rapid.py:1691
+#: ../raphodo/rapid.py:1733
 msgid "Get Help Online..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1695
+#: ../raphodo/rapid.py:1737
 msgid "&Tip of the Day..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1699
+#: ../raphodo/rapid.py:1741
 msgid "Report a Problem..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1703
+#: ../raphodo/rapid.py:1745
 msgid "Make a Donation..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1707
+#: ../raphodo/rapid.py:1749
 msgid "Translate this Application..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1711
+#: ../raphodo/rapid.py:1753
 msgid "&About..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1715
+#: ../raphodo/rapid.py:1757
 msgid "Check for Updates..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1797
+#: ../raphodo/rapid.py:1840
 msgid "Timeline"
 msgstr ""
 
-#: ../raphodo/rapid.py:1807
+#: ../raphodo/rapid.py:1850
 msgid "Destination"
 msgstr ""
 
-#: ../raphodo/rapid.py:1808
+#: ../raphodo/rapid.py:1851
 msgid "Rename"
 msgstr ""
 
-#: ../raphodo/rapid.py:1810
+#: ../raphodo/rapid.py:1853
 msgid "Back Up"
 msgstr ""
 
 #. Devices Header and View
-#: ../raphodo/rapid.py:1926
+#: ../raphodo/rapid.py:1977
 msgid ""
 "Turn on or off the use of devices attached to this computer as download "
 "sources"
 msgstr ""
 
 #. This Computer Header and View
-#: ../raphodo/rapid.py:1940
+#: ../raphodo/rapid.py:1994
 msgid ""
 "Turn on or off the use of a folder on this computer as a download source"
 msgstr ""
 
-#: ../raphodo/rapid.py:1941
+#: ../raphodo/rapid.py:1996
 msgid "This Computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:1952
+#: ../raphodo/rapid.py:2009
 msgid "Select a source folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:1975
+#: ../raphodo/rapid.py:2038
 msgid "Projected Storage Use"
 msgstr ""
 
-#: ../raphodo/rapid.py:1989 ../raphodo/rapid.py:1997
+#: ../raphodo/rapid.py:2056 ../raphodo/rapid.py:2068
 msgid "Select a destination folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:2045
+#: ../raphodo/rapid.py:2117
 msgid "All"
 msgstr ""
 
-#: ../raphodo/rapid.py:2046
+#: ../raphodo/rapid.py:2118
 msgid "New"
 msgstr ""
 
-#: ../raphodo/rapid.py:2048
+#: ../raphodo/rapid.py:2120
 msgid "Show:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2051
+#: ../raphodo/rapid.py:2123
 msgid "Modification Time"
 msgstr ""
 
-#: ../raphodo/rapid.py:2052
+#: ../raphodo/rapid.py:2124
 msgid "Checked State"
 msgstr ""
 
-#: ../raphodo/rapid.py:2055
+#: ../raphodo/rapid.py:2127
 msgid "File Type"
 msgstr ""
 
-#: ../raphodo/rapid.py:2056
+#: ../raphodo/rapid.py:2128
 msgid "Device"
 msgstr "Uređaj"
 
-#: ../raphodo/rapid.py:2058
+#: ../raphodo/rapid.py:2130
 msgid "Sort:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2069
+#: ../raphodo/rapid.py:2141
 msgid "Select All:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2311
+#: ../raphodo/rapid.py:2405
 #, python-format
 msgid "Download %(files)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2327
+#: ../raphodo/rapid.py:2421
 msgid "Resume Download"
 msgstr ""
 
-#: ../raphodo/rapid.py:2329
+#: ../raphodo/rapid.py:2423
 msgid "Pause"
 msgstr ""
 
-#: ../raphodo/rapid.py:2417
+#: ../raphodo/rapid.py:2511
 #, python-brace-format
 msgid ""
 "Please report the problem at <a href=\"{website}\">{website}</a>.<br><br>\n"
@@ -2851,11 +3433,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/rapid.py:2431
+#: ../raphodo/rapid.py:2525
 msgid "Thank you for reporting a problem in Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:2529
+#: ../raphodo/rapid.py:2624
 #, python-format
 msgid ""
 "<b>Changing This Computer source path</b><br><br>Do you really want to "
@@ -2864,30 +3446,29 @@ msgid ""
 "from This Computer will be cancelled."
 msgstr ""
 
-#: ../raphodo/rapid.py:2595
+#: ../raphodo/rapid.py:2694
 msgid "You cannot change the download destination while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:2604
+#: ../raphodo/rapid.py:2704
 #, python-format
 msgid ""
 "<b>Confirm Download Destination</b><br><br>Are you sure you want to set the "
 "%(file_type)s download destination to %(path)s?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2682
+#: ../raphodo/rapid.py:2785
 msgid ""
+"\n"
 "<b>Downloading all files</b><br><br>\n"
-"                    A download always includes all files that are checked "
-"for download,\n"
-"                    including those that are not currently displayed because "
-"the Timeline\n"
-"                    is being used or because only new files are being shown."
-"<br><br>\n"
-"                    Do you want to proceed with the download?"
+"A download always includes all files that are checked for download,\n"
+"including those that are not currently displayed because the Timeline\n"
+"is being used or because only new files are being shown.<br><br>\n"
+"Do you want to proceed with the download?\n"
+"                        "
 msgstr ""
 
-#: ../raphodo/rapid.py:2820
+#: ../raphodo/rapid.py:2937
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -2895,206 +3476,200 @@ msgid ""
 "%(folder2)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2824
+#: ../raphodo/rapid.py:2940
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
 "%s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2827
+#: ../raphodo/rapid.py:2943
 msgid "Download Failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:2828
+#: ../raphodo/rapid.py:2944
 msgid "The download cannot proceed."
 msgstr ""
 
-#: ../raphodo/rapid.py:2842
+#: ../raphodo/rapid.py:2962
 msgid ""
 "Photos and videos will not be backed up because there is nowhere to back "
 "them up. Do you still want to start the download?"
 msgstr ""
 
-#. Translators: filetype will be replaced with 'photos' or 'videos'
-#: ../raphodo/rapid.py:2847 ../raphodo/rapid.py:2854
+#: ../raphodo/rapid.py:2969 ../raphodo/rapid.py:2979
 #, python-format
 msgid ""
 "No backup device exists for backing up %(filetype)s. Do you still want to "
 "start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2848 ../raphodo/rpdfile.py:228
+#: ../raphodo/rapid.py:2971 ../raphodo/rpdfile.py:228
 msgid "photos"
 msgstr "fotografije"
 
-#: ../raphodo/rapid.py:2855 ../raphodo/rpdfile.py:223
+#: ../raphodo/rapid.py:2981 ../raphodo/rpdfile.py:223
 msgid "videos"
 msgstr "video snimke"
 
-#: ../raphodo/rapid.py:2861
+#: ../raphodo/rapid.py:2989
 msgid ""
 "<b>The photo and video backup destinations do not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2869 ../raphodo/rapid.py:2876
+#: ../raphodo/rapid.py:2999 ../raphodo/rapid.py:3008
 #, python-format
 msgid ""
 "<b>The %(filetype)s backup destination does not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2871 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:818
+#: ../raphodo/rapid.py:3001 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:843
 msgid "photo"
 msgstr "fotografija"
 
-#: ../raphodo/rapid.py:2878 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:858
+#: ../raphodo/rapid.py:3010 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:883
 msgid "video"
 msgstr "video"
 
-#: ../raphodo/rapid.py:2886
+#: ../raphodo/rapid.py:3018
 msgid "Backup problem"
 msgstr ""
 
-#. Translators - in the middle is a unicode em dash - please retain it
-#. This string is displayed in the status bar when the download is running
-#: ../raphodo/rapid.py:3571
+#: ../raphodo/rapid.py:3756
 #, python-format
 msgid "%(downloading_from)s — %(time_left)s left (%(speed)s)"
 msgstr ""
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3640
+#: ../raphodo/rapid.py:3828
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr ""
 
-#. Translators: e.g. 2 videos failed to download
-#: ../raphodo/rapid.py:3645
+#: ../raphodo/rapid.py:3836
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr ""
 
-#: ../raphodo/rapid.py:3650 ../raphodo/rapid.py:3723
+#: ../raphodo/rapid.py:3842 ../raphodo/rapid.py:3927
 msgid "warnings"
 msgstr "upozorenja"
 
-#: ../raphodo/rapid.py:3679
+#: ../raphodo/rapid.py:3873
 msgid "All downloads complete"
 msgstr "Sva preuzimanja su završena"
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3686 ../raphodo/rapid.py:3695 ../raphodo/rapid.py:3704
-#: ../raphodo/rapid.py:3713 ../raphodo/rapid.py:3721
+#: ../raphodo/rapid.py:3881 ../raphodo/rapid.py:3892 ../raphodo/rapid.py:3903
+#: ../raphodo/rapid.py:3914 ../raphodo/rapid.py:3924
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3688 ../raphodo/rapid.py:3706
+#: ../raphodo/rapid.py:3884 ../raphodo/rapid.py:3906
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr ""
 
-#: ../raphodo/rapid.py:3697 ../raphodo/rapid.py:3715
+#: ../raphodo/rapid.py:3895 ../raphodo/rapid.py:3917
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr ""
 
-#: ../raphodo/rapid.py:3742
+#: ../raphodo/rapid.py:3950
 msgid "1 failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:3744
+#: ../raphodo/rapid.py:3952
 #, python-format
 msgid "%d failures"
 msgstr ""
 
-#: ../raphodo/rapid.py:3749
+#: ../raphodo/rapid.py:3957
 msgid "1 warning"
 msgstr ""
 
-#: ../raphodo/rapid.py:3751
+#: ../raphodo/rapid.py:3959
 #, python-format
 msgid "%d warnings"
 msgstr ""
 
-#: ../raphodo/rapid.py:3771
+#: ../raphodo/rapid.py:3981
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3774
+#: ../raphodo/rapid.py:3985
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3779
+#: ../raphodo/rapid.py:3989
 #, python-format
 msgid "No files downloaded — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3781
+#: ../raphodo/rapid.py:3991
 msgid "No files downloaded"
 msgstr ""
 
-#: ../raphodo/rapid.py:3805
+#: ../raphodo/rapid.py:4021
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3809
+#: ../raphodo/rapid.py:4026
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3812
+#: ../raphodo/rapid.py:4031
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3820
+#: ../raphodo/rapid.py:4039
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3833
+#: ../raphodo/rapid.py:4052
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3837
+#: ../raphodo/rapid.py:4056
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3841
+#: ../raphodo/rapid.py:4060
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices"
 msgstr ""
 
-#: ../raphodo/rapid.py:3867
+#: ../raphodo/rapid.py:4087
 msgid "The Destination subfolders and Timeline have been rebuilt"
 msgstr ""
 
-#: ../raphodo/rapid.py:3922
+#: ../raphodo/rapid.py:4144
 msgid "Program preferences are invalid"
 msgstr ""
 
-#: ../raphodo/rapid.py:3999
+#: ../raphodo/rapid.py:4228
 #, python-format
 msgid ""
 "<b>All files on the %(camera)s are inaccessible</b>.<br><br>It may be locked "
@@ -3104,179 +3679,205 @@ msgid ""
 "ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4008
+#: ../raphodo/rapid.py:4239
 #, python-format
 msgid ""
-"<b>The %(camera)s appears to be in use by another application.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again.<br><br>Alternatively, you can ignore this "
-"device."
+"<b>The %(camera)s appears to be in use by another "
+"application.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again.<br><br>Alternatively, you "
+"can ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4019
+#: ../raphodo/rapid.py:4250
 msgid "&Try Again"
 msgstr ""
 
-#: ../raphodo/rapid.py:4020
+#: ../raphodo/rapid.py:4251
 msgid "&Ignore This Device"
 msgstr ""
 
-#: ../raphodo/rapid.py:4086
+#: ../raphodo/rapid.py:4323
 #, python-format
 msgid "Sorry, an unexpected problem occurred while scanning %s."
 msgstr ""
 
-#: ../raphodo/rapid.py:4087
+#: ../raphodo/rapid.py:4324
 msgid "Unfortunately you cannot download from this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4091
+#: ../raphodo/rapid.py:4328
 msgid ""
 "A possible workaround for the problem might be downloading from the camera's "
 "memory card using a card reader."
 msgstr ""
 
-#: ../raphodo/rapid.py:4096
+#: ../raphodo/rapid.py:4333
 msgid "Device scan failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:4472
+#: ../raphodo/rapid.py:4720
 #, python-format
 msgid ""
-"<b>The %(camera)s cannot be scanned because it cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again."
+"<b>The %(camera)s cannot be scanned because it cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again."
 msgstr ""
 
-#: ../raphodo/rapid.py:4496
+#: ../raphodo/rapid.py:4745
 #, python-format
 msgid ""
-"<b>The download cannot start because the %(camera)s cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again, and choose which files you want to "
-"download from it."
+"<b>The download cannot start because the %(camera)s cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again, and choose which files "
+"you want to download from it."
+msgstr ""
+
+#: ../raphodo/rapid.py:4842
+msgid "Completed Downloads Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4844
+#, python-format
+msgid "%s whose download have completed are displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4846
+msgid "Do you want to clear the completed downloads?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4848
+msgid "Completed Download Present"
 msgstr ""
 
-#: ../raphodo/rapid.py:4635
+#: ../raphodo/rapid.py:4850
+#, python-format
+msgid "%s whose download has completed is displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4852
+msgid "Do you want to clear the completed download?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4933
 #, python-format
 msgid ""
 "Do you want to download photos and videos from the device <i>%(device)s</i>?"
 msgstr ""
 
-#: ../raphodo/rapid.py:4877
+#: ../raphodo/rapid.py:5183
 #, python-format
 msgid "<b>Do you want to ignore the %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4879
+#: ../raphodo/rapid.py:5186
 msgid ""
 "All cameras, phones and tablets with the same model name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:4883
+#: ../raphodo/rapid.py:5190
 #, python-format
 msgid ""
 "<b>Do you want to ignore the device %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4885
+#: ../raphodo/rapid.py:5192
 msgid "Any device with the same name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:5178
+#: ../raphodo/rapid.py:5492
 #, python-format
 msgid "Downloading from %(location)s on This Computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5180
+#: ../raphodo/rapid.py:5496
 msgid ""
 "Do you really want to download from here?<br><br>On some systems, scanning "
 "this location can take a very long time."
 msgstr ""
 
-#: ../raphodo/rapid.py:5224
+#: ../raphodo/rapid.py:5537
 #, python-format
 msgid "Generating thumbnails for %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5227
+#: ../raphodo/rapid.py:5540
 #, python-format
 msgid "Scanning %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5237
+#: ../raphodo/rapid.py:5551
 #, python-format
 msgid ""
 "%(number)s of %(available files)s checked for download (%(hidden)s hidden)"
 msgstr ""
 
-#: ../raphodo/rapid.py:5243
+#: ../raphodo/rapid.py:5559
 #, python-format
 msgid "%(number)s of %(available files)s checked for download"
 msgstr ""
 
-#: ../raphodo/rapid.py:5494
+#: ../raphodo/rapid.py:5764
 msgid "Display program information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5496
+#: ../raphodo/rapid.py:5766
 msgid "Display debugging information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5499
+#: ../raphodo/rapid.py:5769
 msgid "List photo and video file extensions the program recognizes and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5502
+#: ../raphodo/rapid.py:5772
 msgid "Turn on or off the the renaming of photos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5504
+#: ../raphodo/rapid.py:5774
 msgid "turn on or off the the renaming of videos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5506
+#: ../raphodo/rapid.py:5776
 msgid ""
 "Turn on or off the automatic detection of devices from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5510
+#: ../raphodo/rapid.py:5780
 msgid "Turn on or off downloading from this computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5512 ../raphodo/rapid.py:5515 ../raphodo/rapid.py:5518
-#: ../raphodo/rapid.py:5539 ../raphodo/rapid.py:5543
+#: ../raphodo/rapid.py:5782 ../raphodo/rapid.py:5785 ../raphodo/rapid.py:5788
+#: ../raphodo/rapid.py:5809 ../raphodo/rapid.py:5813
 msgid "PATH"
 msgstr ""
 
-#: ../raphodo/rapid.py:5513
+#: ../raphodo/rapid.py:5783
 msgid "The PATH on this computer from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5516
+#: ../raphodo/rapid.py:5786
 msgid "The PATH where photos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5519
+#: ../raphodo/rapid.py:5789
 msgid "The PATH where videos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5521
+#: ../raphodo/rapid.py:5791
 msgid "Turn on or off the backing up of photos and videos while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:5525
+#: ../raphodo/rapid.py:5795
 msgid "Turn on or off the automatic detection of backup devices."
 msgstr ""
 
-#: ../raphodo/rapid.py:5527 ../raphodo/rapid.py:5533
+#: ../raphodo/rapid.py:5797 ../raphodo/rapid.py:5803
 msgid "FOLDER"
 msgstr ""
 
-#: ../raphodo/rapid.py:5528
+#: ../raphodo/rapid.py:5798
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected photo "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3284,7 +3885,7 @@ msgid ""
 "photos up to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5534
+#: ../raphodo/rapid.py:5804
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected video "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3292,115 +3893,124 @@ msgid ""
 "up videos to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5540
+#: ../raphodo/rapid.py:5810
 msgid ""
 "The PATH where photos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5544
+#: ../raphodo/rapid.py:5814
 msgid ""
 "The PATH where videos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5547
+#: ../raphodo/rapid.py:5817
 #, python-format
 msgid "Ignore photos with the following extensions: %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5551
-msgid "Turn on or off starting downloads as soon as the program itself starts."
+#: ../raphodo/rapid.py:5821
+msgid ""
+"Turn on or off starting downloads as soon as the program itself starts."
 msgstr ""
 
-#: ../raphodo/rapid.py:5554
+#: ../raphodo/rapid.py:5824
 msgid "Turn on or off starting downloads as soon as a device is inserted."
 msgstr ""
 
-#: ../raphodo/rapid.py:5557
+#: ../raphodo/rapid.py:5827
 msgid ""
 "Turn on or off use of the Rapid Photo Downloader Thumbnail Cache. Turning it "
 "off does not delete existing cache contents."
 msgstr ""
 
-#: ../raphodo/rapid.py:5561
+#: ../raphodo/rapid.py:5831
 msgid ""
 "Delete all thumbnails in the Rapid Photo Downloader Thumbnail Cache, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5565
+#: ../raphodo/rapid.py:5835
 msgid "Forget which files have been previously downloaded, and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5568
+#: ../raphodo/rapid.py:5838
 msgid ""
 "Import preferences from an old program version and exit. Requires the "
 "command line program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5571
+#: ../raphodo/rapid.py:5841
 msgid ""
 "Reset all program settings to their default values, delete all thumbnails in "
 "the Thumbnail cache, forget which files have been previously downloaded, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5575
+#: ../raphodo/rapid.py:5845
 msgid "Include gphoto2 debugging information in log files."
 msgstr ""
 
-#: ../raphodo/rapid.py:5579
+#: ../raphodo/rapid.py:5849
 msgid "Print information to the terminal about attached cameras and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5640
+#: ../raphodo/rapid.py:5911
 msgid ""
 "To import preferences from the old version of Rapid Photo Downloader, you "
 "must install the program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5649
+#: ../raphodo/rapid.py:5920
 msgid "No prior program preferences detected: exiting"
 msgstr ""
 
-#: ../raphodo/rapid.py:5652
+#: ../raphodo/rapid.py:5923
 #, python-format
 msgid "Importing preferences from Rapid Photo Downloader %(version)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5714
+#: ../raphodo/rapid.py:5989
 #, python-format
-msgid "Do you want to copy the stored sequence number, which has the value %d?"
+msgid ""
+"Do you want to copy the stored sequence number, which has the value %d?"
 msgstr ""
 
-#: ../raphodo/rapid.py:5726
+#: ../raphodo/rapid.py:6000
 msgid "Program aborting."
 msgstr ""
 
-#: ../raphodo/rapid.py:5736
+#: ../raphodo/rapid.py:6010
 msgid "Never run this program as the sudo / root user."
 msgstr ""
 
-#: ../raphodo/rapid.py:5740
+#: ../raphodo/rapid.py:6014
 msgid "You must install ExifTool to run Rapid Photo Downloader."
 msgstr ""
 
-#: ../raphodo/rapid.py:5794
+#: ../raphodo/rapid.py:6026
+msgid ""
+"Rapid Photo Downloader is installed in multiple locations.\n"
+"\n"
+"Uninstall all copies except the version you want to run."
+msgstr ""
+
+#: ../raphodo/rapid.py:6083
 msgid ""
 "When specifying a path on the command line, do not also specify an\n"
 "option for device auto detection or a path on \"This Computer\"."
 msgstr ""
 
-#: ../raphodo/rapid.py:5950
+#: ../raphodo/rapid.py:6243
 msgid "All settings and caches have been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5958
+#: ../raphodo/rapid.py:6251
 msgid "Thumbnail Cache has been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5964
+#: ../raphodo/rapid.py:6257
 msgid "Remembered files have been forgotten"
 msgstr ""
 
@@ -3416,15 +4026,15 @@ msgstr ""
 msgid "&Don't warn me again about missing or broken program libraries"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:546
+#: ../raphodo/renameandmovefile.py:554
 msgid "subfolder and filename"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:548
+#: ../raphodo/renameandmovefile.py:556
 msgid "filename"
 msgstr "ime datoteke"
 
-#: ../raphodo/renameandmovefile.py:550
+#: ../raphodo/renameandmovefile.py:558
 msgid "subfolder"
 msgstr ""
 
@@ -3504,160 +4114,237 @@ msgstr ""
 msgid "photos or videos"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:306
+#: ../raphodo/rpdfile.py:315
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:318
+#. translators: natural language expression signifying a single video
+#: ../raphodo/rpdfile.py:337
+msgid "a video"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:339
 msgid "1 Video"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:323
+#. translators: natural language expression signifying a single photo
+#: ../raphodo/rpdfile.py:346
+msgid "a photo"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:348
 msgid "1 Photo"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:803
+#: ../raphodo/rpdfile.py:828
 #, python-format
 msgid "%(path)s on %(camera)s"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:819
+#: ../raphodo/rpdfile.py:844
 msgid "Photo"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:859
+#: ../raphodo/rpdfile.py:884
 msgid "Video"
 msgstr ""
 
-#: ../raphodo/storage.py:138
+#: ../raphodo/storage.py:141
 msgid "File system root"
 msgstr ""
 
 #. translators: the name of the Pictures folder
-#: ../raphodo/storage.py:433
+#: ../raphodo/storage.py:437
 msgid "Pictures"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:426
+#: ../raphodo/thumbnaildisplay.py:432
 #, python-format
 msgid "Taken on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:431
+#: ../raphodo/thumbnaildisplay.py:439
 #, python-format
 msgid "Modified on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:437 ../raphodo/thumbnaildisplay.py:466
+#: ../raphodo/thumbnaildisplay.py:447 ../raphodo/thumbnaildisplay.py:481
 #, python-format
 msgid "%(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:451
+#: ../raphodo/thumbnaildisplay.py:464
 #, python-format
 msgid "Memory cards: %s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:457
+#: ../raphodo/thumbnaildisplay.py:468
+#, python-format
+msgid "Memory card: %s"
+msgstr ""
+
+#: ../raphodo/thumbnaildisplay.py:473
 msgid "Downloaded as:"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:472
+#: ../raphodo/thumbnaildisplay.py:489
 #, python-format
 msgid "<br><br>Previous download:<br>%(filename)s<br>%(path)s<br>%(date)s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:1603
+#: ../raphodo/thumbnaildisplay.py:1645
 msgid "Copy Path"
 msgstr ""
 
+#. Translators: these values are file size suffixes like B representing bytes, KB representing
+#. kilobytes, etc.
+#: ../raphodo/utilities.py:170
+msgid "B"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "KB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "MB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "GB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "TB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "PB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "EB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "ZB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "YB"
+msgstr ""
+
 #. two things in a list e.g. "device1 and device2"
-#: ../raphodo/utilities.py:391
+#: ../raphodo/utilities.py:394
 #, python-format
 msgid "%(first_item)s and %(last_item)s"
 msgstr ""
 
-#: ../raphodo/utilities.py:464
+#: ../raphodo/utilities.py:468
 msgid "one"
 msgstr ""
 
-#: ../raphodo/utilities.py:465
+#: ../raphodo/utilities.py:469
 msgid "two"
 msgstr ""
 
-#: ../raphodo/utilities.py:466
+#: ../raphodo/utilities.py:470
 msgid "three"
 msgstr ""
 
-#: ../raphodo/utilities.py:467
+#: ../raphodo/utilities.py:471
 msgid "four"
 msgstr ""
 
-#: ../raphodo/utilities.py:468
+#: ../raphodo/utilities.py:472
 msgid "five"
 msgstr ""
 
-#: ../raphodo/utilities.py:469
+#: ../raphodo/utilities.py:473
 msgid "six"
 msgstr ""
 
-#: ../raphodo/utilities.py:470
+#: ../raphodo/utilities.py:474
 msgid "seven"
 msgstr ""
 
-#: ../raphodo/utilities.py:471
+#: ../raphodo/utilities.py:475
 msgid "eight"
 msgstr ""
 
-#: ../raphodo/utilities.py:472
+#: ../raphodo/utilities.py:476
 msgid "nine"
 msgstr ""
 
-#: ../raphodo/utilities.py:473
+#: ../raphodo/utilities.py:477
 msgid "ten"
 msgstr ""
 
-#: ../raphodo/utilities.py:474
+#: ../raphodo/utilities.py:478
 msgid "eleven"
 msgstr ""
 
-#: ../raphodo/utilities.py:475
+#: ../raphodo/utilities.py:479
 msgid "twelve"
 msgstr ""
 
-#: ../raphodo/utilities.py:476
+#: ../raphodo/utilities.py:480
 msgid "thirteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:477
+#: ../raphodo/utilities.py:481
 msgid "fourteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:478
+#: ../raphodo/utilities.py:482
 msgid "fifteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:479
+#: ../raphodo/utilities.py:483
 msgid "sixteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:480
+#: ../raphodo/utilities.py:484
 msgid "seventeen"
 msgstr ""
 
-#: ../raphodo/utilities.py:481
+#: ../raphodo/utilities.py:485
 msgid "eighteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:482
+#: ../raphodo/utilities.py:486
 msgid "ninenteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:483
+#: ../raphodo/utilities.py:487
 msgid "twenty"
 msgstr ""
 
+#: ../raphodo/viewutils.py:240
+msgid "&OK"
+msgstr ""
+
+#: ../raphodo/viewutils.py:243
+msgid "&Save"
+msgstr ""
+
+#: ../raphodo/viewutils.py:244
+msgid "&Help"
+msgstr ""
+
+#: ../raphodo/viewutils.py:245
+msgid "Restore Defaults"
+msgstr ""
+
+#: ../raphodo/viewutils.py:246
+msgid "&Yes"
+msgstr ""
+
+#: ../raphodo/viewutils.py:247
+msgid "&No"
+msgstr ""
+
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:1
 msgid ""
 "Rapid Photo Downloader imports photos and videos from cameras, phones, "
@@ -3711,8 +4398,8 @@ msgstr ""
 #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:5
 msgid ""
-"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;"
-"memory;card;"
+"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;memory"
+";card;"
 msgstr ""
 
 #: ../data/kde/net.damonlynch.rapid-photo-downloader.desktop.in.h:1
@@ -3818,6 +4505,7 @@ msgstr ""
 #~ msgid "scanning..."
 #~ msgstr "pretražujem..."
 
+#, python-format
 #~ msgid "<i>Example: %s</i>"
 #~ msgstr "<i>Primjer: %s</i>"
 
@@ -3827,6 +4515,7 @@ msgstr ""
 #~ msgid "Download cannot proceed"
 #~ msgstr "Preuzimanje se ne može nastaviti"
 
+#, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
 #~ "Destination: %(destination)s"
diff --git a/po/hu.po b/po/hu.po
index b7c9043..9e061ac 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -2,305 +2,804 @@
 # 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.
+# csola48 <csola48@gmail.com>, 2017.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: rapid\n"
+"Project-Id-Version: Rapid Photo Downloader 0.9.2\n"
 "Report-Msgid-Bugs-To: damonlynch@gmail.com\n"
-"POT-Creation-Date: 2017-07-08 19:16-0500\n"
-"PO-Revision-Date: 2017-07-04 11:06+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
-"Language-Team: Hungarian <hu@li.org>\n"
-"Language: hu\n"
+"POT-Creation-Date: 2017-09-12 17:01-0400\n"
+"PO-Revision-Date: 2017-09-13 18:46+0000\n"
+"Last-Translator: csola48 <Unknown>\n"
+"Language-Team: magyar <csola48@gmail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-07-05 23:04+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-09-26 22:04+0000\n"
+"X-Generator: Launchpad (build 18463)\n"
+"Language: hu\n"
 
-#. type: QPushButton
-#: ../raphodo/aboutdialog.py:217
-msgid "Credits"
+#: ../install.py:65
+msgid "Rapid Photo Downloader installer"
+msgstr "Rapid Photo Downloader telepítő"
+
+#: ../install.py:66
+msgid "Download and install latest version of Rapid Photo Downloader."
 msgstr ""
+"A Rapid Photo Downloader legfrissebb verziójának letöltése és telepítése"
 
-#: ../raphodo/backuppanel.py:239
-msgid "Backups are not configured"
+#: ../install.py:236 ../install.py:1732
+msgid "Installer not found:"
+msgstr "Telepítő nem található:"
+
+#. Translators: do not translate the term tar.gz
+#: ../install.py:240 ../install.py:1736
+msgid "Installer not in tar.gz format:"
+msgstr "A telepítő nem tar.gz típusú:"
+
+#: ../install.py:465
+msgid ""
+"Incorrect folder ownership detected. Changing ownership of and resetting "
+"permissions for"
+msgstr ""
+"Nem megfelelő a mappa tulajdonjoga. Változtasd meg tulajdonost és állítsd be "
+"a jogosultságot:"
+
+#: ../install.py:540
+msgid "The following command will be run:"
+msgstr "A következő parancs fog futni:"
+
+#: ../install.py:543 ../install.py:1479 ../install.py:1484
+msgid "sudo may prompt you for the sudo password."
+msgstr "A sudo parancs lehet, hogy bekéri a sudohoz a jelszót"
+
+#: ../install.py:547
+msgid "Would you like to run the command now?"
+msgstr "Szeretné most futtatni a pancsot?"
+
+#: ../install.py:549
+msgid "Answer is not yes, exiting."
+msgstr "Kilépés, mert nincs \"igen\" válasz."
+
+#: ../install.py:559 ../install.py:751 ../install.py:966
+msgid "Command failed"
+msgstr "Sikertelen parancs"
+
+#: ../install.py:561 ../install.py:752 ../install.py:967
+msgid "Exiting"
+msgstr "Kilépés"
+
+#: ../install.py:582
+msgid "The Universe repository must be enabled."
+msgstr "Engedélyezve kell lennie az Universe tárolónak"
+
+#: ../install.py:606
+msgid ""
+"Do you want to to uninstall the previous version of Rapid Photo Downloader:"
+msgstr "Akarja az előző verziójú  Rapid Photo Downloader eltávolítását:"
+
+#: ../install.py:715 ../install.py:740
+msgid ""
+"Querying package system to see if an older version of Rapid Photo Downloader "
+"is installed (this may take a while)..."
+msgstr ""
+"A csomagkezelő lekérdezése, van-e régebbi verziójú Rapid Photo Downloader "
+"telepítve (eltarthat egy ideig)..."
+
+#: ../install.py:726
+msgid ""
+"Unable to query package system. Please check your Internet connection and "
+"try again"
+msgstr ""
+"A csomagkezelőt nem tudtam lekérdezni. Kérem ellenőrizze az Internet "
+"kapcsolatodat és próbálja újra"
+
+#: ../install.py:756
+msgid "Checking if previous version installed with pip..."
+msgstr "Ellenőrizze, hogy az előző verzió pip-el lett-e telepítve ..."
+
+#: ../install.py:850
+msgid "The following package is unknown on your system: {}\n"
+msgstr "A következő csomagok ismeretlenek a rendszerében: {}\n"
+
+#: ../install.py:857 ../install.py:929 ../install.py:974
+msgid ""
+"To continue, some packages required to run the application will be installed."
+msgstr ""
+"Az alkalmazás telepítésének folytatáshoz további csomagok telepítése "
+"szükséges."
+
+#: ../install.py:886
+msgid "Querying installed and available packages (this may take a while)"
+msgstr ""
+"Telepített és rendelkezésre álló csomagok lekérdezése (ez eltarthat egy "
+"ideig)"
+
+#: ../install.py:958
+msgid ""
+"Querying zypper to see if any required packages are already installed (this "
+"may take a while)... "
+msgstr ""
+"A csomagkezelő lekérdezi, hogy a szükséges csomagok telepítve vannak-e (ez "
+"eltarthat egy ideig) "
+
+#: ../install.py:1004
+msgid "Query to confirm action at each step."
+msgstr "Lépésenkénti megerősítés."
+
+#: ../install.py:1011
+msgid ""
+"When downloading the latest version, install the development version if it "
+"is newer than the stable version."
+msgstr ""
+"A legfrissebb verzió letöltésekor telepítse a fejlesztői verziót, ha az "
+"újabb, mint a stabil változat."
+
+#: ../install.py:1020
+msgid ""
+"Optional tar.gz Rapid Photo Downloader installer archive. If not specified, "
+"the latest version is downloaded from the Internet."
+msgstr ""
+"Opcionális tar.gz Rapid Photo Downloader telepítő archívuma. Ha nincs "
+"megadva, a legfrissebb verzió letöltődik az internetről."
+
+#: ../install.py:1043
+msgid ""
+"Do not run the installer in the tar.gz Rapid Photo Downloader installer "
+"archive if it is newer than this version ({}). The default is to run "
+"whichever installer is newer."
+msgstr ""
+"Ne futtassa a telepítőt a tar.gz Rapid Photo Downloader telepítő "
+"archívumában, ha az újabb, mint ez a verzió  ({}). Az alapértelmezés az, "
+"hogy a legújabb telepítőt futtassa."
+
+#: ../install.py:1050
+msgid ""
+"Uninstall Rapid Photo Downloader that was installed with pip, keeping its "
+"dependencies."
+msgstr ""
+"Távolítsa el a Rapid Photo Downloader-t, amelyet pip-el telepített és tartja "
+"a függőségét."
+
+#: ../install.py:1054
+msgid ""
+"Uninstall the dependencies installed by pip during Rapid Photo Downloader's "
+"installation, and Rapid Photo Downloader itself, then exit."
+msgstr ""
+"Távolítsa el a pip segítségével telepített függőségeket a Rapid Photo "
+"Downloader telepítésénél és magát a Rapid Photo Downloader programot, majd "
+"lépjen ki."
+
+#: ../install.py:1059
+msgid ""
+"Note: this will not uninstall any version of Rapid Photo Downloader "
+"installed by your Linux distribution's package manager."
+msgstr ""
+"Megjegyzés: Ez nem fogja eltávolítani a Linux disztribúció csomagkezelője "
+"által telepített Rapid Photo Downloader-t."
+
+#: ../install.py:1066
+msgid ""
+"Dependencies will only be removed if they are not required by other programs."
+msgstr ""
+"A függőségek csak akkor távolíthatóak el, ha más program nem igényli."
+
+#: ../install.py:1072
+msgid ""
+"Note: this option will remove the dependencies regardless of whether they "
+"are required by another program pip has installed. Upgrade to pip 9.0 or "
+"above if you want to avoid this behavior. You can do so using the command "
+"'python3 -m pip install pip -U --user'. Also note that any version of Rapid "
+"Photo Downloader installed by your Linux distribution's package manager will "
+"not be uninstalled."
+msgstr ""
+"Megjegyzés: ez az opció eltávolítja a függőséget, függetlenül attól, hogy "
+"egy másik program pip telepítve van-e. Frissítse a pip-et  9.0 vagy újabb "
+"verzióra, ha el akarja kerülni ezt a viselkedést. Ezt a \"python3 -m pip "
+"install pip -U - felhasználó\" paranccsal teheti meg. Ezenkívül vegye "
+"figyelembe, hogy a Linux disztribúció csomagkezelője által telepített Rapid "
+"Photo Downloader bármely verzióját nem távolítják el."
+
+#: ../install.py:1122
+msgid "Failed to download versions file"
+msgstr "Nem sikerült letölteni a verziók fájlját"
+
+#: ../install.py:1126
+msgid "Got error code {} while accessing versions file"
+msgstr "A verziófájl elérése közben kapott hibakód {}"
+
+#: ../install.py:1234
+msgid ""
+"Sorry, could not locate installer. Please check your Internet connection and "
+"verify if you can reach https://www.damonlynch.net\n"
+"\n"
+"Exiting.\n"
+msgstr ""
+"Sajnáljuk, a telepítő nem található. Ellenőrizze az internetkapcsolatot és "
+"ellenőrizze, hogy elérheti-e a\n"
+"https://www.damonlynch.net címet\n"
+"\n"
+"Kilépés\n"
+
+#: ../install.py:1408
+msgid "Installing application requirements..."
+msgstr "Az alkalmazáshoz szükséges követelmények telepítése ..."
+
+#: ../install.py:1424
+msgid "Received error code"
+msgstr "Fogadott hibakód"
+
+#: ../install.py:1425
+msgid "Failed to install application requirements: exiting"
+msgstr ""
+"Sikertelen az alkalmazáshoz szükséges követelmények telepítése: kilépés"
+
+#: ../install.py:1428
+msgid "Installing application..."
+msgstr "Alkalmazás telepítése..."
+
+#: ../install.py:1441
+msgid "Failed to install application: exiting..."
+msgstr "Sikertelen az alkalmazás telepítése: kilépés..."
+
+#: ../install.py:1465
+msgid ""
+"You may have to restart the computer to be able to run the program from the "
+"commmand line or application launcher."
+msgstr ""
+"Lehetséges, hogy újra kell indítania a számítógépet, hogy parancssorból vagy "
+"grafikus felületről elindíthassa a programot."
+
+#: ../install.py:1476
+msgid "Do you want to install the application's man pages?"
+msgstr "Akarja az alkalmazáshoz tartozó kézikönyv (man) lapokat telepíteni?"
+
+#: ../install.py:1477
+msgid "They will be installed into {}"
+msgstr "Ide lesznek telepítve {}"
+
+#: ../install.py:1478 ../install.py:1483
+msgid "If you uninstall the application, remove these manpages yourself."
+msgstr ""
+"Ha eltávolítja az alkalmazást, a hozzá tartozó kézikönyv (man) oldalakat "
+"önmagának kell eltávolítania."
+
+#: ../install.py:1480
+msgid "Do want to install the man pages?"
+msgstr "Akarja telepíteni a kézikönyv (man) oldalakat?"
+
+#: ../install.py:1482
+msgid "Installing man pages into {}"
+msgstr "A kézikönyv (man) oldalak telepítése ide {}"
+
+#: ../install.py:1499
+msgid "Failed to create man page directory: exiting"
+msgstr ""
+"Nem sikerült létrehozni a mappát a kézikönyv (man) oldalak számára: kilépés"
+
+#: ../install.py:1511
+msgid "Failed to copy man page."
+msgstr "Sikertelen a kézikönyv (man) oldalak másolása."
+
+#: ../install.py:1521
+msgid "(If a segmentation fault occurs at exit, you can ignore it...)"
+msgstr "(Ha a szegmentálási hiba kilép, akkor figyelmen kívül hagyhatja ...)"
+
+#: ../install.py:1534
+msgid ""
+"The python3 tool pip is required to uninstall a version of Rapid Photo "
+"Downloader that was installed with pip.\n"
+"Cannot continue. Exiting."
+msgstr ""
+"A python3 segédprogram eltávolítása szükséges a pipen telepített Rapid Photo "
+"Downloader verziójának eltávolításához.\n"
+"Nem folytatható. Kilépés."
+
+#: ../install.py:1575
+msgid ""
+"Do not run this installer script as sudo / root user.\n"
+"Run it using the user who will run the program.\n"
+msgstr ""
+"Ne futtassa a telepítő szkriptet root / sudo felhasználóként.\n"
+"Azzal a felhasználóval futtassa aki használni fogja a programot.\n"
+
+#: ../install.py:1585 ../install.py:1599
+msgid "Do not include any other command line arguments when specifying"
+msgstr "Ne adjon meg más parancssori argumentumokat a specifikáció során"
+
+#: ../install.py:1614
+msgid ""
+"Sorry, this installer does not support a custom python installation.\n"
+"Exiting..."
+msgstr ""
+"Sajnáljuk, ez a telepítő nem támogatja az egyéni python telepítést.\n"
+"Kilépés ..."
+
+#: ../install.py:1620
+msgid "Restarting script using system python..."
+msgstr "A szkript újraindítása a python rendszer használatával ..."
+
+#: ../install.py:1651
+msgid "Exiting..."
+msgstr "Kilépés…"
+
+#. Translators: do not translate the term python3-apt
+#: ../install.py:1670
+msgid "To continue, the package python3-apt must be installed."
+msgstr "A folytatáshoz python3-apt -nek telepítve kell lennie"
+
+#: ../install.py:1689
+msgid ""
+"Install the following packages using your Linux distribution's standard "
+"package manager, and then rerun this installer"
+msgstr ""
+"Az alábbi csomagokat telepítse a Linux disztribúció szabványos "
+"csomagkezelőjével, majd telepítse újra ezt a telepítőt"
+
+#: ../install.py:1698
+msgid ""
+"To run this program, programs to assist Python 3 and its package management "
+"must be installed."
+msgstr ""
+"A program futtatásához programokat kell telepíteni a python3 és a "
+"csomagkezelés támogatására."
+
+#. Translators: do not translate the terms Python 3, pip and setuptools
+#: ../install.py:1713
+msgid "Python 3's pip and setuptools must be upgraded for your user."
+msgstr ""
+"A python3 pip-jét és beállítási eszközeit frissíteni kell a felhasználónak."
+
+#. Translators: do not translate the term python or requests
+#: ../install.py:1726
+msgid "Installing python requests"
+msgstr "Pythonhoz szükséges dolgok telepítése"
+
+#: ../upgrade.py:79
+msgid "Upgrade Rapid Photo Downloader"
+msgstr "A Rapid Photo Downloader frissítése"
+
+#: ../upgrade.py:401 ../raphodo/viewutils.py:242
+msgid "&Cancel"
+msgstr "&Megszünteti"
+
+#: ../upgrade.py:405
+msgid "&Upgrade"
+msgstr "&Frissítés"
+
+#: ../upgrade.py:410
+#, python-format
+msgid "Click the Upgrade button to upgrade to version %s."
+msgstr "Kattintson a Frissítés gombra a %s verzióra történő frissítéshez."
+
+#: ../upgrade.py:413
+msgid "Click the Upgrade button to start the upgrade."
+msgstr "Kattintson a Frissítés gombra a frissítés elindításához."
+
+#: ../upgrade.py:416 ../upgrade.py:422 ../raphodo/viewutils.py:241
+msgid "&Close"
+msgstr "&Bezárás"
+
+#: ../upgrade.py:417
+msgid "&Run"
+msgstr "&Futtatás"
+
+#: ../upgrade.py:447
+msgid "Close Rapid Photo Downloader before running this upgrade"
+msgstr ""
+"A frissítés futtatása előtt zárja be a Rapid Photo Downloader alkalmazást"
+
+#: ../upgrade.py:450
+msgid "Upgrade running..."
+msgstr "A frissítés folyamatban..."
+
+#: ../upgrade.py:486
+#, python-format
+msgid ""
+"Successfully upgraded to %s. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+"Sikeresen frissítve a %s -re. Kattintson a Bezárás gombra a kilépéshez, vagy "
+"a Futtatás a program elindításához."
+
+#: ../upgrade.py:491
+msgid ""
+"Upgrade finished successfully. Click Close to exit, or Run to start the "
+"program."
 msgstr ""
+"A frissítés sikeresen befejeződött. Kattintson a Bezárás gombra a "
+"kilépéshez, vagy a Futtatás a program elindításához."
+
+#: ../upgrade.py:495
+msgid "Upgrade failed. Click Close to exit."
+msgstr "Frissítés sikertelen. A kilépéshez kattintson a Bezárás gombra."
+
+#: ../upgrade.py:6967
+#, python-format
+msgid "Upgrading %s..."
+msgstr "%s frissítése ..."
+
+#: ../upgrade.py:6969
+msgid "Press any key to continue..."
+msgstr "Nyomjon meg egy gombot a folytatáshoz..."
+
+#: ../upgrade.py:6982
+msgid "Rapid Photo Downloader upgrade failed"
+msgstr "A Rapid Photo Downloader frissítése sikertelen"
+
+#: ../upgrade.py:6984
+#, python-format
+msgid ""
+"The python package %s could not be updated. The upgrade cannot continue."
+msgstr "A(z) %s python csomag nem frissíthető. A frissítés nem folytatható."
+
+#: ../raphodo/aboutdialog.py:225
+msgid "Credits"
+msgstr "Közreműködők"
 
-#: ../raphodo/backuppanel.py:241
+#: ../raphodo/backuppanel.py:240
+msgid "Backups are not configured"
+msgstr "A biztonsági másolatok nincsenek beállítva"
+
+#: ../raphodo/backuppanel.py:242
 msgid "No backup devices detected"
-msgstr "Nincs elérhető biztonsági mentés eszköz"
+msgstr "A biztonsági másolat eszköze nem elérhető"
 
-#: ../raphodo/backuppanel.py:243
+#: ../raphodo/backuppanel.py:244
 msgid "Valid backup locations not yet specified"
-msgstr ""
+msgstr "Még nincs érvényes biztonsági mentési hely megadva"
 
-#: ../raphodo/backuppanel.py:401
+#: ../raphodo/backuppanel.py:404
 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."
+"A fényké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."
 
-#: ../raphodo/backuppanel.py:407
+#: ../raphodo/backuppanel.py:412
 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"
+msgstr "A fényképek és videók biztonsági mentése letöltés közben"
 
-#: ../raphodo/backuppanel.py:413
+#: ../raphodo/backuppanel.py:418
 msgid "Automatically detect backup devices"
 msgstr "Biztonsági mentés eszközök automatikus érzékelése"
 
-#: ../raphodo/backuppanel.py:417
+#: ../raphodo/backuppanel.py:424
 msgid ""
-"Specify the folder in which backups are stored on the device."
-"<br><br><i>Note: the presence of a folder with this name is used to "
+"Specify the folder in which backups are stored on the "
+"device.<br><br><i>Note: the presence of a folder with this name is used to "
 "determine if 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 folder names. By "
 "adding both folders, the same device can be used to back up both photos and "
 "videos.</i>"
 msgstr ""
+"Adja meg azt a mappát, amelyen a mentések tárolódnak az eszközön. <br> <br> "
+"<i> Megjegyzés: ezzel a névvel rendelkező mappa jelenlétét használhatja "
+"annak meghatározására, hogy az eszközt biztonsági mentésekhez használják-e. "
+"Minden olyan eszköz esetében, amelyet vissza akar kapni, hozzon létre egy "
+"mappát a mappák egyikével. Mindkét mappa hozzáadásával ugyanaz az eszköz "
+"használható mind a fotók, mind a videók biztonsági mentéséhez. </i>"
 
-#: ../raphodo/backuppanel.py:428
+#: ../raphodo/backuppanel.py:439
 msgid "Photo folder name:"
-msgstr ""
+msgstr "Fénykép mappa neve:"
 
-#: ../raphodo/backuppanel.py:433
+#: ../raphodo/backuppanel.py:444
 msgid "Video folder name:"
-msgstr ""
+msgstr "Videó mappa neve:"
 
-#: ../raphodo/backuppanel.py:438 ../raphodo/nameeditor.py:883
+#: ../raphodo/backuppanel.py:449 ../raphodo/nameeditor.py:890
 #: ../raphodo/renamepanel.py:123
 msgid "Example:"
-msgstr ""
+msgstr "Példa:"
 
-#: ../raphodo/backuppanel.py:448
-msgid "If you disable automatic detection, choose the exact backup locations."
+#: ../raphodo/backuppanel.py:460
+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)."
+"Ha letiltja az automatikus felderítést, válassza ki a pontos mentési "
+"helyeket."
 
-#: ../raphodo/backuppanel.py:452
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:468
 msgid "Photo backup location:"
-msgstr "Fotók biztonsági mentésének helye:"
+msgstr "Fényképek biztonsági mentésének helye:"
 
-#: ../raphodo/backuppanel.py:454
+#: ../raphodo/backuppanel.py:474
 msgid "Select Photo Backup Location"
-msgstr ""
+msgstr "Fényképek biztonsági mentésének helye:"
 
-#: ../raphodo/backuppanel.py:460
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:485
 msgid "Video backup location:"
 msgstr "Videó biztonsági mentésének helye:"
 
-#: ../raphodo/backuppanel.py:462
+#: ../raphodo/backuppanel.py:491
 msgid "Select Video Backup Location"
-msgstr ""
+msgstr "Válassza ki a videók bitonsági mentésének helyét"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:564
+#: ../raphodo/backuppanel.py:595
 msgid "drive1"
-msgstr ""
+msgstr "meghajtó1"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:567
+#: ../raphodo/backuppanel.py:598
 msgid "drive2"
-msgstr ""
+msgstr "meghajtó2"
 
-#: ../raphodo/backuppanel.py:628
+#: ../raphodo/backuppanel.py:663
 msgid "Projected Backup Storage Use"
-msgstr ""
+msgstr "Előrejelzett biztonsági másolat tárolása"
 
-#: ../raphodo/backuppanel.py:632
+#: ../raphodo/backuppanel.py:669
 msgid "Backup Options"
-msgstr ""
+msgstr "Biztonsági mentés beállítások"
 
 #. translators: refers to the video thumbnail file that some
 #. cameras generate -- it has a .THM file extension
-#: ../raphodo/copyfiles.py:476
+#: ../raphodo/copyfiles.py:491
 msgid "video THM"
-msgstr ""
+msgstr "videó THM"
 
-#: ../raphodo/copyfiles.py:482
+#: ../raphodo/copyfiles.py:497
 msgid "audio"
-msgstr ""
+msgstr "hang"
 
 #: ../raphodo/destinationdisplay.py:78 ../raphodo/devicedisplay.py:1079
-#: ../raphodo/rpdfile.py:321
+#: ../raphodo/rpdfile.py:342
 #, python-format
 msgid "%(no_photos)s Photos"
-msgstr ""
+msgstr "%(no_photos)s fényképek"
 
 #: ../raphodo/destinationdisplay.py:82 ../raphodo/devicedisplay.py:1081
-#: ../raphodo/rpdfile.py:316
+#: ../raphodo/rpdfile.py:333
 #, python-format
 msgid "%(no_videos)s Videos"
-msgstr ""
+msgstr "%(no_videos)s videók"
 
 #: ../raphodo/destinationdisplay.py:92
 msgid "Used"
-msgstr ""
+msgstr "Felhasznált"
 
 #: ../raphodo/destinationdisplay.py:93
 msgid "Excess"
-msgstr ""
+msgstr "Többlet"
 
 #: ../raphodo/destinationdisplay.py:102
 msgid "Device size unknown"
-msgstr ""
+msgstr "Az eszköz mérete nem ismert"
 
 #: ../raphodo/destinationdisplay.py:112
 #, python-format
 msgid "No space free on %(size_total)s device"
-msgstr ""
+msgstr "Nincs szabad terület az eszközön %(size_total)s"
 
 #: ../raphodo/destinationdisplay.py:119
 #, python-format
 msgid "%(size_free)s free of %(size_total)s"
-msgstr ""
+msgstr "Szabad %(size_free)s  a(z)  %(size_total)s -ból"
 
 #: ../raphodo/destinationdisplay.py:190 ../raphodo/devicedisplay.py:993
-#: ../raphodo/rapid.py:1964 ../raphodo/rapid.py:2079 ../raphodo/rapid.py:5753
-#: ../raphodo/rpdfile.py:905
+#: ../raphodo/rapid.py:2023 ../raphodo/rapid.py:2151 ../raphodo/rapid.py:6043
+#: ../raphodo/rpdfile.py:930
 msgid "Photos"
-msgstr ""
+msgstr "Fényképek"
 
 #. translators: the name of the Videos folder
 #: ../raphodo/destinationdisplay.py:191 ../raphodo/devicedisplay.py:994
-#: ../raphodo/rapid.py:1967 ../raphodo/rapid.py:2080 ../raphodo/rapid.py:5754
-#: ../raphodo/rpdfile.py:933 ../raphodo/storage.py:445
+#: ../raphodo/rapid.py:2028 ../raphodo/rapid.py:2152 ../raphodo/rapid.py:6044
+#: ../raphodo/rpdfile.py:958 ../raphodo/storage.py:449
 msgid "Videos"
-msgstr ""
+msgstr "Videók"
 
 #: ../raphodo/destinationdisplay.py:192
 msgid "Projected storage use after download"
-msgstr ""
+msgstr "A tervezett tárolás letöltés után"
 
-#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:516
+#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:521
 msgid "Custom..."
-msgstr ""
+msgstr "Egyéni…"
 
 #: ../raphodo/destinationdisplay.py:678
 msgid "Configure photo subfolder creation"
-msgstr ""
+msgstr "A fénykép almappa létrehozásának konfigurálása"
 
 #: ../raphodo/destinationdisplay.py:680
 msgid "Configure video subfolder creation"
-msgstr ""
+msgstr "A videó almappa létrehozásának konfigurálása"
 
 #: ../raphodo/devicedisplay.py:983
 msgid "Other"
-msgstr ""
+msgstr "Egyéb"
 
 #: ../raphodo/devicedisplay.py:984
 msgid "Probing device..."
-msgstr ""
+msgstr "Tapintó eszköz ..."
 
 #: ../raphodo/devicedisplay.py:1000
 msgid "Temporarily ignore this device"
-msgstr ""
+msgstr "Ideiglenesen figyelmen kívül hagyja ezt az eszközt"
 
 #: ../raphodo/devicedisplay.py:1002
 msgid "Permanently ignore this device"
-msgstr ""
+msgstr "A készüléket tartósan figyelmen kívül hagyja"
 
 #: ../raphodo/devicedisplay.py:1004
 msgid "Rescan"
-msgstr ""
+msgstr "Újrakeresés"
 
 #. Translators: percentage full e.g. 75% full
 #: ../raphodo/devicedisplay.py:1093
 #, python-format
 msgid "%s full"
-msgstr ""
+msgstr "%s teljes"
 
-#: ../raphodo/devices.py:459
+#: ../raphodo/devices.py:463
 msgid "Cameras"
-msgstr ""
+msgstr "Fényképezőgépek"
 
-#: ../raphodo/devices.py:460 ../raphodo/devices.py:920
-#: ../raphodo/preferencedialog.py:85 ../raphodo/rapid.py:1927
+#: ../raphodo/devices.py:464 ../raphodo/devices.py:927
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/rapid.py:1979
 msgid "Devices"
 msgstr "Eszközök"
 
-#: ../raphodo/devices.py:720
+#: ../raphodo/devices.py:724
 #, python-format
 msgid "Downloading from %(device_names)s"
-msgstr ""
+msgstr "Letöltés: %(device_names)s"
 
 #. Translators: e.g. Three Devices
-#: ../raphodo/devices.py:780
+#: ../raphodo/devices.py:784
 #, python-format
 msgid "%(no_devices)s %(device_type)s"
-msgstr ""
+msgstr "%(no_devices)s %(device_type)s"
 
-#: ../raphodo/devices.py:905 ../raphodo/rapid.py:1764
+#: ../raphodo/devices.py:912 ../raphodo/rapid.py:1807
 msgid "Select Source"
-msgstr ""
+msgstr "Válassza a Forrás lehetőséget"
 
-#: ../raphodo/devices.py:936 ../raphodo/devices.py:947
+#: ../raphodo/devices.py:943 ../raphodo/devices.py:954
 #, python-format
 msgid "%(device1)s + %(device2)s"
-msgstr ""
+msgstr "%(device1)s + %(device2)s"
 
 #. Number of cameras e.g. 3 Cameras
-#: ../raphodo/devices.py:958
+#: ../raphodo/devices.py:965
 #, python-format
 msgid "%(no_cameras)s Cameras"
-msgstr ""
+msgstr "%(no_cameras)s kamerák"
 
-#: ../raphodo/devices.py:963
+#: ../raphodo/devices.py:970
 #, python-format
 msgid "%(no_devices)s Devices"
-msgstr ""
+msgstr "%(no_devices)s Eszközök"
 
 #. Translators: two folder names, separated by a plus sign
-#: ../raphodo/devices.py:1258
+#: ../raphodo/devices.py:1265
 #, python-format
 msgid "%s + %s"
-msgstr ""
+msgstr "%s + %s"
 
-#: ../raphodo/didyouknow.py:44
+#: ../raphodo/didyouknow.py:45
 msgid "Click on a file's checkbox to mark or unmark it for download."
-msgstr ""
+msgstr "Kattintson egy fájl jelölőnégyzetére a letöltéshez vagy jelölje ki."
 
-#: ../raphodo/didyouknow.py:50
+#: ../raphodo/didyouknow.py:51
 msgid ""
 "Files that have already been downloaded are remembered. You can still mark "
 "previously downloaded files to download again, but they are unchecked by "
 "default, and their thumbnails are dimmed so you can differentiate them from "
 "files that are yet to be downloaded."
 msgstr ""
+"A már letöltött fájlokra emlékezik a program. A korábban letöltött fájlokat "
+"továbbra is letöltheti, de alapértelmezés szerint nem ellenőrzik őket és a "
+"bélyegképük elmosódott, így megkülönböztetheti azokat a még le nem töltött "
+"fájloktól."
 
-#: ../raphodo/didyouknow.py:59
+#: ../raphodo/didyouknow.py:60
 msgid ""
 "If more than one file is selected, they'll all take the mark of the file "
 "whose checkbox was clicked, regardless of whether they previously had a "
 "checkmark or not."
 msgstr ""
+"Ha egynél több fájl van kiválasztva, akkor mindegyik egy jelet kap, amelyre "
+"egy négyzetet kattintottak rá, függetlenül attól, hogy korábban volt-e abban "
+"egy pipa vagy sem."
 
-#: ../raphodo/didyouknow.py:67
+#: ../raphodo/didyouknow.py:68
 msgid ""
 "Click on a device's checkbox to quickly mark or unmark all its files for "
 "downloading."
 msgstr ""
+"Az eszköz jelölőnégyzetére kattintva gyorsan letörölheti vagy eltávolíthatja "
+"az összes letöltendő fájlt."
 
-#: ../raphodo/didyouknow.py:74
+#: ../raphodo/didyouknow.py:75
+msgid ""
+"After a download finishes, an icon replaces the thumbnail's checkbox. The "
+"icon's color indicates whether the download was successful (green), had file "
+"renaming problems (yellow/orange), or failed (red)."
+msgstr ""
+"Miután befejeződött a letöltés, egy ikon helyettesíti a bélyegkép "
+"jelölőnégyzetét. Az ikon színe jelzi, hogy a letöltés sikeres volt-e (zöld), "
+"az átnevezési (sárga/narancssárga) vagy sikertelen (piros) próbálkozásokat."
+
+#: ../raphodo/didyouknow.py:83
+msgid ""
+"\n"
+"            In case of any problems, a red icon will appear at the bottom of "
+"the window\n"
+"            indicating how many error reports there are. Clicking on it "
+"opens the Error Report \n"
+"            window.\n"
+"            "
+msgstr ""
+"\n"
+"            Bármely probléma esetén egy piros ikon jelenik meg az ablak "
+"alján\n"
+"             Jelezve, hogy hány hibajelentés létezik. Kattintson rá a Hiba "
+"jelentés ablakra\n"
+"            "
+
+#: ../raphodo/didyouknow.py:91
+msgid ""
+"\n"
+"            The Error Report window lists any problems encountered before, "
+"during or after the \n"
+"            download. An orange triangle represents a warning, a red circle "
+"indicates a failure, \n"
+"            and a black circle indicates more serious failures. You can "
+"click on the hyperlinks to \n"
+"            open its file or device in a file manager. You can also search "
+"the reports using the \n"
+"            search box in the lower left of the Error Report window.\n"
+"            "
+msgstr ""
+"\n"
+"            A Hiba jelentés ablak felsorolja az előtte, alatt vagy után "
+"tapasztalt problémákat\n"
+"            Letöltés. A narancssárga háromszög figyelmeztetést jelent, a "
+"piros kör hibát jelez,\n"
+"            És egy fekete kör nagyobb, súlyos hibákat jelez. Kattintson a "
+"hiperhivatkozásokra,\n"
+"            nyissa meg fájlját vagy az eszközt egy fájlkezelőben. A "
+"jelentések Keresőmezőt a\n"
+"             hibajelentés ablak bal alsó részén találja.\n"
+"            "
+
+#: ../raphodo/didyouknow.py:103
 msgid ""
 "You can simultaneously download from multiple cameras, smartphones, memory "
 "cards, and hard drives&mdash;as many devices as your computer can handle at "
 "one time."
 msgstr ""
+"Egyidejűleg letölthet több kamerából, okostelefonokból, memóriakártyákból és "
+"merevlemezekből is annyi eszközt, amennyit a számítógép egyszerre képes "
+"kezelni."
 
-#: ../raphodo/didyouknow.py:81
+#: ../raphodo/didyouknow.py:110
 msgid ""
 "The <b>Timeline</b> groups photos and videos based on how much time elapsed "
 "between consecutive shots. Use it to identify photos and videos taken at "
 "different periods in a single day or over consecutive days."
 msgstr ""
+"Az <b> Idővonal </b> a fotókat és videókat csoportosítja, az egymást követő "
+"felvételek között eltelt idő alapján. Használja azt a fényképek és videók "
+"azonosítására, amelyek különböző időszakokban, egyetlen nap alatt vagy "
+"egymást követő napokon kerülnek."
 
-#: ../raphodo/didyouknow.py:88
+#: ../raphodo/didyouknow.py:117
 msgid ""
 "\n"
 "<p>In the illustration above, the first row of the Timeline is black because "
@@ -311,29 +810,45 @@ msgid ""
 "the Timeline:</p>\n"
 "            "
 msgstr ""
+"\n"
+"<p> A fenti ábrán az idővonal első sorszáma fekete, mert minden fájl be van "
+"kapcsolva.\n"
+"Ez a dátum korábban letöltött. </p>\n"
+"<p> Az Idővonal csúszkája beállítja az egymást követő lövések közötti időt, "
+"amelyet az elkészítéshez használ az idővonal: </p>\n"
+"            "
 
-#: ../raphodo/didyouknow.py:99
+#: ../raphodo/didyouknow.py:128
 msgid ""
 "To view photos and videos for a particular time range, use the mouse "
 "(optionally in combination with the <tt>Shift</tt> or <tt>Ctrl</tt> keys) to "
 "select time periods. When a time range is selected, the Timeline button on "
 "the left side of the main window will be highlighted."
 msgstr ""
+"Az adott időtartományon belüli fényképek és videók megtekintéséhez használja "
+"az egeret (adott esetben a <tt> Shift </tt> vagy <tt> Ctrl </tt> gombokkal "
+"együtt) az időtartamok kiválasztásához. Ha időintervallum van kiválasztva a "
+"főablak bal oldalán megjelenő Idővonal gomb jelenik meg."
 
-#: ../raphodo/didyouknow.py:106
+#: ../raphodo/didyouknow.py:135
 msgid ""
 "A download always includes all files that are checked for download, "
 "including those that are not currently displayed because the Timeline is "
 "being used."
 msgstr ""
+"A letöltés mindig tartalmazza az összes letöltésre ellenőrzött fájlt, "
+"beleértve azokat is, amelyeket jelenleg nem jelenítenek meg, mert az "
+"idővonalat használják."
 
-#: ../raphodo/didyouknow.py:113
+#: ../raphodo/didyouknow.py:142
 msgid ""
 "You can hide or display the download sources by clicking on the name of the "
 "device you're downloading from at the top left of the program window."
 msgstr ""
+"A letöltési forrásokat elrejtheti vagy megjelenítheti a programablak bal "
+"felső sarkában található letöltési eszköz nevére kattintva."
 
-#: ../raphodo/didyouknow.py:120
+#: ../raphodo/didyouknow.py:149
 msgid ""
 "\n"
 "          Thumbnails can be sorted using a variety of criteria:\n"
@@ -351,34 +866,56 @@ msgid ""
 "downloaded from.</li>\n"
 "</ol> "
 msgstr ""
+"\n"
+"          Az bélyegképek különböző kritériumok alapján válogathatók:\n"
+"<ol><li> <b> Módosítási idő: </b> a fájl utolsó módosításakor, metaadatai "
+"szerint (ahol\n"
+" rendelkezésre állnak) vagy a fájlrendszer szerint (visszaállításként). "
+"</li>\n"
+"<li> <b> Ellenőrzött állapot: </b>, hogy a fájl letöltésre van-e jelölve. "
+"</li>\n"
+"<li> <b> Filenév: </b> a teljes fájlnév, beleértve a kiterjesztést. </li>\n"
+"<li> <b> Bővítmény: </b> a fájlnév kiterjesztése. Ezt felhasználhatja a jpeg "
+"és a RAW képek csoportosításához\n"
+"Például. </li>\n"
+"<li> <b> Fájltípus: </b> fénykép vagy videó. </li>\n"
+"<li> <b> Eszköz: </b> a készülék neve, ahová a fotók és videók letöltöttek. "
+"</li></ol> "
 
-#: ../raphodo/didyouknow.py:137
+#: ../raphodo/didyouknow.py:166
 msgid ""
 "One of Rapid Photo Downloader's most useful features is its ability to "
 "automatically generate download subfolders and rename files as it downloads, "
 "using a scheme of your choosing."
 msgstr ""
+"A Rapid Photo Downloader egyik leghasznosabb funkciója az a képesség, hogy "
+"automatikusan létrehozza a letöltési almappákat és átnevezi a fájlokat "
+"letöltés közben, az Ön által választott rendszert használva."
 
-#: ../raphodo/didyouknow.py:143
+#: ../raphodo/didyouknow.py:172
 msgid ""
 "To specify where you want your files downloaded and how you want them named, "
 "open the appropriate panel on the right-side of the application window: "
 "<b>Destination</b>, <b>Rename</b>, or <b>Job Code</b>."
 msgstr ""
+"Annak meghatározásához, hogy hol töltse le a fájlokat, és azt, hogy miként "
+"szeretné őket megnevezni, nyissa meg a megfelelő panelt az alkalmazásablak "
+"jobb oldalán: <b> Letöltési cél </b>, <b> Átnevezés </b> vagy <b > Munka-kód "
+"</b>."
 
-#: ../raphodo/didyouknow.py:150
+#: ../raphodo/didyouknow.py:179
 msgid ""
 "\n"
 "When thinking about your download directory structure, keep in mind two "
 "different types\n"
 "of directory:\n"
 "<ol>\n"
-"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, &quot;"
-"Photos&quot;, or\n"
+"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, "
+"&quot;Photos&quot;, or\n"
 "&quot;Videos&quot;. This directory should already exist on your computer. In "
 "the illustration \n"
-"below, the destination folders are &quot;Pictures&quot; and &quot;"
-"Videos&quot;. The\n"
+"below, the destination folders are &quot;Pictures&quot; and "
+"&quot;Videos&quot;. The\n"
 "name of the destination folder is displayed in the grey bar directly above "
 "the folder tree, \n"
 "with a folder icon to its left and a gear icon to its far right.</li>\n"
@@ -390,8 +927,24 @@ msgid ""
 "</ol>\n"
 "            "
 msgstr ""
+"\n"
+"Ha a letöltési könyvtár struktúrájára gondolva tartsa észben annak két "
+"különböző típusát\n"
+"A könyvtárban:\n"
+"<ol>\n"
+"<li> A <b> célmappa </b>, pl. Képek & Fotók vagy\n"
+"Videók. Ez a könyvtár már létezik a számítógépen. Az ábrán\n"
+"az alábbiakban a célmappák a \"Képek\" és \"Videók\".\n"
+"A célmappa neve megjelenik a szürke sávban közvetlenül a mappák felett,\n"
+"Egy bal oldali mappa ikonra és egy fogaskerék ikonra a jobb szélén. </li>\n"
+"<li> A <b> letöltési almappák </b>, amelyek automatikusan létrejövő "
+"könyvtárak\n"
+"a Rapid Photo Downloader segítségével. A számítógépen már nincs szükségük, "
+"de ez rendben van, ha igen.\n"
+"Ezeket a rendeltetési mappa alatt hozza létre. </li></ol>\n"
+"            "
 
-#: ../raphodo/didyouknow.py:167
+#: ../raphodo/didyouknow.py:196
 msgid ""
 "\n"
 "You can download photos and videos to the same destination folder, or "
@@ -403,15 +956,24 @@ msgid ""
 "type.            \n"
 "            "
 msgstr ""
+"\n"
+"Fotókat és videókat ugyanabba a célmappába tölthet le vagy megadhat más\n"
+"célmappát is. Ugyanez vonatkozik a fotók és videók letöltési almappáira;\n"
+"Fotókat és videókat ugyanabba az almappára töltheti le vagy egy másik sémát "
+"is használhat.            \n"
+"            "
 
-#: ../raphodo/didyouknow.py:177
+#: ../raphodo/didyouknow.py:206
 msgid ""
 "Automatically generated download subfolders can contain further "
 "automatically generated subfolders if need be. A common scheme is to create "
 "a year subfolder and then a series of year-month-day subfolders within it."
 msgstr ""
+"Az automatikusan generált letöltési almappák további automatikusan generált "
+"almappákat is tartalmazhatnak, ha szükséges. Egy közös rendszer egy év "
+"almappa létrehozása, majd egy év-hónapos almappák sorozatának létrehozása."
 
-#: ../raphodo/didyouknow.py:186
+#: ../raphodo/didyouknow.py:215
 msgid ""
 "\n"
 "Whenever possible, the program previews the download subfolders of photos "
@@ -428,8 +990,22 @@ msgid ""
 "</ol>\n"
 "            "
 msgstr ""
+"\n"
+"Lehetőség szerint a program előnézeti képeket és videófelvételeket letöltő "
+"almappákat tölt le:\n"
+"<ol>\n"
+"<li> A cél könyvtárfája a számítógépen található letöltési almappákat "
+"mutatja\n"
+"     Egy normál, nem dőlt betűs betűtípust), valamint a letöltés során "
+"létrehozott almappákat\n"
+"     (Amelyeknek a neve dőlt.) </li>\n"
+"<li> A mappafájl azt is megmutatja, hogy mely alkönyvtárak töltik le a "
+"fájlokat (azok a színesek\n"
+"     fekete). </li>\n"
+"</ol>\n"
+"            "
 
-#: ../raphodo/didyouknow.py:201
+#: ../raphodo/didyouknow.py:230
 msgid ""
 "\n"
 "Download subfolder names are typically generated using some or all of the "
@@ -452,8 +1028,27 @@ msgid ""
 "option:\n"
 "            "
 msgstr ""
+"\n"
+"Az alkönyvtár nevének letöltése általában a következő elemek közül néhány "
+"vagy mindegyik használatával generálódik:\n"
+"<ol>\n"
+"<li> <b> Fájl metaadat </b>, nagyon gyakran beleértve a fénykép vagy videó "
+"létrehozásának dátumát, de lehet\n"
+"is\n"
+"A fényképezőgép típusának neve, a fényképezőgép sorozatszáma vagy a fájl "
+"kiterjesztése, pl. JPG vagy CR2. </lli>\n"
+"<li> A <b> Munka-kód </b>, amely a letöltéskor megadott szabad szöveg, "
+"például az\n"
+"esemény vagy hely neve. </li>\n"
+"<li> <b> Szöveg </b>, amelyet mindig meg szeretne jeleníteni, például egy "
+"kötőjelet vagy egy szóközt. </ li>\n"
+"</ lo>\n"
+"Az almappák elnevezése az évvel, majd a hónap, majd a nap a numerikus "
+"formátumban\n"
+"Könnyen kezelhetők egy fájlkezelőben, ezért az alapértelmezett beállítás:\n"
+"            "
 
-#: ../raphodo/didyouknow.py:219
+#: ../raphodo/didyouknow.py:248
 msgid ""
 "\n"
 "To automatically create download subfolders as you download, \n"
@@ -462,8 +1057,14 @@ msgid ""
 "the gear icon to bring up a drop-down menu:            \n"
 "            "
 msgstr ""
+"\n"
+"Automatikusan létrehozhat almappákat, ha használja a Rapid Photo Downloader "
+"beépített előbeállításait, vagy létrehozhat egyéni beállításokat. \n"
+"Kattintson a fogaskerék ikonra egy legördülő menü megjelenítéséhez.          "
+"  \n"
+"            "
 
-#: ../raphodo/didyouknow.py:227
+#: ../raphodo/didyouknow.py:256
 msgid ""
 "\n"
 "Using the drop-down menu, select a built-in preset or click on <b>Custom</b> "
@@ -472,21 +1073,32 @@ msgid ""
 "Generation Editor:             \n"
 "            "
 msgstr ""
+"\n"
+"A legördülő menüből válassza ki a beépített előbeállítást, \n"
+"vagy kattintson a <b> Egyéni </b> lehetőségre a sajátrendszer.\n"
+" Saját rendszereit a Fénykép vagy Videó almappák generációs szerkesztője "
+"segítségével hozhatja létre:             \n"
+"            "
 
-#: ../raphodo/didyouknow.py:237
+#: ../raphodo/didyouknow.py:266
 msgid ""
 "It's easy to download raw images into one folder, and jpeg images into "
 "another. Simply use the <b>Filename Extension</b> as part of your download "
 "subfolder generation scheme:"
 msgstr ""
+"Könnyű letölteni a RAW képeket egy mappába és a jpeg képeket a másikba "
+"átvinni. Egyszerűen használja a <b> Fájlnév kiterjesztés </b> fájlt a "
+"letöltési almappák generációs sémájának részeként:"
 
-#: ../raphodo/didyouknow.py:242
+#: ../raphodo/didyouknow.py:271
 msgid ""
 "This illustration shows a saved custom preset named &quot;My custom "
 "preset&quot;."
 msgstr ""
+"Ez az illusztráció egy elmentett egyéni beállítást jelenít meg, amelynek "
+"neve \"Saját beállítások\"."
 
-#: ../raphodo/didyouknow.py:246
+#: ../raphodo/didyouknow.py:275
 msgid ""
 "\n"
 "You do not have to create nested download subfolders. This illustration "
@@ -496,8 +1108,15 @@ msgid ""
 "Job Code:\n"
 "            "
 msgstr ""
+"\n"
+"Nem kell egymásba ágyazott letöltési almappákat létrehoznia. Ez az "
+"illusztráció mutatja\n"
+"a letöltési almappák létrehozását, amelyek csak a fotók dátumát "
+"tartalmazzák, és a\n"
+"Munka-kód:\n"
+"            "
 
-#: ../raphodo/didyouknow.py:256
+#: ../raphodo/didyouknow.py:285
 msgid ""
 "\n"
 "Although there are many built-in date/time naming options, you may find that "
@@ -510,8 +1129,17 @@ msgid ""
 "circle around the hyphen):\n"
 "            "
 msgstr ""
+"\n"
+"Bár sok beépített dátum/idő elnevezési opció van, előfordulhat, hogy Önnek\n"
+"valami másra van szüksége. Nem probléma egy  saját opció létrehozása.\n"
+"A dátum/idő választása kombinálható és új kombinációkat generál. Feltéve, "
+"hogy olyan\n"
+"dátumformátumot szeretne, amely az év (ÉÉÉÉ), a kötőjel, hónap (HH) "
+"szimbólumokból áll. \n"
+"Létrehozhatja így (jegyezze fel a kötőjel körüli vörös köröket):\n"
+"            "
 
-#: ../raphodo/didyouknow.py:265
+#: ../raphodo/didyouknow.py:294
 msgid ""
 "\n"
 "Read more about all the ways you can generate download subfolder names and "
@@ -520,8 +1148,14 @@ msgid ""
 "documentation</a>.\n"
 "            "
 msgstr ""
+"\n"
+"Olvassa el az összes fájlt, amelyen letöltheti az alkönyvtáros neveket és "
+"fájlneveket a\n"
+"<a href = \"http://damonlynch.net/rapid/documentation/#renamedateandtime\"> "
+"online dokumentáció </a>.\n"
+"            "
 
-#: ../raphodo/didyouknow.py:273
+#: ../raphodo/didyouknow.py:302
 msgid ""
 "\n"
 "<b>Job Codes</b> let you easily enter text that describes sets of photos and "
@@ -532,8 +1166,15 @@ msgid ""
 "the Job Code \n"
 "&quot;Green Bazaar&quot;: \n"
 msgstr ""
+"\n"
+"A <b> Munka-kód </b> lehetővé teszi, hogy egyszerűen besorolja a fényképeket "
+"és videókat. \n"
+"Használja őket almappában és fájlnevekben. Ebben az illusztrációban egyes "
+"fájlok rendelkeznek a munka- kóddal\n"
+"\"Utca\" és a kiválasztott fájlok hamarosan megkapják a munka-kódot\n"
+"\"Zöld Bazár\": \n"
 
-#: ../raphodo/didyouknow.py:282
+#: ../raphodo/didyouknow.py:311
 msgid ""
 "\n"
 "You can apply new or existing Job Codes before you start a download. If "
@@ -543,37 +1184,55 @@ msgid ""
 "a Job Code for them before the download begins.\n"
 "            "
 msgstr ""
+"\n"
+"Új vagy meglévő munka-kódokat alkalmazhat a letöltés megkezdése előtt, ha "
+"van ilyen.\n"
+"A letöltött fájloknál, amelyeknek még nem volt munka-kódjuk, akkor be kell "
+"írnia\n"
+"egy megfelelő kódot a letöltés megkezdése előtt.\n"
+"            "
 
-#: ../raphodo/didyouknow.py:291
+#: ../raphodo/didyouknow.py:320
 msgid "Look for hints to guide you when working with Job Codes:"
 msgstr ""
+"Keresse meg azokat a tanácsokat, amelyek segítséget nyújtanak a munka-kódok "
+"kezelésében:"
 
-#: ../raphodo/didyouknow.py:295
+#: ../raphodo/didyouknow.py:324
 msgid ""
 "Hints will vary depending on the context, such as when the mouse is hovering "
 "over a button."
 msgstr ""
+"A tippek a kontextus függvényében változnak, például amikor az egér egy gomb "
+"fölé mozog..."
 
-#: ../raphodo/didyouknow.py:301
+#: ../raphodo/didyouknow.py:330
 msgid ""
 "\n"
 "When you give your photos and videos unique filenames, you'll never be "
 "confused as to \n"
 "which file is which. Using <b>sequence numbers</b> to make filenames unique "
 "is highly \n"
-"recommended!.\n"
+"recommended!\n"
 "            "
 msgstr ""
+"\n"
+"Amikor a fényképek és a videók egyedi fájlneveket kapnak, akkor soha nem "
+"lesz kavarodás, hogy\n"
+"melyik fájl melyik. A <b> sorszámok </b> használatával a fájlnevek "
+"egyedülállóak lesznek, ezért ez\n"
+"erősen ajánlott!\n"
+"            "
 
-#: ../raphodo/didyouknow.py:309
+#: ../raphodo/didyouknow.py:338
 msgid ""
 "\n"
 "<p>Four types of sequence values are available to help you assign unique "
 "names to your photos and \n"
 "videos:\n"
 "<ol>\n"
-"<li><b>Downloads today</b>: tracks downloads completed during that day.</"
-"li>\n"
+"<li><b>Downloads today</b>: tracks downloads completed during that "
+"day.</li>\n"
 "<li><b>Stored number</b>: similar to Downloads today, but it is remembered "
 "from the last time the  \n"
 "program was run.</li>\n"
@@ -586,8 +1245,26 @@ msgid ""
 "documentation</a>.</p>\n"
 "            "
 msgstr ""
+"\n"
+"<p> A szekvenciaértékek négyféle típusa érhető el, amelyek segítségével "
+"egyedi neveket rendelhet a fotókhoz és videókhoz:\n"
+"<ol>\n"
+"<li> <b> A mai letöltések </b>: az adott napon befejezett letöltések nyomon "
+"követése. </li>\n"
+"<li> <b> Tárolt szám </b>: hasonló a mai letöltések számához, de az utoljára "
+"futott ideje</li>\n"
+"<li> <b> Szakasz száma </b>: minden alkalommal, amikor a program fut, "
+"újraindít. </li>\n"
+"<li> <b> Szekvencia betű </b>: hasonlóan a munkamenet számaihoz, de betűket "
+"használ. </li>\n"
+"</ol> </p>\n"
+"<p>\n"
+"További információ a <a href = "
+"\"http://damonlynch.net/rapid/documentation/#sequencenumbers\"> online "
+"dokumentációban </a>. </p>\n"
+"            "
 
-#: ../raphodo/didyouknow.py:327
+#: ../raphodo/didyouknow.py:356
 msgid ""
 "\n"
 "The <b>Rename</b> panel allows you to configure file renaming. To rename "
@@ -595,8 +1272,13 @@ msgid ""
 "from among existing renaming presets or define your own.              \n"
 "            "
 msgstr ""
+"\n"
+"A <b> Átnevezés </b> panel lehetővé teszi a fájl átnevezését. A fájlok "
+"átnevezéséhez választhat a meglévő átnevezési beállítások közül vagy "
+"létrehozhatja a sajátját.              \n"
+"            "
 
-#: ../raphodo/didyouknow.py:334
+#: ../raphodo/didyouknow.py:363
 msgid ""
 "\n"
 "<p>The <b>Synchronize RAW + JPEG</b> option is useful if you use the RAW + "
@@ -614,8 +1296,23 @@ msgid ""
 "documentation</a>.</p>\n"
 "            "
 msgstr ""
+"\n"
+"<p> A <b> RAW + JPEG szinkronizálás </b> beállítás akkor hasznos, ha a RAW + "
+"JPEG funkciót használja a\n"
+"fényképezéskor és a fénykép átnevezésével sorszámokat használhat. Ha "
+"engedélyezi ezt az opciót\n"
+"akkor a program észleli a RAW és JPEG illeszkedő párokat és ha észlelik "
+"őket,\n"
+"ugyanazok a sorszámok kerülnek alkalmazásra mindkét fényképnévre. Továbbá, a "
+"szekvenciák lesznek\n"
+"frissítve, mintha a fotók lennének. </p>\n"
+"<p>\n"
+"További információ a fájl átnevezéséről a <a href = "
+"\"http://damonlynch.net/rapid/documentation/#rename\"> online "
+"dokumentációban </a>. </p>\n"
+"            "
 
-#: ../raphodo/didyouknow.py:348
+#: ../raphodo/didyouknow.py:377
 msgid ""
 "\n"
 "You can have your photos and videos backed up to multiple locations as they "
@@ -625,14 +1322,24 @@ msgid ""
 "backup locations specified.\n"
 "            "
 msgstr ""
+"\n"
+"Lehetősége van arra, hogy fényképeit és videóit több helyre mentse le, "
+"amikor letöltötte. Például\n"
+"külső merevlemezek vagy hálózati megosztások. A biztonsági mentés eszközei "
+"automatikusan észlelhetők vagy pontosak\n"
+"A megadott mentési helyek.\n"
+"            "
 
-#: ../raphodo/didyouknow.py:356
+#: ../raphodo/didyouknow.py:385
 msgid ""
 "In this example, the drive <b>photobackup</b> does not contain a folder "
 "named <tt>Videos</tt>, so videos will not be backed up to it."
 msgstr ""
+"Ebben a példában a <b> Fotó biztonsági mentés </b> meghajtó nem tartalmaz "
+"<tt> Videók </ tt> nevű mappát, így a videókról nem lehet biztonsági "
+"másolatot készíteni."
 
-#: ../raphodo/didyouknow.py:362
+#: ../raphodo/didyouknow.py:391
 msgid ""
 "\n"
 "Several of the program's preferences can be set from the command line, "
@@ -642,8 +1349,19 @@ msgid ""
 "default state, and caches and remembered files cleared.            \n"
 "            "
 msgstr ""
+"\n"
+"Több program beállítása a parancssorból állítható be, beleértve a letöltést\n"
+"forrásokat, célokat és mentéseket is. Ezenkívül a beállítások "
+"visszaállíthatók\n"
+"az alapértelmezett állapotba, valamint a gyorsítótárakat és a megjegyzett "
+"fájlokat törölték.            \n"
+"            "
+
+#: ../raphodo/didyouknow.py:396
+msgid "You can also import program preferences from the older 0.4 version."
+msgstr "A program beállításait a régebbi 0.4 változatból is importálhatja."
 
-#: ../raphodo/didyouknow.py:372
+#: ../raphodo/didyouknow.py:401
 msgid ""
 "\n"
 "Rapid Photo Downloader deals with three types of cache:\n"
@@ -653,8 +1371,8 @@ msgid ""
 "memory cards, and other devices.</li>\n"
 "<li>A <b>temporary cache</b> of files downloaded from a camera, one for "
 "photos and another for \n"
-"videos. They are located in temporary subfolders in the download destination."
-"</li>\n"
+"videos. They are located in temporary subfolders in the download "
+"destination.</li>\n"
 "<li>The <b>desktop's thumbnail cache</b>, in which Rapid Photo Downloader "
 "stores thumbnails of \n"
 "RAW and TIFF photos once they have been downloaded. File browsers like Gnome "
@@ -668,217 +1386,249 @@ msgid ""
 "documentation</a>.\n"
 "            "
 msgstr ""
+"\n"
+"A Rapid Photo Downloader háromféle gyorsítótárral foglalkozik:\n"
+"<ol>\n"
+"<li> A <b> bélyegkép gyorsítótár </b>, amelynek kizárólagos célja a fájlok "
+"bélyegképeinek tárolása a fényképezőgépről, memóriakártyák és egyéb "
+"eszközök. </li>\n"
+"<li> A <b> ideiglenes gyorsítótár </b> a kameráról letöltött fájlok a "
+"fényképek és a videók. Ezek az ideiglenes almappákban találhatók a letöltési "
+"célban. </li>\n"
+"<li> Az <b> asztali bélyegkép gyorsítótár </b>, amelyben a Rapid Photo "
+"Downloader bélyegképeket tárol\n"
+"RAW és TIFF képekről, miután letöltötték őket. A fájl-böngészők, mint a "
+"Gnome Files, ezt a gyorsítótárat használják, valamint azt is jelentik, hogy "
+"ezek a fájlok bélyegképüket is megjelenítenek.\n"
+"</ li>\n"
+"</ol>\n"
+"További információ ezekről a gyorsítótárakról és annak a letöltési "
+"teljesítményre gyakorolt hatásáról a\n"
+"<a href = \"http://damonlynch.net/rapid/documentation/#caches\"> online "
+"dokumentációban </a>.\n"
+"            "
 
-#: ../raphodo/didyouknow.py:431
+#: ../raphodo/didyouknow.py:460
 msgid "Tip of the Day"
-msgstr ""
+msgstr "A nap tippje"
 
-#: ../raphodo/didyouknow.py:439
+#: ../raphodo/didyouknow.py:468
 msgid "Did you know...?"
-msgstr ""
+msgstr "Tudta...?"
 
-#: ../raphodo/didyouknow.py:466
+#: ../raphodo/didyouknow.py:495
 msgid "Show tips on startup"
-msgstr ""
+msgstr "Tippek az indításkor"
 
-#: ../raphodo/didyouknow.py:470
+#: ../raphodo/didyouknow.py:499
 msgid "&Next"
-msgstr ""
+msgstr "&Következő"
 
-#: ../raphodo/didyouknow.py:471
+#: ../raphodo/didyouknow.py:500
 msgid "&Previous"
-msgstr ""
+msgstr "&Előző"
 
 #: ../raphodo/downloadtracker.py:402
 msgid "MB/sec"
-msgstr ""
+msgstr "MB/sec"
 
 #. Be friendly in the last few seconds
 #: ../raphodo/downloadtracker.py:532
 msgid "A few seconds"
-msgstr ""
+msgstr "Néhány másodperc"
 
 #: ../raphodo/downloadtracker.py:588
 msgid "1 second"
-msgstr ""
+msgstr "1 másodperc"
 
 #: ../raphodo/downloadtracker.py:590
 #, python-format
 msgid "%d seconds"
-msgstr ""
+msgstr "%d másodperc"
 
 #: ../raphodo/downloadtracker.py:595
 msgid "1 minute"
-msgstr ""
+msgstr "1 perc"
 
 #: ../raphodo/downloadtracker.py:597
 #, python-format
 msgid "%d minutes"
-msgstr ""
+msgstr "%d perc"
 
 #: ../raphodo/downloadtracker.py:602 ../raphodo/downloadtracker.py:784
 msgid "1 hour"
-msgstr ""
+msgstr "1 óra"
 
 #: ../raphodo/downloadtracker.py:604
 #, python-format
 msgid "%d hours"
-msgstr ""
+msgstr "%d óra"
 
 #: ../raphodo/downloadtracker.py:609 ../raphodo/downloadtracker.py:813
 #: ../raphodo/downloadtracker.py:821
 msgid "1 day"
-msgstr ""
+msgstr "1 nap"
 
 #: ../raphodo/downloadtracker.py:611
 #, python-format
 msgid "%d days"
-msgstr ""
+msgstr "%d nap"
 
 #: ../raphodo/downloadtracker.py:790
 msgid "1 minute, 1 second"
-msgstr ""
+msgstr "1 perc 1 másodperc"
 
 #: ../raphodo/downloadtracker.py:792
 #, python-format
 msgid "1 minute, %d seconds"
-msgstr ""
+msgstr "1 perc %d másodperc"
 
 #: ../raphodo/downloadtracker.py:795
 #, python-format
 msgid "%d minutes, 1 second"
-msgstr ""
+msgstr "%d perc 1 másodperc"
 
 #: ../raphodo/downloadtracker.py:797
 #, python-format
 msgid "%(minutes)d minutes, %(seconds)d seconds"
-msgstr ""
+msgstr "%(minutes)d perc %(seconds)d másodperc"
 
 #: ../raphodo/downloadtracker.py:828
 msgid "1 hour, 1 minute"
-msgstr ""
+msgstr "1 óra 1 perc"
 
 #: ../raphodo/downloadtracker.py:830
 #, python-format
 msgid "1 hour, %d minutes"
-msgstr ""
+msgstr "1 óra %d perc"
 
 #: ../raphodo/downloadtracker.py:833
 #, python-format
 msgid "%d hours, 1 minute"
-msgstr ""
+msgstr "%d óra 1 perc"
 
 #: ../raphodo/downloadtracker.py:835
 #, python-format
 msgid "%(hours)d hours, %(minutes)d minutes"
-msgstr ""
+msgstr "%(hours)d óra %(minutes)d perc"
 
 #: ../raphodo/downloadtracker.py:861
 msgid "1 day, 1 hour"
-msgstr ""
+msgstr "1 nap 1 óra"
 
 #: ../raphodo/downloadtracker.py:863
 #, python-format
 msgid "1 day, %d hours"
-msgstr ""
+msgstr "1 nap %d óra"
 
 #: ../raphodo/downloadtracker.py:866
 #, python-format
 msgid "%d days, 1 hour"
-msgstr ""
+msgstr "%d nap 1 óra"
 
 #: ../raphodo/downloadtracker.py:868
 #, python-format
 msgid "%(days)d days, %(hours)d hours"
-msgstr ""
+msgstr "%(days)d nap %(hours)d óra"
 
-#: ../raphodo/errorlog.py:65
+#: ../raphodo/errorlog.py:66
 msgid "Find"
-msgstr ""
+msgstr "Találat"
 
-#: ../raphodo/errorlog.py:135
+#: ../raphodo/errorlog.py:136
 msgid "Error Reports - Rapid Photo Downloader"
-msgstr ""
+msgstr "Hibajelentések - Rapid Photo Downloader"
 
-#: ../raphodo/errorlog.py:170
+#: ../raphodo/errorlog.py:171
 msgid "Find in reports"
-msgstr ""
+msgstr "Jelentések keresése"
 
-#: ../raphodo/errorlog.py:187
+#: ../raphodo/errorlog.py:188
 msgid "Find the previous occurrence of the phrase"
-msgstr ""
+msgstr "Keresse meg a kifejezés korábbi előfordulását"
 
-#: ../raphodo/errorlog.py:192
+#: ../raphodo/errorlog.py:193
 msgid "Find the next occurrence of the phrase"
-msgstr ""
+msgstr "Keresse meg a kifejezés következő előfordulását"
 
-#: ../raphodo/errorlog.py:194
+#: ../raphodo/errorlog.py:195
 msgid "&Highlight All"
-msgstr ""
+msgstr "&Jelölje ki az összeset"
 
-#: ../raphodo/errorlog.py:195
+#: ../raphodo/errorlog.py:196
 msgid "Highlight all occurrences of the phrase"
-msgstr ""
+msgstr "Jelölje ki a kifejezés összes előfordulását"
 
-#: ../raphodo/errorlog.py:196
+# !!!
+#: ../raphodo/errorlog.py:197
 msgid "&Match Case"
-msgstr ""
+msgstr "&Találat esetén"
 
-#: ../raphodo/errorlog.py:197
+#: ../raphodo/errorlog.py:198
 msgid "Search with case sensitivity"
-msgstr ""
+msgstr "Keresés a kisbetűk érzékenységével"
 
-#: ../raphodo/errorlog.py:198
+#: ../raphodo/errorlog.py:199
 msgid "&Whole Words"
-msgstr ""
+msgstr "&Teljes szavak"
 
-#: ../raphodo/errorlog.py:199
+#: ../raphodo/errorlog.py:200
 msgid "Search whole words only"
-msgstr ""
+msgstr "Keresés teljes szavakra"
 
-#: ../raphodo/errorlog.py:209 ../raphodo/errorlog.py:341
+#: ../raphodo/errorlog.py:210 ../raphodo/errorlog.py:345
 #, python-format
 msgid "%s of %s matches"
-msgstr ""
+msgstr "%s -l %s találat"
 
-#: ../raphodo/errorlog.py:228
+#: ../raphodo/errorlog.py:232
 msgid "Clear"
-msgstr ""
+msgstr "Tiszta"
 
-#: ../raphodo/errorlog.py:328
+#: ../raphodo/errorlog.py:332
 msgid "Phrase not found"
-msgstr ""
+msgstr "Kifejezés nem található"
 
-#: ../raphodo/errorlog.py:487
+#: ../raphodo/errorlog.py:491
 msgid "Search pending..."
-msgstr ""
+msgstr "Keresés folyamatban ..."
 
-#: ../raphodo/errorlog.py:535
+#: ../raphodo/errorlog.py:539
 msgid ""
 "The number of new entries added to the Error Report since it was last open. "
 "Click to open the Error Report."
 msgstr ""
+"Az utolsó bejegyzések óta hozzáadott új bejegyzések száma. Kattintson a "
+"gombra a hibajelentés megnyitásához."
 
 #: ../raphodo/excepthook.py:77
 msgid "Problem in Rapid Photo Downloader"
-msgstr ""
+msgstr "Probléma a Rapid Photo Downloader-ben"
 
 #: ../raphodo/excepthook.py:81
 #, python-brace-format
 msgid ""
 "<b>A problem occurred in Rapid Photo Downloader</b><br><br>\n"
-"    Please report the problem at <a href=\"{website}\">{website}</a>."
-"<br><br>\n"
+"    Please report the problem at <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
 "    Attach the log file <i>{log_file}</i> to your bug report (click\n"
 "    <a href=\"{log_path}\">here</a> to open the log directory).<br><br>If "
 "the same problem occurs\n"
 "    again before the program exits, this is the only notification about it.\n"
 "    "
 msgstr ""
+"<b> Probléma történt a Rapid Photo Downloader alkalmazásban </b> <br> <br>\n"
+"     Kérjük, jelentse be a problémát <a href=\"{website}\"> {website} </a>\n"
+"     Csatolja a naplófájlt <i> {log_file} </i> a hibajelentéshez (kattintson "
+"a gombra\n"
+"     <a href=\"{log_path}\"> itt </a> a naplókönyvtár megnyitásához.) <br> "
+"<br> Ha ugyanaz a probléma fordul elő \n"
+"     mielőtt a program kilép, ne küldjön újat.\n"
+"    "
 
 #: ../raphodo/excepthook.py:98
 msgid "A problem occurred in Rapid Photo Downloader\n"
-msgstr ""
+msgstr "Probléma történt a Rapid Photo Downloader alkalmazásban\n"
 
 #: ../raphodo/excepthook.py:99
 #, python-brace-format
@@ -888,552 +1638,556 @@ msgid ""
 "    Attach the log file to your bug report, found at {log_path}\n"
 "\n"
 msgstr ""
+"Kérjük, jelentse a problémát {website}\n"
+"\n"
+"     Csatolja a naplófájlt a hibajelentéshez, amely megtalál a {log_path}\n"
+"\n"
 
-#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1601
+#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1643
 msgid "Open in File Browser..."
-msgstr ""
+msgstr "Nyissa meg a fájlböngészőben ..."
 
 #: ../raphodo/foldercombo.py:120
 msgid "File System"
-msgstr ""
+msgstr "Fájlrendszer"
 
 #: ../raphodo/foldercombo.py:157
 msgid "Other..."
-msgstr ""
+msgstr "Egyéb..."
 
 #. Translators: indicate in combobox that a path does not exist
 #: ../raphodo/foldercombo.py:235
 #, python-format
 msgid "%s (location does not exist)"
-msgstr ""
+msgstr "%s (hely nem létezik)"
 
-#: ../raphodo/generatenameconfig.py:186
+#: ../raphodo/generatenameconfig.py:190
 msgid "Date time"
 msgstr "Dátum és idő"
 
-#: ../raphodo/generatenameconfig.py:187
+#: ../raphodo/generatenameconfig.py:191
 msgid "Text"
 msgstr "Szöveg"
 
-#: ../raphodo/generatenameconfig.py:188 ../raphodo/rapid.py:2053
+#: ../raphodo/generatenameconfig.py:192 ../raphodo/rapid.py:2125
 msgid "Filename"
 msgstr "Fájlnév"
 
-#: ../raphodo/generatenameconfig.py:189 ../raphodo/preferencedialog.py:488
+#: ../raphodo/generatenameconfig.py:193 ../raphodo/preferencedialog.py:724
 msgid "Metadata"
 msgstr "Metaadat"
 
-#: ../raphodo/generatenameconfig.py:190
+#: ../raphodo/generatenameconfig.py:194
 msgid "Sequences"
 msgstr "Sorozatok"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: ../raphodo/generatenameconfig.py:193
+#: ../raphodo/generatenameconfig.py:197
 msgid "Job code"
 msgstr "Munka-szám"
 
-#: ../raphodo/generatenameconfig.py:194
+#: ../raphodo/generatenameconfig.py:198
 msgid "Image date"
 msgstr "Kép dátuma"
 
-#: ../raphodo/generatenameconfig.py:195
+#: ../raphodo/generatenameconfig.py:199
 msgid "Video date"
-msgstr "Videó dátum"
+msgstr "Videó dátuma"
 
-#: ../raphodo/generatenameconfig.py:196
+#: ../raphodo/generatenameconfig.py:200
 msgid "Today"
 msgstr "Ma"
 
-#: ../raphodo/generatenameconfig.py:197
+#: ../raphodo/generatenameconfig.py:201
 msgid "Yesterday"
 msgstr "Tegnap"
 
 #. Translators: Download time is the time and date that the download started (when the
 #. user clicked the Download button)
-#: ../raphodo/generatenameconfig.py:200
+#: ../raphodo/generatenameconfig.py:204
 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
-#: ../raphodo/generatenameconfig.py:203
+#: ../raphodo/generatenameconfig.py:207
 msgid "Name"
 msgstr "Név"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:206 ../raphodo/rapid.py:2054
+#: ../raphodo/generatenameconfig.py:210 ../raphodo/rapid.py:2126
 msgid "Extension"
 msgstr "Kiterjesztés"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:209
+#: ../raphodo/generatenameconfig.py:213
 msgid "Image number"
 msgstr "Kép száma"
 
-#: ../raphodo/generatenameconfig.py:210
+#: ../raphodo/generatenameconfig.py:214
 msgid "Video number"
-msgstr "Videó sorszám"
+msgstr "Videó száma"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:213
+#: ../raphodo/generatenameconfig.py:217
 msgid "Aperture"
 msgstr "Rekesz"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:216
+#: ../raphodo/generatenameconfig.py:220
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:219
+#: ../raphodo/generatenameconfig.py:223
 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
-#: ../raphodo/generatenameconfig.py:222
+#: ../raphodo/generatenameconfig.py:226
 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
-#: ../raphodo/generatenameconfig.py:225
+#: ../raphodo/generatenameconfig.py:229
 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
-#: ../raphodo/generatenameconfig.py:228
+#: ../raphodo/generatenameconfig.py:232
 msgid "Camera model"
-msgstr "Fényképezőgép"
+msgstr "Fényképezőgép típusa"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:231
+#: ../raphodo/generatenameconfig.py:235
 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
-#: ../raphodo/generatenameconfig.py:234
+#: ../raphodo/generatenameconfig.py:238
 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
-#: ../raphodo/generatenameconfig.py:237
+#: ../raphodo/generatenameconfig.py:241
 msgid "Serial number"
 msgstr "Sorozatszám"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:240
+#: ../raphodo/generatenameconfig.py:244
 msgid "Shutter count"
 msgstr "Zár számláló"
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: ../raphodo/generatenameconfig.py:242
+#: ../raphodo/generatenameconfig.py:246
 msgid "File number"
 msgstr "Fájl (sor)szám"
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:244
+#: ../raphodo/generatenameconfig.py:248
 msgid "Folder only"
 msgstr "Csak mappa"
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:246
+#: ../raphodo/generatenameconfig.py:250
 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
-#: ../raphodo/generatenameconfig.py:249
+#: ../raphodo/generatenameconfig.py:253
 msgid "Owner name"
 msgstr "A tulajdonos neve"
 
-#: ../raphodo/generatenameconfig.py:250
+#: ../raphodo/generatenameconfig.py:254
 msgid "Codec"
 msgstr "Kodek"
 
-#: ../raphodo/generatenameconfig.py:251
+#: ../raphodo/generatenameconfig.py:255
 msgid "Width"
 msgstr "Szélesség"
 
-#: ../raphodo/generatenameconfig.py:252
+#: ../raphodo/generatenameconfig.py:256
 msgid "Height"
 msgstr "Magasság"
 
-#: ../raphodo/generatenameconfig.py:253
+#: ../raphodo/generatenameconfig.py:257
 msgid "Length"
-msgstr "Hossz"
+msgstr "Hosszúság"
 
-#: ../raphodo/generatenameconfig.py:254
+#: ../raphodo/generatenameconfig.py:258
 msgid "Frames Per Second"
 msgstr "Képkoca/másodperc"
 
-#: ../raphodo/generatenameconfig.py:255
+#: ../raphodo/generatenameconfig.py:259
 msgid "Artist"
 msgstr "Készítette"
 
-#: ../raphodo/generatenameconfig.py:256
+#: ../raphodo/generatenameconfig.py:260
 msgid "Copyright"
 msgstr "Szerzői jog"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:259
+#: ../raphodo/generatenameconfig.py:263
 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
-#: ../raphodo/generatenameconfig.py:262
+#: ../raphodo/generatenameconfig.py:266
 msgid "Session number"
 msgstr "Munkamenetszám"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:265
+#: ../raphodo/generatenameconfig.py:269
 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
-#: ../raphodo/generatenameconfig.py:268
+#: ../raphodo/generatenameconfig.py:272
 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
-#: ../raphodo/generatenameconfig.py:271
+#: ../raphodo/generatenameconfig.py:275
 msgid "Sequence letter"
 msgstr "Sorozat betű"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:274
+#: ../raphodo/generatenameconfig.py:278
 msgid "All digits"
 msgstr "Minden számjegy"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:277
+#: ../raphodo/generatenameconfig.py:281
 msgid "Last digit"
 msgstr "Utolsó számjegy"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:280
+#: ../raphodo/generatenameconfig.py:284
 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
-#: ../raphodo/generatenameconfig.py:283
+#: ../raphodo/generatenameconfig.py:287
 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
-#: ../raphodo/generatenameconfig.py:286
+#: ../raphodo/generatenameconfig.py:290
 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
-#: ../raphodo/generatenameconfig.py:289
+#: ../raphodo/generatenameconfig.py:293
 msgid "Original Case"
-msgstr "Eredeti kisbetű / nagybetű"
+msgstr "Eredeti kisbetű/nagybetű"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:292
+#: ../raphodo/generatenameconfig.py:296
 msgid "UPPERCASE"
 msgstr "NAGYBETŰS"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:295
+#: ../raphodo/generatenameconfig.py:299
 msgid "lowercase"
 msgstr "kisbetűs"
 
-#: ../raphodo/generatenameconfig.py:296
+#: ../raphodo/generatenameconfig.py:300
 msgid "One digit"
-msgstr "Egyszámjegyű"
+msgstr "Egy számjegy"
 
-#: ../raphodo/generatenameconfig.py:297
+#: ../raphodo/generatenameconfig.py:301
 msgid "Two digits"
-msgstr "Kétszámjegyű"
+msgstr "Két számjegy"
 
-#: ../raphodo/generatenameconfig.py:298
+#: ../raphodo/generatenameconfig.py:302
 msgid "Three digits"
-msgstr "Háromszámjegyű"
+msgstr "Három számjegy"
 
-#: ../raphodo/generatenameconfig.py:299
+#: ../raphodo/generatenameconfig.py:303
 msgid "Four digits"
-msgstr "Négyszámjegyű"
+msgstr "Négy számjegy"
 
-#: ../raphodo/generatenameconfig.py:300
+#: ../raphodo/generatenameconfig.py:304
 msgid "Five digits"
-msgstr "Ötszámjegyű"
+msgstr "Öt számjegy"
 
-#: ../raphodo/generatenameconfig.py:301
+#: ../raphodo/generatenameconfig.py:305
 msgid "Six digits"
-msgstr "Hatszámjegyű"
+msgstr "Hat számjegy"
 
-#: ../raphodo/generatenameconfig.py:302
+#: ../raphodo/generatenameconfig.py:306
 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
-#: ../raphodo/generatenameconfig.py:305
+#: ../raphodo/generatenameconfig.py:309
 msgid "Subseconds"
 msgstr "Millimásodperc"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:308 ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:312 ../raphodo/generatenameconfig.py:393
 msgid "YYYYMMDD"
 msgstr "ÉÉÉÉHHNN"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:311 ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:315 ../raphodo/generatenameconfig.py:394
 msgid "YYYY-MM-DD"
 msgstr "ÉÉÉÉ-HH-NN"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:314 ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:318 ../raphodo/generatenameconfig.py:395
 msgid "YYYY_MM_DD"
-msgstr ""
+msgstr "ÉÉÉÉ_HH_NN"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:317
+#: ../raphodo/generatenameconfig.py:321
 msgid "YYMMDD"
 msgstr "ÉÉHHNN"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:320
+#: ../raphodo/generatenameconfig.py:324
 msgid "YY-MM-DD"
 msgstr "ÉÉ-HH-NN"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:323
+#: ../raphodo/generatenameconfig.py:327
 msgid "YY_MM_DD"
-msgstr ""
+msgstr "ÉÉ_HH_NN"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:326
+#: ../raphodo/generatenameconfig.py:330
 msgid "MMDDYYYY"
 msgstr "HHNNÉÉÉÉ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:329
+#: ../raphodo/generatenameconfig.py:333
 msgid "MMDDYY"
 msgstr "HHNNÉÉ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:332
+#: ../raphodo/generatenameconfig.py:336
 msgid "MMDD"
 msgstr "HHNN"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:335
+#: ../raphodo/generatenameconfig.py:339
 msgid "DDMMYYYY"
 msgstr "NNHHÉÉÉÉ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:338
+#: ../raphodo/generatenameconfig.py:342
 msgid "DDMMYY"
 msgstr "NNHHÉÉ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:341 ../raphodo/generatenameconfig.py:389
-#: ../raphodo/generatenameconfig.py:390 ../raphodo/generatenameconfig.py:391
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:345 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:394 ../raphodo/generatenameconfig.py:395
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:397
 msgid "YYYY"
 msgstr "ÉÉÉÉ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:344
+#: ../raphodo/generatenameconfig.py:348
 msgid "YY"
 msgstr "ÉÉ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:347
+#: ../raphodo/generatenameconfig.py:351
 msgid "MM"
 msgstr "HH"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:350
+#: ../raphodo/generatenameconfig.py:354
 msgid "DD"
 msgstr "NN"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:353
+#: ../raphodo/generatenameconfig.py:357
 msgid "Month (full)"
 msgstr "Hónap (teljes)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:356
+#: ../raphodo/generatenameconfig.py:360
 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
-#: ../raphodo/generatenameconfig.py:359
+#: ../raphodo/generatenameconfig.py:363
 msgid "HHMMSS"
 msgstr "ÓÓPPMM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:362
+#: ../raphodo/generatenameconfig.py:366
 msgid "HHMM"
 msgstr "ÓÓPP"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:365
+#: ../raphodo/generatenameconfig.py:369
 msgid "HH-MM-SS"
 msgstr "ÓÓ-PP-MM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:368
+#: ../raphodo/generatenameconfig.py:372
 msgid "HH-MM"
 msgstr "ÓÓ-PP"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:371
+#: ../raphodo/generatenameconfig.py:375
 msgid "HH"
 msgstr "ÓÓ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:374
+#: ../raphodo/generatenameconfig.py:378
 msgid "MM (minutes)"
 msgstr "PP"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:377
+#: ../raphodo/generatenameconfig.py:381
 msgid "SS"
 msgstr "MM"
 
-#: ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:393
 msgid "Date"
-msgstr ""
+msgstr "Dátum"
 
-#: ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:394
 msgid "Date (hyphens)"
-msgstr ""
+msgstr "Dátum (elválasztva)"
 
-#: ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:395
 msgid "Date (underscores)"
-msgstr ""
+msgstr "Dátum (aláhúzással)"
 
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:438
-#: ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:442
+#: ../raphodo/generatenameconfig.py:537
 msgid "Date and Job Code"
-msgstr ""
+msgstr "Dátum és munka-kód"
 
-#: ../raphodo/generatenameconfig.py:392
+#: ../raphodo/generatenameconfig.py:396
 msgid "YYYYMM_Job Code"
-msgstr ""
+msgstr "YYYYMM_munka-kód"
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "Date and Job Code Subfolder"
-msgstr ""
+msgstr "Dátum és munka-kód aldosszié"
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "YYYYMM"
-msgstr ""
+msgstr "ÉÉÉÉHH"
 
-#: ../raphodo/generatenameconfig.py:393 ../raphodo/jobcodepanel.py:198
-#: ../raphodo/nameeditor.py:827 ../raphodo/rapid.py:1809
+#: ../raphodo/generatenameconfig.py:397 ../raphodo/jobcodepanel.py:199
+#: ../raphodo/nameeditor.py:833 ../raphodo/rapid.py:1852
 #: ../raphodo/renamepanel.py:83 ../raphodo/renamepanel.py:241
 msgid "Job Code"
-msgstr "Munka kód"
+msgstr "Munka-kód"
 
-#: ../raphodo/generatenameconfig.py:433 ../raphodo/generatenameconfig.py:512
+#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:532
 msgid "Original Filename"
-msgstr ""
+msgstr "Eredeti fájlnév"
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "Date-Time and Downloads today"
-msgstr ""
+msgstr "Dátum-idő és mai letöltések"
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "YYYYMMDD-HHMM-1"
-msgstr ""
+msgstr "ÉÉÉÉHHNN-ÓÓPP-1"
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "Date and Downloads today"
-msgstr ""
+msgstr "Dátum és mai letöltések"
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "YYYYMMDD-1"
-msgstr ""
+msgstr "ÉÉÉÉHHNN-1"
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "Date-Time and Image number"
-msgstr ""
+msgstr "Dátum-idő és Fotó száma"
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "YYYYMMDD-1234"
-msgstr ""
+msgstr "ÉÉÉÉHHNN-1234"
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "Date-Time and Job Code"
-msgstr ""
+msgstr "Dátum-idő és munka-kód"
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "YYYYMMDD-HHMM-Job Code-1"
-msgstr ""
+msgstr "ÉÉÉÉHHNN-ÓÓPP-munka-kód-1"
 
-#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:442 ../raphodo/generatenameconfig.py:537
 msgid "YYYYMMDD-Job Code-1"
-msgstr ""
+msgstr "ÉÉÉÉHHNN-munka-kód-1"
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "Date-Time and Video number"
-msgstr ""
+msgstr "Dátum-idő és Videó száma"
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "YYYYMMDD_1234"
-msgstr ""
+msgstr "ÉÉÉÉHHDD_1234"
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "Resolution"
-msgstr ""
+msgstr "Felbontás"
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "YYYYMMDD-HHMM-1-1920x1080"
-msgstr ""
+msgstr "ÉÉÉÉHHNN-ÓÓPP-1-1920x1080"
 
 #: ../raphodo/jobcodepanel.py:64
 msgid "Enter a new Job Code, or select a previous one"
@@ -1444,6 +2198,8 @@ msgstr "Adjon meg új munka-kódot, vagy válasszon egyet a korábbiakból."
 #, python-format
 msgid "The Job Code will be applied to %s that does not yet have a Job Code."
 msgstr ""
+"A munka-kódot a(z) %s rendszerre alkalmazza, amely még nem rendelkezik munka-"
+"kóddal."
 
 #. Translators: the value substituted will be something like '85 photos and 5
 #. videos'.
@@ -1451,10 +2207,12 @@ msgstr ""
 #, python-format
 msgid "The Job Code will be applied to %s that do not yet have a Job Code."
 msgstr ""
+"A munka-kódot a(z) %s rendszerre alkalmazza, amely még nem rendelkezik munka-"
+"kóddal."
 
 #: ../raphodo/jobcodepanel.py:78
 msgid "Apply Job Code to Download"
-msgstr ""
+msgstr "Munka-kód alkalmazása a letöltéshez"
 
 #: ../raphodo/jobcodepanel.py:80
 msgid "Enter a new Job Code"
@@ -1462,663 +2220,966 @@ msgstr "Adjon meg új munka-kódot"
 
 #: ../raphodo/jobcodepanel.py:86
 msgid "The new Job Code will not be applied to any photos or videos."
-msgstr ""
+msgstr "Az új munka-kód nem alkalmazható semmilyen fényképen vagy videón."
 
 #. Translators: the value substituted will be something like '100 photos and 5
 #. videos'.
 #: ../raphodo/jobcodepanel.py:92
 #, python-format
 msgid "The new Job Code will <b>not</b> be applied to %s."
-msgstr ""
+msgstr "Az új munka-kódot <b> nem </b> kell alkalmazni a %s -ra."
 
 #. Translators: the value substituted will be something like '100 photos and 5
 #. videos'.
 #: ../raphodo/jobcodepanel.py:97
 #, python-format
 msgid "The new Job Code will be applied to %s."
-msgstr ""
+msgstr "Az új munkakódot a(z) %s fájlra kell alkalmazni."
 
 #: ../raphodo/jobcodepanel.py:99
 msgid "New Job Code"
-msgstr ""
+msgstr "Új munka-kód"
 
 #: ../raphodo/jobcodepanel.py:134
 msgid "&Job Code:"
-msgstr ""
+msgstr "&Munka-kód:"
 
 #: ../raphodo/jobcodepanel.py:136 ../raphodo/rememberthisdialog.py:68
 msgid "&Remember this choice"
-msgstr ""
+msgstr "&Emlékezzen erre a választásra"
 
-#: ../raphodo/jobcodepanel.py:185
+#: ../raphodo/jobcodepanel.py:186
 msgid ""
 "Select photos and videos to be able to apply a new or existing Job Code to "
 "them."
 msgstr ""
+"Jelöljön ki fényképeket és videókat, hogy új vagy meglévő munka-kódot adjon "
+"hozzájuk."
 
-#: ../raphodo/jobcodepanel.py:186
-msgid "The new Job Code will be applied to all selected photos and/or videos."
+#: ../raphodo/jobcodepanel.py:187
+msgid ""
+"The new Job Code will be applied to all selected photos and/or videos."
 msgstr ""
+"Az új munka-kódot minden kiválasztott fényképre és/vagy videóra alkalmazzák."
 
-#: ../raphodo/jobcodepanel.py:187
+#: ../raphodo/jobcodepanel.py:188
 msgid ""
 "Click the Apply button to apply the current Job Code to all selected photos "
 "and/or videos. You can also simply double click the Job Code."
 msgstr ""
+"Kattintson az Alkalmaz gombra, hogy az aktuális munka-kódot minden "
+"kiválasztott fényképre és/vagy videóra alkalmazza. Egyszerűen duplán "
+"kattinthat a munka-kódra is."
 
-#: ../raphodo/jobcodepanel.py:189
+#: ../raphodo/jobcodepanel.py:190
 msgid ""
 "Removing a Job Code removes it only from the list of saved Job Codes, not "
 "from any photos or videos that it may have been applied to."
 msgstr ""
+"A munka-kód eltávolítása csak az elmentett munkakódok listájából távolítja "
+"el azt és nem olyan fényképekből vagy videókból, amelyekre alkalmazva van."
 
-#: ../raphodo/jobcodepanel.py:191
+#: ../raphodo/jobcodepanel.py:192
 msgid ""
 "If you want to use Job Codes, configure file renaming or destination "
 "subfolder names to use them."
 msgstr ""
+"Ha munka-kódokat kíván alkalmazni, konfigurálja a fájl átnevezését vagy a "
+"cél alkönyvtár nevét."
 
-#: ../raphodo/jobcodepanel.py:197
+#: ../raphodo/jobcodepanel.py:198
 msgid "Last Used"
-msgstr ""
+msgstr "Utoljára használt"
 
-#: ../raphodo/jobcodepanel.py:202
+#: ../raphodo/jobcodepanel.py:203
 msgid "Job Code Sort:"
-msgstr ""
+msgstr "Munka-kód rendezés:"
 
-#: ../raphodo/jobcodepanel.py:205 ../raphodo/rapid.py:2061
+#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2133
 msgid "Ascending"
-msgstr ""
+msgstr "Növekvő"
 
-#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2062
+#: ../raphodo/jobcodepanel.py:207 ../raphodo/rapid.py:2134
 msgid "Descending"
-msgstr ""
+msgstr "Csökkenő"
 
-#: ../raphodo/jobcodepanel.py:216
+#: ../raphodo/jobcodepanel.py:217
 msgid "&New..."
-msgstr ""
+msgstr "&Új..."
 
-#: ../raphodo/jobcodepanel.py:220
+#: ../raphodo/jobcodepanel.py:221
 msgid "&Apply"
-msgstr ""
+msgstr "&Alkalmaz"
 
-#: ../raphodo/jobcodepanel.py:224
+#: ../raphodo/jobcodepanel.py:225
 msgid "&Remove"
-msgstr ""
+msgstr "&Eltávolít"
 
-#: ../raphodo/jobcodepanel.py:228 ../raphodo/preferencedialog.py:125
-#: ../raphodo/preferencedialog.py:154 ../raphodo/preferencedialog.py:433
+#: ../raphodo/jobcodepanel.py:229 ../raphodo/preferencedialog.py:200
+#: ../raphodo/preferencedialog.py:229 ../raphodo/preferencedialog.py:531
 msgid "Remove All"
-msgstr ""
+msgstr "Mindent eltávolít"
 
-#: ../raphodo/jobcodepanel.py:427
+#: ../raphodo/jobcodepanel.py:428
 msgid "Do you really want to remove all the Job Codes?"
-msgstr ""
+msgstr "Összes munka-kód eltávolítása?"
 
-#: ../raphodo/jobcodepanel.py:429
+#: ../raphodo/jobcodepanel.py:430
 msgid "Remove all Job Codes"
-msgstr ""
+msgstr "Összes munka-kód eltávolítása"
 
-#: ../raphodo/jobcodepanel.py:492
+#: ../raphodo/jobcodepanel.py:493
 msgid "Job Codes"
-msgstr "Munka-szám"
+msgstr "Munka-kód"
 
 #. 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
 #: ../raphodo/messagewidget.py:65
 #, python-format
 msgid "<i><b>Hint:</b> %(message)s"
-msgstr ""
+msgstr "<i><b> Tipp: </b> %(message)s"
 
-#: ../raphodo/nameeditor.py:418 ../raphodo/nameeditor.py:432
+#: ../raphodo/nameeditor.py:423 ../raphodo/nameeditor.py:437
 #, python-format
 msgid "%(description)s - %(elements)s"
-msgstr ""
+msgstr "%(description)s - %(elements)s"
 
-#: ../raphodo/nameeditor.py:512
+#: ../raphodo/nameeditor.py:517
 msgid "Save New Custom Preset..."
-msgstr ""
+msgstr "Az új egyéni előbeállítások mentése ..."
 
-#: ../raphodo/nameeditor.py:513
+#: ../raphodo/nameeditor.py:518
 msgid "Remove All Custom Presets..."
-msgstr ""
+msgstr "Összes egyéni előbeállítás eltávolítása ..."
 
-#: ../raphodo/nameeditor.py:559
+#: ../raphodo/nameeditor.py:564
 msgid "(New Custom Preset)"
-msgstr ""
+msgstr "(Új egyéni beállítás)"
 
-#: ../raphodo/nameeditor.py:576
+#: ../raphodo/nameeditor.py:581
 #, python-format
 msgid "%s (edited)"
-msgstr ""
+msgstr "%s (edited)"
 
-#: ../raphodo/nameeditor.py:579 ../raphodo/nameeditor.py:1370
+#: ../raphodo/nameeditor.py:584 ../raphodo/nameeditor.py:1379
 #, python-format
 msgid "Update Custom Preset \"%s\""
-msgstr ""
+msgstr "Egyéni beállítások frissítése \"%s\""
 
-#: ../raphodo/nameeditor.py:667
+#: ../raphodo/nameeditor.py:672
 msgid "Save New Custom Preset - Rapid Photo Downloader"
-msgstr ""
+msgstr "Mentse az új egyéni beállításokat - Rapid Photo Downloader"
 
-#: ../raphodo/nameeditor.py:675
+#: ../raphodo/nameeditor.py:680
 msgid "Preset Name:"
-msgstr ""
+msgstr "Előre beállított név:"
+
+#: ../raphodo/nameeditor.py:799
+msgid "Photo Subfolder Generation Editor"
+msgstr "Fénykép alkönyvtár generációs szerkesztő"
 
-#: ../raphodo/nameeditor.py:836
+#: ../raphodo/nameeditor.py:805
+msgid "Video Subfolder Generation Editor"
+msgstr "Videó alkönyvtár generációs szerkesztő"
+
+#: ../raphodo/nameeditor.py:811
+msgid "Photo Renaming Editor"
+msgstr "Fénykép átnevezés szerkesztő"
+
+#: ../raphodo/nameeditor.py:817
+msgid "Video Renaming Editor"
+msgstr "Videó átnevezés szerkesztő"
+
+#: ../raphodo/nameeditor.py:842
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>There is insufficient data to "
 "fully generate the name. Please use other renaming options.</i>"
 msgstr ""
+"<b><font color = \"red\"> Figyelmeztetés: </font> </b><i> Nincs elég adat a "
+"név teljes generálásához. Kérjük, használjon más átnevezési beállításokat. "
+"</i>"
 
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees.
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:846
+#: ../raphodo/nameeditor.py:853
 #, python-format
 msgid "The character</i> %(separator)s <i>creates a new subfolder level."
-msgstr ""
+msgstr "A karakter <i> %(separator)s </i> új almappát állít elő."
 
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:851
+#: ../raphodo/nameeditor.py:858
 #, python-format
 msgid ""
 "There is no need start or end with the folder separator </i> "
 "%(separator)s<i>, because it is added automatically."
 msgstr ""
+"Nincs szükség a szeparátor <i> %(separator)s </i> elindítására vagy "
+"befejezésére, mert automatikusan hozzáadódik."
 
-#: ../raphodo/nameeditor.py:859
+#: ../raphodo/nameeditor.py:866
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>Unique filenames may not be "
 "generated. Make filenames unique by using Sequence values.</i>"
 msgstr ""
+"<b> <font color = \"red\"> Figyelmeztetés: </font> </b> <i> Nem hozhatók "
+"létre egyedi fájlnevek.  A szekvenciaértékek használatával egyedi "
+"fájlneveket hozhat létre. </i>"
 
-#: ../raphodo/nameeditor.py:882 ../raphodo/renamepanel.py:121
+#: ../raphodo/nameeditor.py:889 ../raphodo/renamepanel.py:121
 msgid "Preset:"
-msgstr ""
+msgstr "Előbeállítás:"
 
 #. Translators: appears in a combobox, e.g. Image Date (YYYY)
-#: ../raphodo/nameeditor.py:959 ../raphodo/nameeditor.py:980
+#: ../raphodo/nameeditor.py:966 ../raphodo/nameeditor.py:987
 #, python-brace-format
 msgid "{choice} ({variant})"
-msgstr ""
+msgstr "{choice} ({variant})"
 
-#: ../raphodo/nameeditor.py:1005 ../raphodo/preferencedialog.py:530
+#: ../raphodo/nameeditor.py:1012 ../raphodo/preferencedialog.py:783
 msgid "Get help online..."
-msgstr ""
+msgstr "Online segítség kérése ..."
 
-#: ../raphodo/nameeditor.py:1025
+#: ../raphodo/nameeditor.py:1034
 msgid "Insert"
-msgstr ""
+msgstr "Beszúrás"
 
-#: ../raphodo/nameeditor.py:1351
+#: ../raphodo/nameeditor.py:1360
 msgid "Save Preset - Rapid Photo Downloader"
-msgstr ""
+msgstr "Előbeállítás mentése - Rapid Photo Downloader"
 
-#: ../raphodo/nameeditor.py:1356
+#: ../raphodo/nameeditor.py:1365
 msgid ""
-"<b>Do you want to save the changes in a new custom preset?</"
-"b><br><br>Creating a custom preset is not required, but can help you keep "
-"organized.<br><br>The changes to the preferences will still be applied "
-"regardless of whether you create a new custom preset or not."
+"<b>Do you want to save the changes in a new custom "
+"preset?</b><br><br>Creating a custom preset is not required, but can help "
+"you keep organized.<br><br>The changes to the preferences will still be "
+"applied regardless of whether you create a new custom preset or not."
 msgstr ""
+"<b> Szeretné menteni a változtatásokat egy új egyéni programcsomagban? </b> "
+"<br> <br> Egyéni beállítások létrehozása nem szükséges, de segíthet a "
+"szervezettség megőrzésében. A preferenciák továbbra is alkalmazásra kerülnek "
+"függetlenül attól, hogy létrehozott-e egy új egyéni beállítást vagy sem."
 
-#: ../raphodo/nameeditor.py:1365
+#: ../raphodo/nameeditor.py:1374
 msgid ""
 "<b>Do you want to save the changes in a custom preset?</b><br><br>If you "
 "like, you can create a new custom preset or update the existing custom "
 "preset.<br><br>The changes to the preferences will still be applied "
 "regardless of whether you save a custom preset or not."
 msgstr ""
+"<b> Szeretné a változásokat egyéni beállításokba menteni? </b> <br> <br> Ha "
+"igen, létrehozhat egy új egyéni beállítást vagy frissítheti a meglévő egyéni "
+"beállításokat. A preferenciák módosításai továbbra is alkalmazásra kerülnek, "
+"függetlenül attól, hogy egyéni beállításokat mentett-e vagy sem."
 
-#: ../raphodo/nameeditor.py:1372
+#: ../raphodo/nameeditor.py:1381
 msgid "Save New Custom Preset"
-msgstr ""
+msgstr "Új egyéni beállítás mentése"
 
-#: ../raphodo/newversion.py:306
+#: ../raphodo/newversion.py:312
 msgid "Checking for new version..."
-msgstr ""
+msgstr "Új verzió ellenőrzése ..."
 
-#: ../raphodo/newversion.py:307
+#: ../raphodo/newversion.py:313
 msgid "You are running the latest version."
-msgstr ""
+msgstr "Ön a legújabb verziót futtatja."
 
-#: ../raphodo/newversion.py:308
+#: ../raphodo/newversion.py:314
 msgid "Failed to contact the update server."
-msgstr ""
+msgstr "Nem sikerült kapcsolatba lépni a frissítést tartalmazó szerverrel."
 
-#: ../raphodo/newversion.py:310
+#: ../raphodo/newversion.py:316
 #, python-format
 msgid "A new version of Rapid Photo Downloader (%s) is available."
-msgstr ""
+msgstr "A Rapid Photo Downloader (%s) új verziója elérhető."
 
-#: ../raphodo/newversion.py:312
+#: ../raphodo/newversion.py:318
 msgid "Do you want to download the new version?"
-msgstr ""
+msgstr "Szeretné letölteni az új verziót?"
 
-#: ../raphodo/newversion.py:313
+#: ../raphodo/newversion.py:319
 #, python-format
 msgid "Changes in the new release can be viewed <a href=\"%s\">here</a>."
 msgstr ""
+"Az új verzióban történt változások megtekinthetők: <a href=\"%s\"> itt </a>."
 
 #. Translators: this text appears in a button - the & sets the s key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:340 ../raphodo/newversion.py:353
+#: ../raphodo/newversion.py:348 ../raphodo/newversion.py:363
 msgid "&Skip this release"
-msgstr ""
+msgstr "&Kiadás kihagyása"
 
 #. Translators: this text appears in a button - the & sets the o key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:356
+#: ../raphodo/newversion.py:366
 msgid "&Open Download Page"
-msgstr ""
+msgstr "&Letöltési oldal megnyitása"
 
-#: ../raphodo/newversion.py:376
+#: ../raphodo/newversion.py:386
 msgid "Rapid Photo Downloader updates"
-msgstr ""
+msgstr "A Rapid Photo Downloader frissítései"
 
 #. Translators: shows how much of a file has been downloaded e.g  123 KB of 1.3 MB
-#: ../raphodo/newversion.py:478
+#: ../raphodo/newversion.py:488
 #, python-format
 msgid "%(downloaded)s of %(total)s"
-msgstr ""
+msgstr "Letöltve: %(downloaded)s / Összes: %(total)s"
 
-#: ../raphodo/newversion.py:495
+#: ../raphodo/newversion.py:507
 msgid "Downloading..."
-msgstr ""
+msgstr "Letöltés ..."
 
-#: ../raphodo/preferencedialog.py:76
+#: ../raphodo/preferencedialog.py:86
 msgid "Preferences"
 msgstr "Beállítások"
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Automation"
 msgstr "Automatizálás"
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Thumbnails"
-msgstr "Előnézeti képek"
+msgstr "Bélyegképek"
 
-#: ../raphodo/preferencedialog.py:85 ../raphodo/preferencedialog.py:343
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/preferencedialog.py:428
 msgid "Error Handling"
 msgstr "Hibakezelés"
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Warnings"
-msgstr ""
+msgstr "Figyelmeztetések"
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:109
+msgid "Consolidation"
+msgstr "Megerősítés"
+
+#: ../raphodo/preferencedialog.py:109 ../raphodo/preferencedialog.py:119
 msgid "Miscellaneous"
 msgstr "Egyebek"
 
-#: ../raphodo/preferencedialog.py:94
+#: ../raphodo/preferencedialog.py:147
 msgid "Device Scanning"
-msgstr ""
+msgstr "Eszközkeresés"
 
-#: ../raphodo/preferencedialog.py:96
+#: ../raphodo/preferencedialog.py:148
 msgid "Scan only external devices"
-msgstr ""
+msgstr "Csak külső eszközöket vizsgáljon"
 
-#: ../raphodo/preferencedialog.py:98
+#: ../raphodo/preferencedialog.py:150
 msgid ""
 "Scan for photos and videos only on devices that are external to the "
 "computer,\n"
 "including cameras, memory cards, external hard drives, and USB flash drives."
 msgstr ""
+"Fényképek és videók csak a számítógépen kívüli eszközökről,\n"
+"beleértve a fényképezőgépeket, memóriakártyákat, külső merevlemezeket és USB "
+"flash meghajtókat."
 
-#: ../raphodo/preferencedialog.py:102
-msgid "Scan non-camera devices lacking a DCIM folder"
+#: ../raphodo/preferencedialog.py:153
+msgid "Scan only specific folders on devices"
+msgstr "Csak külső eszközöket vizsgáljon"
+
+#: ../raphodo/preferencedialog.py:155
+msgid ""
+"Scan for photos and videos only in the folders specified below (except "
+"paths\n"
+"specified in Ignored Paths).\n"
+"\n"
+"Changing this setting causes all devices to be scanned again."
 msgstr ""
+"Fotók és videók keresése csak az alábbiakban megadott mappákban\n"
+"(kivéve az kihagyandó elérési utakat).\n"
+"\n"
+"Ennek a beállításnak a megváltoztatásával minden eszköz ismét beolvasható."
 
-#: ../raphodo/preferencedialog.py:104
+#: ../raphodo/preferencedialog.py:161
+msgid "Folders to scan:"
+msgstr "Mappák keresése:"
+
+#: ../raphodo/preferencedialog.py:164
 msgid ""
-"Scan the entirety of a device for photos and videos, irrespective of whether "
-"it contains a DCIM folder,\n"
-"as opposed to only scanning within a DCIM folder.\n"
+"Folders at the base level of device file systems that will be scanned\n"
+"for photos and videos."
+msgstr ""
+"A beolvasandó eszközfájlrendszer alapszintű mappái\n"
+"fotókhoz és videókhoz."
+
+#: ../raphodo/preferencedialog.py:167 ../raphodo/preferencedialog.py:219
+msgid "Add..."
+msgstr "Hozzáadás ..."
+
+#: ../raphodo/preferencedialog.py:169
+msgid ""
+"Add a folder to the list of folders to scan for photos and videos.\n"
 "\n"
-"Changing this setting causes all devices to be scanned again.\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+"Adjon egy mappát a mappák listájához, hogy fotókat és videókat olvashasson "
+"be.\n"
 "\n"
-"Note: With cameras, only the DCIM folder is scanned."
+"Ennek a beállításnak a megváltoztatásával minden eszköz ismét beolvasható."
+
+#: ../raphodo/preferencedialog.py:172 ../raphodo/preferencedialog.py:198
+#: ../raphodo/preferencedialog.py:224 ../raphodo/preferencedialog.py:529
+msgid "Remove"
+msgstr "Eltávolít"
+
+#: ../raphodo/preferencedialog.py:174
+msgid ""
+"Remove a folder from the list of folders to scan for photos and videos.\n"
+"\n"
+"Changing this setting causes all devices to be scanned again."
 msgstr ""
+"Távolítson el egy mappát a mappák listájáról a fotók és videók kereséséhez.\n"
+"\n"
+"Ennek a beállításnak a megváltoztatásával minden eszköz ismét beolvasható."
 
-#: ../raphodo/preferencedialog.py:116
+#: ../raphodo/preferencedialog.py:191
 msgid "Devices that have been set to automatically ignore or download from."
 msgstr ""
+"Olyan eszközök, amelyeket beállított, hogy automatikusan figyelmen kívül "
+"hagyják vagy letöltik."
 
-#: ../raphodo/preferencedialog.py:117
+#: ../raphodo/preferencedialog.py:192
 msgid "Remembered Devices"
-msgstr ""
+msgstr "Megjegyzett eszközök"
 
-#: ../raphodo/preferencedialog.py:121
+#: ../raphodo/preferencedialog.py:196
 msgid ""
 "Remove a device from the list of devices to automatically ignore or download "
 "from."
 msgstr ""
+"Távolítson el egy eszközt az eszközök listájáról, hogy automatikusan "
+"figyelmen kívül hagyja vagy letöltse."
 
-#: ../raphodo/preferencedialog.py:123 ../raphodo/preferencedialog.py:149
-#: ../raphodo/preferencedialog.py:431
-msgid "Remove"
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:127
+#: ../raphodo/preferencedialog.py:202
 msgid ""
 "Clear the list of devices from which to automatically ignore or download "
 "from.\n"
 "\n"
 "Note: Changes take effect when the computer is next scanned for devices."
 msgstr ""
+"Törölje azon eszközök listáját, amelyekről automatikusan figyelmen kívül "
+"hagy vagy letölt.\n"
+"\n"
+"Megjegyzés: A módosítások akkor lépnek életbe, amikor a számítógép a "
+"következő eszközkeresést végzi."
 
-#: ../raphodo/preferencedialog.py:140
+#: ../raphodo/preferencedialog.py:215
 msgid "Ignored Paths"
-msgstr "Mellőzött útvonal"
+msgstr "Mellőzött elérési út"
 
-#: ../raphodo/preferencedialog.py:141
+#: ../raphodo/preferencedialog.py:216
 msgid ""
 "The end part of a path that should never be scanned for photos or videos."
 msgstr ""
+"Az elérési út végső része, amelyen soha nem szabad fényképeket vagy videókat "
+"keresni."
 
-#: ../raphodo/preferencedialog.py:144
-msgid "Add..."
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:146
+#: ../raphodo/preferencedialog.py:221
 msgid ""
 "Add a path to the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
+"Adjon hozzá egy elérési utat a figyelmen kívül hagyandó elérési utak "
+"listájához.\n"
+"\n"
+"Ennek a beállításnak a megváltoztatásával minden eszköz újra beolvasásra "
+"kerül."
 
-#: ../raphodo/preferencedialog.py:151
+#: ../raphodo/preferencedialog.py:226
 msgid ""
 "Remove a path from the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
+"Távolítson el egy elérési utat a figyelmen kívül hagyni kívánt elérési utak "
+"listájáról.\n"
+"\n"
+"Ennek a beállításnak a megváltoztatásával minden eszköz újra beolvasásra "
+"kerül."
 
-#: ../raphodo/preferencedialog.py:156
+#: ../raphodo/preferencedialog.py:231
 msgid ""
 "Clear the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
+"Törölje a figyelmen kívül hagyandó elérési utak listáját.\n"
+"\n"
+"Ennek a beállításnak a megváltoztatásával minden eszköz újra beolvasásra "
+"kerül."
 
-#: ../raphodo/preferencedialog.py:164
+#: ../raphodo/preferencedialog.py:239
 msgid ""
-"Use python-style <a href=\"http://damonlynch.net/rapid/documentation/"
-"#regularexpressions\">regular expressions</a>"
+"Use python-style <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">regula"
+"r expressions</a>"
 msgstr ""
+"Használjon python stílusú <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\"> "
+"szabályos kifejezéseket </a>"
 
-#: ../raphodo/preferencedialog.py:168
+#: ../raphodo/preferencedialog.py:243
 msgid ""
 "Use regular expressions in the list of ignored paths.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
+"Használjon szabályos kifejezéseket a figyelmen kívül hagyott elérési utak "
+"listáján.\n"
+"\n"
+"Ennek a beállításnak a megváltoztatásával minden eszköz újra beolvasásra "
+"kerül."
 
-#: ../raphodo/preferencedialog.py:208
+#: ../raphodo/preferencedialog.py:283
 msgid "Program Automation"
-msgstr ""
+msgstr "Program automatizálás"
 
-#: ../raphodo/preferencedialog.py:209
+#: ../raphodo/preferencedialog.py:284
 msgid "Start downloading at program startup"
 msgstr "A letöltés megkezdése a program indításakor"
 
-#: ../raphodo/preferencedialog.py:210
+#: ../raphodo/preferencedialog.py:285
 msgid "Start downloading upon device insertion"
-msgstr "Azonnali letöltés a készülék csatlakoztatását követően."
+msgstr "Azonnali letöltés a készülék csatlakoztatását követően"
 
-#: ../raphodo/preferencedialog.py:211
+#: ../raphodo/preferencedialog.py:286
 msgid "Unmount (eject) device upon download completion"
-msgstr ""
+msgstr "A letöltés befejeztével távolítsa el a forrás eszközt"
 
-#: ../raphodo/preferencedialog.py:212
+#: ../raphodo/preferencedialog.py:287
 msgid "Exit program when download completes"
 msgstr "Kilépés a programból a letöltés végeztével"
 
-#: ../raphodo/preferencedialog.py:213
+#: ../raphodo/preferencedialog.py:288
 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."
+msgstr ""
+"Kilépés a programból letöltési hibák és figyelmeztetések ellenére is."
 
-#: ../raphodo/preferencedialog.py:240
+#: ../raphodo/preferencedialog.py:315
 msgid "Thumbnail Generation"
-msgstr ""
+msgstr "Bélyegkép generáció"
 
-#: ../raphodo/preferencedialog.py:241
+#: ../raphodo/preferencedialog.py:316
 msgid "Generate thumbnails"
-msgstr ""
+msgstr "Bélyegképek létrehozása"
 
-#: ../raphodo/preferencedialog.py:242
+#: ../raphodo/preferencedialog.py:318
 msgid "Generate thumbnails to show in the main program window"
-msgstr ""
+msgstr "Bélyegképek létrehozása a fő programablakban"
 
-#: ../raphodo/preferencedialog.py:244
+#: ../raphodo/preferencedialog.py:320
 msgid "Cache thumbnails"
-msgstr ""
+msgstr "Bélyegképek gyorsítótár"
 
-#: ../raphodo/preferencedialog.py:245
+#: ../raphodo/preferencedialog.py:323
 msgid ""
 "Save thumbnails shown in the main program window in a thumbnail cache unique "
 "to Rapid Photo Downloader"
 msgstr ""
+"Mentse el a fő programablakban megjelenített bélyegképeket a Rapid Photo "
+"Downloader egyedi bélyegkép  gyorsítótárában"
 
-#: ../raphodo/preferencedialog.py:247
+#: ../raphodo/preferencedialog.py:327
 msgid "Generate system thumbnails"
-msgstr ""
+msgstr "Rendszerbélyegképek létrehozása"
 
-#: ../raphodo/preferencedialog.py:248
+#: ../raphodo/preferencedialog.py:330
 msgid ""
 "While downloading, save thumbnails that can be used by desktop file managers "
 "and other programs"
 msgstr ""
+"A letöltés során mentse el a bélyegképeket, amelyeket az asztali fájlkezelők "
+"és más programok használhatnak"
 
-#: ../raphodo/preferencedialog.py:255
+#: ../raphodo/preferencedialog.py:339
 msgid "Number of CPU cores used to generate thumbnails."
-msgstr ""
+msgstr "A bélyegképek előállításához használt CPU magok száma."
 
-#: ../raphodo/preferencedialog.py:256
+#: ../raphodo/preferencedialog.py:340
 msgid "CPU cores:"
-msgstr ""
+msgstr "CPU magok:"
 
 #. Translators: the * acts as an asterisk to denote a reference to an annotation
 #. such as '* Takes effect upon program restart'
-#: ../raphodo/preferencedialog.py:271 ../raphodo/preferencedialog.py:317
+#: ../raphodo/preferencedialog.py:355 ../raphodo/preferencedialog.py:401
 msgid "*"
-msgstr ""
+msgstr "*"
 
-#: ../raphodo/preferencedialog.py:294
+#: ../raphodo/preferencedialog.py:378
 msgid "Thumbnail Cache"
-msgstr ""
+msgstr "Bélyegkép gyorsítótár"
 
-#: ../raphodo/preferencedialog.py:296
+#: ../raphodo/preferencedialog.py:380
 msgid "Calculating..."
-msgstr ""
+msgstr "Számítás..."
 
-#: ../raphodo/preferencedialog.py:302
+#: ../raphodo/preferencedialog.py:386
 msgid "days"
-msgstr ""
+msgstr "napok"
 
-#: ../raphodo/preferencedialog.py:303
+#: ../raphodo/preferencedialog.py:387
 msgid "forever"
-msgstr ""
+msgstr "örökké"
 
-#: ../raphodo/preferencedialog.py:308
+#: ../raphodo/preferencedialog.py:392
 msgid "Cache size:"
-msgstr ""
+msgstr "Gyorsítótár méret:"
 
-#: ../raphodo/preferencedialog.py:310
+#: ../raphodo/preferencedialog.py:394
 msgid "Number of thumbnails:"
-msgstr ""
+msgstr "Bélyegképek száma:"
 
-#: ../raphodo/preferencedialog.py:312
+#: ../raphodo/preferencedialog.py:396
 msgid "Database size:"
-msgstr ""
+msgstr "Adatbázis mérete:"
 
-#: ../raphodo/preferencedialog.py:314
+#: ../raphodo/preferencedialog.py:398
 msgid "Cache unaccessed thumbnails for:"
-msgstr ""
+msgstr "Gyorsítótárnak nem elérhető bélyegképek:"
 
-#: ../raphodo/preferencedialog.py:322
+#: ../raphodo/preferencedialog.py:406
 msgid "Purge Cache..."
-msgstr ""
+msgstr "Gyorsítótár tisztítása..."
 
-#: ../raphodo/preferencedialog.py:323
+#: ../raphodo/preferencedialog.py:408
 msgid "Optimize Cache..."
-msgstr ""
+msgstr "Gyorsítás optimalizálása..."
 
-#: ../raphodo/preferencedialog.py:336
+#: ../raphodo/preferencedialog.py:421
 msgid "* Takes effect upon program restart"
-msgstr ""
+msgstr "* A program újraindításakor érvényesül"
 
-#: ../raphodo/preferencedialog.py:346
+#: ../raphodo/preferencedialog.py:431
 msgid "Skip download"
 msgstr "A letöltés kihagyása"
 
-#: ../raphodo/preferencedialog.py:347
+#: ../raphodo/preferencedialog.py:432
 msgid "Don't download the file, and issue an error message"
-msgstr ""
+msgstr "Ne töltse le a fájlt és adjon ki hibaüzenetet"
 
-#: ../raphodo/preferencedialog.py:348
+#: ../raphodo/preferencedialog.py:433
 msgid "Add unique identifier"
 msgstr "Egyedi azonosító megadása"
 
-#: ../raphodo/preferencedialog.py:349
+#: ../raphodo/preferencedialog.py:436
 msgid ""
 "Add an identifier like _1 or _2 to the end of the filename, immediately "
 "before the file's extension"
 msgstr ""
+"Adjon hozzá egy _1 vagy _2 azonosítót a fájlnév végéhez közvetlenül a fájl "
+"kiterjesztése előtt"
 
-#: ../raphodo/preferencedialog.py:355
+#: ../raphodo/preferencedialog.py:444
 msgid "Overwrite"
 msgstr "Felülírás"
 
-#: ../raphodo/preferencedialog.py:356
+#: ../raphodo/preferencedialog.py:445
 msgid "Overwrite the previously backed up file"
-msgstr ""
+msgstr "Felülírja az előzőleg mentett fájlt"
 
-#: ../raphodo/preferencedialog.py:357
+#: ../raphodo/preferencedialog.py:446
 msgid "Skip"
 msgstr "Kihagyás"
 
-#: ../raphodo/preferencedialog.py:358
+#: ../raphodo/preferencedialog.py:448
 msgid "Don't overwrite the backup file, and issue an error message"
-msgstr ""
+msgstr "Ne írja felül a biztonsági másolatot és adjon ki hibaüzenetet"
 
-#: ../raphodo/preferencedialog.py:364
+#: ../raphodo/preferencedialog.py:455
 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 identifier:"
 msgstr ""
+"Ha ugyanazt a fényképet vagy videót már le is töltötte, válassza ki, hogy "
+"kihagyja-e a fájl letöltését vagy egyedi azonosítót ad:"
 
-#: ../raphodo/preferencedialog.py:378
+#: ../raphodo/preferencedialog.py:464
+msgid ""
+"Using sequence numbers to automatically generate unique filenames is "
+"strongly recommended. Configure file renaming in the Rename panel in the "
+"main window."
+msgstr ""
+"Erősen ajánlott a sorozatszámok használata, amelyek automatikusan "
+"létrehoznak egyedi fájlneveket. Állítsa át a fájl átnevezését a főablak "
+"Átnevezés panelen."
+
+#: ../raphodo/preferencedialog.py:473
 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 ""
+"A biztonsági mentés során válassza ki, hogy felülírja-e a mentett eszközön "
+"egy azonos nevet tartalmazó fájlt, vagy hagyja felül írni a biztonsági "
+"másolatot:"
 
-#: ../raphodo/preferencedialog.py:398
+#: ../raphodo/preferencedialog.py:494
 msgid "Program Warnings"
-msgstr ""
+msgstr "Program figyelmeztetések"
 
-#: ../raphodo/preferencedialog.py:399
+#: ../raphodo/preferencedialog.py:495
 msgid "Show a warning when:"
-msgstr ""
+msgstr "Figyelmeztetés megjelenítése, ha:"
 
-#: ../raphodo/preferencedialog.py:402
+#: ../raphodo/preferencedialog.py:498
 msgid "Downloading files currently not displayed"
-msgstr ""
+msgstr "A jelenleg nem megjelenített fájlok letöltése"
 
-#: ../raphodo/preferencedialog.py:403
+#: ../raphodo/preferencedialog.py:499
 msgid ""
 "Warn when about to download files that are not displayed in the main window."
 msgstr ""
+"Figyelmeztetés, amikor olyan fájlokat tölt le, amelyek nem jelennek meg a "
+"főablakban."
 
-#: ../raphodo/preferencedialog.py:405
+#: ../raphodo/preferencedialog.py:501
 msgid "Backup destinations are missing"
-msgstr ""
+msgstr "A mentési célok hiányoznak"
 
-#: ../raphodo/preferencedialog.py:406
-msgid "Warn before starting a download if it is not possible to back up files."
+#: ../raphodo/preferencedialog.py:502
+msgid ""
+"Warn before starting a download if it is not possible to back up files."
 msgstr ""
+"Figyelmeztetés a letöltés megkezdése előtt, ha a fájlok biztonsági mentése "
+"nem lehetséges."
 
-#: ../raphodo/preferencedialog.py:408
+#: ../raphodo/preferencedialog.py:504
 msgid "Program libraries are missing or broken"
-msgstr ""
+msgstr "A programkönyvtárak hiányoznak vagy hibásak"
 
-#: ../raphodo/preferencedialog.py:409
+#: ../raphodo/preferencedialog.py:505
 msgid ""
 "Warn if a software library used by Rapid Photo Downloader is missing or not "
 "functioning."
 msgstr ""
+"Figyelmeztetés, ha a Rapid Photo Downloader által használt szoftverkönyvtár "
+"hiányzik vagy nem működik."
 
-#: ../raphodo/preferencedialog.py:412
+#: ../raphodo/preferencedialog.py:508
 msgid "Filesystem metadata cannot be set"
-msgstr ""
+msgstr "A fájlrendszer metaadatait nem lehet beállítani"
 
-#: ../raphodo/preferencedialog.py:413
+#: ../raphodo/preferencedialog.py:509
 msgid ""
 "Warn if there is an error setting a file's filesystem metadata, such as its "
 "modification time."
 msgstr ""
+"Figyelmeztetés, ha hiba van a fájl fájlrendszer metaadataiban, például a "
+"módosítási idő beállításának."
 
-#: ../raphodo/preferencedialog.py:416
+#: ../raphodo/preferencedialog.py:512
 msgid "Encountering unhandled files"
-msgstr ""
+msgstr "Nem kezelt fájlok találkozása"
 
-#: ../raphodo/preferencedialog.py:417
+#: ../raphodo/preferencedialog.py:513
 msgid ""
 "Warn after scanning a device or this computer if there are unrecognized "
 "files that will not be included in the download."
 msgstr ""
+"Figyelmeztetés az eszköz vagy a számítógép lekeresése után, ha vannak "
+"ismeretlen fájlok, amelyek nem szerepelnek a letöltésben."
 
-#: ../raphodo/preferencedialog.py:420
+#: ../raphodo/preferencedialog.py:517
 msgid "Do not warn about unhandled files with extensions:"
-msgstr ""
+msgstr "Ne figyelmeztesse a nem kezelt fájlokat kiterjesztéssel:"
 
-#: ../raphodo/preferencedialog.py:424
+#: ../raphodo/preferencedialog.py:522
 msgid ""
 "File extensions are case insensitive and do not need to include the leading "
 "dot."
 msgstr ""
+"A fájlkiterjesztések kis-és nagybetűket nem tartalmaznak és nem kell "
+"tartalmazniuk a vezető pontot."
 
-#: ../raphodo/preferencedialog.py:427
+#: ../raphodo/preferencedialog.py:525
 msgid "Add"
-msgstr ""
+msgstr "Hozzáad"
 
-#: ../raphodo/preferencedialog.py:428
+#: ../raphodo/preferencedialog.py:526
 msgid ""
 "Add a file extension to the list of unhandled file types to not warn about."
 msgstr ""
+"Adjon hozzá egy fájlkiterjesztést a nem kezelt fájltípusok listájához, hogy "
+"ne figyelmeztessen."
 
-#: ../raphodo/preferencedialog.py:430
+#: ../raphodo/preferencedialog.py:528
 msgid ""
 "Remove a file extension from the list of unhandled file types to not warn "
 "about."
 msgstr ""
+"Távolítson el egy fájlkiterjesztést a nem kezelt fájltípusok listájáról, "
+"hogy ne figyelmeztessen."
 
-#: ../raphodo/preferencedialog.py:434
+#: ../raphodo/preferencedialog.py:532
 msgid ""
 "Clear the list of file extensions of unhandled file types to not warn about."
 msgstr ""
+"Törölje a nem kezelt fájltípusok fájlkiterjesztéseinek listáját, hogy ne "
+"figyelmeztessen."
 
-#: ../raphodo/preferencedialog.py:469
-msgid "Version Check"
+#: ../raphodo/preferencedialog.py:568
+msgid "Photo and Video Consolidation"
+msgstr "Fénykép és videó megerősítés"
+
+#: ../raphodo/preferencedialog.py:571
+msgid "Consolidate files across devices and downloads"
+msgstr "Erősítse meg a fájlokat eszközökön és letöltéseken"
+
+#: ../raphodo/preferencedialog.py:574
+msgid ""
+"Analyze the results of device scans looking for duplicate files and matching "
+"RAW and JPEG pairs,\n"
+"comparing them across multiple devices and download sessions."
 msgstr ""
+"Elemezze az eszközkeresések eredményeit, amelyek duplikátum fájlokat és RAW- "
+"és JPEG-párokat keresnek,\n"
+"összehasonlítva azokat több eszközön és a letöltési munkamenetek között."
 
-#: ../raphodo/preferencedialog.py:470
-msgid "Check for new version at startup"
+#: ../raphodo/preferencedialog.py:580
+msgid "Treat matching RAW and JPEG files as:"
+msgstr "Az illeszkedő RAW és JPEG fájlok kezelése:"
+
+#: ../raphodo/preferencedialog.py:581
+msgid "One photo"
+msgstr "Egy fénykép"
+
+#: ../raphodo/preferencedialog.py:582
+msgid "Two photos"
+msgstr "Két fénykép"
+
+#: ../raphodo/preferencedialog.py:584
+msgid ""
+"Display matching pairs of RAW and JPEG photos as one photo, and if marked, "
+"download both."
+msgstr ""
+"A RAW- és JPEG-képek illesztése páronként egy fotót jelenítsen meg, és ha "
+"jelölve van, töltse le mindkettőt."
+
+#: ../raphodo/preferencedialog.py:589
+msgid ""
+"Display matching pairs of RAW and JPEG photos as two different photos. You "
+"can still synchronize their sequence numbers."
+msgstr ""
+"A RAW- és JPEG-képek egyező párjainak megjelenítése két különböző "
+"fényképként. Később még mindig szinkronizálhatja a sorszámukat."
+
+#: ../raphodo/preferencedialog.py:598
+msgid "With matching RAW and JPEG photos:"
+msgstr "Megfelelő RAW és JPEG képekkel:"
+
+#: ../raphodo/preferencedialog.py:600
+msgid "Do not mark JPEG for download"
+msgstr "Ne jelölje meg a JPEG letöltést"
+
+#: ../raphodo/preferencedialog.py:601
+msgid "Do not mark RAW for download"
+msgstr "Ne jelölje meg a RAW letöltést"
+
+#: ../raphodo/preferencedialog.py:602
+msgid "Mark both for download"
+msgstr "Jelölje meg mind a letöltéshez"
+
+#: ../raphodo/preferencedialog.py:609
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"JPEG for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+"Amikor RAW és JPEG képeket talál, akkor nem jelöli meg automatikusan a JPEG-"
+"et\n"
+"letöltéshez. Még mindig megjelölheti letöltéshez."
+
+#: ../raphodo/preferencedialog.py:614
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"RAW for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+"Amikor RAW és JPEG képeket talál, akkor nem jelöli meg automatikusan a RAW "
+"értéket\n"
+"letöltéshez. Még mindig megjelölheti letöltéshez."
+
+#: ../raphodo/preferencedialog.py:619
+msgid ""
+"When matching RAW and JPEG photos are found, automatically mark both for "
+"download."
 msgstr ""
+"Amikor RAW és JPEG képeket talál, akkor a letöltés automatikusan jelzi."
 
-#: ../raphodo/preferencedialog.py:471
+#: ../raphodo/preferencedialog.py:625
+msgid ""
+"If you disable file consolidation, choose what to do when a download device "
+"is inserted while completed downloads are displayed:"
+msgstr ""
+"Ha letiltja a fájlok összevonását, válassza ki, hogy mit kell tennie, amikor "
+"a letöltési eszköz megjeleníti letöltött fájlokat:"
+
+#: ../raphodo/preferencedialog.py:631
+msgid ""
+"When a download device is inserted while completed downloads are displayed:"
+msgstr ""
+"Ha a letöltési eszköz be van helyezve és a teljes letöltést mutatja a "
+"képernyő:"
+
+#: ../raphodo/preferencedialog.py:642
+msgid "Clear completed downloads"
+msgstr "A befejezett letöltések törlése"
+
+#: ../raphodo/preferencedialog.py:643
+msgid "Keep displaying completed downloads"
+msgstr "Folytassa a befejezett letöltések megjelenítését"
+
+#: ../raphodo/preferencedialog.py:644
+msgid "Prompt for what to do"
+msgstr "Kérje, mit tegyen"
+
+#: ../raphodo/preferencedialog.py:649
+msgid ""
+"Automatically clear the display of completed downloads whenever a new "
+"download device is inserted."
+msgstr ""
+"Automatikusan törölje a befejezett letöltések megjelenítését, amikor egy új "
+"letöltőeszköz be van helyezve."
+
+#: ../raphodo/preferencedialog.py:654
+msgid ""
+"Keep displaying completed downloads whenever a new download device is "
+"inserted."
+msgstr ""
+"Tartsa meg a befejezett letöltések megjelenítését, amikor egy új "
+"letöltőeszköz be van helyezve."
+
+#: ../raphodo/preferencedialog.py:658
+msgid ""
+"Prompt whether to keep displaying completed downloads or clear them whenever "
+"a new download device is inserted."
+msgstr ""
+"Kérdezze meg, hogy folytassa-e a befejezett letöltések megjelenítését vagy "
+"törölje azokat, amikor új letöltési eszközt helyez be."
+
+#: ../raphodo/preferencedialog.py:702
+msgid "Version Check"
+msgstr "Verzióellenőrzés"
+
+#: ../raphodo/preferencedialog.py:703
+msgid "Check for new version at startup"
+msgstr "Ellenőrizze az új verziót indításkor"
+
+#: ../raphodo/preferencedialog.py:705
 msgid "Check for a new version of the program each time the program starts."
 msgstr ""
+"A program minden egyes indításakor ellenőrizze a program új verzióját."
 
-#: ../raphodo/preferencedialog.py:473
+#: ../raphodo/preferencedialog.py:707
 msgid "Include development releases"
-msgstr ""
+msgstr "Fejlesztési kiadásokat is tartalmaz"
 
-#: ../raphodo/preferencedialog.py:474
+#: ../raphodo/preferencedialog.py:709
 msgid ""
 "Include alpha, beta and other development releases when checking for a new "
 "version of the program.\n"
@@ -2126,12 +3187,17 @@ msgid ""
 "If you are currently running a development version, the check will always "
 "occur."
 msgstr ""
+"Alfa-, béta- és más fejlesztési kiadásokat is tartalmazhat a program új "
+"verziójának ellenőrzéséhez.\n"
+"\n"
+"Ha jelenleg fejlesztési verziót futtat, az ellenőrzés mindig megtörténik."
 
-#: ../raphodo/preferencedialog.py:489
+#: ../raphodo/preferencedialog.py:725
 msgid "Ignore DNG date/time metadata on MTP devices"
 msgstr ""
+"A DNG dátum/idő metaadatainak figyelmen kívül hagyása az MTP-eszközökön"
 
-#: ../raphodo/preferencedialog.py:490
+#: ../raphodo/preferencedialog.py:727
 msgid ""
 "Ignore date/time metadata in DNG files located on MTP devices, and use the "
 "file's modification time instead.\n"
@@ -2139,73 +3205,100 @@ msgid ""
 "Useful for devices like some phones and tablets that create incorrect DNG "
 "metadata."
 msgstr ""
+"Adja meg a dátum/idő metaadatait az MTP-eszközökön található DNG fájlokban "
+"és használja a fájl módosítási idejét.\n"
+"Hasznos olyan eszközökhöz, mint például olyan telefonok és táblagépek, "
+"amelyek helytelen DNG metaadatokat hoznak létre."
+
+#: ../raphodo/preferencedialog.py:741
+msgid "Completed Downloads"
+msgstr "Befejezett letöltések"
 
 #. Translators: substituted value is a description for the set of preferences
 #. shown in the preference dialog window, e.g. Devices, Automation, etc.
 #. This string is shown in a tooltip for the "Restore Defaults" button
-#: ../raphodo/preferencedialog.py:710
+#: ../raphodo/preferencedialog.py:1067
 #, python-format
 msgid "Restores default %s preference values"
-msgstr ""
+msgstr "Visszaállítja az alapértelmezett %s preferenciaértékeket"
 
-#: ../raphodo/preferencedialog.py:832
+#: ../raphodo/preferencedialog.py:1208
 msgid ""
 "Do you want to purge the thumbnail cache? The cache will be purged when the "
 "program is next started."
 msgstr ""
+"Tisztítja a bélyegkép gyorsítótárat? A gyorsítótár megszűnik, amikor a "
+"programot elindítja."
 
-#: ../raphodo/preferencedialog.py:835
+#: ../raphodo/preferencedialog.py:1212
 msgid "Purge Thumbnail Cache"
-msgstr ""
+msgstr "Törölje a bélyegkép gyorsító fájlt."
 
-#: ../raphodo/preferencedialog.py:847
+#: ../raphodo/preferencedialog.py:1225
 msgid ""
 "Do you want to optimize the thumbnail cache? The cache will be optimized "
 "when the program is next started."
 msgstr ""
+"Szeretné optimalizálni a bélyegkép gyorsítótárat? A gyorsítótár "
+"optimalizálásra kerül, amikor a következő programot elindítjuk."
 
-#: ../raphodo/preferencedialog.py:850
+#: ../raphodo/preferencedialog.py:1229
 msgid "Optimize Thumbnail Cache"
+msgstr "A bélyegkép gyorsítótár optimalizálása"
+
+#: ../raphodo/preferencedialog.py:1481
+msgid "Enter a Folder to Scan"
+msgstr "Mappa megadása kereséshez"
+
+#: ../raphodo/preferencedialog.py:1482
+msgid "Specify a folder that will be scanned for photos and videos"
 msgstr ""
+"Adjon meg egy mappát, amelyet be kell olvasni a fotók és a videók számára"
 
-#: ../raphodo/preferencedialog.py:1045
+#: ../raphodo/preferencedialog.py:1483
+msgid "Folder:"
+msgstr "Mappa:"
+
+#: ../raphodo/preferencedialog.py:1497
 msgid "Enter a Path to Ignore"
-msgstr "Add meg a mellőzni kívánt útvonalat"
+msgstr "Adja meg a mellőzni kívánt elérési útvonalat"
 
-#: ../raphodo/preferencedialog.py:1046
+#: ../raphodo/preferencedialog.py:1498
 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"
 
-#: ../raphodo/preferencedialog.py:1047
+#: ../raphodo/preferencedialog.py:1499
 msgid "Path:"
 msgstr "Útvonal:"
 
-#: ../raphodo/preferencedialog.py:1061
+#: ../raphodo/preferencedialog.py:1513
 msgid "Enter a File Extension"
-msgstr ""
+msgstr "Adja meg a fájl kiterjesztését"
 
-#: ../raphodo/preferencedialog.py:1062
+#: ../raphodo/preferencedialog.py:1514
 msgid "Specify a file extension (without the leading dot)"
-msgstr ""
+msgstr "Adjon meg egy fájlkiterjesztést (a vezető pont nélkül)"
 
-#: ../raphodo/preferencedialog.py:1063 ../raphodo/renamepanel.py:122
+#: ../raphodo/preferencedialog.py:1515 ../raphodo/renamepanel.py:122
 msgid "Extension:"
-msgstr ""
+msgstr "Kiterjesztés:"
 
-#: ../raphodo/preferencedialog.py:1078
+#: ../raphodo/preferencedialog.py:1530
 msgid "Invalid File Extension"
-msgstr ""
+msgstr "Érvénytelen fájlkiterjesztés"
 
-#: ../raphodo/preferencedialog.py:1079
+#: ../raphodo/preferencedialog.py:1531
 #, python-format
 msgid ""
 "The file extension <b>%s</b> is recognized by Rapid Photo Downloader, so it "
 "makes no sense to warn about its presence."
 msgstr ""
+"A <b> %s </b> fájlkiterjesztést a Rapid Photo Downloader felismeri, ezért "
+"nincs értelme figyelmeztetni a jelenlétét."
 
-#: ../raphodo/preferencedialog.py:1081
+#: ../raphodo/preferencedialog.py:1533
 #, python-format
 msgid ""
 "Recognized file types:\n"
@@ -2222,405 +3315,460 @@ msgid ""
 "Other:\n"
 "%(other)s"
 msgstr ""
+"Elfogadott fájltípusok:\n"
+"\n"
+"Fénykép:\n"
+"%(photos)s\n"
+"\n"
+"Videó:\n"
+"%(videos)s\n"
+"\n"
+"Hang:\n"
+"%(audio)s\n"
+"\n"
+"Más:\n"
+"%(other)s"
 
 #: ../raphodo/preferences.py:286
 msgid "Wedding"
-msgstr ""
+msgstr "Esküvő"
 
 #: ../raphodo/preferences.py:286
 msgid "Birthday"
-msgstr ""
+msgstr "Születésnap"
 
-#: ../raphodo/preferences.py:614
+#: ../raphodo/preferences.py:624
 #, 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"
 
-#: ../raphodo/preferences.py:617
+#: ../raphodo/preferences.py:627
 #, 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"
 
-#: ../raphodo/preferences.py:622
+#: ../raphodo/preferences.py:632
 #, 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"
+msgstr ""
+"Alkönyvtár beállítások nem tartalmazhatnak két %s értéket egymás után"
 
-#. self.setFlat(True)
 #: ../raphodo/primarybutton.py:72
 msgid "Download 8 Photos and 10 Videos"
-msgstr ""
+msgstr "Letölt 8 fényképet és 10 videót"
 
-#: ../raphodo/problemnotification.py:86 ../raphodo/problemnotification.py:208
+#: ../raphodo/problemnotification.py:87 ../raphodo/problemnotification.py:209
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
-msgstr ""
+msgstr "Hiba: %(errno)s %(strerror)s"
 
-#: ../raphodo/problemnotification.py:89
+#: ../raphodo/problemnotification.py:90
 #, python-format
 msgid "Error: %s"
-msgstr ""
+msgstr "Hiba: %s"
 
-#: ../raphodo/problemnotification.py:116
+#: ../raphodo/problemnotification.py:117
 #, python-format
 msgid "GPhoto2 Error: %s"
-msgstr ""
+msgstr "GPhoto2 hiba: %s"
 
-#: ../raphodo/problemnotification.py:124
+#: ../raphodo/problemnotification.py:125
 msgid ""
 "Unable to initialize the camera, probably because another program is using "
 "it. No files were copied from it."
 msgstr ""
+"Nem sikerült inicializálni a kamerát, valószínűleg azért, mert egy másik "
+"program használja. Nincs fájl másolva."
 
-#: ../raphodo/problemnotification.py:134
+#: ../raphodo/problemnotification.py:135
 #, python-format
 msgid "Unable to read directory %s"
-msgstr ""
+msgstr "A(z) %s könyvtár nem olvasható"
 
-#: ../raphodo/problemnotification.py:140
+#: ../raphodo/problemnotification.py:141
 #, python-format
 msgid "Unable to access modification time or size from %s"
-msgstr ""
+msgstr "Nem sikerült hozzáférni a módosítási időhöz vagy mérethez %s-ból"
 
-#: ../raphodo/problemnotification.py:146
+#: ../raphodo/problemnotification.py:147
 #, python-format
 msgid "Unable to read file %s"
-msgstr ""
+msgstr "A(z) %s fájl nem olvasható"
 
-#: ../raphodo/problemnotification.py:152
+#: ../raphodo/problemnotification.py:153
 #, python-format
 msgid "Unable to write file %s"
-msgstr ""
+msgstr "A(z) %s fájl nem írható"
 
-#: ../raphodo/problemnotification.py:158
+#: ../raphodo/problemnotification.py:159
 #, python-format
 msgid "Unable to move file %s"
-msgstr ""
+msgstr "A(z) %s fájl nem mozgatható"
 
-#: ../raphodo/problemnotification.py:164
+#: ../raphodo/problemnotification.py:165
 #, python-format
 msgid "Unable to remove file %s"
-msgstr ""
+msgstr "A(z) %s fájl nem eltávolítható"
 
-#: ../raphodo/problemnotification.py:170
+#: ../raphodo/problemnotification.py:171
 #, python-format
 msgid "Unable to copy file %s"
-msgstr ""
+msgstr "A(z) %s fájl nem másolható"
 
-#: ../raphodo/problemnotification.py:176
+#: ../raphodo/problemnotification.py:177
 #, python-format
 msgid "Zero length file %s will not be downloaded"
-msgstr ""
+msgstr "A(z) %s nulla hosszúságú fájl nem töltődik le"
 
-#: ../raphodo/problemnotification.py:182
+#: ../raphodo/problemnotification.py:183
 #, python-format
 msgid "Could not determine filesystem modification time for %s"
 msgstr ""
+"Nem sikerült meghatározni a fájlrendszer módosítási idejét a(z) %s esetén"
 
-#: ../raphodo/problemnotification.py:188
+#: ../raphodo/problemnotification.py:189
 #, python-format
 msgid "Unable to load metadata from %s"
-msgstr ""
+msgstr "Nem sikerült betölteni a metaadatokat a következőből: %s"
 
-#: ../raphodo/problemnotification.py:194
+#: ../raphodo/problemnotification.py:195
 #, python-format
 msgid ""
 "Unable to load metadata from %(name)s. The %(filetype)s was not downloaded."
 msgstr ""
+"A(z) %(name)s metaadatai nem tölthetők be. A %(filetype)s nem lett letöltve."
 
-#: ../raphodo/problemnotification.py:202
+#: ../raphodo/problemnotification.py:203
 #, python-format
 msgid ""
 "An error occurred setting a file's filesystem metadata on the filesystem %s. "
 "If this error occurs again on the same filesystem, it will not be reported "
 "again."
 msgstr ""
+"Hiba történt a fájl fájlrendszer metaadatainak beállítása a(z) %s "
+"fájlrendszeren. Ha ez a hiba ismét ugyanazon a fájlrendszeren fordul elő, "
+"akkor nem jelentik újra."
 
-#: ../raphodo/problemnotification.py:216
+#: ../raphodo/problemnotification.py:217
 #, python-format
 msgid "Encountered unhandled file %s. It will not be downloaded."
-msgstr ""
+msgstr "%s nem kezelt fájlt észlelt. Nem töltődik le."
 
-#: ../raphodo/problemnotification.py:223
+#: ../raphodo/problemnotification.py:224
 #, python-format
 msgid "%(filetype)s %(destination)s already exists."
-msgstr ""
+msgstr "%(filetype)s %(destination)s már létezik."
 
-#: ../raphodo/problemnotification.py:234 ../raphodo/problemnotification.py:262
+#: ../raphodo/problemnotification.py:235 ../raphodo/problemnotification.py:263
 #, python-format
 msgid ""
 "The existing %(filetype)s %(destination)s was last modified on %(date)s at "
 "%(time)s."
 msgstr ""
+"A(z) %(filetype)s %(destination)s létező változata a %(date)s %(time)s az "
+"utolsó módosított verzión volt."
 
-#: ../raphodo/problemnotification.py:245
+#: ../raphodo/problemnotification.py:246
 #, python-format
 msgid "The %(filetype)s %(source)s was not downloaded from %(device)s."
-msgstr ""
+msgstr "A(z) %(filetype)s %(source)s nem lett letöltve %(device)s-ből."
 
-#: ../raphodo/problemnotification.py:273
+#: ../raphodo/problemnotification.py:274
 #, python-format
 msgid "The %(filetype)s %(source)s was downloaded from %(device)s."
 msgstr ""
+"A(z) %(filetype)s %(source)s fájlokat a(z) %(device)s fájlból töltötte le."
 
-#: ../raphodo/problemnotification.py:282
+#: ../raphodo/problemnotification.py:283
 #, python-format
 msgid "The unique identifier '%s' was added to the filename."
-msgstr ""
+msgstr "A(z) '% s' egyedi azonosítót hozzáadta a fájlnévhez."
 
-#: ../raphodo/problemnotification.py:298
+#: ../raphodo/problemnotification.py:299
 #, python-format
 msgid ""
 "The existing backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
+"A(z) %(filetype)s %(destination)s mentési fájlt a(z) %(date)s %(time)s "
+"változónál módosították."
 
-#: ../raphodo/problemnotification.py:309
+#: ../raphodo/problemnotification.py:310
 #, python-format
 msgid "The %(filetype)s %(source)s was not backed up from %(device)s."
 msgstr ""
+"A(z) %(filetype)s %(source)s nem lett felmentve a(z) %(device)s fájlból."
 
-#: ../raphodo/problemnotification.py:326
+#: ../raphodo/problemnotification.py:327
 #, python-format
 msgid ""
 "The previous backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
+"Az előző %(filetype)s %(destination)s mentést utoljára módosítottuk %(date)s-"
+"ban %(time)s alatt."
 
-#: ../raphodo/problemnotification.py:337
+#: ../raphodo/problemnotification.py:338
 #, python-format
 msgid ""
 "The %(filetype)s %(source)s from %(device)s was backed up, overwriting the "
 "previous backup %(filetype)s."
 msgstr ""
+"A(z) %(filetype)s %(source)s %(device)s fájlt biztonsági másolat készítette "
+"és felülírta az előző %(filetype)s  fájlt."
 
-#: ../raphodo/problemnotification.py:356
+#: ../raphodo/problemnotification.py:357
 #, python-format
 msgid ""
 "When synchronizing RAW + JPEG sequence values, a duplicate %(filetype)s "
 "%(file)s was encountered, and was not downloaded."
 msgstr ""
+"A RAW + JPEG szekvencia értékek szinkronizálásakor %(filetype)s %(file)s "
+"ismétlődő volt, és nem lett letöltve."
 
-#: ../raphodo/problemnotification.py:366
+#: ../raphodo/problemnotification.py:367
 msgid ""
 "When synchronizing RAW + JPEG sequence values, photos were detected with the "
 "same filenames, but taken at different times:"
 msgstr ""
+"A RAW + JPEG szekvencia értékek szinkronizálásakor a fényképezéseket azonos "
+"fájlnevekkel azonosították, de különböző időpontokban vették őket:"
 
-#: ../raphodo/problemnotification.py:373
+#: ../raphodo/problemnotification.py:374
 #, 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 ""
-"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."
+"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."
 
-#: ../raphodo/problemnotification.py:389
+#: ../raphodo/problemnotification.py:390
 #, python-format
 msgid "Unable to finalize the filename for %s"
-msgstr ""
+msgstr "A(z) %s fájlnév véglegesítése nem sikerült"
 
-#: ../raphodo/problemnotification.py:424
+#: ../raphodo/problemnotification.py:425
 #, python-format
 msgid ""
 "The filename %(destination)s was not fully generated for %(filetype)s "
 "%(source)s."
 msgstr ""
+"A(z) %(destination)s fájlnév nem teljesen lett generálva a %(filetype)s "
+"%(source)s esetén."
 
-#: ../raphodo/problemnotification.py:433
+#: ../raphodo/problemnotification.py:434
 #, python-format
 msgid "The %(type)s metadata is missing."
-msgstr "A %(type)s métaadat hiányzik."
+msgstr "A(z) %(type)s metaadat hiányzik."
 
-#: ../raphodo/problemnotification.py:439
+#: ../raphodo/problemnotification.py:440
 #, python-format
 msgid "The following metadata is missing: %s."
-msgstr ""
+msgstr "A következő metaadatok hiányoznak: %s."
 
-#: ../raphodo/problemnotification.py:445
+#: ../raphodo/problemnotification.py:446
 #, python-format
 msgid "Date/time conversion failed: %s."
-msgstr ""
+msgstr "A dátum/idő konverzió sikertelen: %s."
 
-#: ../raphodo/problemnotification.py:451
+#: ../raphodo/problemnotification.py:452
 msgid ""
 "Could not extract valid date/time metadata or determine the file "
 "modification time."
 msgstr ""
+"Nem sikerült kivonni érvényes dátum/idő metaadatokat vagy meghatározni a "
+"fájl módosításának idejét."
 
-#: ../raphodo/problemnotification.py:457
+#: ../raphodo/problemnotification.py:458
 msgid "Filename does not have an extension."
 msgstr "A fájlnévnek nincs kiterjesztése."
 
-#: ../raphodo/problemnotification.py:460
+#: ../raphodo/problemnotification.py:461
 msgid "Filename does not have a number component."
 msgstr "A fájlnévnek nincs szám része."
 
-#: ../raphodo/problemnotification.py:464
+#: ../raphodo/problemnotification.py:465
 #, python-format
 msgid "Error generating component %(component)s. Error: %(error)s"
-msgstr ""
+msgstr "Hiba a(z) %(component)s komponens létrehozásában. Hiba: %(error)s"
 
-#: ../raphodo/problemnotification.py:477
+#: ../raphodo/problemnotification.py:478
 #, python-format
 msgid ""
 "The download subfolders %(folder)s were only partially generated for "
 "%(filetype)s %(source)s."
 msgstr ""
+"A(z) %(folder)s letöltési alkönyvtárak csak részlegesen generáltak "
+"%(filetype)s %(source)s esetén."
 
-#: ../raphodo/problemnotification.py:486
+#: ../raphodo/problemnotification.py:487
 #, python-format
 msgid ""
 "There is no data with which to generate the %(subfolder_file)s for "
 "%(filename)s. The %(filetype)s was not downloaded."
 msgstr ""
+"Nincs adat, amellyel a(z) %(subfolder_file)s %(filename)s fájlját "
+"generálnák. A(z) %(filetype)s nem lett letöltve."
 
-#: ../raphodo/problemnotification.py:499
+#: ../raphodo/problemnotification.py:500
 #, python-format
 msgid ""
 "Unable to create the %(filetype)s %(destination)s in %(folder)s. The "
 "download file was %(source)s in %(device)s. It was not downloaded."
 msgstr ""
+"A(z) %(filetype)s %(destination)s %(folder)s létrehozása nem sikerült. A "
+"letöltési fájl %(source)s %(device)s nem lett letöltve."
 
-#: ../raphodo/problemnotification.py:514
+#: ../raphodo/problemnotification.py:515
 #, python-format
 msgid "Unable to create the download subfolder %s."
-msgstr ""
+msgstr "Nem sikerült létrehozni a %s letöltési almappát."
 
-#: ../raphodo/problemnotification.py:526
+#: ../raphodo/problemnotification.py:527
 #, python-format
 msgid "Unable to create the backup subfolder %s."
-msgstr ""
+msgstr "Nem sikerült létrehozni a %s biztonsági alkönyvtárt."
 
-#: ../raphodo/problemnotification.py:577
+#: ../raphodo/problemnotification.py:578
 #, python-format
 msgid "Problems scanning %s"
-msgstr ""
+msgstr "Problémák szkennelése %s"
 
-#: ../raphodo/problemnotification.py:584
+#: ../raphodo/problemnotification.py:585
 #, python-format
 msgid "Problems copying from %s"
-msgstr ""
+msgstr "Problémák másolása %s-ról"
 
-#: ../raphodo/problemnotification.py:591
+#: ../raphodo/problemnotification.py:592
 msgid "Problems while finalizing filenames and generating subfolders"
 msgstr ""
+"Problémák a fájlnevek véglegesítése és alkönyvtárak létrehozása közben"
 
-#: ../raphodo/problemnotification.py:598
+#: ../raphodo/problemnotification.py:599
 #, python-format
 msgid "Problems backing up to %s"
-msgstr ""
+msgstr "Problémák a %s biztonsági mentésénél"
+
+#. Translators: for example Nov 3 2015, 11:25 AM
+#. Translators: for example, Nov 3, 12:15 PM
+#: ../raphodo/proximity.py:188 ../raphodo/proximity.py:213
+#: ../raphodo/proximity.py:236 ../raphodo/proximity.py:239
+#, python-format
+msgid "%(date)s, %(time)s"
+msgstr "%(date)s, %(time)s"
+
+#: ../raphodo/proximity.py:204
+#, python-format
+msgid "%(starttime)s - %(endtime)s"
+msgstr "%(starttime)s - %(endtime)s"
 
-#. Translators: for example Nov 3 or Dec 31
 #. The start and end dates are on a different day
 #. Translators: for example Nov 3 or Dec 31
-#: ../raphodo/proximity.py:105 ../raphodo/proximity.py:221
-#: ../raphodo/proximity.py:224 ../raphodo/proximity.py:828
+#: ../raphodo/proximity.py:221 ../raphodo/proximity.py:225
+#: ../raphodo/proximity.py:980 ../raphodo/timeutils.py:105
 #, python-format
 msgid "%(month)s %(numeric_day)s"
-msgstr ""
+msgstr "%(month)s %(numeric_day)s"
 
-#. Translators: for example Nov 15 2015
 #. Translators: for example Nov 3 2015
-#: ../raphodo/proximity.py:109 ../raphodo/proximity.py:230
-#: ../raphodo/proximity.py:231 ../raphodo/proximity.py:831
+#. Translators: for example Nov 2 2015
+#. Translators: for example Nov 15 2015
+#: ../raphodo/proximity.py:232 ../raphodo/proximity.py:233
+#: ../raphodo/proximity.py:985 ../raphodo/timeutils.py:110
 #, python-format
 msgid "%(date)s %(year)s"
-msgstr ""
-
-#. Translators: for example Nov 3 2015, 11:25 AM
-#. Translators: for example, Nov 3, 12:15 PM
-#: ../raphodo/proximity.py:197 ../raphodo/proximity.py:215
-#: ../raphodo/proximity.py:234 ../raphodo/proximity.py:236
-#, python-format
-msgid "%(date)s, %(time)s"
-msgstr ""
-
-#: ../raphodo/proximity.py:209
-#, python-format
-msgid "%(starttime)s - %(endtime)s"
-msgstr ""
+msgstr "%(date)s %(year)s"
 
 #. Translators: for example, Nov 3, 12:15 PM - Nov 4, 1:00 AM
-#: ../raphodo/proximity.py:241
+#: ../raphodo/proximity.py:245
 #, python-format
 msgid "%(earlier_time)s - %(later_time)s"
-msgstr ""
+msgstr "%(earlier_time)s - %(later_time)s"
 
 #. Translators, for example:
 #. Nov 3 2012, 12:15 PM -
 #. Nov 4 2012, 1:00 AM
 #. (please keep the line break signified by \n)
-#: ../raphodo/proximity.py:248
+#: ../raphodo/proximity.py:253
 #, python-format
 msgid ""
 "%(earlier_time)s -\n"
 "%(later_time)s"
 msgstr ""
+"%(earlier_time)s -\n"
+"%(later_time)s"
 
-#: ../raphodo/proximity.py:359
+#: ../raphodo/proximity.py:382
 #, python-format
 msgid "%(month)s  %(year)s"
-msgstr ""
+msgstr "%(month)s  %(year)s"
 
 #. Translators: for example Nov 2015
-#: ../raphodo/proximity.py:833
+#: ../raphodo/proximity.py:987
 #, python-format
 msgid "%(month)s %(year)s"
-msgstr ""
+msgstr "%(month)s %(year)s"
 
-#: ../raphodo/proximity.py:1344
+#: ../raphodo/proximity.py:1595
 msgid ""
 "The time elapsed between consecutive photos and videos that is used to build "
 "the Timeline"
 msgstr ""
+"Az idővonal elkészítéséhez használt egymást követő fotók és videók között "
+"eltelt idő"
 
 #. Translators: e.g. "45m", which is short for 45 minutes.
 #. Replace the very last character (after the d) with the correct
 #. localized value, keeping everything else. In other words, change
 #. only the m character.
-#: ../raphodo/proximity.py:1406
+#: ../raphodo/proximity.py:1652
 #, python-format
 msgid "%(minutes)dm"
-msgstr ""
+msgstr "%(minutes)d P"
 
 #. Translators: i.e. "1.5h", which is short for 1.5 hours.
 #. Replace the entire string with the correct localized value
-#: ../raphodo/proximity.py:1410
+#: ../raphodo/proximity.py:1656
 msgid "1.5h"
-msgstr ""
+msgstr "1.5 Ó"
 
 #. Translators: e.g. "5h", which is short for 5 hours.
 #. Replace the very last character (after the d) with the correct localized value,
 #. keeping everything else. In other words, change only the h character.
-#: ../raphodo/proximity.py:1415
+#: ../raphodo/proximity.py:1661
 #, python-format
 msgid "%(hours)dh"
-msgstr ""
+msgstr "%(hours)d Ó"
 
-#: ../raphodo/proximity.py:1461
+#: ../raphodo/proximity.py:1710
 msgid ""
 "The Timeline groups photos and videos based on how much time elapsed between "
 "consecutive shots. Use it to identify photos and videos taken at different "
 "periods in a single day or over consecutive days."
 msgstr ""
+"Az Idővonal csoportokat készít fotók és videók alapján, hogy mennyi idő telt "
+"el egymást követő felvételek között. Használja azt a fotók és videók "
+"azonosítására, amelyek különböző időszakokban, egyetlen nap alatt vagy "
+"egymást követő napokon kerülnek."
 
-#: ../raphodo/proximity.py:1464
+#: ../raphodo/proximity.py:1715
 msgid ""
 "Use the slider (below) to adjust the time elapsed between consecutive shots "
 "that is used to build the Timeline."
 msgstr ""
+"Használja a csúszkát (lent) az idővonal elkészítéséhez használt egymást "
+"követő felvételek között eltelt idő beállításához."
 
-#: ../raphodo/proximity.py:1466
+#: ../raphodo/proximity.py:1718
 msgid "Timeline build pending..."
-msgstr ""
+msgstr "A függőben lévő idővonal létrehozása ..."
 
-#: ../raphodo/proximity.py:1467
+#: ../raphodo/proximity.py:1719
 msgid "Timeline is building..."
-msgstr ""
+msgstr "Az idővonal épül ..."
 
-#: ../raphodo/proximity.py:1468
+#: ../raphodo/proximity.py:1721
 msgid ""
 "The Timeline needs to be rebuilt because the file modification time does not "
 "match the time a shot was taken for one or more shots.<br><br>The Timeline "
@@ -2631,226 +3779,253 @@ msgid ""
 "The time a shot was taken is confirmed when generating thumbnails or "
 "downloading, which is when the metadata is read."
 msgstr ""
-
-#: ../raphodo/rapid.py:485 ../raphodo/rapid.py:2461 ../raphodo/rapid.py:3728
-#: ../raphodo/rapid.py:3846 ../raphodo/rapid.py:3850 ../raphodo/rapid.py:3870
-#: ../raphodo/rapid.py:3874 ../raphodo/rapid.py:3998 ../raphodo/rapid.py:4007
-#: ../raphodo/rapid.py:4495 ../raphodo/rapid.py:4888 ../raphodo/rapid.py:5722
-#: ../raphodo/rememberthisdialog.py:97
+"Az idővonalat újra kell építeni, mert a fájl módosításának ideje nem egyezik "
+"meg azzal a pillanattal, amikor egy vagy több felvétel készítése történt. "
+"<br> <br> Az idővonal azt mutatja, hogy mikor készítettek felvételeket. A "
+"felvétel időpontja a fotók vagy videók metaadataiban található meg. A "
+"metaadatok olvasása időigényes, így a Rapid Photo Downloader elkerüli a "
+"metaadatok olvasását a fájlok szkennelése közben. Ehelyett azt az időt "
+"használja, amikor a fájlt utoljára módosították proxyként a felvétel "
+"elkészítésekor. A felvétel elkészítésének ideje megerősítést nyer, amikor "
+"miniatűr vagy letöltődik, vagyis amikor a metaadatokat elolvassa."
+
+#: ../raphodo/rapid.py:493 ../raphodo/rapid.py:2555 ../raphodo/rapid.py:3934
+#: ../raphodo/rapid.py:4065 ../raphodo/rapid.py:4069 ../raphodo/rapid.py:4092
+#: ../raphodo/rapid.py:4096 ../raphodo/rapid.py:4226 ../raphodo/rapid.py:4237
+#: ../raphodo/rapid.py:4743 ../raphodo/rapid.py:5195 ../raphodo/rapid.py:5997
+#: ../raphodo/rememberthisdialog.py:99
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:3
 msgid "Rapid Photo Downloader"
 msgstr "Gyors Fotó Letöltő"
 
-#: ../raphodo/rapid.py:1100
+#: ../raphodo/rapid.py:1131
 msgid ""
 "<b>ExifTool has a problem</b><br><br> Rapid Photo Downloader uses ExifTool "
 "to get metadata from videos and photos. The program will run without it, but "
 "installing it is <b>highly</b> recommended."
 msgstr ""
+"<b> ExifTool-nak van egy problémája </b> <br> <br> A Rapid Photo Downloader "
+"az ExifTool-ot használja a metaadatok megszerzéséhez videókról és "
+"fényképekről. A program fut e nélkül is, de telepítése <b> nagyon </b> "
+"ajánlott."
 
-#: ../raphodo/rapid.py:1110 ../raphodo/rapid.py:1130
+#: ../raphodo/rapid.py:1141 ../raphodo/rapid.py:1161
 msgid "Problem with libmediainfo"
-msgstr ""
+msgstr "Probléma a libmediainfo-val"
 
-#: ../raphodo/rapid.py:1119
+#: ../raphodo/rapid.py:1150
 msgid ""
 "<b>The library libmediainfo appears to be missing</b><br><br> Rapid Photo "
 "Downloader uses libmediainfo to get the date and time a video was shot. The "
 "program will run  without it, but installing it is recommended."
 msgstr ""
+"<b> Úgy tűnik, hogy a könyvtár libmediainfo hiányzik </b> <br> <br> A Rapid "
+"Photo Downloader a libmediainfo használatával kapja meg a dátumot és az "
+"időt. A program fut e nélkül is, de a telepítés ajánlott."
 
-#: ../raphodo/rapid.py:1417
+#: ../raphodo/rapid.py:1448
 msgid "Download failed"
-msgstr ""
+msgstr "Sikertelen letöltés"
 
-#: ../raphodo/rapid.py:1419
+#: ../raphodo/rapid.py:1450
 msgid ""
 "Sorry, the download of the new version of Rapid Photo Downloader failed."
 msgstr ""
+"Sajnáljuk, a Rapid Photo Downloader új verziójának letöltése nem sikerült."
 
-#: ../raphodo/rapid.py:1425
+#: ../raphodo/rapid.py:1457
 msgid ""
 "The new version was successfully downloaded. Do you want to close Rapid "
 "Photo Downloader and install it now?"
 msgstr ""
+"Az új verzió sikeresen letöltött. Szeretné bezárni a Rapid Photo Downloader "
+"programot, és telepíteni?"
 
-#: ../raphodo/rapid.py:1428
+#: ../raphodo/rapid.py:1461
 msgid "Update Rapid Photo Downloader"
-msgstr ""
+msgstr "A Rapid Photo Downloader frissítése"
 
-#: ../raphodo/rapid.py:1432
+#: ../raphodo/rapid.py:1465
 msgid "Install"
-msgstr ""
+msgstr "Telepítés"
 
-#: ../raphodo/rapid.py:1450
+#: ../raphodo/rapid.py:1483
 msgid "New version saved"
-msgstr ""
+msgstr "Új verzió mentve"
 
-#: ../raphodo/rapid.py:1451
+#: ../raphodo/rapid.py:1485
 #, python-format
 msgid ""
 "The tar file and installer script are saved at:\n"
 "\n"
 " %s"
 msgstr ""
+"A tar fájl és a telepítő szkript a következő helyre kerül:\n"
+"\n"
+"%s"
 
-#: ../raphodo/rapid.py:1468
+#: ../raphodo/rapid.py:1502
 msgid "Upgrade failed"
-msgstr ""
+msgstr "Frissítés sikertelen"
 
-#: ../raphodo/rapid.py:1469
+#: ../raphodo/rapid.py:1505
 msgid ""
 "Sorry, upgrading Rapid Photo Downloader failed because there was an error "
 "opening the installer."
 msgstr ""
+"Sajnáljuk, a Rapid Photo Downloader frissítése sikertelen volt, mert hiba "
+"történt a telepítő megnyitásakor."
 
-#: ../raphodo/rapid.py:1667 ../raphodo/rapid.py:2331
+#: ../raphodo/rapid.py:1709 ../raphodo/rapid.py:2425
 msgid "Download"
 msgstr "Letöltés"
 
-#: ../raphodo/rapid.py:1671
+#: ../raphodo/rapid.py:1713
 msgid "&Refresh..."
-msgstr ""
+msgstr "&Frissítés..."
 
-#: ../raphodo/rapid.py:1675
+#: ../raphodo/rapid.py:1717
 msgid "&Preferences"
-msgstr ""
+msgstr "&Preferenciák"
 
-#: ../raphodo/rapid.py:1679
+#: ../raphodo/rapid.py:1721
 msgid "&Quit"
-msgstr ""
+msgstr "&Kilépés"
 
-#: ../raphodo/rapid.py:1683
+#: ../raphodo/rapid.py:1725
 msgid "Error &Reports"
-msgstr ""
+msgstr "&Hibaüzenetek"
 
-#: ../raphodo/rapid.py:1687
+#: ../raphodo/rapid.py:1729
 msgid "Clear Completed Downloads"
-msgstr ""
+msgstr "A befejezett letöltések törlése"
 
-#: ../raphodo/rapid.py:1691
+#: ../raphodo/rapid.py:1733
 msgid "Get Help Online..."
-msgstr ""
+msgstr "Súgó online ..."
 
-#: ../raphodo/rapid.py:1695
+#: ../raphodo/rapid.py:1737
 msgid "&Tip of the Day..."
-msgstr ""
+msgstr "&A nap tippje..."
 
-#: ../raphodo/rapid.py:1699
+#: ../raphodo/rapid.py:1741
 msgid "Report a Problem..."
-msgstr ""
+msgstr "Probléma jelentése..."
 
-#: ../raphodo/rapid.py:1703
+#: ../raphodo/rapid.py:1745
 msgid "Make a Donation..."
-msgstr ""
+msgstr "Adakozzon..."
 
-#: ../raphodo/rapid.py:1707
+#: ../raphodo/rapid.py:1749
 msgid "Translate this Application..."
 msgstr "Ezen alkalmazás fordítása…"
 
-#: ../raphodo/rapid.py:1711
+#: ../raphodo/rapid.py:1753
 msgid "&About..."
-msgstr ""
+msgstr "&Névjegy"
 
-#: ../raphodo/rapid.py:1715
+#: ../raphodo/rapid.py:1757
 msgid "Check for Updates..."
-msgstr ""
+msgstr "Frissítések keresése..."
 
-#: ../raphodo/rapid.py:1797
+#: ../raphodo/rapid.py:1840
 msgid "Timeline"
-msgstr ""
+msgstr "Idővonal"
 
-#: ../raphodo/rapid.py:1807
+#: ../raphodo/rapid.py:1850
 msgid "Destination"
-msgstr ""
+msgstr "Letöltési cél"
 
-#: ../raphodo/rapid.py:1808
+#: ../raphodo/rapid.py:1851
 msgid "Rename"
-msgstr ""
+msgstr "Átnevezés"
 
-#: ../raphodo/rapid.py:1810
+#: ../raphodo/rapid.py:1853
 msgid "Back Up"
-msgstr ""
+msgstr "Biztonsági mentés"
 
 #. Devices Header and View
-#: ../raphodo/rapid.py:1926
+#: ../raphodo/rapid.py:1977
 msgid ""
 "Turn on or off the use of devices attached to this computer as download "
 "sources"
 msgstr ""
+"Kapcsolja be vagy ki a számítógéphez csatlakoztatott eszközöket letöltési "
+"forrásként"
 
 #. This Computer Header and View
-#: ../raphodo/rapid.py:1940
+#: ../raphodo/rapid.py:1994
 msgid ""
 "Turn on or off the use of a folder on this computer as a download source"
 msgstr ""
+"Kapcsolja be vagy ki a mappát ezen a számítógépen letöltési forrásként"
 
-#: ../raphodo/rapid.py:1941
+#: ../raphodo/rapid.py:1996
 msgid "This Computer"
-msgstr ""
+msgstr "Ez a számítógép"
 
-#: ../raphodo/rapid.py:1952
+#: ../raphodo/rapid.py:2009
 msgid "Select a source folder"
-msgstr ""
+msgstr "Válasszon ki egy forrás mappát"
 
-#: ../raphodo/rapid.py:1975
+#: ../raphodo/rapid.py:2038
 msgid "Projected Storage Use"
-msgstr ""
+msgstr "Tervezett tárolási használat"
 
-#: ../raphodo/rapid.py:1989 ../raphodo/rapid.py:1997
+#: ../raphodo/rapid.py:2056 ../raphodo/rapid.py:2068
 msgid "Select a destination folder"
-msgstr ""
+msgstr "Válasszon ki egy célmappát"
 
-#: ../raphodo/rapid.py:2045
+#: ../raphodo/rapid.py:2117
 msgid "All"
-msgstr ""
+msgstr "Minden"
 
-#: ../raphodo/rapid.py:2046
+#: ../raphodo/rapid.py:2118
 msgid "New"
-msgstr ""
+msgstr "Új"
 
-#: ../raphodo/rapid.py:2048
+#: ../raphodo/rapid.py:2120
 msgid "Show:"
-msgstr ""
+msgstr "Mutat:"
 
-#: ../raphodo/rapid.py:2051
+#: ../raphodo/rapid.py:2123
 msgid "Modification Time"
-msgstr ""
+msgstr "Módosítási idő"
 
-#: ../raphodo/rapid.py:2052
+#: ../raphodo/rapid.py:2124
 msgid "Checked State"
-msgstr ""
+msgstr "Ellenőrzött állapot"
 
-#: ../raphodo/rapid.py:2055
+#: ../raphodo/rapid.py:2127
 msgid "File Type"
-msgstr ""
+msgstr "Fájltípus"
 
-#: ../raphodo/rapid.py:2056
+#: ../raphodo/rapid.py:2128
 msgid "Device"
 msgstr "Eszköz"
 
-#: ../raphodo/rapid.py:2058
+#: ../raphodo/rapid.py:2130
 msgid "Sort:"
-msgstr ""
+msgstr "Fajta:"
 
-#: ../raphodo/rapid.py:2069
+#: ../raphodo/rapid.py:2141
 msgid "Select All:"
-msgstr ""
+msgstr "Mindent kiválaszt:"
 
-#: ../raphodo/rapid.py:2311
+#: ../raphodo/rapid.py:2405
 #, python-format
 msgid "Download %(files)s"
-msgstr ""
+msgstr "Letöltés %(files)s"
 
-#: ../raphodo/rapid.py:2327
+#: ../raphodo/rapid.py:2421
 msgid "Resume Download"
-msgstr ""
+msgstr "Letöltés folytatása"
 
-#: ../raphodo/rapid.py:2329
+#: ../raphodo/rapid.py:2423
 msgid "Pause"
 msgstr "Megállítás"
 
-#: ../raphodo/rapid.py:2417
+#: ../raphodo/rapid.py:2511
 #, python-brace-format
 msgid ""
 "Please report the problem at <a href=\"{website}\">{website}</a>.<br><br>\n"
@@ -2858,12 +4033,20 @@ msgid ""
 "            <a href=\"{log_path}\">here</a> to open the log directory).\n"
 "            "
 msgstr ""
+"Kérjük, jelentse be a problémát <a href=\"{website}\"> {website} </a>\n"
+"             Csatlakoztassa a naplófájlt <i> {log_file} </i> a jelentéséhez "
+"(kattintson a gombra\n"
+"             <a href=\"{log_path}\"> itt </a> a naplókönyvtár "
+"megnyitásához).\n"
+"            "
 
-#: ../raphodo/rapid.py:2431
+#: ../raphodo/rapid.py:2525
 msgid "Thank you for reporting a problem in Rapid Photo Downloader"
 msgstr ""
+"Köszönjük, hogy jelentett egy problémát a Rapid Photo Downloader "
+"alkalmazásban"
 
-#: ../raphodo/rapid.py:2529
+#: ../raphodo/rapid.py:2624
 #, python-format
 msgid ""
 "<b>Changing This Computer source path</b><br><br>Do you really want to "
@@ -2871,243 +4054,273 @@ msgid ""
 "from %(source_path)s.<br><br>If you do change the path, the current download "
 "from This Computer will be cancelled."
 msgstr ""
+"<b> A számítógép forrásút megváltoztatása </b> <br> <br> Valóban meg akarja "
+"változtatni a forrás elérési útvonalát %(new_path)s -re? <br> <br> A(z) "
+"%(source_path)s. <br> <br> Ha megváltoztatja az elérési utat, az aktuális "
+"letöltés ezen a számítógépen törlődik."
 
-#: ../raphodo/rapid.py:2595
+#: ../raphodo/rapid.py:2694
 msgid "You cannot change the download destination while downloading."
-msgstr ""
+msgstr "Nem cserélheti a letöltési célt a letöltés során."
 
-#: ../raphodo/rapid.py:2604
+#: ../raphodo/rapid.py:2704
 #, python-format
 msgid ""
 "<b>Confirm Download Destination</b><br><br>Are you sure you want to set the "
 "%(file_type)s download destination to %(path)s?"
 msgstr ""
+"<b> A letöltési cél jóváhagyása </b> <br> <br> Biztosan megadja a(z) "
+"%(file_type)s letöltési célállomását %(path)s számára?"
 
-#: ../raphodo/rapid.py:2682
+#: ../raphodo/rapid.py:2785
 msgid ""
+"\n"
 "<b>Downloading all files</b><br><br>\n"
-"                    A download always includes all files that are checked "
-"for download,\n"
-"                    including those that are not currently displayed because "
-"the Timeline\n"
-"                    is being used or because only new files are being shown."
-"<br><br>\n"
-"                    Do you want to proceed with the download?"
+"A download always includes all files that are checked for download,\n"
+"including those that are not currently displayed because the Timeline\n"
+"is being used or because only new files are being shown.<br><br>\n"
+"Do you want to proceed with the download?\n"
+"                        "
 msgstr ""
+"\n"
+"<b> Összes fájl letöltése </b> <br> <br>\n"
+"A letöltés mindig tartalmaz minden olyan fájlt, amelyet letöltöttek,\n"
+"beleértve azokat is, amelyeket jelenleg nem jelenítenek meg az idővonal "
+"miatt\n"
+"vagy mert csak az új fájlok jelennek meg.\n"
+"Szeretné folytatni a letöltést?\n"
+"                        "
 
-#: ../raphodo/rapid.py:2820
+#: ../raphodo/rapid.py:2937
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
 "%(folder1)s\n"
 "%(folder2)s"
 msgstr ""
-"Nem jók a letöltési könyvtárak:\n"
+"Érvénytelen letöltési könyvtárak:\n"
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: ../raphodo/rapid.py:2824
+#: ../raphodo/rapid.py:2940
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
 "%s"
 msgstr ""
-"Nem jó a letöltési könyvtár:\n"
+"Érvénytelen letöltési könyvtár:\n"
 "%s"
 
-#: ../raphodo/rapid.py:2827
+#: ../raphodo/rapid.py:2943
 msgid "Download Failure"
-msgstr ""
+msgstr "Letöltés hiba"
 
-#: ../raphodo/rapid.py:2828
+#: ../raphodo/rapid.py:2944
 msgid "The download cannot proceed."
-msgstr ""
+msgstr "A letöltés nem folytatható."
 
-#: ../raphodo/rapid.py:2842
+#: ../raphodo/rapid.py:2962
 msgid ""
 "Photos and videos will not be backed up because there is nowhere to back "
 "them up. Do you still want to start the download?"
 msgstr ""
+"A fotók és a videók nem lesznek használhatóak, mert nincs hova felvenni "
+"őket. Még mindig el akarja indítani a letöltést?"
 
-#. Translators: filetype will be replaced with 'photos' or 'videos'
-#: ../raphodo/rapid.py:2847 ../raphodo/rapid.py:2854
+#: ../raphodo/rapid.py:2969 ../raphodo/rapid.py:2979
 #, python-format
 msgid ""
 "No backup device exists for backing up %(filetype)s. Do you still want to "
 "start the download?"
 msgstr ""
+"Nincs mentési eszköz a(z) %(filetype)s biztonsági másolatának "
+"létrehozásához. Még mindig el akarja indítani a letöltést?"
 
-#: ../raphodo/rapid.py:2848 ../raphodo/rpdfile.py:228
+#: ../raphodo/rapid.py:2971 ../raphodo/rpdfile.py:228
 msgid "photos"
 msgstr "fényképek"
 
-#: ../raphodo/rapid.py:2855 ../raphodo/rpdfile.py:223
+#: ../raphodo/rapid.py:2981 ../raphodo/rpdfile.py:223
 msgid "videos"
 msgstr "videók"
 
-#: ../raphodo/rapid.py:2861
+#: ../raphodo/rapid.py:2989
 msgid ""
 "<b>The photo and video backup destinations do not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
+"<b> A fotó- és videómentés célállomások nem léteznek vagy nem írhatók. </b> "
+"<br> <br> Még mindig el szeretné indítani a letöltést?"
 
-#: ../raphodo/rapid.py:2869 ../raphodo/rapid.py:2876
+#: ../raphodo/rapid.py:2999 ../raphodo/rapid.py:3008
 #, python-format
 msgid ""
 "<b>The %(filetype)s backup destination does not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
+"<b> A(z) %(filetype)s mentési cél nem létezik vagy nem írható be. </b> <br> "
+"<br> Még mindig el szeretné indítani a letöltést?"
 
-#: ../raphodo/rapid.py:2871 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:818
+#: ../raphodo/rapid.py:3001 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:843
 msgid "photo"
 msgstr "fénykép"
 
-#: ../raphodo/rapid.py:2878 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:858
+#: ../raphodo/rapid.py:3010 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:883
 msgid "video"
 msgstr "videó"
 
-#: ../raphodo/rapid.py:2886
+#: ../raphodo/rapid.py:3018
 msgid "Backup problem"
-msgstr "Probléma a Biztonsági mentéssel"
+msgstr "Probléma a biztonsági mentéssel"
 
-#. Translators - in the middle is a unicode em dash - please retain it
-#. This string is displayed in the status bar when the download is running
-#: ../raphodo/rapid.py:3571
+#: ../raphodo/rapid.py:3756
 #, python-format
 msgid "%(downloading_from)s — %(time_left)s left (%(speed)s)"
-msgstr ""
+msgstr "%(downloading_from)s - %(time_left)s maradt (%(speed)s)"
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3640
+#: ../raphodo/rapid.py:3828
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "Letöltve: %(noFiles)s %(filetypes)s"
 
-#. Translators: e.g. 2 videos failed to download
-#: ../raphodo/rapid.py:3645
+#: ../raphodo/rapid.py:3836
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "%(noFiles)s %(filetypes)s : sikertelen letöltés"
 
-#: ../raphodo/rapid.py:3650 ../raphodo/rapid.py:3723
+#: ../raphodo/rapid.py:3842 ../raphodo/rapid.py:3927
 msgid "warnings"
 msgstr "figyelmeztetések"
 
-#: ../raphodo/rapid.py:3679
+#: ../raphodo/rapid.py:3873
 msgid "All downloads complete"
 msgstr "Minden letöltés befejeződött"
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3686 ../raphodo/rapid.py:3695 ../raphodo/rapid.py:3704
-#: ../raphodo/rapid.py:3713 ../raphodo/rapid.py:3721
+#: ../raphodo/rapid.py:3881 ../raphodo/rapid.py:3892 ../raphodo/rapid.py:3903
+#: ../raphodo/rapid.py:3914 ../raphodo/rapid.py:3924
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: ../raphodo/rapid.py:3688 ../raphodo/rapid.py:3706
+#: ../raphodo/rapid.py:3884 ../raphodo/rapid.py:3906
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s letöltve"
 
-#: ../raphodo/rapid.py:3697 ../raphodo/rapid.py:3715
+#: ../raphodo/rapid.py:3895 ../raphodo/rapid.py:3917
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "%(filetype)s letöltése sikertelen volt"
 
-#: ../raphodo/rapid.py:3742
+#: ../raphodo/rapid.py:3950
 msgid "1 failure"
-msgstr ""
+msgstr "1 hiba"
 
-#: ../raphodo/rapid.py:3744
+#: ../raphodo/rapid.py:3952
 #, python-format
 msgid "%d failures"
-msgstr ""
+msgstr "%d hibák"
 
-#: ../raphodo/rapid.py:3749
+#: ../raphodo/rapid.py:3957
 msgid "1 warning"
-msgstr ""
+msgstr "1 figyelmeztetés"
 
-#: ../raphodo/rapid.py:3751
+#: ../raphodo/rapid.py:3959
 #, python-format
 msgid "%d warnings"
-msgstr ""
+msgstr "%d figyelmeztetés"
 
-#: ../raphodo/rapid.py:3771
+#: ../raphodo/rapid.py:3981
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s"
-msgstr ""
+msgstr "Letöltött %(no_files_and_types)s %(devices)s"
 
-#: ../raphodo/rapid.py:3774
+#: ../raphodo/rapid.py:3985
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s — %(failures)s"
-msgstr ""
+msgstr "Letöltött %(no_files_and_types)s %(devices)s - %(failures)s"
 
-#: ../raphodo/rapid.py:3779
+#: ../raphodo/rapid.py:3989
 #, python-format
 msgid "No files downloaded — %(failures)s"
-msgstr ""
+msgstr "Nincs letöltött fájl - %(failures)s"
 
-#: ../raphodo/rapid.py:3781
+#: ../raphodo/rapid.py:3991
 msgid "No files downloaded"
-msgstr ""
+msgstr "Nincs letöltött fájl"
 
-#: ../raphodo/rapid.py:3805
+#: ../raphodo/rapid.py:4021
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s"
 msgstr ""
+"A cél alkönyvtárakat és az idővonalat újraépíti, miután a(z) %(camera)s "
+"összes bélyegképét létrehozta"
 
-#: ../raphodo/rapid.py:3809
+#: ../raphodo/rapid.py:4026
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for this computer"
 msgstr ""
+"A célkönyvtárak és az idővonal újraszerkesztésre kerül, miután minden "
+"bélyegképet generáltak ehhez a számítógéphez"
 
-#: ../raphodo/rapid.py:3812
+#: ../raphodo/rapid.py:4031
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s"
 msgstr ""
+"A cél alkönyvtárakat és az idővonalat újraépíti, miután a(z) %(device)s az "
+"összes bélyegképet létrehozta"
 
-#: ../raphodo/rapid.py:3820
+#: ../raphodo/rapid.py:4039
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices and this computer"
 msgstr ""
+"A cél alkönyvtárak és az idővonal újraszerkesztésre kerül, miután a(z) "
+"%(number_devices)s eszközökre és a számítógépre az összes bélyegképet "
+"generálta"
 
-#: ../raphodo/rapid.py:3833
+#: ../raphodo/rapid.py:4052
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s and this computer"
 msgstr ""
+"A cél alkönyvtárak és az idővonal újraszerkesztésre kerül, miután a(z) "
+"%(camera)s és a számítógép összes bélyegképe generálva lett"
 
-#: ../raphodo/rapid.py:3837
+#: ../raphodo/rapid.py:4056
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s and this computer"
 msgstr ""
+"A cél alkönyvtárakat és az idővonalat újraépíti, miután a(z) %(device)s és a "
+"számítógép összes bélyegképet  generálták"
 
-#: ../raphodo/rapid.py:3841
+#: ../raphodo/rapid.py:4060
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices"
 msgstr ""
+"A cél alkönyvtárak és az idővonal újraszerkesztésre kerül, miután a(z) "
+"%(number_devices)s eszközök az összes bélyegképét generálták"
 
-#: ../raphodo/rapid.py:3867
+#: ../raphodo/rapid.py:4087
 msgid "The Destination subfolders and Timeline have been rebuilt"
-msgstr ""
+msgstr "A cél alkönyvtárakat és az idővonalat újraépítették"
 
-#: ../raphodo/rapid.py:3922
+#: ../raphodo/rapid.py:4144
 msgid "Program preferences are invalid"
 msgstr "A program beállítása nem jó."
 
-#: ../raphodo/rapid.py:3999
+#: ../raphodo/rapid.py:4228
 #, python-format
 msgid ""
 "<b>All files on the %(camera)s are inaccessible</b>.<br><br>It may be locked "
@@ -3116,334 +4329,444 @@ msgid ""
 "charging</i> to <i>USB for file transfers</i>.<br><br>Alternatively, you can "
 "ignore this device."
 msgstr ""
+"<b> A(z) %(camera)s összes fájlja elérhetetlen </b>. <br> <br> Lehet, hogy "
+"zárolva vagy nincs konfigurálva az MTP használatával történő fájlátvitelre. "
+"Feloldhatja és megpróbálhatja újra. <br> <br> Néhány modellen is meg kell "
+"változtatnia az <i> USB töltéshez </i> az USB-t a fájlok átviteléhez </i>. "
+"<br> Alternatív megoldásként figyelmen kívül hagyhatja ezt az eszközt."
 
-#: ../raphodo/rapid.py:4008
+#: ../raphodo/rapid.py:4239
 #, python-format
 msgid ""
-"<b>The %(camera)s appears to be in use by another application.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again.<br><br>Alternatively, you can ignore this "
-"device."
+"<b>The %(camera)s appears to be in use by another "
+"application.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again.<br><br>Alternatively, you "
+"can ignore this device."
 msgstr ""
+"<b> Úgy tűnik, hogy a(z) %(camera)s használatban van egy másik "
+"alkalmazással. </b> <br> <br> Le tud zárni minden olyan alkalmazást (például "
+"egy fájlböngészőt), amelyik használta és próbálja meg újra. Ha ez nem "
+"működik, húzza ki a számítógépből a(z) %(camera)s csatlakozót és "
+"csatlakoztassa újra. <br> <br> Másik lehetőségként figyelmen kívül hagyhatja "
+"a készüléket."
 
-#: ../raphodo/rapid.py:4019
+#: ../raphodo/rapid.py:4250
 msgid "&Try Again"
-msgstr ""
+msgstr "&Próbálja újra"
 
-#: ../raphodo/rapid.py:4020
+#: ../raphodo/rapid.py:4251
 msgid "&Ignore This Device"
-msgstr ""
+msgstr "&A készülék figyelmen kívül hagyása"
 
-#: ../raphodo/rapid.py:4086
+#: ../raphodo/rapid.py:4323
 #, python-format
 msgid "Sorry, an unexpected problem occurred while scanning %s."
-msgstr ""
+msgstr "Sajnáljuk, váratlan probléma történt a(z) %s beolvasása közben."
 
-#: ../raphodo/rapid.py:4087
+#: ../raphodo/rapid.py:4324
 msgid "Unfortunately you cannot download from this device."
-msgstr ""
+msgstr "Sajnos nem lehet letölteni az eszközről."
 
-#: ../raphodo/rapid.py:4091
+#: ../raphodo/rapid.py:4328
 msgid ""
 "A possible workaround for the problem might be downloading from the camera's "
 "memory card using a card reader."
 msgstr ""
+"A probléma megkerülhető azzal, hogy a letöltendő fájlokat a fényképezőgép "
+"memóriakártyájából egy kártyaolvasó használatával olvassuk be."
 
-#: ../raphodo/rapid.py:4096
+#: ../raphodo/rapid.py:4333
 msgid "Device scan failed"
-msgstr ""
+msgstr "Az eszköz lekeresése sikertelen"
 
-#: ../raphodo/rapid.py:4472
+#: ../raphodo/rapid.py:4720
 #, python-format
 msgid ""
-"<b>The %(camera)s cannot be scanned because it cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again."
+"<b>The %(camera)s cannot be scanned because it cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again."
 msgstr ""
+"<b> A(z) %(camera)s nem kereshető, mert nem lehet eltávolítani. </b> <br> "
+"<br> Le tud zárni minden olyan alkalmazást (például egy fájlböngészőt), "
+"amely megpróbálja újra használni. Ha ez nem működik, húzza ki a "
+"számítógépből a(z) %(camera)s csatlakozóját és csatlakoztassa újra."
 
-#: ../raphodo/rapid.py:4496
+#: ../raphodo/rapid.py:4745
 #, python-format
 msgid ""
-"<b>The download cannot start because the %(camera)s cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again, and choose which files you want to "
-"download from it."
+"<b>The download cannot start because the %(camera)s cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again, and choose which files "
+"you want to download from it."
 msgstr ""
+"<B> A letöltés nem indulhat el, mert a(z) %(camera)s nem távolítható el. "
+"</b> <br> <br> Leállíthatja az összes olyan alkalmazást (például egy "
+"fájlböngészőt), amelyik használni fogja és próbálja újra. Ha ez nem működik, "
+"húzza ki a számítógépből a %(camera)s csatlakozóját és csatlakoztassa újra, "
+"majd válassza ki a letölteni kívánt fájlokat."
+
+#: ../raphodo/rapid.py:4842
+msgid "Completed Downloads Present"
+msgstr "Befejezett letöltések jelen"
+
+#: ../raphodo/rapid.py:4844
+#, python-format
+msgid "%s whose download have completed are displayed."
+msgstr "A(z) %s letöltés befejeződött."
+
+#: ../raphodo/rapid.py:4846
+msgid "Do you want to clear the completed downloads?"
+msgstr "Szeretné törölni a befejezett letöltéseket?"
+
+#: ../raphodo/rapid.py:4848
+msgid "Completed Download Present"
+msgstr "Befejezett letöltések jelen"
 
-#: ../raphodo/rapid.py:4635
+#: ../raphodo/rapid.py:4850
+#, python-format
+msgid "%s whose download has completed is displayed."
+msgstr "Megjelenik a(z) %s, amelynek letöltése befejeződött."
+
+#: ../raphodo/rapid.py:4852
+msgid "Do you want to clear the completed download?"
+msgstr "Szeretné törölni a befejezett letöltést?"
+
+#: ../raphodo/rapid.py:4933
 #, python-format
 msgid ""
 "Do you want to download photos and videos from the device <i>%(device)s</i>?"
 msgstr ""
+"Szeretne fotókat és videókat letölteni az eszközről <i> %(device)s </i>?"
 
-#: ../raphodo/rapid.py:4877
+#: ../raphodo/rapid.py:5183
 #, python-format
 msgid "<b>Do you want to ignore the %s whenever this program is run?</b>"
 msgstr ""
+"<b> Szeretné figyelmen kívül hagyni a(z) %s -ot, ha ez a program fut? </b>"
 
-#: ../raphodo/rapid.py:4879
+#: ../raphodo/rapid.py:5186
 msgid ""
 "All cameras, phones and tablets with the same model name will be ignored."
 msgstr ""
+"A fényképezőgépek, a telefonok és a tabletek ugyanazzal a modellnevekkel "
+"figyelmen kívül lesznek hagyva."
 
-#: ../raphodo/rapid.py:4883
+#: ../raphodo/rapid.py:5190
 #, python-format
 msgid ""
 "<b>Do you want to ignore the device %s whenever this program is run?</b>"
 msgstr ""
+"<b> Szeretné figyelmen kívül hagyni a(z) %s eszközt, ha ez a program fut? "
+"</b>"
 
-#: ../raphodo/rapid.py:4885
+#: ../raphodo/rapid.py:5192
 msgid "Any device with the same name will be ignored."
-msgstr ""
+msgstr "Bármely azonos nevű eszközt figyelmen kívül hagyja."
 
-#: ../raphodo/rapid.py:5178
+#: ../raphodo/rapid.py:5492
 #, python-format
 msgid "Downloading from %(location)s on This Computer."
-msgstr ""
+msgstr "A(z) %(location)s letöltése ezen a számítógépen."
 
-#: ../raphodo/rapid.py:5180
+#: ../raphodo/rapid.py:5496
 msgid ""
 "Do you really want to download from here?<br><br>On some systems, scanning "
 "this location can take a very long time."
 msgstr ""
+"Tényleg szeretne letölteni innen? <br> <br> Néhány rendszeren a beolvasás "
+"nagyon sokáig tarthat."
 
-#: ../raphodo/rapid.py:5224
+#: ../raphodo/rapid.py:5537
 #, python-format
 msgid "Generating thumbnails for %s"
-msgstr ""
+msgstr "Bélyegképek létrehozása a következőhöz: %s"
 
-#: ../raphodo/rapid.py:5227
+#: ../raphodo/rapid.py:5540
 #, python-format
 msgid "Scanning %s"
-msgstr ""
+msgstr "A(z) %s beolvasása"
 
-#: ../raphodo/rapid.py:5237
+#: ../raphodo/rapid.py:5551
 #, python-format
 msgid ""
 "%(number)s of %(available files)s checked for download (%(hidden)s hidden)"
 msgstr ""
+"%(number)s %(available files)s ellenőrzött letöltés (%(hidden)s rejtett)"
 
-#: ../raphodo/rapid.py:5243
+#: ../raphodo/rapid.py:5559
 #, python-format
 msgid "%(number)s of %(available files)s checked for download"
-msgstr ""
+msgstr "%(number)s %(available files)s ellenőrzött a letöltésre"
 
-#: ../raphodo/rapid.py:5494
+#: ../raphodo/rapid.py:5764
 msgid "Display program information when run from the command line."
 msgstr ""
+"A program információk megjelenítése a parancssorból történő futtatáskor."
 
-#: ../raphodo/rapid.py:5496
+#: ../raphodo/rapid.py:5766
 msgid "Display debugging information when run from the command line."
 msgstr ""
+"A parancssorból történő futtatáskor jelezze ki a hibakeresési információkat."
 
-#: ../raphodo/rapid.py:5499
+#: ../raphodo/rapid.py:5769
 msgid "List photo and video file extensions the program recognizes and exit."
 msgstr ""
+"Sorolja fel azokat a fényképeket és videófájl-kiterjesztéseket, amelyeket a "
+"program felismer és kilép."
 
-#: ../raphodo/rapid.py:5502
+#: ../raphodo/rapid.py:5772
 msgid "Turn on or off the the renaming of photos."
-msgstr ""
+msgstr "Kapcsolja be vagy ki az átnevezés képek."
 
-#: ../raphodo/rapid.py:5504
+#: ../raphodo/rapid.py:5774
 msgid "turn on or off the the renaming of videos."
-msgstr ""
+msgstr "Kapcsolja be vagy ki a videók átnevezését."
 
-#: ../raphodo/rapid.py:5506
+#: ../raphodo/rapid.py:5776
 msgid ""
 "Turn on or off the automatic detection of devices from which to download."
-msgstr ""
+msgstr "Kapcsolja be vagy ki a letöltött eszközök automatikus felismerését."
 
-#: ../raphodo/rapid.py:5510
+#: ../raphodo/rapid.py:5780
 msgid "Turn on or off downloading from this computer."
-msgstr ""
+msgstr "A számítógépről történő letöltés be- vagy kikapcsolása."
 
-#: ../raphodo/rapid.py:5512 ../raphodo/rapid.py:5515 ../raphodo/rapid.py:5518
-#: ../raphodo/rapid.py:5539 ../raphodo/rapid.py:5543
+#: ../raphodo/rapid.py:5782 ../raphodo/rapid.py:5785 ../raphodo/rapid.py:5788
+#: ../raphodo/rapid.py:5809 ../raphodo/rapid.py:5813
 msgid "PATH"
-msgstr ""
+msgstr "ELÉRÉSI ÚT"
 
-#: ../raphodo/rapid.py:5513
+#: ../raphodo/rapid.py:5783
 msgid "The PATH on this computer from which to download."
-msgstr ""
+msgstr "Az ELÉRÉSI ÚT ezen a számítógépen, ahonnan letölthet."
 
-#: ../raphodo/rapid.py:5516
+#: ../raphodo/rapid.py:5786
 msgid "The PATH where photos will be downloaded to."
-msgstr ""
+msgstr "Az ELÉRÉSI ÚT, ahova a fotókat letölteni fogják."
 
-#: ../raphodo/rapid.py:5519
+#: ../raphodo/rapid.py:5789
 msgid "The PATH where videos will be downloaded to."
-msgstr ""
+msgstr "Az ELÉRÉSI ÚT, ahova a videókat letöltve lesznek."
 
-#: ../raphodo/rapid.py:5521
+#: ../raphodo/rapid.py:5791
 msgid "Turn on or off the backing up of photos and videos while downloading."
 msgstr ""
+"Fotók és videók biztonsági mentésének bekapcsolása vagy kikapcsolása "
+"letöltés közben."
 
-#: ../raphodo/rapid.py:5525
+#: ../raphodo/rapid.py:5795
 msgid "Turn on or off the automatic detection of backup devices."
 msgstr ""
+"Kapcsolja be vagy ki a biztonsági másolatok automatikus felismerését."
 
-#: ../raphodo/rapid.py:5527 ../raphodo/rapid.py:5533
+#: ../raphodo/rapid.py:5797 ../raphodo/rapid.py:5803
 msgid "FOLDER"
-msgstr ""
+msgstr "MAPPA"
 
-#: ../raphodo/rapid.py:5528
+#: ../raphodo/rapid.py:5798
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected photo "
 "backup device, with the folder's name being used to identify whether or not "
 "the device is used for backups. For each device you wish to use for backing "
 "photos up to, create a folder on it with this name."
 msgstr ""
+"A MAPPA, amelyben mentések tárolását a rendszer automatikusan észleli a "
+"fényképet biztonsági eszközt, a mappa neve annak segítségével azonosítják-e "
+"vagy sem az eszközt használják a mentéseket. Minden olyan eszköz esetében, "
+"amelyet a fotók támogatásához használni szeretne, hozzon létre egy mappát "
+"rajta ezzel a névvel."
 
-#: ../raphodo/rapid.py:5534
+#: ../raphodo/rapid.py:5804
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected video "
 "backup device, with the folder's name being used to identify whether or not "
 "the device is used for backups. For each device you wish to use for backing "
 "up videos to, create a folder on it with this name."
 msgstr ""
+"A MAPPA, amelyben a mentések az automatikusan észlelt video mentési eszközön "
+"tárolódnak, és a mappa neve azonosítja, hogy a készülék biztonsági "
+"másolatokat használ-e. Minden olyan eszköz esetében, amelyet videofájlok "
+"biztonsági mentéséhez kíván használni, hozzon létre egy mappát rajta ezzel a "
+"névvel."
 
-#: ../raphodo/rapid.py:5540
+#: ../raphodo/rapid.py:5810
 msgid ""
 "The PATH where photos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
+"Az ELÉRÉSI ÚT, ahol a biztonsági mentés automatikus felismerése esetén "
+"biztonsági mentést készül a fotókról."
 
-#: ../raphodo/rapid.py:5544
+#: ../raphodo/rapid.py:5814
 msgid ""
 "The PATH where videos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
+"Az ELÉRÉSI ÚT, ahova a videókról biztonsági másolat készül, amikor a mentési "
+"eszközök automatikus felismerése ki van kapcsolva."
 
-#: ../raphodo/rapid.py:5547
+#: ../raphodo/rapid.py:5817
 #, python-format
 msgid "Ignore photos with the following extensions: %s"
 msgstr ""
+"A következő kiterjesztésekkel rendelkező fotók figyelmen kívül hagyása: %s"
 
-#: ../raphodo/rapid.py:5551
-msgid "Turn on or off starting downloads as soon as the program itself starts."
-msgstr ""
+#: ../raphodo/rapid.py:5821
+msgid ""
+"Turn on or off starting downloads as soon as the program itself starts."
+msgstr "Kapcsolja be vagy ki a letöltéseket a program indításakor."
 
-#: ../raphodo/rapid.py:5554
+#: ../raphodo/rapid.py:5824
 msgid "Turn on or off starting downloads as soon as a device is inserted."
 msgstr ""
+"Kapcsolja be vagy ki a letöltések indítását, amint egy eszközt behelyez."
 
-#: ../raphodo/rapid.py:5557
+#: ../raphodo/rapid.py:5827
 msgid ""
 "Turn on or off use of the Rapid Photo Downloader Thumbnail Cache. Turning it "
 "off does not delete existing cache contents."
 msgstr ""
+"Kapcsolja be vagy ki a Rapid Photo Downloader bélyegkép gyorsítótár "
+"használatát. A kikapcsolás nem törli a meglévő gyorsítótár tartalmát."
 
-#: ../raphodo/rapid.py:5561
+#: ../raphodo/rapid.py:5831
 msgid ""
 "Delete all thumbnails in the Rapid Photo Downloader Thumbnail Cache, and "
 "exit."
 msgstr ""
+"Törölje a bélyegképeket a Rapid Photo Downloader bélyegkép gyorsítótárában "
+"és lépjen ki."
 
-#: ../raphodo/rapid.py:5565
+#: ../raphodo/rapid.py:5835
 msgid "Forget which files have been previously downloaded, and exit."
-msgstr ""
+msgstr "Felejtse el, hogy mely fájlokat töltötte le és lépjen ki."
 
-#: ../raphodo/rapid.py:5568
+#: ../raphodo/rapid.py:5838
 msgid ""
 "Import preferences from an old program version and exit. Requires the "
 "command line program gconftool-2."
 msgstr ""
+"Importáljon preferenciákat egy régi programverzióból és lépjen ki. Szükséges "
+"a gconftool-2 parancssori program."
 
-#: ../raphodo/rapid.py:5571
+#: ../raphodo/rapid.py:5841
 msgid ""
 "Reset all program settings to their default values, delete all thumbnails in "
 "the Thumbnail cache, forget which files have been previously downloaded, and "
 "exit."
 msgstr ""
+"Állítsa vissza az összes programbeállításot az alapértelmezett értékekre, "
+"törölje az összes bélyegképet a bélyegkép gyorsítótárában, és felejtse el, "
+"hogy mely fájlokat töltötte le korábban és lépjen ki."
 
-#: ../raphodo/rapid.py:5575
+#: ../raphodo/rapid.py:5845
 msgid "Include gphoto2 debugging information in log files."
-msgstr ""
+msgstr "Adja meg a gphoto2 hibakeresési információkat a naplófájlokban."
 
-#: ../raphodo/rapid.py:5579
+#: ../raphodo/rapid.py:5849
 msgid "Print information to the terminal about attached cameras and exit."
 msgstr ""
+"Nyomtasson információt a terminálhoz a csatlakoztatott kamerákról és lépjen "
+"ki."
 
-#: ../raphodo/rapid.py:5640
+#: ../raphodo/rapid.py:5911
 msgid ""
 "To import preferences from the old version of Rapid Photo Downloader, you "
 "must install the program gconftool-2."
 msgstr ""
+"A preferenciák importálásához a Rapid Photo Downloader régi verziójából "
+"telepíteni kell a gconftool-2 programot."
 
-#: ../raphodo/rapid.py:5649
+#: ../raphodo/rapid.py:5920
 msgid "No prior program preferences detected: exiting"
-msgstr ""
+msgstr "Nincs korábbi programbeállítás: kilépés"
 
-#: ../raphodo/rapid.py:5652
+#: ../raphodo/rapid.py:5923
 #, python-format
 msgid "Importing preferences from Rapid Photo Downloader %(version)s"
-msgstr ""
+msgstr "Preferenciák importálása a Rapid Photo Downloader %(version)s-ból"
 
-#: ../raphodo/rapid.py:5714
+#: ../raphodo/rapid.py:5989
 #, python-format
-msgid "Do you want to copy the stored sequence number, which has the value %d?"
-msgstr ""
+msgid ""
+"Do you want to copy the stored sequence number, which has the value %d?"
+msgstr "Szeretné másolni a tárolt sorszámot, amelynek értéke %d?"
 
-#: ../raphodo/rapid.py:5726
+#: ../raphodo/rapid.py:6000
 msgid "Program aborting."
-msgstr ""
+msgstr "A program megszakítása."
 
-#: ../raphodo/rapid.py:5736
+#: ../raphodo/rapid.py:6010
 msgid "Never run this program as the sudo / root user."
-msgstr ""
+msgstr "Soha ne futtassa ezt a programot sudo/root felhasználóként."
 
-#: ../raphodo/rapid.py:5740
+#: ../raphodo/rapid.py:6014
 msgid "You must install ExifTool to run Rapid Photo Downloader."
 msgstr ""
+"A Rapid Photo Downloader futtatásához telepítenie kell az ExifTool "
+"alkalmazást."
+
+#: ../raphodo/rapid.py:6026
+msgid ""
+"Rapid Photo Downloader is installed in multiple locations.\n"
+"\n"
+"Uninstall all copies except the version you want to run."
+msgstr ""
+"A Rapid Photo Downloader több helyre van telepítve.\n"
+"\n"
+"Törölje az összes példányt, kivéve a futtatni kívánt verziót."
 
-#: ../raphodo/rapid.py:5794
+#: ../raphodo/rapid.py:6083
 msgid ""
 "When specifying a path on the command line, do not also specify an\n"
 "option for device auto detection or a path on \"This Computer\"."
 msgstr ""
+"Amikor megad egy elérési utat a parancssorban, ne adjon meg egy\n"
+"lehetőséget az eszköz automatikus felismerésére vagy a \"Ez a számítógép\" "
+"elérési útjára."
 
-#: ../raphodo/rapid.py:5950
+#: ../raphodo/rapid.py:6243
 msgid "All settings and caches have been reset"
-msgstr ""
+msgstr "Minden beállítás és gyorsítótár vissza lett állítva"
 
-#: ../raphodo/rapid.py:5958
+#: ../raphodo/rapid.py:6251
 msgid "Thumbnail Cache has been reset"
-msgstr ""
+msgstr "A bélyegkép gyorsítótár vissza lett állítva"
 
-#: ../raphodo/rapid.py:5964
+#: ../raphodo/rapid.py:6257
 msgid "Remembered files have been forgotten"
-msgstr ""
+msgstr "Elfelejtették a megjegyzett fájlokat"
 
 #: ../raphodo/rememberthisdialog.py:70
 msgid "&Don't ask me about this again"
-msgstr ""
+msgstr "&Ne kérdezzen újra erről"
 
 #: ../raphodo/rememberthisdialog.py:72
 msgid "&Don't warn me about this again"
-msgstr ""
+msgstr "&Ne figyelmeztessen újra erről"
 
 #: ../raphodo/rememberthisdialog.py:75
 msgid "&Don't warn me again about missing or broken program libraries"
-msgstr ""
+msgstr "&Ne figyelmeztessen többé a hiányzó vagy törött programkönyvtárakról"
 
-#: ../raphodo/renameandmovefile.py:546
+#: ../raphodo/renameandmovefile.py:554
 msgid "subfolder and filename"
-msgstr "alkönyvtár és file neve"
+msgstr "alkönyvtár és fájlnév"
 
-#: ../raphodo/renameandmovefile.py:548
+#: ../raphodo/renameandmovefile.py:556
 msgid "filename"
 msgstr "fájlnév"
 
-#: ../raphodo/renameandmovefile.py:550
+#: ../raphodo/renameandmovefile.py:558
 msgid "subfolder"
 msgstr "alkönyvtár"
 
 #: ../raphodo/renamepanel.py:290
 msgid "A counter for how many downloads occur on each day"
-msgstr ""
+msgstr "Egy számláló, hogy hány letöltés történik minden nap"
 
 #: ../raphodo/renamepanel.py:291
 msgid "Downloads today:"
@@ -3452,6 +4775,7 @@ msgstr "Mai letöltések:"
 #: ../raphodo/renamepanel.py:313
 msgid "A counter that is remembered each time the program is run "
 msgstr ""
+"Egy olyan számláló, amely a program minden egyes futtatására emlékezik "
 
 #: ../raphodo/renamepanel.py:314
 msgid "Stored number:"
@@ -3461,6 +4785,7 @@ msgstr "Tárolt szám:"
 msgid ""
 "The time at which the <i>Downloads today</i> sequence number should be reset"
 msgstr ""
+"Az az időpont, amikor a <i> Letöltések ma </i> sorszámot vissza kell állítani"
 
 #: ../raphodo/renamepanel.py:332
 msgid "Day start:"
@@ -3470,7 +4795,7 @@ msgstr "Nap kezdete:"
 #. self.dayStart.setDisplayFormat('HH:mm:ss')
 #: ../raphodo/renamepanel.py:342
 msgid "Synchronize RAW + JPEG"
-msgstr ""
+msgstr "RAW + JPEG szinkronizálása"
 
 #: ../raphodo/renamepanel.py:345
 msgid ""
@@ -3478,10 +4803,13 @@ msgid ""
 "\n"
 "See the online documentation for more details."
 msgstr ""
+"A RAW és JPEG párhoz tartozó sorszámok szinkronizálása.\n"
+"\n"
+"További részletek az online dokumentációban találhatóak."
 
 #: ../raphodo/renamepanel.py:349
 msgid "Sequence Numbers"
-msgstr ""
+msgstr "Sorszámok"
 
 #: ../raphodo/renamepanel.py:360
 msgid "Strip incompatible characters"
@@ -3492,22 +4820,24 @@ msgid ""
 "Whether photo, video and folder names should have any characters removed "
 "that are not allowed by other operating systems"
 msgstr ""
+"Függetlenül attól, hogy a fotó-, videó- és mappanevek legyenek olyan "
+"karakterek, amelyeket más operációs rendszerek nem engedélyeznek"
 
 #: ../raphodo/renamepanel.py:365
 msgid "Compatibility"
-msgstr ""
+msgstr "Kompatibilitás"
 
 #: ../raphodo/renamepanel.py:433
 msgid "Photo Renaming"
-msgstr ""
+msgstr "Fotó átnevezése"
 
 #: ../raphodo/renamepanel.py:436
 msgid "Video Renaming"
-msgstr ""
+msgstr "Videó átnevezése"
 
 #: ../raphodo/renamepanel.py:439
 msgid "Renaming Options"
-msgstr ""
+msgstr "Átnevezési beállítások"
 
 #: ../raphodo/rpdfile.py:218
 msgid "photos and videos"
@@ -3515,161 +4845,238 @@ msgstr "fényképek és videók"
 
 #: ../raphodo/rpdfile.py:220
 msgid "photos or videos"
-msgstr "fénykép vagy videó"
+msgstr "fényképek vagy videók"
 
-#: ../raphodo/rpdfile.py:306
+#: ../raphodo/rpdfile.py:315
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: ../raphodo/rpdfile.py:318
+#. translators: natural language expression signifying a single video
+#: ../raphodo/rpdfile.py:337
+msgid "a video"
+msgstr "egy videó"
+
+#: ../raphodo/rpdfile.py:339
 msgid "1 Video"
-msgstr ""
+msgstr "1 videó"
+
+#. translators: natural language expression signifying a single photo
+#: ../raphodo/rpdfile.py:346
+msgid "a photo"
+msgstr "egy fénykép"
 
-#: ../raphodo/rpdfile.py:323
+#: ../raphodo/rpdfile.py:348
 msgid "1 Photo"
-msgstr ""
+msgstr "1 fénykép"
 
-#: ../raphodo/rpdfile.py:803
+#: ../raphodo/rpdfile.py:828
 #, python-format
 msgid "%(path)s on %(camera)s"
-msgstr ""
+msgstr "%(path)s %(camera)s"
 
-#: ../raphodo/rpdfile.py:819
+#: ../raphodo/rpdfile.py:844
 msgid "Photo"
 msgstr "Fénykép"
 
-#: ../raphodo/rpdfile.py:859
+#: ../raphodo/rpdfile.py:884
 msgid "Video"
 msgstr "Videó"
 
-#: ../raphodo/storage.py:138
+#: ../raphodo/storage.py:141
 msgid "File system root"
-msgstr ""
+msgstr "A fájlrendszer gyökere"
 
 #. translators: the name of the Pictures folder
-#: ../raphodo/storage.py:433
+#: ../raphodo/storage.py:437
 msgid "Pictures"
-msgstr ""
+msgstr "Képek"
 
-#: ../raphodo/thumbnaildisplay.py:426
+#: ../raphodo/thumbnaildisplay.py:432
 #, python-format
 msgid "Taken on %(date_time)s (%(human_readable)s)"
-msgstr ""
+msgstr "Felvett %(date_time)s (%(human_readable)s)"
 
-#: ../raphodo/thumbnaildisplay.py:431
+#: ../raphodo/thumbnaildisplay.py:439
 #, python-format
 msgid "Modified on %(date_time)s (%(human_readable)s)"
-msgstr ""
+msgstr "Módosítás dátuma: %(date_time)s (%(human_readable)s)"
 
-#: ../raphodo/thumbnaildisplay.py:437 ../raphodo/thumbnaildisplay.py:466
+#: ../raphodo/thumbnaildisplay.py:447 ../raphodo/thumbnaildisplay.py:481
 #, python-format
 msgid "%(date_time)s (%(human_readable)s)"
-msgstr ""
+msgstr "%(date_time)s (%(human_readable)s)"
 
-#: ../raphodo/thumbnaildisplay.py:451
+#: ../raphodo/thumbnaildisplay.py:464
 #, python-format
 msgid "Memory cards: %s"
-msgstr ""
+msgstr "Memóriakártyák: %s"
+
+#: ../raphodo/thumbnaildisplay.py:468
+#, python-format
+msgid "Memory card: %s"
+msgstr "Memóriakártya: %s"
 
-#: ../raphodo/thumbnaildisplay.py:457
+#: ../raphodo/thumbnaildisplay.py:473
 msgid "Downloaded as:"
-msgstr ""
+msgstr "Letöltve, mint:"
 
-#: ../raphodo/thumbnaildisplay.py:472
+#: ../raphodo/thumbnaildisplay.py:489
 #, python-format
 msgid "<br><br>Previous download:<br>%(filename)s<br>%(path)s<br>%(date)s"
-msgstr ""
+msgstr "<br><br> Előző letöltés: <br> %(filename)s <br> %(path)s %(date)s"
 
-#: ../raphodo/thumbnaildisplay.py:1603
+#: ../raphodo/thumbnaildisplay.py:1645
 msgid "Copy Path"
-msgstr ""
+msgstr "Másolás elérési út"
+
+#. Translators: these values are file size suffixes like B representing bytes, KB representing
+#. kilobytes, etc.
+#: ../raphodo/utilities.py:170
+msgid "B"
+msgstr "B"
+
+#: ../raphodo/utilities.py:170
+msgid "KB"
+msgstr "KB"
+
+#: ../raphodo/utilities.py:170
+msgid "MB"
+msgstr "MB"
+
+#: ../raphodo/utilities.py:170
+msgid "GB"
+msgstr "GB"
+
+#: ../raphodo/utilities.py:170
+msgid "TB"
+msgstr "TB"
+
+#: ../raphodo/utilities.py:170
+msgid "PB"
+msgstr "PB"
+
+#: ../raphodo/utilities.py:170
+msgid "EB"
+msgstr "EB"
+
+#: ../raphodo/utilities.py:170
+msgid "ZB"
+msgstr "ZB"
+
+#: ../raphodo/utilities.py:170
+msgid "YB"
+msgstr "YB"
 
 #. two things in a list e.g. "device1 and device2"
-#: ../raphodo/utilities.py:391
+#: ../raphodo/utilities.py:394
 #, python-format
 msgid "%(first_item)s and %(last_item)s"
-msgstr ""
+msgstr "%(first_item)s és %(last_item)s"
 
-#: ../raphodo/utilities.py:464
+#: ../raphodo/utilities.py:468
 msgid "one"
-msgstr ""
+msgstr "egy"
 
-#: ../raphodo/utilities.py:465
+#: ../raphodo/utilities.py:469
 msgid "two"
-msgstr ""
+msgstr "kettő"
 
-#: ../raphodo/utilities.py:466
+#: ../raphodo/utilities.py:470
 msgid "three"
-msgstr ""
+msgstr "három"
 
-#: ../raphodo/utilities.py:467
+#: ../raphodo/utilities.py:471
 msgid "four"
-msgstr ""
+msgstr "négy"
 
-#: ../raphodo/utilities.py:468
+#: ../raphodo/utilities.py:472
 msgid "five"
-msgstr ""
+msgstr "öt"
 
-#: ../raphodo/utilities.py:469
+#: ../raphodo/utilities.py:473
 msgid "six"
-msgstr ""
+msgstr "hat"
 
-#: ../raphodo/utilities.py:470
+#: ../raphodo/utilities.py:474
 msgid "seven"
-msgstr ""
+msgstr "hét"
 
-#: ../raphodo/utilities.py:471
+#: ../raphodo/utilities.py:475
 msgid "eight"
-msgstr ""
+msgstr "nyolc"
 
-#: ../raphodo/utilities.py:472
+#: ../raphodo/utilities.py:476
 msgid "nine"
-msgstr ""
+msgstr "kilenc"
 
-#: ../raphodo/utilities.py:473
+#: ../raphodo/utilities.py:477
 msgid "ten"
-msgstr ""
+msgstr "tíz"
 
-#: ../raphodo/utilities.py:474
+#: ../raphodo/utilities.py:478
 msgid "eleven"
-msgstr ""
+msgstr "tizenegy"
 
-#: ../raphodo/utilities.py:475
+#: ../raphodo/utilities.py:479
 msgid "twelve"
-msgstr ""
+msgstr "tizenkettő"
 
-#: ../raphodo/utilities.py:476
+#: ../raphodo/utilities.py:480
 msgid "thirteen"
-msgstr ""
+msgstr "tizenhárom"
 
-#: ../raphodo/utilities.py:477
+#: ../raphodo/utilities.py:481
 msgid "fourteen"
-msgstr ""
+msgstr "tizennégy"
 
-#: ../raphodo/utilities.py:478
+#: ../raphodo/utilities.py:482
 msgid "fifteen"
-msgstr ""
+msgstr "tizenöt"
 
-#: ../raphodo/utilities.py:479
+#: ../raphodo/utilities.py:483
 msgid "sixteen"
-msgstr ""
+msgstr "tizenhat"
 
-#: ../raphodo/utilities.py:480
+#: ../raphodo/utilities.py:484
 msgid "seventeen"
-msgstr ""
+msgstr "tizenhét"
 
-#: ../raphodo/utilities.py:481
+#: ../raphodo/utilities.py:485
 msgid "eighteen"
-msgstr ""
+msgstr "tizennyolc"
 
-#: ../raphodo/utilities.py:482
+#: ../raphodo/utilities.py:486
 msgid "ninenteen"
-msgstr ""
+msgstr "tizenkilenc"
 
-#: ../raphodo/utilities.py:483
+#: ../raphodo/utilities.py:487
 msgid "twenty"
-msgstr ""
+msgstr "húsz"
+
+#: ../raphodo/viewutils.py:240
+msgid "&OK"
+msgstr "&OK"
+
+#: ../raphodo/viewutils.py:243
+msgid "&Save"
+msgstr "&Mentés"
+
+#: ../raphodo/viewutils.py:244
+msgid "&Help"
+msgstr "&Sugó"
+
+#: ../raphodo/viewutils.py:245
+msgid "Restore Defaults"
+msgstr "Alapértékek visszaállítása"
+
+#: ../raphodo/viewutils.py:246
+msgid "&Yes"
+msgstr "&Igen"
+
+#: ../raphodo/viewutils.py:247
+msgid "&No"
+msgstr "&Nem"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:1
 msgid ""
@@ -3679,6 +5086,11 @@ msgid ""
 "photos and videos as they are downloaded. It downloads from and backs up to "
 "multiple devices simultaneously."
 msgstr ""
+"A Rapid Photo Downloader nagy sebességgel importál fényképeket és videókat "
+"kamerákból, telefonokból, memóriakártyákból és más eszközökből. Úgy van "
+"beállítva, hogy átnevezzen fényképeket és videókat a megadott fájlnevekkel. "
+"A képek és videók biztonsági másolata is letölthető. Egyszerre több "
+"eszközről tölt le és több eszközt támogat."
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:2
 msgid ""
@@ -3687,6 +5099,10 @@ msgid ""
 "identify photos and videos taken at different periods in a single day or "
 "over consecutive days."
 msgstr ""
+"A Rapid Photo Downloader egyedülálló eleme az idővonal, amely a fotókat és "
+"videókat csoportosítja az egymást követő felvételek között eltelt idő "
+"alapján. Használja azt a fotók és videók azonosítására, amelyek különböző "
+"időszakokban, egyetlen nap alatt vagy egymást követő napokon készülnek."
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:3
 msgid ""
@@ -3695,46 +5111,56 @@ msgid ""
 "configured without the need for complicated codes. Common tasks can be "
 "automated, such as unmounting a memory card when the download is complete."
 msgstr ""
+"A professzionális és amatőr fotográfus által készített Rapid Photo "
+"Downloader könnyen konfigurálható és használható. A programbeállítások "
+"bonyolult kódok nélkül konfigurálhatók. A szokásos feladatok "
+"automatizálhatók, például a memóriakártya eltávolítása a letöltés "
+"befejezésekor."
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:4
 msgid "The main window"
-msgstr ""
+msgstr "A főablak"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:5
 msgid "Downloading"
-msgstr ""
+msgstr "Letöltés"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:6
 msgid "The Timeline"
-msgstr ""
+msgstr "Az idővonal"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:7
 msgid "Right-clicking on a device"
-msgstr ""
+msgstr "Kattintson jobb gombbal egy eszközre"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:1
 msgid ""
 "Download, rename and back up photos and videos from cameras and other devices"
 msgstr ""
+"Fényképek és videók letöltése, átnevezése és biztonsági mentése kamerákból "
+"és egyéb eszközökről"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:2
 msgid "Photo Downloader"
-msgstr ""
+msgstr "Photo Downloader"
 
 #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:5
 msgid ""
-"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;"
-"memory;card;"
+"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;memory"
+";card;"
 msgstr ""
+"fénykép, letöltés, fényképezés, import, videó, RAW, kamera, telefon, mentés, "
+"memória kártya;"
 
 #: ../data/kde/net.damonlynch.rapid-photo-downloader.desktop.in.h:1
 msgid "Download Photos and Videos with Rapid Photo Downloader"
-msgstr ""
+msgstr "Fotók és videók letöltése a Rapid Photo Downloader alkalmazással"
 
 #~ msgid "Select a folder to download photos to"
 #~ msgstr "Válasszon egy letöltési könyvtárat"
 
+#, python-format
 #~ msgid "<i>Example: %s</i>"
 #~ msgstr "<i>Példa: %s</i>"
 
@@ -3753,6 +5179,7 @@ msgstr ""
 #~ msgid "Backing up error"
 #~ msgstr "A biztonsági másolat készítése során hiba történt."
 
+#, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
 #~ "Destination: %(destination)s"
@@ -3778,9 +5205,11 @@ msgstr ""
 #~ msgid "Using backup devices"
 #~ msgstr "A biztonsági mentés eszközök használata"
 
+#, python-format
 #~ msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 #~ msgstr "Kb. %(minutes)i:%(seconds)02i perc van hátra"
 
+#, python-format
 #~ msgid "About %i seconds remaining"
 #~ msgstr "Kb. %i másodperc van hátra"
 
@@ -3793,6 +5222,7 @@ msgstr ""
 #~ msgid "About 1 second remaining"
 #~ msgstr "Kb. 1 másodperc van hátra"
 
+#, python-format
 #~ msgid ""
 #~ "display program information on the command line as the program runs "
 #~ "(default: %default)"
@@ -3800,6 +5230,7 @@ msgstr ""
 #~ "futás közben program információ megjelenítése a terminálban (default: "
 #~ "%default)"
 
+#, python-format
 #~ msgid "and %s"
 #~ msgstr "és %s"
 
@@ -3975,6 +5406,7 @@ msgstr ""
 #~ msgid "R_emove All"
 #~ msgstr "Összes törlése"
 
+#, python-format
 #~ msgid "Source: %(source)s"
 #~ msgstr "Forrás: %(source)s"
 
@@ -3987,6 +5419,7 @@ msgstr ""
 #~ msgid "Should all Job Codes be removed?"
 #~ msgstr "Minden Munka-szám el legyen távolítva?"
 
+#, 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"
 
@@ -4074,6 +5507,7 @@ msgstr ""
 #~ msgid "Video backup folder name:"
 #~ msgstr "A videó biztonsági mentési könyvtára"
 
+#, python-format
 #~ msgid "Select a folder containing %(file_types)s"
 #~ msgstr "Válasszon egy könyvtárt az alábbiaknak: %(file_types)s"
 
@@ -4091,6 +5525,7 @@ msgstr ""
 #~ "A program által felismerhető kép és videó kiterjesztések listázása, majd "
 #~ "kilépés"
 
+#, python-format
 #~ msgid "Backing up to %(path)s"
 #~ msgstr "Biztonsági mentés készül az alábbi helyre: %(path)s"
 
@@ -4098,8 +5533,8 @@ msgstr ""
 #~ "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>"
+#~ "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 "Unmount (\"eject\") device upon download completion"
@@ -4116,9 +5551,10 @@ msgstr ""
 #~ "When backing up, choose whether to overwrite a file on the backup device "
 #~ "that has the same name, or skip backing it up."
 #~ 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."
+#~ "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."
 
+#, python-format
 #~ msgid ""
 #~ "The %(filetype)s subfolder preferences entered are invalid and cannot be "
 #~ "used.\n"
@@ -4127,12 +5563,15 @@ 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."
 
+#, python-format
 #~ msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
+#, python-format
 #~ msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
+#, python-format
 #~ msgid ""
 #~ "%(date)s\n"
 #~ "%(time)s"
@@ -4140,30 +5579,31 @@ msgstr ""
 #~ "%(date)s\n"
 #~ "%(time)s"
 
+#, python-format
 #~ msgid "%(date)s %(time)s"
 #~ msgstr "%(date)s %(time)s"
 
+#, python-format
 #~ msgid "Error: %(inst)s"
 #~ msgstr "Hiba: %(inst)s"
 
 #~ msgid "Photo has already been downloaded"
 #~ msgstr "A kép már korábban le lett töltve."
 
-#~ msgid ""
-#~ "Photos detected with the same filenames, but taken at different times"
+#~ 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."
 
+#, python-format
 #~ msgid "%(freespace)s. %(backuppaths)s."
 #~ msgstr "%(freespace)s. %(backuppaths)s."
 
 #~ 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."
+#~ "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 ""
-#~ "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"
+#~ "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"
 
 #~ msgid "_File"
 #~ msgstr "_Fájl"
@@ -4177,35 +5617,43 @@ msgstr ""
 #~ msgid "Size"
 #~ msgstr "Méret"
 
+#, python-format
 #~ msgid "%(device)s did not unmount"
 #~ msgstr "%(device)s eszköz nem lett csatlakoztatva"
 
 #~ msgid "Free space:"
 #~ msgstr "Szabad hely:"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s"
 #~ msgstr "%(total)s %(filetypes)s összesen.  Letöltve: %(number)s"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 #~ msgstr ""
-#~ "%(total)s %(filetypes)s  összesen. Letöltve: %(number)s  (%(remaining)s "
-#~ "még hátra van)"
+#~ "%(total)s %(filetypes)s  összesen. Letöltve: %(number)s  (%(remaining)s még "
+#~ "hátra van)"
 
+#, python-format
 #~ msgid "Folder: %s"
 #~ msgstr "könyvtár: %s"
 
+#, python-format
 #~ msgid "%(file_type)s download folder does not exist"
 #~ msgstr "%(file_type)s letöltési könyvtár nem létezik"
 
 #~ msgid "; "
 #~ msgstr "; "
 
+#, python-format
 #~ msgid "%(file_type)s download folder is not writable"
 #~ msgstr "%(file_type)s letöltési könyvtár nem írható"
 
+#, python-format
 #~ msgid "%(file_type)s download folder is invalid"
 #~ msgstr "%(file_type)s letöltési könyvtár nem jó"
 
+#, python-format
 #~ msgid ""
 #~ "%(problem)s\n"
 #~ "File: %(file)s"
@@ -4213,47 +5661,57 @@ msgstr ""
 #~ "%(problem)s\n"
 #~ "Fájl: %(file)s"
 
+#, python-format
 #~ msgid "%(filetype)s metadata cannot be read"
 #~ msgstr "%(filetype)s métadatatát nem tudom olvasni"
 
+#, python-format
 #~ msgid "Error generating component %s."
 #~ msgstr "Hiba a komponens elkészítésekor: %s."
 
+#, python-format
 #~ msgid "Date time value %s appears invalid."
 #~ msgstr "Ez a dátim, idő érték nem tűnik valósnak: %s"
 
+#, python-format
 #~ msgid "%(free)s free"
 #~ msgstr "%(free)s üres"
 
+#, python-format
 #~ msgid ""
 #~ "%(filetype)s could not be backed up because no suitable backup locations "
 #~ "were found."
 #~ msgstr ""
-#~ "%(filetype)s biztonsági mentése nem készül el, mert nincs használható "
-#~ "hely számára"
+#~ "%(filetype)s biztonsági mentése nem készül el, mert nincs használható hely "
+#~ "számára"
 
+#, python-format
 #~ msgid "%(filetype)s already exists"
 #~ msgstr "%(filetype)s már létezik (le van töltve)"
 
+#, python-format
 #~ msgid "%(filetype)s was already downloaded"
 #~ msgstr "%(filetype)s már le van töltve"
 
+#, python-format
 #~ msgid "%(filetype)s %(area)s could not be generated"
 #~ msgstr "%(filetype)s %(area)s nem lehet létrehozni"
 
+#, python-format
 #~ msgid "An error occurred when copying the %(filetype)s"
 #~ msgstr "Hiba lépett fel a %(filetype)s másolása közben"
 
+#, 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."
+#~ msgstr "Hiba történt a biztonsági mentés közben ezen az eszközön %(volume)s."
 
+#, 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"
+#~ msgstr "A fényképeknek azonos a neve, de eltérő időben készültek:%(details)s"
 
+#, 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: "
@@ -4269,15 +5727,18 @@ msgstr ""
 #~ "A fájlnév, a kiterjesztés, és az Exif információ szerint ez már le van "
 #~ "töltve."
 
+#, python-format
 #~ msgid " It was backed up to %(volume)s"
 #~ msgstr " Biztonsági mentés létrehozva: %(volume)s"
 
 #~ msgid " It was backed up to these devices: "
 #~ msgstr " Biztonsági mentés létrehozva ezeken az eszközökön: "
 
+#, python-format
 #~ msgid "%s, "
 #~ msgstr "%s, "
 
+#, python-format
 #~ msgid "%(volumes)s and %(final_volume)s."
 #~ msgstr "%(volumes)s és %(final_volume)s."
 
@@ -4287,34 +5748,40 @@ msgstr ""
 #~ msgid "Backups overwritten on these devices: "
 #~ msgstr "A biztonsági mentés felülírva ezeken az eszközökön: "
 
+#, python-format
 #~ msgid "Backup overwritten on %(volume)s."
 #~ msgstr "A biztonsági mentés felülírva ezen az eszközön: %(volume)s."
 
 #~ msgid "Backups already exist in these locations: "
 #~ msgstr "A biztonsági mentés az elábbi eszközökön már létezik: "
 
+#, python-format
 #~ msgid "Backup already exists on %(volume)s."
 #~ msgstr "A biztonsági mentés már létezik itt: %(volume)s."
 
+#, python-format
 #~ msgid "%(volumes)s and %(volume)s."
 #~ msgstr "%(volumes)s és %(volume)s."
 
+#, python-format
 #~ msgid "%(volumes)s and %(volume)s (%(inst)s)."
 #~ msgstr "%(volumes)s és %(volume)s (%(inst)s)."
 
+#, 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."
 
 #~ msgid ""
-#~ "Errors occurred when creating directories on the following backup "
-#~ "devices: "
+#~ "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: "
 
+#, python-format
 #~ msgid "Problem in %s generation"
 #~ msgstr "Probléma a %s létrehozásakor"
 
+#, python-format
 #~ msgid "Problems in %s generation"
 #~ msgstr "Probléma a %s létrehozásakor"
 
@@ -4327,17 +5794,16 @@ msgstr ""
 #~ msgid "The following metadata is missing: "
 #~ msgstr "A következő métaadatad hiányzik: "
 
-#~ msgid ""
-#~ "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
-#~ msgstr ""
-#~ "%(missing_metadata_elements)s és %(final_missing_metadata_element)s."
+#, python-format
+#~ msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
+#~ msgstr "%(missing_metadata_elements)s és %(final_missing_metadata_element)s."
 
-#~ msgid ""
-#~ "An error occurred when copying the %(filetype)s, but it was backed up"
+#, 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."
+#~ "Hiba történt a %(filetype)s másolásakor, de a biztonsági mentés létrehozva."
 
+#, 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"
 
@@ -4353,12 +5819,14 @@ msgstr ""
 #~ msgid "There were errors backing up"
 #~ msgstr "Hibák voltak a biztonsági mentés közben"
 
+#, python-format
 #~ msgid "%(previousproblem)s, and %(backinguperror)s"
 #~ msgstr "%(previousproblem)s, és %(backinguperror)s"
 
 #~ msgid "There was an error backing up"
 #~ msgstr "Hiba volt a biztonsági mentés közben"
 
+#, python-format
 #~ msgid "Path: %s"
 #~ msgstr "Path: %s"
 
@@ -4383,21 +5851,27 @@ msgstr ""
 #~ msgid "Generate thumbnails (slower)"
 #~ msgstr "Bélyegkép létrehozás (lassabb)"
 
+#, python-format
 #~ msgid "%(volume)s, "
 #~ msgstr "%(volume)s, "
 
+#, python-format
 #~ msgid "%(volume)s (%(inst)s), "
 #~ msgstr "%(volume)s (%(inst)s), "
 
+#, python-format
 #~ msgid "Error: %(errorno)s %(strerror)s"
 #~ msgstr "Hiba: %(errorno)s %(strerror)s"
 
+#, python-format
 #~ msgid "%(previousproblem)s Additionally, %(newproblem)s"
 #~ msgstr "%(previousproblem)s továbbá, %(newproblem)s"
 
+#, python-format
 #~ msgid " Furthermore, there were %(problems)s."
 #~ msgstr " Továbbá, még ezek %(problems)s."
 
+#, python-format
 #~ msgid " Furthermore, there was a %(problem)s."
 #~ msgstr " Továbbá, még ez %(problem)s."
 
@@ -4407,27 +5881,28 @@ msgstr ""
 #~ msgid "Invalid regular expression"
 #~ msgstr "Érvénytelen reguláris kifejezés"
 
+#, python-format
 #~ msgid ""
 #~ "The following regular expressions are invalid, and will be removed unless "
 #~ "you correct them:\n"
 #~ " %s"
 #~ msgstr ""
-#~ "A következő reguláris kifejezések hibásak, és távolításra kerülnek, ha "
-#~ "nem javítod ki őket:\n"
+#~ "A következő reguláris kifejezések hibásak, és távolításra kerülnek, ha nem "
+#~ "javítod ki őket:\n"
 #~ " %s"
 
+#, python-format
 #~ msgid ""
-#~ "This regular expression is invalid, and will be removed unless you "
-#~ "correct it:\n"
+#~ "This regular expression is invalid, and will be removed unless you correct "
+#~ "it:\n"
 #~ " %s"
 #~ msgstr ""
-#~ "Ez a reguláris kifejezés hibás,  és távolításra kerül, ha nem javítod "
-#~ "ki:\n"
+#~ "Ez a reguláris kifejezés hibás,  és távolításra kerül, ha nem javítod ki:\n"
 #~ " %s"
 
 #~ msgid ""
-#~ "If you disable automatic detection, choose the exact location of the "
-#~ "photos and videos."
+#~ "If you disable automatic detection, choose the exact location of the photos "
+#~ "and videos."
 #~ msgstr ""
 #~ "Kérlek válassz könyvtárt a fotók és a videók számára, ha nem akarod hogy "
 #~ "automatikusan kerüljenek meghatározásra (disable auto detection)."
@@ -4436,22 +5911,22 @@ msgstr ""
 #~ "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."
+#~ "When this option is enabled, and a potential device is detected, you will be "
+#~ "prompted to determine if it should be scanned or not."
 #~ msgstr ""
-#~ "Ha engedé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"
+#~ "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."
+#~ "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."
 
+#, 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"
 
+#, 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"
 
@@ -4466,8 +5941,7 @@ msgstr ""
 
 #~ 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>"
+#~ "<span weight=\"bold\" size=\"x-large\">A Fényképek Letöltési Könyvtára</span>"
 
 #~ msgid "<b>Example</b>"
 #~ msgstr "<b>Példa:</b>"
@@ -4487,8 +5961,7 @@ msgstr ""
 #~ "fognak jönni az általad megadott könyvtár alá."
 
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Átnevezési lehetőségek</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Átnevezési lehetőségek</span>"
 
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
 #~ msgstr "<span weight=\"bold\" size=\"x-large\">Munka-szám</span>"
@@ -4497,23 +5970,23 @@ msgstr ""
 #~ "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"
+#~ "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>"
+#~ "<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 ""
-#~ "Eszközök ahonnan a fotókat és a videókat letöltjük, mint például "
-#~ "fényképező gépek, memória kártyák, pendirve-ok.\n"
+#~ "Eszközök ahonnan a fotókat és a videókat letöltjük, mint például fényképező "
+#~ "gépek, memória kártyák, pendirve-ok.\n"
 #~ "\n"
 #~ "Letölthetsz egyszerre több eszközről, vagy kijelölhetsz egy könyvtárat a "
 #~ "merevlemezeden.\n"
 #~ "\n"
-#~ "<i>A fényképezőgépről történő közvetlen letöltés még kísérleti lehetőség. "
-#~ "Ha a fényképezőgépről a letöltés lassú, vagy nem működik akkor próbáld "
-#~ "meg a fényképezőgépet PTP módba állítani. Ha ez nem lehetséges használj "
+#~ "<i>A fényképezőgépről történő közvetlen letöltés még kísérleti lehetőség. Ha "
+#~ "a fényképezőgépről a letöltés lassú, vagy nem működik akkor próbáld meg a "
+#~ "fényképezőgépet PTP módba állítani. Ha ez nem lehetséges használj "
 #~ "kártyaolvasót.</i>"
 
 #~ msgid "Automatically detect devices"
@@ -4554,6 +6027,7 @@ msgstr ""
 #~ msgid "Auto Detect"
 #~ msgstr "Automatikus Felismerés"
 
+#, python-format
 #~ msgid "Downloading from %(location)s."
 #~ msgstr "Letöltés  innen: %(location)s."
 
@@ -4579,36 +6053,38 @@ msgstr ""
 #~ msgstr "Letöltésben szerepel"
 
 #~ 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>."
+#~ "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."
+#~ "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 "Select a folder in which to backup videos"
 #~ msgstr "Add meg a videók biztonsági mentésének útvonalát"
 
 #~ 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."
+#~ "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."
 
+#, python-format
 #~ msgid ""
-#~ "The existing %(filetype)s was last modified on %(date)s at %(time)s. "
-#~ "Unique identifier '%(identifier)s' added."
+#~ "The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
+#~ "identifier '%(identifier)s' added."
 #~ msgstr ""
-#~ "A létező %(filetype)s  típus utoljára %(date)s %(time)s lett módosítva."
-#~ "\r\n"
+#~ "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"
 
+#, python-format
 #~ msgid "There is no data with which to name the %(filetype)s."
 #~ msgstr "Nincs adat a %(filetype)s elnevezéséhez"
 
+#, 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."
 
@@ -4617,16 +6093,18 @@ msgstr ""
 
 #~ 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."
+#~ "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."
 
+#, python-format
 #~ msgid "(%(file_type)s)"
 #~ msgstr "(%(file_type)s)"
 
+#, python-format
 #~ msgid "%(free)s %(file_type)s"
 #~ msgstr "%(free)s %(file_type)s"
 
@@ -4648,9 +6126,11 @@ msgstr ""
 #~ msgid "About..."
 #~ msgstr "Névjegy…"
 
+#, python-format
 #~ msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
 #~ msgstr "keresés  (found %(photos)s photos and %(videos)s videos)..."
 
+#, python-format
 #~ msgid "The %(filetype)s did not download correctly"
 #~ msgstr "A  %(filetype)s letöltése nem volt hibátlan."
 
@@ -4660,6 +6140,7 @@ msgstr ""
 #~ msgid "Refresh"
 #~ msgstr "Újratöltés"
 
+#, 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 "
@@ -4671,9 +6152,10 @@ msgstr ""
 #~ msgstr ""
 #~ "A fájl ellenőrzés hibát talált. A letöltött verzió eltér az eredetitől."
 
+#, python-format
 #~ msgid ""
-#~ "File verification failed on %(volume)s. The backed up version is "
-#~ "different from the downloaded version."
+#~ "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."
diff --git a/po/id.po b/po/id.po
index 46c1a2b..fc441fd 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,129 +7,489 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: damonlynch@gmail.com\n"
-"POT-Creation-Date: 2017-07-08 19:16-0500\n"
-"PO-Revision-Date: 2017-07-04 11:06+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2017-09-12 17:01-0400\n"
+"PO-Revision-Date: 2017-09-13 18:34+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: Indonesian <id@li.org>\n"
-"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-07-05 23:04+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-09-26 22:04+0000\n"
+"X-Generator: Launchpad (build 18463)\n"
+"Language: id\n"
+
+#: ../install.py:65
+msgid "Rapid Photo Downloader installer"
+msgstr ""
+
+#: ../install.py:66
+msgid "Download and install latest version of Rapid Photo Downloader."
+msgstr ""
+
+#: ../install.py:236 ../install.py:1732
+msgid "Installer not found:"
+msgstr ""
+
+#. Translators: do not translate the term tar.gz
+#: ../install.py:240 ../install.py:1736
+msgid "Installer not in tar.gz format:"
+msgstr ""
+
+#: ../install.py:465
+msgid ""
+"Incorrect folder ownership detected. Changing ownership of and resetting "
+"permissions for"
+msgstr ""
+
+#: ../install.py:540
+msgid "The following command will be run:"
+msgstr ""
+
+#: ../install.py:543 ../install.py:1479 ../install.py:1484
+msgid "sudo may prompt you for the sudo password."
+msgstr ""
+
+#: ../install.py:547
+msgid "Would you like to run the command now?"
+msgstr ""
+
+#: ../install.py:549
+msgid "Answer is not yes, exiting."
+msgstr ""
+
+#: ../install.py:559 ../install.py:751 ../install.py:966
+msgid "Command failed"
+msgstr ""
+
+#: ../install.py:561 ../install.py:752 ../install.py:967
+msgid "Exiting"
+msgstr ""
+
+#: ../install.py:582
+msgid "The Universe repository must be enabled."
+msgstr ""
+
+#: ../install.py:606
+msgid ""
+"Do you want to to uninstall the previous version of Rapid Photo Downloader:"
+msgstr ""
+
+#: ../install.py:715 ../install.py:740
+msgid ""
+"Querying package system to see if an older version of Rapid Photo Downloader "
+"is installed (this may take a while)..."
+msgstr ""
+
+#: ../install.py:726
+msgid ""
+"Unable to query package system. Please check your Internet connection and "
+"try again"
+msgstr ""
+
+#: ../install.py:756
+msgid "Checking if previous version installed with pip..."
+msgstr ""
+
+#: ../install.py:850
+msgid "The following package is unknown on your system: {}\n"
+msgstr ""
+
+#: ../install.py:857 ../install.py:929 ../install.py:974
+msgid ""
+"To continue, some packages required to run the application will be installed."
+msgstr ""
+
+#: ../install.py:886
+msgid "Querying installed and available packages (this may take a while)"
+msgstr ""
+
+#: ../install.py:958
+msgid ""
+"Querying zypper to see if any required packages are already installed (this "
+"may take a while)... "
+msgstr ""
+
+#: ../install.py:1004
+msgid "Query to confirm action at each step."
+msgstr ""
+
+#: ../install.py:1011
+msgid ""
+"When downloading the latest version, install the development version if it "
+"is newer than the stable version."
+msgstr ""
+
+#: ../install.py:1020
+msgid ""
+"Optional tar.gz Rapid Photo Downloader installer archive. If not specified, "
+"the latest version is downloaded from the Internet."
+msgstr ""
+
+#: ../install.py:1043
+msgid ""
+"Do not run the installer in the tar.gz Rapid Photo Downloader installer "
+"archive if it is newer than this version ({}). The default is to run "
+"whichever installer is newer."
+msgstr ""
+
+#: ../install.py:1050
+msgid ""
+"Uninstall Rapid Photo Downloader that was installed with pip, keeping its "
+"dependencies."
+msgstr ""
+
+#: ../install.py:1054
+msgid ""
+"Uninstall the dependencies installed by pip during Rapid Photo Downloader's "
+"installation, and Rapid Photo Downloader itself, then exit."
+msgstr ""
 
-#. type: QPushButton
-#: ../raphodo/aboutdialog.py:217
+#: ../install.py:1059
+msgid ""
+"Note: this will not uninstall any version of Rapid Photo Downloader "
+"installed by your Linux distribution's package manager."
+msgstr ""
+
+#: ../install.py:1066
+msgid ""
+"Dependencies will only be removed if they are not required by other programs."
+msgstr ""
+
+#: ../install.py:1072
+msgid ""
+"Note: this option will remove the dependencies regardless of whether they "
+"are required by another program pip has installed. Upgrade to pip 9.0 or "
+"above if you want to avoid this behavior. You can do so using the command "
+"'python3 -m pip install pip -U --user'. Also note that any version of Rapid "
+"Photo Downloader installed by your Linux distribution's package manager will "
+"not be uninstalled."
+msgstr ""
+
+#: ../install.py:1122
+msgid "Failed to download versions file"
+msgstr ""
+
+#: ../install.py:1126
+msgid "Got error code {} while accessing versions file"
+msgstr ""
+
+#: ../install.py:1234
+msgid ""
+"Sorry, could not locate installer. Please check your Internet connection and "
+"verify if you can reach https://www.damonlynch.net\n"
+"\n"
+"Exiting.\n"
+msgstr ""
+
+#: ../install.py:1408
+msgid "Installing application requirements..."
+msgstr ""
+
+#: ../install.py:1424
+msgid "Received error code"
+msgstr ""
+
+#: ../install.py:1425
+msgid "Failed to install application requirements: exiting"
+msgstr ""
+
+#: ../install.py:1428
+msgid "Installing application..."
+msgstr ""
+
+#: ../install.py:1441
+msgid "Failed to install application: exiting..."
+msgstr ""
+
+#: ../install.py:1465
+msgid ""
+"You may have to restart the computer to be able to run the program from the "
+"commmand line or application launcher."
+msgstr ""
+
+#: ../install.py:1476
+msgid "Do you want to install the application's man pages?"
+msgstr ""
+
+#: ../install.py:1477
+msgid "They will be installed into {}"
+msgstr ""
+
+#: ../install.py:1478 ../install.py:1483
+msgid "If you uninstall the application, remove these manpages yourself."
+msgstr ""
+
+#: ../install.py:1480
+msgid "Do want to install the man pages?"
+msgstr ""
+
+#: ../install.py:1482
+msgid "Installing man pages into {}"
+msgstr ""
+
+#: ../install.py:1499
+msgid "Failed to create man page directory: exiting"
+msgstr ""
+
+#: ../install.py:1511
+msgid "Failed to copy man page."
+msgstr ""
+
+#: ../install.py:1521
+msgid "(If a segmentation fault occurs at exit, you can ignore it...)"
+msgstr ""
+
+#: ../install.py:1534
+msgid ""
+"The python3 tool pip is required to uninstall a version of Rapid Photo "
+"Downloader that was installed with pip.\n"
+"Cannot continue. Exiting."
+msgstr ""
+
+#: ../install.py:1575
+msgid ""
+"Do not run this installer script as sudo / root user.\n"
+"Run it using the user who will run the program.\n"
+msgstr ""
+
+#: ../install.py:1585 ../install.py:1599
+msgid "Do not include any other command line arguments when specifying"
+msgstr ""
+
+#: ../install.py:1614
+msgid ""
+"Sorry, this installer does not support a custom python installation.\n"
+"Exiting..."
+msgstr ""
+
+#: ../install.py:1620
+msgid "Restarting script using system python..."
+msgstr ""
+
+#: ../install.py:1651
+msgid "Exiting..."
+msgstr ""
+
+#. Translators: do not translate the term python3-apt
+#: ../install.py:1670
+msgid "To continue, the package python3-apt must be installed."
+msgstr ""
+
+#: ../install.py:1689
+msgid ""
+"Install the following packages using your Linux distribution's standard "
+"package manager, and then rerun this installer"
+msgstr ""
+
+#: ../install.py:1698
+msgid ""
+"To run this program, programs to assist Python 3 and its package management "
+"must be installed."
+msgstr ""
+
+#. Translators: do not translate the terms Python 3, pip and setuptools
+#: ../install.py:1713
+msgid "Python 3's pip and setuptools must be upgraded for your user."
+msgstr ""
+
+#. Translators: do not translate the term python or requests
+#: ../install.py:1726
+msgid "Installing python requests"
+msgstr ""
+
+#: ../upgrade.py:79
+msgid "Upgrade Rapid Photo Downloader"
+msgstr ""
+
+#: ../upgrade.py:401 ../raphodo/viewutils.py:242
+msgid "&Cancel"
+msgstr ""
+
+#: ../upgrade.py:405
+msgid "&Upgrade"
+msgstr ""
+
+#: ../upgrade.py:410
+#, python-format
+msgid "Click the Upgrade button to upgrade to version %s."
+msgstr ""
+
+#: ../upgrade.py:413
+msgid "Click the Upgrade button to start the upgrade."
+msgstr ""
+
+#: ../upgrade.py:416 ../upgrade.py:422 ../raphodo/viewutils.py:241
+msgid "&Close"
+msgstr ""
+
+#: ../upgrade.py:417
+msgid "&Run"
+msgstr ""
+
+#: ../upgrade.py:447
+msgid "Close Rapid Photo Downloader before running this upgrade"
+msgstr ""
+
+#: ../upgrade.py:450
+msgid "Upgrade running..."
+msgstr ""
+
+#: ../upgrade.py:486
+#, python-format
+msgid ""
+"Successfully upgraded to %s. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:491
+msgid ""
+"Upgrade finished successfully. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:495
+msgid "Upgrade failed. Click Close to exit."
+msgstr ""
+
+#: ../upgrade.py:6967
+#, python-format
+msgid "Upgrading %s..."
+msgstr ""
+
+#: ../upgrade.py:6969
+msgid "Press any key to continue..."
+msgstr ""
+
+#: ../upgrade.py:6982
+msgid "Rapid Photo Downloader upgrade failed"
+msgstr ""
+
+#: ../upgrade.py:6984
+#, python-format
+msgid ""
+"The python package %s could not be updated. The upgrade cannot continue."
+msgstr ""
+
+#: ../raphodo/aboutdialog.py:225
 msgid "Credits"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:239
+#: ../raphodo/backuppanel.py:240
 msgid "Backups are not configured"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:241
+#: ../raphodo/backuppanel.py:242
 msgid "No backup devices detected"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:243
+#: ../raphodo/backuppanel.py:244
 msgid "Valid backup locations not yet specified"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:401
+#: ../raphodo/backuppanel.py:404
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
 msgstr ""
 
-#: ../raphodo/backuppanel.py:407
+#: ../raphodo/backuppanel.py:412
 msgid "Back up photos and videos when downloading"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:413
+#: ../raphodo/backuppanel.py:418
 msgid "Automatically detect backup devices"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:417
+#: ../raphodo/backuppanel.py:424
 msgid ""
-"Specify the folder in which backups are stored on the device."
-"<br><br><i>Note: the presence of a folder with this name is used to "
+"Specify the folder in which backups are stored on the "
+"device.<br><br><i>Note: the presence of a folder with this name is used to "
 "determine if 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 folder names. By "
 "adding both folders, the same device can be used to back up both photos and "
 "videos.</i>"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:428
+#: ../raphodo/backuppanel.py:439
 msgid "Photo folder name:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:433
+#: ../raphodo/backuppanel.py:444
 msgid "Video folder name:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:438 ../raphodo/nameeditor.py:883
+#: ../raphodo/backuppanel.py:449 ../raphodo/nameeditor.py:890
 #: ../raphodo/renamepanel.py:123
 msgid "Example:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:448
-msgid "If you disable automatic detection, choose the exact backup locations."
+#: ../raphodo/backuppanel.py:460
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
 
-#: ../raphodo/backuppanel.py:452
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:468
 msgid "Photo backup location:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:454
+#: ../raphodo/backuppanel.py:474
 msgid "Select Photo Backup Location"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:460
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:485
 msgid "Video backup location:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:462
+#: ../raphodo/backuppanel.py:491
 msgid "Select Video Backup Location"
 msgstr ""
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:564
+#: ../raphodo/backuppanel.py:595
 msgid "drive1"
 msgstr ""
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:567
+#: ../raphodo/backuppanel.py:598
 msgid "drive2"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:628
+#: ../raphodo/backuppanel.py:663
 msgid "Projected Backup Storage Use"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:632
+#: ../raphodo/backuppanel.py:669
 msgid "Backup Options"
 msgstr ""
 
 #. translators: refers to the video thumbnail file that some
 #. cameras generate -- it has a .THM file extension
-#: ../raphodo/copyfiles.py:476
+#: ../raphodo/copyfiles.py:491
 msgid "video THM"
 msgstr ""
 
-#: ../raphodo/copyfiles.py:482
+#: ../raphodo/copyfiles.py:497
 msgid "audio"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:78 ../raphodo/devicedisplay.py:1079
-#: ../raphodo/rpdfile.py:321
+#: ../raphodo/rpdfile.py:342
 #, python-format
 msgid "%(no_photos)s Photos"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:82 ../raphodo/devicedisplay.py:1081
-#: ../raphodo/rpdfile.py:316
+#: ../raphodo/rpdfile.py:333
 #, python-format
 msgid "%(no_videos)s Videos"
 msgstr ""
@@ -157,15 +517,15 @@ msgid "%(size_free)s free of %(size_total)s"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:190 ../raphodo/devicedisplay.py:993
-#: ../raphodo/rapid.py:1964 ../raphodo/rapid.py:2079 ../raphodo/rapid.py:5753
-#: ../raphodo/rpdfile.py:905
+#: ../raphodo/rapid.py:2023 ../raphodo/rapid.py:2151 ../raphodo/rapid.py:6043
+#: ../raphodo/rpdfile.py:930
 msgid "Photos"
 msgstr ""
 
 #. translators: the name of the Videos folder
 #: ../raphodo/destinationdisplay.py:191 ../raphodo/devicedisplay.py:994
-#: ../raphodo/rapid.py:1967 ../raphodo/rapid.py:2080 ../raphodo/rapid.py:5754
-#: ../raphodo/rpdfile.py:933 ../raphodo/storage.py:445
+#: ../raphodo/rapid.py:2028 ../raphodo/rapid.py:2152 ../raphodo/rapid.py:6044
+#: ../raphodo/rpdfile.py:958 ../raphodo/storage.py:449
 msgid "Videos"
 msgstr ""
 
@@ -173,7 +533,7 @@ msgstr ""
 msgid "Projected storage use after download"
 msgstr ""
 
-#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:516
+#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:521
 msgid "Custom..."
 msgstr ""
 
@@ -211,57 +571,58 @@ msgstr ""
 msgid "%s full"
 msgstr ""
 
-#: ../raphodo/devices.py:459
+#: ../raphodo/devices.py:463
 msgid "Cameras"
 msgstr ""
 
-#: ../raphodo/devices.py:460 ../raphodo/devices.py:920
-#: ../raphodo/preferencedialog.py:85 ../raphodo/rapid.py:1927
+#: ../raphodo/devices.py:464 ../raphodo/devices.py:927
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/rapid.py:1979
 msgid "Devices"
 msgstr ""
 
-#: ../raphodo/devices.py:720
+#: ../raphodo/devices.py:724
 #, python-format
 msgid "Downloading from %(device_names)s"
 msgstr ""
 
 #. Translators: e.g. Three Devices
-#: ../raphodo/devices.py:780
+#: ../raphodo/devices.py:784
 #, python-format
 msgid "%(no_devices)s %(device_type)s"
 msgstr ""
 
-#: ../raphodo/devices.py:905 ../raphodo/rapid.py:1764
+#: ../raphodo/devices.py:912 ../raphodo/rapid.py:1807
 msgid "Select Source"
 msgstr ""
 
-#: ../raphodo/devices.py:936 ../raphodo/devices.py:947
+#: ../raphodo/devices.py:943 ../raphodo/devices.py:954
 #, python-format
 msgid "%(device1)s + %(device2)s"
 msgstr ""
 
 #. Number of cameras e.g. 3 Cameras
-#: ../raphodo/devices.py:958
+#: ../raphodo/devices.py:965
 #, python-format
 msgid "%(no_cameras)s Cameras"
 msgstr ""
 
-#: ../raphodo/devices.py:963
+#: ../raphodo/devices.py:970
 #, python-format
 msgid "%(no_devices)s Devices"
 msgstr ""
 
 #. Translators: two folder names, separated by a plus sign
-#: ../raphodo/devices.py:1258
+#: ../raphodo/devices.py:1265
 #, python-format
 msgid "%s + %s"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:44
+#: ../raphodo/didyouknow.py:45
 msgid "Click on a file's checkbox to mark or unmark it for download."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:50
+#: ../raphodo/didyouknow.py:51
 msgid ""
 "Files that have already been downloaded are remembered. You can still mark "
 "previously downloaded files to download again, but they are unchecked by "
@@ -269,34 +630,67 @@ msgid ""
 "files that are yet to be downloaded."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:59
+#: ../raphodo/didyouknow.py:60
 msgid ""
 "If more than one file is selected, they'll all take the mark of the file "
 "whose checkbox was clicked, regardless of whether they previously had a "
 "checkmark or not."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:67
+#: ../raphodo/didyouknow.py:68
 msgid ""
 "Click on a device's checkbox to quickly mark or unmark all its files for "
 "downloading."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:74
+#: ../raphodo/didyouknow.py:75
+msgid ""
+"After a download finishes, an icon replaces the thumbnail's checkbox. The "
+"icon's color indicates whether the download was successful (green), had file "
+"renaming problems (yellow/orange), or failed (red)."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:83
+msgid ""
+"\n"
+"            In case of any problems, a red icon will appear at the bottom of "
+"the window\n"
+"            indicating how many error reports there are. Clicking on it "
+"opens the Error Report \n"
+"            window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:91
+msgid ""
+"\n"
+"            The Error Report window lists any problems encountered before, "
+"during or after the \n"
+"            download. An orange triangle represents a warning, a red circle "
+"indicates a failure, \n"
+"            and a black circle indicates more serious failures. You can "
+"click on the hyperlinks to \n"
+"            open its file or device in a file manager. You can also search "
+"the reports using the \n"
+"            search box in the lower left of the Error Report window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:103
 msgid ""
 "You can simultaneously download from multiple cameras, smartphones, memory "
 "cards, and hard drives&mdash;as many devices as your computer can handle at "
 "one time."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:81
+#: ../raphodo/didyouknow.py:110
 msgid ""
 "The <b>Timeline</b> groups photos and videos based on how much time elapsed "
 "between consecutive shots. Use it to identify photos and videos taken at "
 "different periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:88
+#: ../raphodo/didyouknow.py:117
 msgid ""
 "\n"
 "<p>In the illustration above, the first row of the Timeline is black because "
@@ -308,7 +702,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:99
+#: ../raphodo/didyouknow.py:128
 msgid ""
 "To view photos and videos for a particular time range, use the mouse "
 "(optionally in combination with the <tt>Shift</tt> or <tt>Ctrl</tt> keys) to "
@@ -316,20 +710,20 @@ msgid ""
 "the left side of the main window will be highlighted."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:106
+#: ../raphodo/didyouknow.py:135
 msgid ""
 "A download always includes all files that are checked for download, "
 "including those that are not currently displayed because the Timeline is "
 "being used."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:113
+#: ../raphodo/didyouknow.py:142
 msgid ""
 "You can hide or display the download sources by clicking on the name of the "
 "device you're downloading from at the top left of the program window."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:120
+#: ../raphodo/didyouknow.py:149
 msgid ""
 "\n"
 "          Thumbnails can be sorted using a variety of criteria:\n"
@@ -348,33 +742,33 @@ msgid ""
 "</ol> "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:137
+#: ../raphodo/didyouknow.py:166
 msgid ""
 "One of Rapid Photo Downloader's most useful features is its ability to "
 "automatically generate download subfolders and rename files as it downloads, "
 "using a scheme of your choosing."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:143
+#: ../raphodo/didyouknow.py:172
 msgid ""
 "To specify where you want your files downloaded and how you want them named, "
 "open the appropriate panel on the right-side of the application window: "
 "<b>Destination</b>, <b>Rename</b>, or <b>Job Code</b>."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:150
+#: ../raphodo/didyouknow.py:179
 msgid ""
 "\n"
 "When thinking about your download directory structure, keep in mind two "
 "different types\n"
 "of directory:\n"
 "<ol>\n"
-"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, &quot;"
-"Photos&quot;, or\n"
+"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, "
+"&quot;Photos&quot;, or\n"
 "&quot;Videos&quot;. This directory should already exist on your computer. In "
 "the illustration \n"
-"below, the destination folders are &quot;Pictures&quot; and &quot;"
-"Videos&quot;. The\n"
+"below, the destination folders are &quot;Pictures&quot; and "
+"&quot;Videos&quot;. The\n"
 "name of the destination folder is displayed in the grey bar directly above "
 "the folder tree, \n"
 "with a folder icon to its left and a gear icon to its far right.</li>\n"
@@ -387,7 +781,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:167
+#: ../raphodo/didyouknow.py:196
 msgid ""
 "\n"
 "You can download photos and videos to the same destination folder, or "
@@ -400,14 +794,14 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:177
+#: ../raphodo/didyouknow.py:206
 msgid ""
 "Automatically generated download subfolders can contain further "
 "automatically generated subfolders if need be. A common scheme is to create "
 "a year subfolder and then a series of year-month-day subfolders within it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:186
+#: ../raphodo/didyouknow.py:215
 msgid ""
 "\n"
 "Whenever possible, the program previews the download subfolders of photos "
@@ -425,7 +819,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:201
+#: ../raphodo/didyouknow.py:230
 msgid ""
 "\n"
 "Download subfolder names are typically generated using some or all of the "
@@ -449,7 +843,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:219
+#: ../raphodo/didyouknow.py:248
 msgid ""
 "\n"
 "To automatically create download subfolders as you download, \n"
@@ -459,7 +853,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:227
+#: ../raphodo/didyouknow.py:256
 msgid ""
 "\n"
 "Using the drop-down menu, select a built-in preset or click on <b>Custom</b> "
@@ -469,20 +863,20 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:237
+#: ../raphodo/didyouknow.py:266
 msgid ""
 "It's easy to download raw images into one folder, and jpeg images into "
 "another. Simply use the <b>Filename Extension</b> as part of your download "
 "subfolder generation scheme:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:242
+#: ../raphodo/didyouknow.py:271
 msgid ""
 "This illustration shows a saved custom preset named &quot;My custom "
 "preset&quot;."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:246
+#: ../raphodo/didyouknow.py:275
 msgid ""
 "\n"
 "You do not have to create nested download subfolders. This illustration "
@@ -493,7 +887,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:256
+#: ../raphodo/didyouknow.py:285
 msgid ""
 "\n"
 "Although there are many built-in date/time naming options, you may find that "
@@ -507,7 +901,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:265
+#: ../raphodo/didyouknow.py:294
 msgid ""
 "\n"
 "Read more about all the ways you can generate download subfolder names and "
@@ -517,7 +911,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:273
+#: ../raphodo/didyouknow.py:302
 msgid ""
 "\n"
 "<b>Job Codes</b> let you easily enter text that describes sets of photos and "
@@ -529,7 +923,7 @@ msgid ""
 "&quot;Green Bazaar&quot;: \n"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:282
+#: ../raphodo/didyouknow.py:311
 msgid ""
 "\n"
 "You can apply new or existing Job Codes before you start a download. If "
@@ -540,36 +934,36 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:291
+#: ../raphodo/didyouknow.py:320
 msgid "Look for hints to guide you when working with Job Codes:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:295
+#: ../raphodo/didyouknow.py:324
 msgid ""
 "Hints will vary depending on the context, such as when the mouse is hovering "
 "over a button."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:301
+#: ../raphodo/didyouknow.py:330
 msgid ""
 "\n"
 "When you give your photos and videos unique filenames, you'll never be "
 "confused as to \n"
 "which file is which. Using <b>sequence numbers</b> to make filenames unique "
 "is highly \n"
-"recommended!.\n"
+"recommended!\n"
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:309
+#: ../raphodo/didyouknow.py:338
 msgid ""
 "\n"
 "<p>Four types of sequence values are available to help you assign unique "
 "names to your photos and \n"
 "videos:\n"
 "<ol>\n"
-"<li><b>Downloads today</b>: tracks downloads completed during that day.</"
-"li>\n"
+"<li><b>Downloads today</b>: tracks downloads completed during that "
+"day.</li>\n"
 "<li><b>Stored number</b>: similar to Downloads today, but it is remembered "
 "from the last time the  \n"
 "program was run.</li>\n"
@@ -583,7 +977,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:327
+#: ../raphodo/didyouknow.py:356
 msgid ""
 "\n"
 "The <b>Rename</b> panel allows you to configure file renaming. To rename "
@@ -592,7 +986,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:334
+#: ../raphodo/didyouknow.py:363
 msgid ""
 "\n"
 "<p>The <b>Synchronize RAW + JPEG</b> option is useful if you use the RAW + "
@@ -611,7 +1005,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:348
+#: ../raphodo/didyouknow.py:377
 msgid ""
 "\n"
 "You can have your photos and videos backed up to multiple locations as they "
@@ -622,13 +1016,13 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:356
+#: ../raphodo/didyouknow.py:385
 msgid ""
 "In this example, the drive <b>photobackup</b> does not contain a folder "
 "named <tt>Videos</tt>, so videos will not be backed up to it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:362
+#: ../raphodo/didyouknow.py:391
 msgid ""
 "\n"
 "Several of the program's preferences can be set from the command line, "
@@ -639,7 +1033,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:372
+#: ../raphodo/didyouknow.py:396
+msgid "You can also import program preferences from the older 0.4 version."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:401
 msgid ""
 "\n"
 "Rapid Photo Downloader deals with three types of cache:\n"
@@ -649,8 +1047,8 @@ msgid ""
 "memory cards, and other devices.</li>\n"
 "<li>A <b>temporary cache</b> of files downloaded from a camera, one for "
 "photos and another for \n"
-"videos. They are located in temporary subfolders in the download destination."
-"</li>\n"
+"videos. They are located in temporary subfolders in the download "
+"destination.</li>\n"
 "<li>The <b>desktop's thumbnail cache</b>, in which Rapid Photo Downloader "
 "stores thumbnails of \n"
 "RAW and TIFF photos once they have been downloaded. File browsers like Gnome "
@@ -665,23 +1063,23 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:431
+#: ../raphodo/didyouknow.py:460
 msgid "Tip of the Day"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:439
+#: ../raphodo/didyouknow.py:468
 msgid "Did you know...?"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:466
+#: ../raphodo/didyouknow.py:495
 msgid "Show tips on startup"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:470
+#: ../raphodo/didyouknow.py:499
 msgid "&Next"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:471
+#: ../raphodo/didyouknow.py:500
 msgid "&Previous"
 msgstr ""
 
@@ -788,68 +1186,68 @@ msgstr ""
 msgid "%(days)d days, %(hours)d hours"
 msgstr ""
 
-#: ../raphodo/errorlog.py:65
+#: ../raphodo/errorlog.py:66
 msgid "Find"
 msgstr ""
 
-#: ../raphodo/errorlog.py:135
+#: ../raphodo/errorlog.py:136
 msgid "Error Reports - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/errorlog.py:170
+#: ../raphodo/errorlog.py:171
 msgid "Find in reports"
 msgstr ""
 
-#: ../raphodo/errorlog.py:187
+#: ../raphodo/errorlog.py:188
 msgid "Find the previous occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:192
+#: ../raphodo/errorlog.py:193
 msgid "Find the next occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:194
+#: ../raphodo/errorlog.py:195
 msgid "&Highlight All"
 msgstr ""
 
-#: ../raphodo/errorlog.py:195
+#: ../raphodo/errorlog.py:196
 msgid "Highlight all occurrences of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:196
+#: ../raphodo/errorlog.py:197
 msgid "&Match Case"
 msgstr ""
 
-#: ../raphodo/errorlog.py:197
+#: ../raphodo/errorlog.py:198
 msgid "Search with case sensitivity"
 msgstr ""
 
-#: ../raphodo/errorlog.py:198
+#: ../raphodo/errorlog.py:199
 msgid "&Whole Words"
 msgstr ""
 
-#: ../raphodo/errorlog.py:199
+#: ../raphodo/errorlog.py:200
 msgid "Search whole words only"
 msgstr ""
 
-#: ../raphodo/errorlog.py:209 ../raphodo/errorlog.py:341
+#: ../raphodo/errorlog.py:210 ../raphodo/errorlog.py:345
 #, python-format
 msgid "%s of %s matches"
 msgstr ""
 
-#: ../raphodo/errorlog.py:228
+#: ../raphodo/errorlog.py:232
 msgid "Clear"
 msgstr ""
 
-#: ../raphodo/errorlog.py:328
+#: ../raphodo/errorlog.py:332
 msgid "Phrase not found"
 msgstr ""
 
-#: ../raphodo/errorlog.py:487
+#: ../raphodo/errorlog.py:491
 msgid "Search pending..."
 msgstr ""
 
-#: ../raphodo/errorlog.py:535
+#: ../raphodo/errorlog.py:539
 msgid ""
 "The number of new entries added to the Error Report since it was last open. "
 "Click to open the Error Report."
@@ -863,8 +1261,8 @@ msgstr ""
 #, python-brace-format
 msgid ""
 "<b>A problem occurred in Rapid Photo Downloader</b><br><br>\n"
-"    Please report the problem at <a href=\"{website}\">{website}</a>."
-"<br><br>\n"
+"    Please report the problem at <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
 "    Attach the log file <i>{log_file}</i> to your bug report (click\n"
 "    <a href=\"{log_path}\">here</a> to open the log directory).<br><br>If "
 "the same problem occurs\n"
@@ -885,7 +1283,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1601
+#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1643
 msgid "Open in File Browser..."
 msgstr ""
 
@@ -903,531 +1301,531 @@ msgstr ""
 msgid "%s (location does not exist)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:186
+#: ../raphodo/generatenameconfig.py:190
 msgid "Date time"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:187
+#: ../raphodo/generatenameconfig.py:191
 msgid "Text"
 msgstr "Teks"
 
-#: ../raphodo/generatenameconfig.py:188 ../raphodo/rapid.py:2053
+#: ../raphodo/generatenameconfig.py:192 ../raphodo/rapid.py:2125
 msgid "Filename"
 msgstr "Nama Berkas"
 
-#: ../raphodo/generatenameconfig.py:189 ../raphodo/preferencedialog.py:488
+#: ../raphodo/generatenameconfig.py:193 ../raphodo/preferencedialog.py:724
 msgid "Metadata"
 msgstr "Metadata"
 
-#: ../raphodo/generatenameconfig.py:190
+#: ../raphodo/generatenameconfig.py:194
 msgid "Sequences"
 msgstr "Urutan"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: ../raphodo/generatenameconfig.py:193
+#: ../raphodo/generatenameconfig.py:197
 msgid "Job code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:194
+#: ../raphodo/generatenameconfig.py:198
 msgid "Image date"
 msgstr "Tanggal gambar"
 
-#: ../raphodo/generatenameconfig.py:195
+#: ../raphodo/generatenameconfig.py:199
 msgid "Video date"
 msgstr "Tanggal video"
 
-#: ../raphodo/generatenameconfig.py:196
+#: ../raphodo/generatenameconfig.py:200
 msgid "Today"
 msgstr "Hari ini"
 
-#: ../raphodo/generatenameconfig.py:197
+#: ../raphodo/generatenameconfig.py:201
 msgid "Yesterday"
 msgstr "Kemarin"
 
 #. Translators: Download time is the time and date that the download started (when the
 #. user clicked the Download button)
-#: ../raphodo/generatenameconfig.py:200
+#: ../raphodo/generatenameconfig.py:204
 msgid "Download time"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:203
+#: ../raphodo/generatenameconfig.py:207
 msgid "Name"
 msgstr "Nama"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:206 ../raphodo/rapid.py:2054
+#: ../raphodo/generatenameconfig.py:210 ../raphodo/rapid.py:2126
 msgid "Extension"
 msgstr "Ekstensi"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:209
+#: ../raphodo/generatenameconfig.py:213
 msgid "Image number"
 msgstr "Jumlah gambar"
 
-#: ../raphodo/generatenameconfig.py:210
+#: ../raphodo/generatenameconfig.py:214
 msgid "Video number"
 msgstr "Jumlah video"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:213
+#: ../raphodo/generatenameconfig.py:217
 msgid "Aperture"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:216
+#: ../raphodo/generatenameconfig.py:220
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:219
+#: ../raphodo/generatenameconfig.py:223
 msgid "Exposure time"
 msgstr "Waktu pencahayaan"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:222
+#: ../raphodo/generatenameconfig.py:226
 msgid "Focal length"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:225
+#: ../raphodo/generatenameconfig.py:229
 msgid "Camera make"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:228
+#: ../raphodo/generatenameconfig.py:232
 msgid "Camera model"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:231
+#: ../raphodo/generatenameconfig.py:235
 msgid "Short camera model"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:234
+#: ../raphodo/generatenameconfig.py:238
 msgid "Hyphenated short camera model"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:237
+#: ../raphodo/generatenameconfig.py:241
 msgid "Serial number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:240
+#: ../raphodo/generatenameconfig.py:244
 msgid "Shutter count"
 msgstr ""
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: ../raphodo/generatenameconfig.py:242
+#: ../raphodo/generatenameconfig.py:246
 msgid "File number"
 msgstr ""
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:244
+#: ../raphodo/generatenameconfig.py:248
 msgid "Folder only"
 msgstr ""
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:246
+#: ../raphodo/generatenameconfig.py:250
 msgid "Folder and file"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:249
+#: ../raphodo/generatenameconfig.py:253
 msgid "Owner name"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:250
+#: ../raphodo/generatenameconfig.py:254
 msgid "Codec"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:251
+#: ../raphodo/generatenameconfig.py:255
 msgid "Width"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:252
+#: ../raphodo/generatenameconfig.py:256
 msgid "Height"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:253
+#: ../raphodo/generatenameconfig.py:257
 msgid "Length"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:254
+#: ../raphodo/generatenameconfig.py:258
 msgid "Frames Per Second"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:255
+#: ../raphodo/generatenameconfig.py:259
 msgid "Artist"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:256
+#: ../raphodo/generatenameconfig.py:260
 msgid "Copyright"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:259
+#: ../raphodo/generatenameconfig.py:263
 msgid "Downloads today"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:262
+#: ../raphodo/generatenameconfig.py:266
 msgid "Session number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:265
+#: ../raphodo/generatenameconfig.py:269
 msgid "Subfolder number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:268
+#: ../raphodo/generatenameconfig.py:272
 msgid "Stored number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: ../raphodo/generatenameconfig.py:271
+#: ../raphodo/generatenameconfig.py:275
 msgid "Sequence letter"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:274
+#: ../raphodo/generatenameconfig.py:278
 msgid "All digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:277
+#: ../raphodo/generatenameconfig.py:281
 msgid "Last digit"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:280
+#: ../raphodo/generatenameconfig.py:284
 msgid "Last 2 digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:283
+#: ../raphodo/generatenameconfig.py:287
 msgid "Last 3 digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:286
+#: ../raphodo/generatenameconfig.py:290
 msgid "Last 4 digits"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:289
+#: ../raphodo/generatenameconfig.py:293
 msgid "Original Case"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:292
+#: ../raphodo/generatenameconfig.py:296
 msgid "UPPERCASE"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:295
+#: ../raphodo/generatenameconfig.py:299
 msgid "lowercase"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:296
+#: ../raphodo/generatenameconfig.py:300
 msgid "One digit"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:297
+#: ../raphodo/generatenameconfig.py:301
 msgid "Two digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:298
+#: ../raphodo/generatenameconfig.py:302
 msgid "Three digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:299
+#: ../raphodo/generatenameconfig.py:303
 msgid "Four digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:300
+#: ../raphodo/generatenameconfig.py:304
 msgid "Five digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:301
+#: ../raphodo/generatenameconfig.py:305
 msgid "Six digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:302
+#: ../raphodo/generatenameconfig.py:306
 msgid "Seven digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:305
+#: ../raphodo/generatenameconfig.py:309
 msgid "Subseconds"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:308 ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:312 ../raphodo/generatenameconfig.py:393
 msgid "YYYYMMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:311 ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:315 ../raphodo/generatenameconfig.py:394
 msgid "YYYY-MM-DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:314 ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:318 ../raphodo/generatenameconfig.py:395
 msgid "YYYY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:317
+#: ../raphodo/generatenameconfig.py:321
 msgid "YYMMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:320
+#: ../raphodo/generatenameconfig.py:324
 msgid "YY-MM-DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:323
+#: ../raphodo/generatenameconfig.py:327
 msgid "YY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:326
+#: ../raphodo/generatenameconfig.py:330
 msgid "MMDDYYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:329
+#: ../raphodo/generatenameconfig.py:333
 msgid "MMDDYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:332
+#: ../raphodo/generatenameconfig.py:336
 msgid "MMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:335
+#: ../raphodo/generatenameconfig.py:339
 msgid "DDMMYYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:338
+#: ../raphodo/generatenameconfig.py:342
 msgid "DDMMYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:341 ../raphodo/generatenameconfig.py:389
-#: ../raphodo/generatenameconfig.py:390 ../raphodo/generatenameconfig.py:391
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:345 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:394 ../raphodo/generatenameconfig.py:395
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:397
 msgid "YYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:344
+#: ../raphodo/generatenameconfig.py:348
 msgid "YY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:347
+#: ../raphodo/generatenameconfig.py:351
 msgid "MM"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:350
+#: ../raphodo/generatenameconfig.py:354
 msgid "DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:353
+#: ../raphodo/generatenameconfig.py:357
 msgid "Month (full)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:356
+#: ../raphodo/generatenameconfig.py:360
 msgid "Month (abbreviated)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:359
+#: ../raphodo/generatenameconfig.py:363
 msgid "HHMMSS"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:362
+#: ../raphodo/generatenameconfig.py:366
 msgid "HHMM"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:365
+#: ../raphodo/generatenameconfig.py:369
 msgid "HH-MM-SS"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:368
+#: ../raphodo/generatenameconfig.py:372
 msgid "HH-MM"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:371
+#: ../raphodo/generatenameconfig.py:375
 msgid "HH"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:374
+#: ../raphodo/generatenameconfig.py:378
 msgid "MM (minutes)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:377
+#: ../raphodo/generatenameconfig.py:381
 msgid "SS"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:393
 msgid "Date"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:394
 msgid "Date (hyphens)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:395
 msgid "Date (underscores)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:438
-#: ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:442
+#: ../raphodo/generatenameconfig.py:537
 msgid "Date and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392
+#: ../raphodo/generatenameconfig.py:396
 msgid "YYYYMM_Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "Date and Job Code Subfolder"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "YYYYMM"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393 ../raphodo/jobcodepanel.py:198
-#: ../raphodo/nameeditor.py:827 ../raphodo/rapid.py:1809
+#: ../raphodo/generatenameconfig.py:397 ../raphodo/jobcodepanel.py:199
+#: ../raphodo/nameeditor.py:833 ../raphodo/rapid.py:1852
 #: ../raphodo/renamepanel.py:83 ../raphodo/renamepanel.py:241
 msgid "Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:433 ../raphodo/generatenameconfig.py:512
+#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:532
 msgid "Original Filename"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "Date-Time and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "YYYYMMDD-HHMM-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "Date and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "YYYYMMDD-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "Date-Time and Image number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "YYYYMMDD-1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "Date-Time and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "YYYYMMDD-HHMM-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:442 ../raphodo/generatenameconfig.py:537
 msgid "YYYYMMDD-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "Date-Time and Video number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "YYYYMMDD_1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "Resolution"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "YYYYMMDD-HHMM-1-1920x1080"
 msgstr ""
 
@@ -1486,76 +1884,77 @@ msgstr ""
 msgid "&Remember this choice"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:185
+#: ../raphodo/jobcodepanel.py:186
 msgid ""
 "Select photos and videos to be able to apply a new or existing Job Code to "
 "them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:186
-msgid "The new Job Code will be applied to all selected photos and/or videos."
+#: ../raphodo/jobcodepanel.py:187
+msgid ""
+"The new Job Code will be applied to all selected photos and/or videos."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:187
+#: ../raphodo/jobcodepanel.py:188
 msgid ""
 "Click the Apply button to apply the current Job Code to all selected photos "
 "and/or videos. You can also simply double click the Job Code."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:189
+#: ../raphodo/jobcodepanel.py:190
 msgid ""
 "Removing a Job Code removes it only from the list of saved Job Codes, not "
 "from any photos or videos that it may have been applied to."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:191
+#: ../raphodo/jobcodepanel.py:192
 msgid ""
 "If you want to use Job Codes, configure file renaming or destination "
 "subfolder names to use them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:197
+#: ../raphodo/jobcodepanel.py:198
 msgid "Last Used"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:202
+#: ../raphodo/jobcodepanel.py:203
 msgid "Job Code Sort:"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:205 ../raphodo/rapid.py:2061
+#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2133
 msgid "Ascending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2062
+#: ../raphodo/jobcodepanel.py:207 ../raphodo/rapid.py:2134
 msgid "Descending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:216
+#: ../raphodo/jobcodepanel.py:217
 msgid "&New..."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:220
+#: ../raphodo/jobcodepanel.py:221
 msgid "&Apply"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:224
+#: ../raphodo/jobcodepanel.py:225
 msgid "&Remove"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:228 ../raphodo/preferencedialog.py:125
-#: ../raphodo/preferencedialog.py:154 ../raphodo/preferencedialog.py:433
+#: ../raphodo/jobcodepanel.py:229 ../raphodo/preferencedialog.py:200
+#: ../raphodo/preferencedialog.py:229 ../raphodo/preferencedialog.py:531
 msgid "Remove All"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:427
+#: ../raphodo/jobcodepanel.py:428
 msgid "Do you really want to remove all the Job Codes?"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:429
+#: ../raphodo/jobcodepanel.py:430
 msgid "Remove all Job Codes"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:492
+#: ../raphodo/jobcodepanel.py:493
 msgid "Job Codes"
 msgstr ""
 
@@ -1566,42 +1965,58 @@ msgstr ""
 msgid "<i><b>Hint:</b> %(message)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:418 ../raphodo/nameeditor.py:432
+#: ../raphodo/nameeditor.py:423 ../raphodo/nameeditor.py:437
 #, python-format
 msgid "%(description)s - %(elements)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:512
+#: ../raphodo/nameeditor.py:517
 msgid "Save New Custom Preset..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:513
+#: ../raphodo/nameeditor.py:518
 msgid "Remove All Custom Presets..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:559
+#: ../raphodo/nameeditor.py:564
 msgid "(New Custom Preset)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:576
+#: ../raphodo/nameeditor.py:581
 #, python-format
 msgid "%s (edited)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:579 ../raphodo/nameeditor.py:1370
+#: ../raphodo/nameeditor.py:584 ../raphodo/nameeditor.py:1379
 #, python-format
 msgid "Update Custom Preset \"%s\""
 msgstr ""
 
-#: ../raphodo/nameeditor.py:667
+#: ../raphodo/nameeditor.py:672
 msgid "Save New Custom Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:675
+#: ../raphodo/nameeditor.py:680
 msgid "Preset Name:"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:836
+#: ../raphodo/nameeditor.py:799
+msgid "Photo Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:805
+msgid "Video Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:811
+msgid "Photo Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:817
+msgid "Video Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:842
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>There is insufficient data to "
 "fully generate the name. Please use other renaming options.</i>"
@@ -1610,7 +2025,7 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees.
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:846
+#: ../raphodo/nameeditor.py:853
 #, python-format
 msgid "The character</i> %(separator)s <i>creates a new subfolder level."
 msgstr ""
@@ -1618,50 +2033,50 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:851
+#: ../raphodo/nameeditor.py:858
 #, python-format
 msgid ""
 "There is no need start or end with the folder separator </i> "
 "%(separator)s<i>, because it is added automatically."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:859
+#: ../raphodo/nameeditor.py:866
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>Unique filenames may not be "
 "generated. Make filenames unique by using Sequence values.</i>"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:882 ../raphodo/renamepanel.py:121
+#: ../raphodo/nameeditor.py:889 ../raphodo/renamepanel.py:121
 msgid "Preset:"
 msgstr ""
 
 #. Translators: appears in a combobox, e.g. Image Date (YYYY)
-#: ../raphodo/nameeditor.py:959 ../raphodo/nameeditor.py:980
+#: ../raphodo/nameeditor.py:966 ../raphodo/nameeditor.py:987
 #, python-brace-format
 msgid "{choice} ({variant})"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1005 ../raphodo/preferencedialog.py:530
+#: ../raphodo/nameeditor.py:1012 ../raphodo/preferencedialog.py:783
 msgid "Get help online..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1025
+#: ../raphodo/nameeditor.py:1034
 msgid "Insert"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1351
+#: ../raphodo/nameeditor.py:1360
 msgid "Save Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1356
+#: ../raphodo/nameeditor.py:1365
 msgid ""
-"<b>Do you want to save the changes in a new custom preset?</"
-"b><br><br>Creating a custom preset is not required, but can help you keep "
-"organized.<br><br>The changes to the preferences will still be applied "
-"regardless of whether you create a new custom preset or not."
+"<b>Do you want to save the changes in a new custom "
+"preset?</b><br><br>Creating a custom preset is not required, but can help "
+"you keep organized.<br><br>The changes to the preferences will still be "
+"applied regardless of whether you create a new custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1365
+#: ../raphodo/nameeditor.py:1374
 msgid ""
 "<b>Do you want to save the changes in a custom preset?</b><br><br>If you "
 "like, you can create a new custom preset or update the existing custom "
@@ -1669,136 +2084,167 @@ msgid ""
 "regardless of whether you save a custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1372
+#: ../raphodo/nameeditor.py:1381
 msgid "Save New Custom Preset"
 msgstr ""
 
-#: ../raphodo/newversion.py:306
+#: ../raphodo/newversion.py:312
 msgid "Checking for new version..."
 msgstr ""
 
-#: ../raphodo/newversion.py:307
+#: ../raphodo/newversion.py:313
 msgid "You are running the latest version."
 msgstr ""
 
-#: ../raphodo/newversion.py:308
+#: ../raphodo/newversion.py:314
 msgid "Failed to contact the update server."
 msgstr ""
 
-#: ../raphodo/newversion.py:310
+#: ../raphodo/newversion.py:316
 #, python-format
 msgid "A new version of Rapid Photo Downloader (%s) is available."
 msgstr ""
 
-#: ../raphodo/newversion.py:312
+#: ../raphodo/newversion.py:318
 msgid "Do you want to download the new version?"
 msgstr ""
 
-#: ../raphodo/newversion.py:313
+#: ../raphodo/newversion.py:319
 #, python-format
 msgid "Changes in the new release can be viewed <a href=\"%s\">here</a>."
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the s key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:340 ../raphodo/newversion.py:353
+#: ../raphodo/newversion.py:348 ../raphodo/newversion.py:363
 msgid "&Skip this release"
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the o key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:356
+#: ../raphodo/newversion.py:366
 msgid "&Open Download Page"
 msgstr ""
 
-#: ../raphodo/newversion.py:376
+#: ../raphodo/newversion.py:386
 msgid "Rapid Photo Downloader updates"
 msgstr ""
 
 #. Translators: shows how much of a file has been downloaded e.g  123 KB of 1.3 MB
-#: ../raphodo/newversion.py:478
+#: ../raphodo/newversion.py:488
 #, python-format
 msgid "%(downloaded)s of %(total)s"
 msgstr ""
 
-#: ../raphodo/newversion.py:495
+#: ../raphodo/newversion.py:507
 msgid "Downloading..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:76
+#: ../raphodo/preferencedialog.py:86
 msgid "Preferences"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Automation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Thumbnails"
 msgstr "Miniatur gambar"
 
-#: ../raphodo/preferencedialog.py:85 ../raphodo/preferencedialog.py:343
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/preferencedialog.py:428
 msgid "Error Handling"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:109
+msgid "Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:109 ../raphodo/preferencedialog.py:119
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:94
+#: ../raphodo/preferencedialog.py:147
 msgid "Device Scanning"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:96
+#: ../raphodo/preferencedialog.py:148
 msgid "Scan only external devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:98
+#: ../raphodo/preferencedialog.py:150
 msgid ""
 "Scan for photos and videos only on devices that are external to the "
 "computer,\n"
 "including cameras, memory cards, external hard drives, and USB flash drives."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:102
-msgid "Scan non-camera devices lacking a DCIM folder"
+#: ../raphodo/preferencedialog.py:153
+msgid "Scan only specific folders on devices"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:155
+msgid ""
+"Scan for photos and videos only in the folders specified below (except "
+"paths\n"
+"specified in Ignored Paths).\n"
+"\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:161
+msgid "Folders to scan:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:164
+msgid ""
+"Folders at the base level of device file systems that will be scanned\n"
+"for photos and videos."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:167 ../raphodo/preferencedialog.py:219
+msgid "Add..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:104
+#: ../raphodo/preferencedialog.py:169
 msgid ""
-"Scan the entirety of a device for photos and videos, irrespective of whether "
-"it contains a DCIM folder,\n"
-"as opposed to only scanning within a DCIM folder.\n"
+"Add a folder to the list of folders to scan for photos and videos.\n"
 "\n"
-"Changing this setting causes all devices to be scanned again.\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:172 ../raphodo/preferencedialog.py:198
+#: ../raphodo/preferencedialog.py:224 ../raphodo/preferencedialog.py:529
+msgid "Remove"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:174
+msgid ""
+"Remove a folder from the list of folders to scan for photos and videos.\n"
 "\n"
-"Note: With cameras, only the DCIM folder is scanned."
+"Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:116
+#: ../raphodo/preferencedialog.py:191
 msgid "Devices that have been set to automatically ignore or download from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:117
+#: ../raphodo/preferencedialog.py:192
 msgid "Remembered Devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:121
+#: ../raphodo/preferencedialog.py:196
 msgid ""
 "Remove a device from the list of devices to automatically ignore or download "
 "from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:123 ../raphodo/preferencedialog.py:149
-#: ../raphodo/preferencedialog.py:431
-msgid "Remove"
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:127
+#: ../raphodo/preferencedialog.py:202
 msgid ""
 "Clear the list of devices from which to automatically ignore or download "
 "from.\n"
@@ -1806,315 +2252,436 @@ msgid ""
 "Note: Changes take effect when the computer is next scanned for devices."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:140
+#: ../raphodo/preferencedialog.py:215
 msgid "Ignored Paths"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:141
+#: ../raphodo/preferencedialog.py:216
 msgid ""
 "The end part of a path that should never be scanned for photos or videos."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:144
-msgid "Add..."
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:146
+#: ../raphodo/preferencedialog.py:221
 msgid ""
 "Add a path to the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:151
+#: ../raphodo/preferencedialog.py:226
 msgid ""
 "Remove a path from the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:156
+#: ../raphodo/preferencedialog.py:231
 msgid ""
 "Clear the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:164
+#: ../raphodo/preferencedialog.py:239
 msgid ""
-"Use python-style <a href=\"http://damonlynch.net/rapid/documentation/"
-"#regularexpressions\">regular expressions</a>"
+"Use python-style <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">regula"
+"r expressions</a>"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:168
+#: ../raphodo/preferencedialog.py:243
 msgid ""
 "Use regular expressions in the list of ignored paths.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:208
+#: ../raphodo/preferencedialog.py:283
 msgid "Program Automation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:209
+#: ../raphodo/preferencedialog.py:284
 msgid "Start downloading at program startup"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:210
+#: ../raphodo/preferencedialog.py:285
 msgid "Start downloading upon device insertion"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:211
+#: ../raphodo/preferencedialog.py:286
 msgid "Unmount (eject) device upon download completion"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:212
+#: ../raphodo/preferencedialog.py:287
 msgid "Exit program when download completes"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:213
+#: ../raphodo/preferencedialog.py:288
 msgid "Exit program even if download had warnings or errors"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:240
+#: ../raphodo/preferencedialog.py:315
 msgid "Thumbnail Generation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:241
+#: ../raphodo/preferencedialog.py:316
 msgid "Generate thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:242
+#: ../raphodo/preferencedialog.py:318
 msgid "Generate thumbnails to show in the main program window"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:244
+#: ../raphodo/preferencedialog.py:320
 msgid "Cache thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:245
+#: ../raphodo/preferencedialog.py:323
 msgid ""
 "Save thumbnails shown in the main program window in a thumbnail cache unique "
 "to Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:247
+#: ../raphodo/preferencedialog.py:327
 msgid "Generate system thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:248
+#: ../raphodo/preferencedialog.py:330
 msgid ""
 "While downloading, save thumbnails that can be used by desktop file managers "
 "and other programs"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:255
+#: ../raphodo/preferencedialog.py:339
 msgid "Number of CPU cores used to generate thumbnails."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:256
+#: ../raphodo/preferencedialog.py:340
 msgid "CPU cores:"
 msgstr ""
 
 #. Translators: the * acts as an asterisk to denote a reference to an annotation
 #. such as '* Takes effect upon program restart'
-#: ../raphodo/preferencedialog.py:271 ../raphodo/preferencedialog.py:317
+#: ../raphodo/preferencedialog.py:355 ../raphodo/preferencedialog.py:401
 msgid "*"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:294
+#: ../raphodo/preferencedialog.py:378
 msgid "Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:296
+#: ../raphodo/preferencedialog.py:380
 msgid "Calculating..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:302
+#: ../raphodo/preferencedialog.py:386
 msgid "days"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:303
+#: ../raphodo/preferencedialog.py:387
 msgid "forever"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:308
+#: ../raphodo/preferencedialog.py:392
 msgid "Cache size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:310
+#: ../raphodo/preferencedialog.py:394
 msgid "Number of thumbnails:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:312
+#: ../raphodo/preferencedialog.py:396
 msgid "Database size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:314
+#: ../raphodo/preferencedialog.py:398
 msgid "Cache unaccessed thumbnails for:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:322
+#: ../raphodo/preferencedialog.py:406
 msgid "Purge Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:323
+#: ../raphodo/preferencedialog.py:408
 msgid "Optimize Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:336
+#: ../raphodo/preferencedialog.py:421
 msgid "* Takes effect upon program restart"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:346
+#: ../raphodo/preferencedialog.py:431
 msgid "Skip download"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:347
+#: ../raphodo/preferencedialog.py:432
 msgid "Don't download the file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:348
+#: ../raphodo/preferencedialog.py:433
 msgid "Add unique identifier"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:349
+#: ../raphodo/preferencedialog.py:436
 msgid ""
 "Add an identifier like _1 or _2 to the end of the filename, immediately "
 "before the file's extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:355
+#: ../raphodo/preferencedialog.py:444
 msgid "Overwrite"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:356
+#: ../raphodo/preferencedialog.py:445
 msgid "Overwrite the previously backed up file"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:357
+#: ../raphodo/preferencedialog.py:446
 msgid "Skip"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:358
+#: ../raphodo/preferencedialog.py:448
 msgid "Don't overwrite the backup file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:364
+#: ../raphodo/preferencedialog.py:455
 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 identifier:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:378
+#: ../raphodo/preferencedialog.py:464
+msgid ""
+"Using sequence numbers to automatically generate unique filenames is "
+"strongly recommended. Configure file renaming in the Rename panel in the "
+"main window."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:473
 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 ""
 
-#: ../raphodo/preferencedialog.py:398
+#: ../raphodo/preferencedialog.py:494
 msgid "Program Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:399
+#: ../raphodo/preferencedialog.py:495
 msgid "Show a warning when:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:402
+#: ../raphodo/preferencedialog.py:498
 msgid "Downloading files currently not displayed"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:403
+#: ../raphodo/preferencedialog.py:499
 msgid ""
 "Warn when about to download files that are not displayed in the main window."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:405
+#: ../raphodo/preferencedialog.py:501
 msgid "Backup destinations are missing"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:406
-msgid "Warn before starting a download if it is not possible to back up files."
+#: ../raphodo/preferencedialog.py:502
+msgid ""
+"Warn before starting a download if it is not possible to back up files."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:408
+#: ../raphodo/preferencedialog.py:504
 msgid "Program libraries are missing or broken"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:409
+#: ../raphodo/preferencedialog.py:505
 msgid ""
 "Warn if a software library used by Rapid Photo Downloader is missing or not "
 "functioning."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:412
+#: ../raphodo/preferencedialog.py:508
 msgid "Filesystem metadata cannot be set"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:413
+#: ../raphodo/preferencedialog.py:509
 msgid ""
 "Warn if there is an error setting a file's filesystem metadata, such as its "
 "modification time."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:416
+#: ../raphodo/preferencedialog.py:512
 msgid "Encountering unhandled files"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:417
+#: ../raphodo/preferencedialog.py:513
 msgid ""
 "Warn after scanning a device or this computer if there are unrecognized "
 "files that will not be included in the download."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:420
+#: ../raphodo/preferencedialog.py:517
 msgid "Do not warn about unhandled files with extensions:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:424
+#: ../raphodo/preferencedialog.py:522
 msgid ""
 "File extensions are case insensitive and do not need to include the leading "
 "dot."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:427
+#: ../raphodo/preferencedialog.py:525
 msgid "Add"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:428
+#: ../raphodo/preferencedialog.py:526
 msgid ""
 "Add a file extension to the list of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:430
+#: ../raphodo/preferencedialog.py:528
 msgid ""
 "Remove a file extension from the list of unhandled file types to not warn "
 "about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:434
+#: ../raphodo/preferencedialog.py:532
 msgid ""
 "Clear the list of file extensions of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:469
+#: ../raphodo/preferencedialog.py:568
+msgid "Photo and Video Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:571
+msgid "Consolidate files across devices and downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:574
+msgid ""
+"Analyze the results of device scans looking for duplicate files and matching "
+"RAW and JPEG pairs,\n"
+"comparing them across multiple devices and download sessions."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:580
+msgid "Treat matching RAW and JPEG files as:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:581
+msgid "One photo"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:582
+msgid "Two photos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:584
+msgid ""
+"Display matching pairs of RAW and JPEG photos as one photo, and if marked, "
+"download both."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:589
+msgid ""
+"Display matching pairs of RAW and JPEG photos as two different photos. You "
+"can still synchronize their sequence numbers."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:598
+msgid "With matching RAW and JPEG photos:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:600
+msgid "Do not mark JPEG for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:601
+msgid "Do not mark RAW for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:602
+msgid "Mark both for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:609
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"JPEG for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:614
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"RAW for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:619
+msgid ""
+"When matching RAW and JPEG photos are found, automatically mark both for "
+"download."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:625
+msgid ""
+"If you disable file consolidation, choose what to do when a download device "
+"is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:631
+msgid ""
+"When a download device is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:642
+msgid "Clear completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:643
+msgid "Keep displaying completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:644
+msgid "Prompt for what to do"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:649
+msgid ""
+"Automatically clear the display of completed downloads whenever a new "
+"download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:654
+msgid ""
+"Keep displaying completed downloads whenever a new download device is "
+"inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:658
+msgid ""
+"Prompt whether to keep displaying completed downloads or clear them whenever "
+"a new download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:702
 msgid "Version Check"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:470
+#: ../raphodo/preferencedialog.py:703
 msgid "Check for new version at startup"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:471
+#: ../raphodo/preferencedialog.py:705
 msgid "Check for a new version of the program each time the program starts."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:473
+#: ../raphodo/preferencedialog.py:707
 msgid "Include development releases"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:474
+#: ../raphodo/preferencedialog.py:709
 msgid ""
 "Include alpha, beta and other development releases when checking for a new "
 "version of the program.\n"
@@ -2123,11 +2690,11 @@ msgid ""
 "occur."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:489
+#: ../raphodo/preferencedialog.py:725
 msgid "Ignore DNG date/time metadata on MTP devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:490
+#: ../raphodo/preferencedialog.py:727
 msgid ""
 "Ignore date/time metadata in DNG files located on MTP devices, and use the "
 "file's modification time instead.\n"
@@ -2136,70 +2703,86 @@ msgid ""
 "metadata."
 msgstr ""
 
+#: ../raphodo/preferencedialog.py:741
+msgid "Completed Downloads"
+msgstr ""
+
 #. Translators: substituted value is a description for the set of preferences
 #. shown in the preference dialog window, e.g. Devices, Automation, etc.
 #. This string is shown in a tooltip for the "Restore Defaults" button
-#: ../raphodo/preferencedialog.py:710
+#: ../raphodo/preferencedialog.py:1067
 #, python-format
 msgid "Restores default %s preference values"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:832
+#: ../raphodo/preferencedialog.py:1208
 msgid ""
 "Do you want to purge the thumbnail cache? The cache will be purged when the "
 "program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:835
+#: ../raphodo/preferencedialog.py:1212
 msgid "Purge Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:847
+#: ../raphodo/preferencedialog.py:1225
 msgid ""
 "Do you want to optimize the thumbnail cache? The cache will be optimized "
 "when the program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:850
+#: ../raphodo/preferencedialog.py:1229
 msgid "Optimize Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1045
+#: ../raphodo/preferencedialog.py:1481
+msgid "Enter a Folder to Scan"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1482
+msgid "Specify a folder that will be scanned for photos and videos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1483
+msgid "Folder:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1497
 msgid "Enter a Path to Ignore"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1046
+#: ../raphodo/preferencedialog.py:1498
 msgid "Specify a path that will never be scanned for photos or videos"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1047
+#: ../raphodo/preferencedialog.py:1499
 msgid "Path:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1061
+#: ../raphodo/preferencedialog.py:1513
 msgid "Enter a File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1062
+#: ../raphodo/preferencedialog.py:1514
 msgid "Specify a file extension (without the leading dot)"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1063 ../raphodo/renamepanel.py:122
+#: ../raphodo/preferencedialog.py:1515 ../raphodo/renamepanel.py:122
 msgid "Extension:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1078
+#: ../raphodo/preferencedialog.py:1530
 msgid "Invalid File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1079
+#: ../raphodo/preferencedialog.py:1531
 #, python-format
 msgid ""
 "The file extension <b>%s</b> is recognized by Rapid Photo Downloader, so it "
 "makes no sense to warn about its presence."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1081
+#: ../raphodo/preferencedialog.py:1533
 #, python-format
 msgid ""
 "Recognized file types:\n"
@@ -2225,104 +2808,103 @@ msgstr ""
 msgid "Birthday"
 msgstr ""
 
-#: ../raphodo/preferences.py:614
+#: ../raphodo/preferences.py:624
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr ""
 
-#: ../raphodo/preferences.py:617
+#: ../raphodo/preferences.py:627
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr ""
 
-#: ../raphodo/preferences.py:622
+#: ../raphodo/preferences.py:632
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
 
-#. self.setFlat(True)
 #: ../raphodo/primarybutton.py:72
 msgid "Download 8 Photos and 10 Videos"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:86 ../raphodo/problemnotification.py:208
+#: ../raphodo/problemnotification.py:87 ../raphodo/problemnotification.py:209
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:89
+#: ../raphodo/problemnotification.py:90
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:116
+#: ../raphodo/problemnotification.py:117
 #, python-format
 msgid "GPhoto2 Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:124
+#: ../raphodo/problemnotification.py:125
 msgid ""
 "Unable to initialize the camera, probably because another program is using "
 "it. No files were copied from it."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:134
+#: ../raphodo/problemnotification.py:135
 #, python-format
 msgid "Unable to read directory %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:140
+#: ../raphodo/problemnotification.py:141
 #, python-format
 msgid "Unable to access modification time or size from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:146
+#: ../raphodo/problemnotification.py:147
 #, python-format
 msgid "Unable to read file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:152
+#: ../raphodo/problemnotification.py:153
 #, python-format
 msgid "Unable to write file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:158
+#: ../raphodo/problemnotification.py:159
 #, python-format
 msgid "Unable to move file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:164
+#: ../raphodo/problemnotification.py:165
 #, python-format
 msgid "Unable to remove file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:170
+#: ../raphodo/problemnotification.py:171
 #, python-format
 msgid "Unable to copy file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:176
+#: ../raphodo/problemnotification.py:177
 #, python-format
 msgid "Zero length file %s will not be downloaded"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:182
+#: ../raphodo/problemnotification.py:183
 #, python-format
 msgid "Could not determine filesystem modification time for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:188
+#: ../raphodo/problemnotification.py:189
 #, python-format
 msgid "Unable to load metadata from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:194
+#: ../raphodo/problemnotification.py:195
 #, python-format
 msgid ""
 "Unable to load metadata from %(name)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:202
+#: ../raphodo/problemnotification.py:203
 #, python-format
 msgid ""
 "An error occurred setting a file's filesystem metadata on the filesystem %s. "
@@ -2330,212 +2912,212 @@ msgid ""
 "again."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:216
+#: ../raphodo/problemnotification.py:217
 #, python-format
 msgid "Encountered unhandled file %s. It will not be downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:223
+#: ../raphodo/problemnotification.py:224
 #, python-format
 msgid "%(filetype)s %(destination)s already exists."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:234 ../raphodo/problemnotification.py:262
+#: ../raphodo/problemnotification.py:235 ../raphodo/problemnotification.py:263
 #, python-format
 msgid ""
 "The existing %(filetype)s %(destination)s was last modified on %(date)s at "
 "%(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:245
+#: ../raphodo/problemnotification.py:246
 #, python-format
 msgid "The %(filetype)s %(source)s was not downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:273
+#: ../raphodo/problemnotification.py:274
 #, python-format
 msgid "The %(filetype)s %(source)s was downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:282
+#: ../raphodo/problemnotification.py:283
 #, python-format
 msgid "The unique identifier '%s' was added to the filename."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:298
+#: ../raphodo/problemnotification.py:299
 #, python-format
 msgid ""
 "The existing backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:309
+#: ../raphodo/problemnotification.py:310
 #, python-format
 msgid "The %(filetype)s %(source)s was not backed up from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:326
+#: ../raphodo/problemnotification.py:327
 #, python-format
 msgid ""
 "The previous backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:337
+#: ../raphodo/problemnotification.py:338
 #, python-format
 msgid ""
 "The %(filetype)s %(source)s from %(device)s was backed up, overwriting the "
 "previous backup %(filetype)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:356
+#: ../raphodo/problemnotification.py:357
 #, python-format
 msgid ""
 "When synchronizing RAW + JPEG sequence values, a duplicate %(filetype)s "
 "%(file)s was encountered, and was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:366
+#: ../raphodo/problemnotification.py:367
 msgid ""
 "When synchronizing RAW + JPEG sequence values, photos were detected with the "
 "same filenames, but taken at different times:"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:373
+#: ../raphodo/problemnotification.py:374
 #, 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 ""
 
-#: ../raphodo/problemnotification.py:389
+#: ../raphodo/problemnotification.py:390
 #, python-format
 msgid "Unable to finalize the filename for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:424
+#: ../raphodo/problemnotification.py:425
 #, python-format
 msgid ""
 "The filename %(destination)s was not fully generated for %(filetype)s "
 "%(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:433
+#: ../raphodo/problemnotification.py:434
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:439
+#: ../raphodo/problemnotification.py:440
 #, python-format
 msgid "The following metadata is missing: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:445
+#: ../raphodo/problemnotification.py:446
 #, python-format
 msgid "Date/time conversion failed: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:451
+#: ../raphodo/problemnotification.py:452
 msgid ""
 "Could not extract valid date/time metadata or determine the file "
 "modification time."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:457
+#: ../raphodo/problemnotification.py:458
 msgid "Filename does not have an extension."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:460
+#: ../raphodo/problemnotification.py:461
 msgid "Filename does not have a number component."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:464
+#: ../raphodo/problemnotification.py:465
 #, python-format
 msgid "Error generating component %(component)s. Error: %(error)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:477
+#: ../raphodo/problemnotification.py:478
 #, python-format
 msgid ""
 "The download subfolders %(folder)s were only partially generated for "
 "%(filetype)s %(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:486
+#: ../raphodo/problemnotification.py:487
 #, python-format
 msgid ""
 "There is no data with which to generate the %(subfolder_file)s for "
 "%(filename)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:499
+#: ../raphodo/problemnotification.py:500
 #, python-format
 msgid ""
 "Unable to create the %(filetype)s %(destination)s in %(folder)s. The "
 "download file was %(source)s in %(device)s. It was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:514
+#: ../raphodo/problemnotification.py:515
 #, python-format
 msgid "Unable to create the download subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:526
+#: ../raphodo/problemnotification.py:527
 #, python-format
 msgid "Unable to create the backup subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:577
+#: ../raphodo/problemnotification.py:578
 #, python-format
 msgid "Problems scanning %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:584
+#: ../raphodo/problemnotification.py:585
 #, python-format
 msgid "Problems copying from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:591
+#: ../raphodo/problemnotification.py:592
 msgid "Problems while finalizing filenames and generating subfolders"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:598
+#: ../raphodo/problemnotification.py:599
 #, python-format
 msgid "Problems backing up to %s"
 msgstr ""
 
-#. Translators: for example Nov 3 or Dec 31
-#. The start and end dates are on a different day
-#. Translators: for example Nov 3 or Dec 31
-#: ../raphodo/proximity.py:105 ../raphodo/proximity.py:221
-#: ../raphodo/proximity.py:224 ../raphodo/proximity.py:828
+#. Translators: for example Nov 3 2015, 11:25 AM
+#. Translators: for example, Nov 3, 12:15 PM
+#: ../raphodo/proximity.py:188 ../raphodo/proximity.py:213
+#: ../raphodo/proximity.py:236 ../raphodo/proximity.py:239
 #, python-format
-msgid "%(month)s %(numeric_day)s"
+msgid "%(date)s, %(time)s"
 msgstr ""
 
-#. Translators: for example Nov 15 2015
-#. Translators: for example Nov 3 2015
-#: ../raphodo/proximity.py:109 ../raphodo/proximity.py:230
-#: ../raphodo/proximity.py:231 ../raphodo/proximity.py:831
+#: ../raphodo/proximity.py:204
 #, python-format
-msgid "%(date)s %(year)s"
+msgid "%(starttime)s - %(endtime)s"
 msgstr ""
 
-#. Translators: for example Nov 3 2015, 11:25 AM
-#. Translators: for example, Nov 3, 12:15 PM
-#: ../raphodo/proximity.py:197 ../raphodo/proximity.py:215
-#: ../raphodo/proximity.py:234 ../raphodo/proximity.py:236
+#. The start and end dates are on a different day
+#. Translators: for example Nov 3 or Dec 31
+#: ../raphodo/proximity.py:221 ../raphodo/proximity.py:225
+#: ../raphodo/proximity.py:980 ../raphodo/timeutils.py:105
 #, python-format
-msgid "%(date)s, %(time)s"
+msgid "%(month)s %(numeric_day)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:209
+#. Translators: for example Nov 3 2015
+#. Translators: for example Nov 2 2015
+#. Translators: for example Nov 15 2015
+#: ../raphodo/proximity.py:232 ../raphodo/proximity.py:233
+#: ../raphodo/proximity.py:985 ../raphodo/timeutils.py:110
 #, python-format
-msgid "%(starttime)s - %(endtime)s"
+msgid "%(date)s %(year)s"
 msgstr ""
 
 #. Translators: for example, Nov 3, 12:15 PM - Nov 4, 1:00 AM
-#: ../raphodo/proximity.py:241
+#: ../raphodo/proximity.py:245
 #, python-format
 msgid "%(earlier_time)s - %(later_time)s"
 msgstr ""
@@ -2544,25 +3126,25 @@ msgstr ""
 #. Nov 3 2012, 12:15 PM -
 #. Nov 4 2012, 1:00 AM
 #. (please keep the line break signified by \n)
-#: ../raphodo/proximity.py:248
+#: ../raphodo/proximity.py:253
 #, python-format
 msgid ""
 "%(earlier_time)s -\n"
 "%(later_time)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:359
+#: ../raphodo/proximity.py:382
 #, python-format
 msgid "%(month)s  %(year)s"
 msgstr ""
 
 #. Translators: for example Nov 2015
-#: ../raphodo/proximity.py:833
+#: ../raphodo/proximity.py:987
 #, python-format
 msgid "%(month)s %(year)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:1344
+#: ../raphodo/proximity.py:1595
 msgid ""
 "The time elapsed between consecutive photos and videos that is used to build "
 "the Timeline"
@@ -2572,47 +3154,47 @@ msgstr ""
 #. Replace the very last character (after the d) with the correct
 #. localized value, keeping everything else. In other words, change
 #. only the m character.
-#: ../raphodo/proximity.py:1406
+#: ../raphodo/proximity.py:1652
 #, python-format
 msgid "%(minutes)dm"
 msgstr ""
 
 #. Translators: i.e. "1.5h", which is short for 1.5 hours.
 #. Replace the entire string with the correct localized value
-#: ../raphodo/proximity.py:1410
+#: ../raphodo/proximity.py:1656
 msgid "1.5h"
 msgstr ""
 
 #. Translators: e.g. "5h", which is short for 5 hours.
 #. Replace the very last character (after the d) with the correct localized value,
 #. keeping everything else. In other words, change only the h character.
-#: ../raphodo/proximity.py:1415
+#: ../raphodo/proximity.py:1661
 #, python-format
 msgid "%(hours)dh"
 msgstr ""
 
-#: ../raphodo/proximity.py:1461
+#: ../raphodo/proximity.py:1710
 msgid ""
 "The Timeline groups photos and videos based on how much time elapsed between "
 "consecutive shots. Use it to identify photos and videos taken at different "
 "periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/proximity.py:1464
+#: ../raphodo/proximity.py:1715
 msgid ""
 "Use the slider (below) to adjust the time elapsed between consecutive shots "
 "that is used to build the Timeline."
 msgstr ""
 
-#: ../raphodo/proximity.py:1466
+#: ../raphodo/proximity.py:1718
 msgid "Timeline build pending..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1467
+#: ../raphodo/proximity.py:1719
 msgid "Timeline is building..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1468
+#: ../raphodo/proximity.py:1721
 msgid ""
 "The Timeline needs to be rebuilt because the file modification time does not "
 "match the time a shot was taken for one or more shots.<br><br>The Timeline "
@@ -2624,61 +3206,61 @@ msgid ""
 "downloading, which is when the metadata is read."
 msgstr ""
 
-#: ../raphodo/rapid.py:485 ../raphodo/rapid.py:2461 ../raphodo/rapid.py:3728
-#: ../raphodo/rapid.py:3846 ../raphodo/rapid.py:3850 ../raphodo/rapid.py:3870
-#: ../raphodo/rapid.py:3874 ../raphodo/rapid.py:3998 ../raphodo/rapid.py:4007
-#: ../raphodo/rapid.py:4495 ../raphodo/rapid.py:4888 ../raphodo/rapid.py:5722
-#: ../raphodo/rememberthisdialog.py:97
+#: ../raphodo/rapid.py:493 ../raphodo/rapid.py:2555 ../raphodo/rapid.py:3934
+#: ../raphodo/rapid.py:4065 ../raphodo/rapid.py:4069 ../raphodo/rapid.py:4092
+#: ../raphodo/rapid.py:4096 ../raphodo/rapid.py:4226 ../raphodo/rapid.py:4237
+#: ../raphodo/rapid.py:4743 ../raphodo/rapid.py:5195 ../raphodo/rapid.py:5997
+#: ../raphodo/rememberthisdialog.py:99
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:3
 msgid "Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:1100
+#: ../raphodo/rapid.py:1131
 msgid ""
 "<b>ExifTool has a problem</b><br><br> Rapid Photo Downloader uses ExifTool "
 "to get metadata from videos and photos. The program will run without it, but "
 "installing it is <b>highly</b> recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1110 ../raphodo/rapid.py:1130
+#: ../raphodo/rapid.py:1141 ../raphodo/rapid.py:1161
 msgid "Problem with libmediainfo"
 msgstr ""
 
-#: ../raphodo/rapid.py:1119
+#: ../raphodo/rapid.py:1150
 msgid ""
 "<b>The library libmediainfo appears to be missing</b><br><br> Rapid Photo "
 "Downloader uses libmediainfo to get the date and time a video was shot. The "
 "program will run  without it, but installing it is recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1417
+#: ../raphodo/rapid.py:1448
 msgid "Download failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1419
+#: ../raphodo/rapid.py:1450
 msgid ""
 "Sorry, the download of the new version of Rapid Photo Downloader failed."
 msgstr ""
 
-#: ../raphodo/rapid.py:1425
+#: ../raphodo/rapid.py:1457
 msgid ""
 "The new version was successfully downloaded. Do you want to close Rapid "
 "Photo Downloader and install it now?"
 msgstr ""
 
-#: ../raphodo/rapid.py:1428
+#: ../raphodo/rapid.py:1461
 msgid "Update Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:1432
+#: ../raphodo/rapid.py:1465
 msgid "Install"
 msgstr ""
 
-#: ../raphodo/rapid.py:1450
+#: ../raphodo/rapid.py:1483
 msgid "New version saved"
 msgstr ""
 
-#: ../raphodo/rapid.py:1451
+#: ../raphodo/rapid.py:1485
 #, python-format
 msgid ""
 "The tar file and installer script are saved at:\n"
@@ -2686,163 +3268,163 @@ msgid ""
 " %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:1468
+#: ../raphodo/rapid.py:1502
 msgid "Upgrade failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1469
+#: ../raphodo/rapid.py:1505
 msgid ""
 "Sorry, upgrading Rapid Photo Downloader failed because there was an error "
 "opening the installer."
 msgstr ""
 
-#: ../raphodo/rapid.py:1667 ../raphodo/rapid.py:2331
+#: ../raphodo/rapid.py:1709 ../raphodo/rapid.py:2425
 msgid "Download"
 msgstr "Unduh"
 
-#: ../raphodo/rapid.py:1671
+#: ../raphodo/rapid.py:1713
 msgid "&Refresh..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1675
+#: ../raphodo/rapid.py:1717
 msgid "&Preferences"
 msgstr ""
 
-#: ../raphodo/rapid.py:1679
+#: ../raphodo/rapid.py:1721
 msgid "&Quit"
 msgstr ""
 
-#: ../raphodo/rapid.py:1683
+#: ../raphodo/rapid.py:1725
 msgid "Error &Reports"
 msgstr ""
 
-#: ../raphodo/rapid.py:1687
+#: ../raphodo/rapid.py:1729
 msgid "Clear Completed Downloads"
 msgstr ""
 
-#: ../raphodo/rapid.py:1691
+#: ../raphodo/rapid.py:1733
 msgid "Get Help Online..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1695
+#: ../raphodo/rapid.py:1737
 msgid "&Tip of the Day..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1699
+#: ../raphodo/rapid.py:1741
 msgid "Report a Problem..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1703
+#: ../raphodo/rapid.py:1745
 msgid "Make a Donation..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1707
+#: ../raphodo/rapid.py:1749
 msgid "Translate this Application..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1711
+#: ../raphodo/rapid.py:1753
 msgid "&About..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1715
+#: ../raphodo/rapid.py:1757
 msgid "Check for Updates..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1797
+#: ../raphodo/rapid.py:1840
 msgid "Timeline"
 msgstr ""
 
-#: ../raphodo/rapid.py:1807
+#: ../raphodo/rapid.py:1850
 msgid "Destination"
 msgstr ""
 
-#: ../raphodo/rapid.py:1808
+#: ../raphodo/rapid.py:1851
 msgid "Rename"
 msgstr ""
 
-#: ../raphodo/rapid.py:1810
+#: ../raphodo/rapid.py:1853
 msgid "Back Up"
 msgstr ""
 
 #. Devices Header and View
-#: ../raphodo/rapid.py:1926
+#: ../raphodo/rapid.py:1977
 msgid ""
 "Turn on or off the use of devices attached to this computer as download "
 "sources"
 msgstr ""
 
 #. This Computer Header and View
-#: ../raphodo/rapid.py:1940
+#: ../raphodo/rapid.py:1994
 msgid ""
 "Turn on or off the use of a folder on this computer as a download source"
 msgstr ""
 
-#: ../raphodo/rapid.py:1941
+#: ../raphodo/rapid.py:1996
 msgid "This Computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:1952
+#: ../raphodo/rapid.py:2009
 msgid "Select a source folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:1975
+#: ../raphodo/rapid.py:2038
 msgid "Projected Storage Use"
 msgstr ""
 
-#: ../raphodo/rapid.py:1989 ../raphodo/rapid.py:1997
+#: ../raphodo/rapid.py:2056 ../raphodo/rapid.py:2068
 msgid "Select a destination folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:2045
+#: ../raphodo/rapid.py:2117
 msgid "All"
 msgstr ""
 
-#: ../raphodo/rapid.py:2046
+#: ../raphodo/rapid.py:2118
 msgid "New"
 msgstr ""
 
-#: ../raphodo/rapid.py:2048
+#: ../raphodo/rapid.py:2120
 msgid "Show:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2051
+#: ../raphodo/rapid.py:2123
 msgid "Modification Time"
 msgstr ""
 
-#: ../raphodo/rapid.py:2052
+#: ../raphodo/rapid.py:2124
 msgid "Checked State"
 msgstr ""
 
-#: ../raphodo/rapid.py:2055
+#: ../raphodo/rapid.py:2127
 msgid "File Type"
 msgstr ""
 
-#: ../raphodo/rapid.py:2056
+#: ../raphodo/rapid.py:2128
 msgid "Device"
 msgstr "Perangkat"
 
-#: ../raphodo/rapid.py:2058
+#: ../raphodo/rapid.py:2130
 msgid "Sort:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2069
+#: ../raphodo/rapid.py:2141
 msgid "Select All:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2311
+#: ../raphodo/rapid.py:2405
 #, python-format
 msgid "Download %(files)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2327
+#: ../raphodo/rapid.py:2421
 msgid "Resume Download"
 msgstr ""
 
-#: ../raphodo/rapid.py:2329
+#: ../raphodo/rapid.py:2423
 msgid "Pause"
 msgstr "Jeda"
 
-#: ../raphodo/rapid.py:2417
+#: ../raphodo/rapid.py:2511
 #, python-brace-format
 msgid ""
 "Please report the problem at <a href=\"{website}\">{website}</a>.<br><br>\n"
@@ -2851,11 +3433,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/rapid.py:2431
+#: ../raphodo/rapid.py:2525
 msgid "Thank you for reporting a problem in Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:2529
+#: ../raphodo/rapid.py:2624
 #, python-format
 msgid ""
 "<b>Changing This Computer source path</b><br><br>Do you really want to "
@@ -2864,30 +3446,29 @@ msgid ""
 "from This Computer will be cancelled."
 msgstr ""
 
-#: ../raphodo/rapid.py:2595
+#: ../raphodo/rapid.py:2694
 msgid "You cannot change the download destination while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:2604
+#: ../raphodo/rapid.py:2704
 #, python-format
 msgid ""
 "<b>Confirm Download Destination</b><br><br>Are you sure you want to set the "
 "%(file_type)s download destination to %(path)s?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2682
+#: ../raphodo/rapid.py:2785
 msgid ""
+"\n"
 "<b>Downloading all files</b><br><br>\n"
-"                    A download always includes all files that are checked "
-"for download,\n"
-"                    including those that are not currently displayed because "
-"the Timeline\n"
-"                    is being used or because only new files are being shown."
-"<br><br>\n"
-"                    Do you want to proceed with the download?"
+"A download always includes all files that are checked for download,\n"
+"including those that are not currently displayed because the Timeline\n"
+"is being used or because only new files are being shown.<br><br>\n"
+"Do you want to proceed with the download?\n"
+"                        "
 msgstr ""
 
-#: ../raphodo/rapid.py:2820
+#: ../raphodo/rapid.py:2937
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -2898,7 +3479,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: ../raphodo/rapid.py:2824
+#: ../raphodo/rapid.py:2940
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -2907,199 +3488,193 @@ msgstr ""
 "Folder unduh ini tidak valid:\n"
 "%s"
 
-#: ../raphodo/rapid.py:2827
+#: ../raphodo/rapid.py:2943
 msgid "Download Failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:2828
+#: ../raphodo/rapid.py:2944
 msgid "The download cannot proceed."
 msgstr ""
 
-#: ../raphodo/rapid.py:2842
+#: ../raphodo/rapid.py:2962
 msgid ""
 "Photos and videos will not be backed up because there is nowhere to back "
 "them up. Do you still want to start the download?"
 msgstr ""
 
-#. Translators: filetype will be replaced with 'photos' or 'videos'
-#: ../raphodo/rapid.py:2847 ../raphodo/rapid.py:2854
+#: ../raphodo/rapid.py:2969 ../raphodo/rapid.py:2979
 #, python-format
 msgid ""
 "No backup device exists for backing up %(filetype)s. Do you still want to "
 "start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2848 ../raphodo/rpdfile.py:228
+#: ../raphodo/rapid.py:2971 ../raphodo/rpdfile.py:228
 msgid "photos"
 msgstr ""
 
-#: ../raphodo/rapid.py:2855 ../raphodo/rpdfile.py:223
+#: ../raphodo/rapid.py:2981 ../raphodo/rpdfile.py:223
 msgid "videos"
 msgstr ""
 
-#: ../raphodo/rapid.py:2861
+#: ../raphodo/rapid.py:2989
 msgid ""
 "<b>The photo and video backup destinations do not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2869 ../raphodo/rapid.py:2876
+#: ../raphodo/rapid.py:2999 ../raphodo/rapid.py:3008
 #, python-format
 msgid ""
 "<b>The %(filetype)s backup destination does not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2871 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:818
+#: ../raphodo/rapid.py:3001 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:843
 msgid "photo"
 msgstr ""
 
-#: ../raphodo/rapid.py:2878 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:858
+#: ../raphodo/rapid.py:3010 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:883
 msgid "video"
 msgstr ""
 
-#: ../raphodo/rapid.py:2886
+#: ../raphodo/rapid.py:3018
 msgid "Backup problem"
 msgstr ""
 
-#. Translators - in the middle is a unicode em dash - please retain it
-#. This string is displayed in the status bar when the download is running
-#: ../raphodo/rapid.py:3571
+#: ../raphodo/rapid.py:3756
 #, python-format
 msgid "%(downloading_from)s — %(time_left)s left (%(speed)s)"
 msgstr ""
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3640
+#: ../raphodo/rapid.py:3828
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr ""
 
-#. Translators: e.g. 2 videos failed to download
-#: ../raphodo/rapid.py:3645
+#: ../raphodo/rapid.py:3836
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr ""
 
-#: ../raphodo/rapid.py:3650 ../raphodo/rapid.py:3723
+#: ../raphodo/rapid.py:3842 ../raphodo/rapid.py:3927
 msgid "warnings"
 msgstr ""
 
-#: ../raphodo/rapid.py:3679
+#: ../raphodo/rapid.py:3873
 msgid "All downloads complete"
 msgstr ""
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3686 ../raphodo/rapid.py:3695 ../raphodo/rapid.py:3704
-#: ../raphodo/rapid.py:3713 ../raphodo/rapid.py:3721
+#: ../raphodo/rapid.py:3881 ../raphodo/rapid.py:3892 ../raphodo/rapid.py:3903
+#: ../raphodo/rapid.py:3914 ../raphodo/rapid.py:3924
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3688 ../raphodo/rapid.py:3706
+#: ../raphodo/rapid.py:3884 ../raphodo/rapid.py:3906
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr ""
 
-#: ../raphodo/rapid.py:3697 ../raphodo/rapid.py:3715
+#: ../raphodo/rapid.py:3895 ../raphodo/rapid.py:3917
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr ""
 
-#: ../raphodo/rapid.py:3742
+#: ../raphodo/rapid.py:3950
 msgid "1 failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:3744
+#: ../raphodo/rapid.py:3952
 #, python-format
 msgid "%d failures"
 msgstr ""
 
-#: ../raphodo/rapid.py:3749
+#: ../raphodo/rapid.py:3957
 msgid "1 warning"
 msgstr ""
 
-#: ../raphodo/rapid.py:3751
+#: ../raphodo/rapid.py:3959
 #, python-format
 msgid "%d warnings"
 msgstr ""
 
-#: ../raphodo/rapid.py:3771
+#: ../raphodo/rapid.py:3981
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3774
+#: ../raphodo/rapid.py:3985
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3779
+#: ../raphodo/rapid.py:3989
 #, python-format
 msgid "No files downloaded — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3781
+#: ../raphodo/rapid.py:3991
 msgid "No files downloaded"
 msgstr ""
 
-#: ../raphodo/rapid.py:3805
+#: ../raphodo/rapid.py:4021
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3809
+#: ../raphodo/rapid.py:4026
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3812
+#: ../raphodo/rapid.py:4031
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3820
+#: ../raphodo/rapid.py:4039
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3833
+#: ../raphodo/rapid.py:4052
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3837
+#: ../raphodo/rapid.py:4056
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3841
+#: ../raphodo/rapid.py:4060
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices"
 msgstr ""
 
-#: ../raphodo/rapid.py:3867
+#: ../raphodo/rapid.py:4087
 msgid "The Destination subfolders and Timeline have been rebuilt"
 msgstr ""
 
-#: ../raphodo/rapid.py:3922
+#: ../raphodo/rapid.py:4144
 msgid "Program preferences are invalid"
 msgstr ""
 
-#: ../raphodo/rapid.py:3999
+#: ../raphodo/rapid.py:4228
 #, python-format
 msgid ""
 "<b>All files on the %(camera)s are inaccessible</b>.<br><br>It may be locked "
@@ -3109,179 +3684,205 @@ msgid ""
 "ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4008
+#: ../raphodo/rapid.py:4239
 #, python-format
 msgid ""
-"<b>The %(camera)s appears to be in use by another application.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again.<br><br>Alternatively, you can ignore this "
-"device."
+"<b>The %(camera)s appears to be in use by another "
+"application.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again.<br><br>Alternatively, you "
+"can ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4019
+#: ../raphodo/rapid.py:4250
 msgid "&Try Again"
 msgstr ""
 
-#: ../raphodo/rapid.py:4020
+#: ../raphodo/rapid.py:4251
 msgid "&Ignore This Device"
 msgstr ""
 
-#: ../raphodo/rapid.py:4086
+#: ../raphodo/rapid.py:4323
 #, python-format
 msgid "Sorry, an unexpected problem occurred while scanning %s."
 msgstr ""
 
-#: ../raphodo/rapid.py:4087
+#: ../raphodo/rapid.py:4324
 msgid "Unfortunately you cannot download from this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4091
+#: ../raphodo/rapid.py:4328
 msgid ""
 "A possible workaround for the problem might be downloading from the camera's "
 "memory card using a card reader."
 msgstr ""
 
-#: ../raphodo/rapid.py:4096
+#: ../raphodo/rapid.py:4333
 msgid "Device scan failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:4472
+#: ../raphodo/rapid.py:4720
 #, python-format
 msgid ""
-"<b>The %(camera)s cannot be scanned because it cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again."
+"<b>The %(camera)s cannot be scanned because it cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again."
 msgstr ""
 
-#: ../raphodo/rapid.py:4496
+#: ../raphodo/rapid.py:4745
 #, python-format
 msgid ""
-"<b>The download cannot start because the %(camera)s cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again, and choose which files you want to "
-"download from it."
+"<b>The download cannot start because the %(camera)s cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again, and choose which files "
+"you want to download from it."
+msgstr ""
+
+#: ../raphodo/rapid.py:4842
+msgid "Completed Downloads Present"
 msgstr ""
 
-#: ../raphodo/rapid.py:4635
+#: ../raphodo/rapid.py:4844
+#, python-format
+msgid "%s whose download have completed are displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4846
+msgid "Do you want to clear the completed downloads?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4848
+msgid "Completed Download Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4850
+#, python-format
+msgid "%s whose download has completed is displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4852
+msgid "Do you want to clear the completed download?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4933
 #, python-format
 msgid ""
 "Do you want to download photos and videos from the device <i>%(device)s</i>?"
 msgstr ""
 
-#: ../raphodo/rapid.py:4877
+#: ../raphodo/rapid.py:5183
 #, python-format
 msgid "<b>Do you want to ignore the %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4879
+#: ../raphodo/rapid.py:5186
 msgid ""
 "All cameras, phones and tablets with the same model name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:4883
+#: ../raphodo/rapid.py:5190
 #, python-format
 msgid ""
 "<b>Do you want to ignore the device %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4885
+#: ../raphodo/rapid.py:5192
 msgid "Any device with the same name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:5178
+#: ../raphodo/rapid.py:5492
 #, python-format
 msgid "Downloading from %(location)s on This Computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5180
+#: ../raphodo/rapid.py:5496
 msgid ""
 "Do you really want to download from here?<br><br>On some systems, scanning "
 "this location can take a very long time."
 msgstr ""
 
-#: ../raphodo/rapid.py:5224
+#: ../raphodo/rapid.py:5537
 #, python-format
 msgid "Generating thumbnails for %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5227
+#: ../raphodo/rapid.py:5540
 #, python-format
 msgid "Scanning %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5237
+#: ../raphodo/rapid.py:5551
 #, python-format
 msgid ""
 "%(number)s of %(available files)s checked for download (%(hidden)s hidden)"
 msgstr ""
 
-#: ../raphodo/rapid.py:5243
+#: ../raphodo/rapid.py:5559
 #, python-format
 msgid "%(number)s of %(available files)s checked for download"
 msgstr ""
 
-#: ../raphodo/rapid.py:5494
+#: ../raphodo/rapid.py:5764
 msgid "Display program information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5496
+#: ../raphodo/rapid.py:5766
 msgid "Display debugging information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5499
+#: ../raphodo/rapid.py:5769
 msgid "List photo and video file extensions the program recognizes and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5502
+#: ../raphodo/rapid.py:5772
 msgid "Turn on or off the the renaming of photos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5504
+#: ../raphodo/rapid.py:5774
 msgid "turn on or off the the renaming of videos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5506
+#: ../raphodo/rapid.py:5776
 msgid ""
 "Turn on or off the automatic detection of devices from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5510
+#: ../raphodo/rapid.py:5780
 msgid "Turn on or off downloading from this computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5512 ../raphodo/rapid.py:5515 ../raphodo/rapid.py:5518
-#: ../raphodo/rapid.py:5539 ../raphodo/rapid.py:5543
+#: ../raphodo/rapid.py:5782 ../raphodo/rapid.py:5785 ../raphodo/rapid.py:5788
+#: ../raphodo/rapid.py:5809 ../raphodo/rapid.py:5813
 msgid "PATH"
 msgstr ""
 
-#: ../raphodo/rapid.py:5513
+#: ../raphodo/rapid.py:5783
 msgid "The PATH on this computer from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5516
+#: ../raphodo/rapid.py:5786
 msgid "The PATH where photos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5519
+#: ../raphodo/rapid.py:5789
 msgid "The PATH where videos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5521
+#: ../raphodo/rapid.py:5791
 msgid "Turn on or off the backing up of photos and videos while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:5525
+#: ../raphodo/rapid.py:5795
 msgid "Turn on or off the automatic detection of backup devices."
 msgstr ""
 
-#: ../raphodo/rapid.py:5527 ../raphodo/rapid.py:5533
+#: ../raphodo/rapid.py:5797 ../raphodo/rapid.py:5803
 msgid "FOLDER"
 msgstr ""
 
-#: ../raphodo/rapid.py:5528
+#: ../raphodo/rapid.py:5798
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected photo "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3289,7 +3890,7 @@ msgid ""
 "photos up to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5534
+#: ../raphodo/rapid.py:5804
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected video "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3297,115 +3898,124 @@ msgid ""
 "up videos to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5540
+#: ../raphodo/rapid.py:5810
 msgid ""
 "The PATH where photos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5544
+#: ../raphodo/rapid.py:5814
 msgid ""
 "The PATH where videos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5547
+#: ../raphodo/rapid.py:5817
 #, python-format
 msgid "Ignore photos with the following extensions: %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5551
-msgid "Turn on or off starting downloads as soon as the program itself starts."
+#: ../raphodo/rapid.py:5821
+msgid ""
+"Turn on or off starting downloads as soon as the program itself starts."
 msgstr ""
 
-#: ../raphodo/rapid.py:5554
+#: ../raphodo/rapid.py:5824
 msgid "Turn on or off starting downloads as soon as a device is inserted."
 msgstr ""
 
-#: ../raphodo/rapid.py:5557
+#: ../raphodo/rapid.py:5827
 msgid ""
 "Turn on or off use of the Rapid Photo Downloader Thumbnail Cache. Turning it "
 "off does not delete existing cache contents."
 msgstr ""
 
-#: ../raphodo/rapid.py:5561
+#: ../raphodo/rapid.py:5831
 msgid ""
 "Delete all thumbnails in the Rapid Photo Downloader Thumbnail Cache, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5565
+#: ../raphodo/rapid.py:5835
 msgid "Forget which files have been previously downloaded, and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5568
+#: ../raphodo/rapid.py:5838
 msgid ""
 "Import preferences from an old program version and exit. Requires the "
 "command line program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5571
+#: ../raphodo/rapid.py:5841
 msgid ""
 "Reset all program settings to their default values, delete all thumbnails in "
 "the Thumbnail cache, forget which files have been previously downloaded, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5575
+#: ../raphodo/rapid.py:5845
 msgid "Include gphoto2 debugging information in log files."
 msgstr ""
 
-#: ../raphodo/rapid.py:5579
+#: ../raphodo/rapid.py:5849
 msgid "Print information to the terminal about attached cameras and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5640
+#: ../raphodo/rapid.py:5911
 msgid ""
 "To import preferences from the old version of Rapid Photo Downloader, you "
 "must install the program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5649
+#: ../raphodo/rapid.py:5920
 msgid "No prior program preferences detected: exiting"
 msgstr ""
 
-#: ../raphodo/rapid.py:5652
+#: ../raphodo/rapid.py:5923
 #, python-format
 msgid "Importing preferences from Rapid Photo Downloader %(version)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5714
+#: ../raphodo/rapid.py:5989
 #, python-format
-msgid "Do you want to copy the stored sequence number, which has the value %d?"
+msgid ""
+"Do you want to copy the stored sequence number, which has the value %d?"
 msgstr ""
 
-#: ../raphodo/rapid.py:5726
+#: ../raphodo/rapid.py:6000
 msgid "Program aborting."
 msgstr ""
 
-#: ../raphodo/rapid.py:5736
+#: ../raphodo/rapid.py:6010
 msgid "Never run this program as the sudo / root user."
 msgstr ""
 
-#: ../raphodo/rapid.py:5740
+#: ../raphodo/rapid.py:6014
 msgid "You must install ExifTool to run Rapid Photo Downloader."
 msgstr ""
 
-#: ../raphodo/rapid.py:5794
+#: ../raphodo/rapid.py:6026
+msgid ""
+"Rapid Photo Downloader is installed in multiple locations.\n"
+"\n"
+"Uninstall all copies except the version you want to run."
+msgstr ""
+
+#: ../raphodo/rapid.py:6083
 msgid ""
 "When specifying a path on the command line, do not also specify an\n"
 "option for device auto detection or a path on \"This Computer\"."
 msgstr ""
 
-#: ../raphodo/rapid.py:5950
+#: ../raphodo/rapid.py:6243
 msgid "All settings and caches have been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5958
+#: ../raphodo/rapid.py:6251
 msgid "Thumbnail Cache has been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5964
+#: ../raphodo/rapid.py:6257
 msgid "Remembered files have been forgotten"
 msgstr ""
 
@@ -3421,15 +4031,15 @@ msgstr ""
 msgid "&Don't warn me again about missing or broken program libraries"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:546
+#: ../raphodo/renameandmovefile.py:554
 msgid "subfolder and filename"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:548
+#: ../raphodo/renameandmovefile.py:556
 msgid "filename"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:550
+#: ../raphodo/renameandmovefile.py:558
 msgid "subfolder"
 msgstr ""
 
@@ -3509,160 +4119,237 @@ msgstr "Foto dan Video"
 msgid "photos or videos"
 msgstr "Foto dan Video"
 
-#: ../raphodo/rpdfile.py:306
+#: ../raphodo/rpdfile.py:315
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:318
+#. translators: natural language expression signifying a single video
+#: ../raphodo/rpdfile.py:337
+msgid "a video"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:339
 msgid "1 Video"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:323
+#. translators: natural language expression signifying a single photo
+#: ../raphodo/rpdfile.py:346
+msgid "a photo"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:348
 msgid "1 Photo"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:803
+#: ../raphodo/rpdfile.py:828
 #, python-format
 msgid "%(path)s on %(camera)s"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:819
+#: ../raphodo/rpdfile.py:844
 msgid "Photo"
 msgstr "Foto"
 
-#: ../raphodo/rpdfile.py:859
+#: ../raphodo/rpdfile.py:884
 msgid "Video"
 msgstr "Video"
 
-#: ../raphodo/storage.py:138
+#: ../raphodo/storage.py:141
 msgid "File system root"
 msgstr ""
 
 #. translators: the name of the Pictures folder
-#: ../raphodo/storage.py:433
+#: ../raphodo/storage.py:437
 msgid "Pictures"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:426
+#: ../raphodo/thumbnaildisplay.py:432
 #, python-format
 msgid "Taken on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:431
+#: ../raphodo/thumbnaildisplay.py:439
 #, python-format
 msgid "Modified on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:437 ../raphodo/thumbnaildisplay.py:466
+#: ../raphodo/thumbnaildisplay.py:447 ../raphodo/thumbnaildisplay.py:481
 #, python-format
 msgid "%(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:451
+#: ../raphodo/thumbnaildisplay.py:464
 #, python-format
 msgid "Memory cards: %s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:457
+#: ../raphodo/thumbnaildisplay.py:468
+#, python-format
+msgid "Memory card: %s"
+msgstr ""
+
+#: ../raphodo/thumbnaildisplay.py:473
 msgid "Downloaded as:"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:472
+#: ../raphodo/thumbnaildisplay.py:489
 #, python-format
 msgid "<br><br>Previous download:<br>%(filename)s<br>%(path)s<br>%(date)s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:1603
+#: ../raphodo/thumbnaildisplay.py:1645
 msgid "Copy Path"
 msgstr ""
 
+#. Translators: these values are file size suffixes like B representing bytes, KB representing
+#. kilobytes, etc.
+#: ../raphodo/utilities.py:170
+msgid "B"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "KB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "MB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "GB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "TB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "PB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "EB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "ZB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "YB"
+msgstr ""
+
 #. two things in a list e.g. "device1 and device2"
-#: ../raphodo/utilities.py:391
+#: ../raphodo/utilities.py:394
 #, python-format
 msgid "%(first_item)s and %(last_item)s"
 msgstr ""
 
-#: ../raphodo/utilities.py:464
+#: ../raphodo/utilities.py:468
 msgid "one"
 msgstr ""
 
-#: ../raphodo/utilities.py:465
+#: ../raphodo/utilities.py:469
 msgid "two"
 msgstr ""
 
-#: ../raphodo/utilities.py:466
+#: ../raphodo/utilities.py:470
 msgid "three"
 msgstr ""
 
-#: ../raphodo/utilities.py:467
+#: ../raphodo/utilities.py:471
 msgid "four"
 msgstr ""
 
-#: ../raphodo/utilities.py:468
+#: ../raphodo/utilities.py:472
 msgid "five"
 msgstr ""
 
-#: ../raphodo/utilities.py:469
+#: ../raphodo/utilities.py:473
 msgid "six"
 msgstr ""
 
-#: ../raphodo/utilities.py:470
+#: ../raphodo/utilities.py:474
 msgid "seven"
 msgstr ""
 
-#: ../raphodo/utilities.py:471
+#: ../raphodo/utilities.py:475
 msgid "eight"
 msgstr ""
 
-#: ../raphodo/utilities.py:472
+#: ../raphodo/utilities.py:476
 msgid "nine"
 msgstr ""
 
-#: ../raphodo/utilities.py:473
+#: ../raphodo/utilities.py:477
 msgid "ten"
 msgstr ""
 
-#: ../raphodo/utilities.py:474
+#: ../raphodo/utilities.py:478
 msgid "eleven"
 msgstr ""
 
-#: ../raphodo/utilities.py:475
+#: ../raphodo/utilities.py:479
 msgid "twelve"
 msgstr ""
 
-#: ../raphodo/utilities.py:476
+#: ../raphodo/utilities.py:480
 msgid "thirteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:477
+#: ../raphodo/utilities.py:481
 msgid "fourteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:478
+#: ../raphodo/utilities.py:482
 msgid "fifteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:479
+#: ../raphodo/utilities.py:483
 msgid "sixteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:480
+#: ../raphodo/utilities.py:484
 msgid "seventeen"
 msgstr ""
 
-#: ../raphodo/utilities.py:481
+#: ../raphodo/utilities.py:485
 msgid "eighteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:482
+#: ../raphodo/utilities.py:486
 msgid "ninenteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:483
+#: ../raphodo/utilities.py:487
 msgid "twenty"
 msgstr ""
 
+#: ../raphodo/viewutils.py:240
+msgid "&OK"
+msgstr ""
+
+#: ../raphodo/viewutils.py:243
+msgid "&Save"
+msgstr ""
+
+#: ../raphodo/viewutils.py:244
+msgid "&Help"
+msgstr ""
+
+#: ../raphodo/viewutils.py:245
+msgid "Restore Defaults"
+msgstr ""
+
+#: ../raphodo/viewutils.py:246
+msgid "&Yes"
+msgstr ""
+
+#: ../raphodo/viewutils.py:247
+msgid "&No"
+msgstr ""
+
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:1
 msgid ""
 "Rapid Photo Downloader imports photos and videos from cameras, phones, "
@@ -3716,8 +4403,8 @@ msgstr ""
 #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:5
 msgid ""
-"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;"
-"memory;card;"
+"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;memory"
+";card;"
 msgstr ""
 
 #: ../data/kde/net.damonlynch.rapid-photo-downloader.desktop.in.h:1
@@ -3727,6 +4414,7 @@ msgstr ""
 #~ msgid "Size"
 #~ msgstr "Ukuran"
 
+#, python-format
 #~ msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 #~ msgstr "Sisa %(minutes)i:%(seconds)02i menit"
 
@@ -3739,6 +4427,7 @@ msgstr ""
 #~ msgid "Download cannot proceed"
 #~ msgstr "Mengunduh tidak dapat diproses"
 
+#, python-format
 #~ msgid "About %i seconds remaining"
 #~ msgstr "Sisa %i detik"
 
@@ -3760,5 +4449,6 @@ msgstr ""
 #~ msgid "Videos:"
 #~ msgstr "Video:"
 
+#, python-format
 #~ msgid "and %s"
 #~ msgstr "dan %s"
diff --git a/po/it.po b/po/it.po
index 98dc9a1..ce8fea7 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,35 +7,399 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: damonlynch@gmail.com\n"
-"POT-Creation-Date: 2017-07-08 19:16-0500\n"
-"PO-Revision-Date: 2017-07-04 11:06+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2017-09-12 17:01-0400\n"
+"PO-Revision-Date: 2017-09-13 18:37+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: Italian <it@li.org>\n"
-"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-07-05 23:04+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-09-26 22:04+0000\n"
+"X-Generator: Launchpad (build 18463)\n"
+"Language: it\n"
+
+#: ../install.py:65
+msgid "Rapid Photo Downloader installer"
+msgstr ""
+
+#: ../install.py:66
+msgid "Download and install latest version of Rapid Photo Downloader."
+msgstr "Scarica e installa l'ultima versione di Rapid Photo Downloader"
+
+#: ../install.py:236 ../install.py:1732
+msgid "Installer not found:"
+msgstr "Installatore non trovato:"
+
+#. Translators: do not translate the term tar.gz
+#: ../install.py:240 ../install.py:1736
+msgid "Installer not in tar.gz format:"
+msgstr "Installatore non in formato tar.gz:"
+
+#: ../install.py:465
+msgid ""
+"Incorrect folder ownership detected. Changing ownership of and resetting "
+"permissions for"
+msgstr ""
+
+#: ../install.py:540
+msgid "The following command will be run:"
+msgstr "Sarà eseguito il seguente comando:"
+
+#: ../install.py:543 ../install.py:1479 ../install.py:1484
+msgid "sudo may prompt you for the sudo password."
+msgstr "sudo potrà chiedervi la password di sudo"
+
+#: ../install.py:547
+msgid "Would you like to run the command now?"
+msgstr ""
+
+#: ../install.py:549
+msgid "Answer is not yes, exiting."
+msgstr ""
+
+#: ../install.py:559 ../install.py:751 ../install.py:966
+msgid "Command failed"
+msgstr "Comando fallito"
+
+#: ../install.py:561 ../install.py:752 ../install.py:967
+msgid "Exiting"
+msgstr "Uscita"
+
+#: ../install.py:582
+msgid "The Universe repository must be enabled."
+msgstr "Il repository dell'Universo deve essere abilitato."
+
+#: ../install.py:606
+msgid ""
+"Do you want to to uninstall the previous version of Rapid Photo Downloader:"
+msgstr "Vuoi disinstallare la precedente versione di Rapid Photo Downloader:"
+
+#: ../install.py:715 ../install.py:740
+msgid ""
+"Querying package system to see if an older version of Rapid Photo Downloader "
+"is installed (this may take a while)..."
+msgstr ""
+
+#: ../install.py:726
+msgid ""
+"Unable to query package system. Please check your Internet connection and "
+"try again"
+msgstr ""
+"Impossibile interrogare il sistema dei pacchetti. Verificare la connessione "
+"a Internet e riprovare"
+
+#: ../install.py:756
+msgid "Checking if previous version installed with pip..."
+msgstr "Verifica se una precedente versione è installata con pip..."
+
+#: ../install.py:850
+msgid "The following package is unknown on your system: {}\n"
+msgstr "Il seguente pacchetto è sconosciuto sul vostro sistema: {}\n"
+
+#: ../install.py:857 ../install.py:929 ../install.py:974
+msgid ""
+"To continue, some packages required to run the application will be installed."
+msgstr ""
+
+#: ../install.py:886
+msgid "Querying installed and available packages (this may take a while)"
+msgstr ""
+"Sono in interrogazione i pacchetti installati e disponibili (può richiedere "
+"un po' di tempo)"
+
+#: ../install.py:958
+msgid ""
+"Querying zypper to see if any required packages are already installed (this "
+"may take a while)... "
+msgstr ""
+"Zypper in interrogazione per verificare se i pacchetti richiesti sono già "
+"installati (può richiedere un po' di tempo)... "
+
+#: ../install.py:1004
+msgid "Query to confirm action at each step."
+msgstr ""
+
+#: ../install.py:1011
+msgid ""
+"When downloading the latest version, install the development version if it "
+"is newer than the stable version."
+msgstr ""
+"Durante lo scaricamento dell'ultima versione, installare la versione di "
+"sviluppo se è più recente della versione stabile."
+
+#: ../install.py:1020
+msgid ""
+"Optional tar.gz Rapid Photo Downloader installer archive. If not specified, "
+"the latest version is downloaded from the Internet."
+msgstr ""
+
+#: ../install.py:1043
+msgid ""
+"Do not run the installer in the tar.gz Rapid Photo Downloader installer "
+"archive if it is newer than this version ({}). The default is to run "
+"whichever installer is newer."
+msgstr ""
+
+#: ../install.py:1050
+msgid ""
+"Uninstall Rapid Photo Downloader that was installed with pip, keeping its "
+"dependencies."
+msgstr ""
+"Disinstallare Rapid Photo Downloader installato con pip, conservando le sue "
+"dipendenze."
+
+#: ../install.py:1054
+msgid ""
+"Uninstall the dependencies installed by pip during Rapid Photo Downloader's "
+"installation, and Rapid Photo Downloader itself, then exit."
+msgstr ""
+
+#: ../install.py:1059
+msgid ""
+"Note: this will not uninstall any version of Rapid Photo Downloader "
+"installed by your Linux distribution's package manager."
+msgstr ""
+"Nota: questo non disinstallerà alcuna versione di Rapid Photo Downloader "
+"installata dal gestore pacchetti della vostra distribuzione Linux."
+
+#: ../install.py:1066
+msgid ""
+"Dependencies will only be removed if they are not required by other programs."
+msgstr ""
+"Le dipendenze saranno rimosse solo se non richieste da alcun altro programma."
+
+#: ../install.py:1072
+msgid ""
+"Note: this option will remove the dependencies regardless of whether they "
+"are required by another program pip has installed. Upgrade to pip 9.0 or "
+"above if you want to avoid this behavior. You can do so using the command "
+"'python3 -m pip install pip -U --user'. Also note that any version of Rapid "
+"Photo Downloader installed by your Linux distribution's package manager will "
+"not be uninstalled."
+msgstr ""
+
+#: ../install.py:1122
+msgid "Failed to download versions file"
+msgstr ""
+
+#: ../install.py:1126
+msgid "Got error code {} while accessing versions file"
+msgstr ""
+
+#: ../install.py:1234
+msgid ""
+"Sorry, could not locate installer. Please check your Internet connection and "
+"verify if you can reach https://www.damonlynch.net\n"
+"\n"
+"Exiting.\n"
+msgstr ""
+
+#: ../install.py:1408
+msgid "Installing application requirements..."
+msgstr "Requisiti dell'applicazione in installazione..."
+
+#: ../install.py:1424
+msgid "Received error code"
+msgstr ""
+
+#: ../install.py:1425
+msgid "Failed to install application requirements: exiting"
+msgstr ""
+
+#: ../install.py:1428
+msgid "Installing application..."
+msgstr ""
+
+#: ../install.py:1441
+msgid "Failed to install application: exiting..."
+msgstr ""
+
+#: ../install.py:1465
+msgid ""
+"You may have to restart the computer to be able to run the program from the "
+"commmand line or application launcher."
+msgstr ""
+
+#: ../install.py:1476
+msgid "Do you want to install the application's man pages?"
+msgstr ""
+
+#: ../install.py:1477
+msgid "They will be installed into {}"
+msgstr ""
+
+#: ../install.py:1478 ../install.py:1483
+msgid "If you uninstall the application, remove these manpages yourself."
+msgstr ""
+
+#: ../install.py:1480
+msgid "Do want to install the man pages?"
+msgstr ""
+
+#: ../install.py:1482
+msgid "Installing man pages into {}"
+msgstr ""
+
+#: ../install.py:1499
+msgid "Failed to create man page directory: exiting"
+msgstr ""
+
+#: ../install.py:1511
+msgid "Failed to copy man page."
+msgstr ""
+
+#: ../install.py:1521
+msgid "(If a segmentation fault occurs at exit, you can ignore it...)"
+msgstr ""
+
+#: ../install.py:1534
+msgid ""
+"The python3 tool pip is required to uninstall a version of Rapid Photo "
+"Downloader that was installed with pip.\n"
+"Cannot continue. Exiting."
+msgstr ""
+
+#: ../install.py:1575
+msgid ""
+"Do not run this installer script as sudo / root user.\n"
+"Run it using the user who will run the program.\n"
+msgstr ""
+
+#: ../install.py:1585 ../install.py:1599
+msgid "Do not include any other command line arguments when specifying"
+msgstr ""
+
+#: ../install.py:1614
+msgid ""
+"Sorry, this installer does not support a custom python installation.\n"
+"Exiting..."
+msgstr ""
+
+#: ../install.py:1620
+msgid "Restarting script using system python..."
+msgstr ""
+
+#: ../install.py:1651
+msgid "Exiting..."
+msgstr ""
+
+#. Translators: do not translate the term python3-apt
+#: ../install.py:1670
+msgid "To continue, the package python3-apt must be installed."
+msgstr ""
+
+#: ../install.py:1689
+msgid ""
+"Install the following packages using your Linux distribution's standard "
+"package manager, and then rerun this installer"
+msgstr ""
+
+#: ../install.py:1698
+msgid ""
+"To run this program, programs to assist Python 3 and its package management "
+"must be installed."
+msgstr ""
+
+#. Translators: do not translate the terms Python 3, pip and setuptools
+#: ../install.py:1713
+msgid "Python 3's pip and setuptools must be upgraded for your user."
+msgstr ""
+
+#. Translators: do not translate the term python or requests
+#: ../install.py:1726
+msgid "Installing python requests"
+msgstr ""
+
+#: ../upgrade.py:79
+msgid "Upgrade Rapid Photo Downloader"
+msgstr ""
+
+#: ../upgrade.py:401 ../raphodo/viewutils.py:242
+msgid "&Cancel"
+msgstr ""
+
+#: ../upgrade.py:405
+msgid "&Upgrade"
+msgstr ""
+
+#: ../upgrade.py:410
+#, python-format
+msgid "Click the Upgrade button to upgrade to version %s."
+msgstr ""
+
+#: ../upgrade.py:413
+msgid "Click the Upgrade button to start the upgrade."
+msgstr ""
+
+#: ../upgrade.py:416 ../upgrade.py:422 ../raphodo/viewutils.py:241
+msgid "&Close"
+msgstr ""
+
+#: ../upgrade.py:417
+msgid "&Run"
+msgstr ""
+
+#: ../upgrade.py:447
+msgid "Close Rapid Photo Downloader before running this upgrade"
+msgstr ""
+
+#: ../upgrade.py:450
+msgid "Upgrade running..."
+msgstr ""
 
-#. type: QPushButton
-#: ../raphodo/aboutdialog.py:217
+#: ../upgrade.py:486
+#, python-format
+msgid ""
+"Successfully upgraded to %s. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:491
+msgid ""
+"Upgrade finished successfully. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:495
+msgid "Upgrade failed. Click Close to exit."
+msgstr ""
+
+#: ../upgrade.py:6967
+#, python-format
+msgid "Upgrading %s..."
+msgstr ""
+
+#: ../upgrade.py:6969
+msgid "Press any key to continue..."
+msgstr ""
+
+#: ../upgrade.py:6982
+msgid "Rapid Photo Downloader upgrade failed"
+msgstr ""
+
+#: ../upgrade.py:6984
+#, python-format
+msgid ""
+"The python package %s could not be updated. The upgrade cannot continue."
+msgstr ""
+
+#: ../raphodo/aboutdialog.py:225
 msgid "Credits"
 msgstr "Riconoscimenti"
 
-#: ../raphodo/backuppanel.py:239
+#: ../raphodo/backuppanel.py:240
 msgid "Backups are not configured"
 msgstr "Nessun backup configurato"
 
-#: ../raphodo/backuppanel.py:241
+#: ../raphodo/backuppanel.py:242
 msgid "No backup devices detected"
 msgstr "Non è stato rilevato alcun dispositivo di backup"
 
-#: ../raphodo/backuppanel.py:243
+#: ../raphodo/backuppanel.py:244
 msgid "Valid backup locations not yet specified"
 msgstr "Nessuna posizione valida per i backup è stata specificata"
 
-#: ../raphodo/backuppanel.py:401
+#: ../raphodo/backuppanel.py:404
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
@@ -43,97 +407,106 @@ msgstr ""
 "Durante il download è possibile effettuare il backup delle foto e dei video "
 "in posizioni multiple, come ad esempio su dischi esterni."
 
-#: ../raphodo/backuppanel.py:407
+#: ../raphodo/backuppanel.py:412
 msgid "Back up photos and videos when downloading"
 msgstr "Effettua il backup delle foto e dei video durante il download"
 
-#: ../raphodo/backuppanel.py:413
+#: ../raphodo/backuppanel.py:418
 msgid "Automatically detect backup devices"
 msgstr "Rileva automaticamente i dispositivi di backup"
 
-#: ../raphodo/backuppanel.py:417
+#: ../raphodo/backuppanel.py:424
 msgid ""
-"Specify the folder in which backups are stored on the device."
-"<br><br><i>Note: the presence of a folder with this name is used to "
+"Specify the folder in which backups are stored on the "
+"device.<br><br><i>Note: the presence of a folder with this name is used to "
 "determine if 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 folder names. By "
 "adding both folders, the same device can be used to back up both photos and "
 "videos.</i>"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:428
+#: ../raphodo/backuppanel.py:439
 msgid "Photo folder name:"
 msgstr "Nome cartella foto:"
 
-#: ../raphodo/backuppanel.py:433
+#: ../raphodo/backuppanel.py:444
 msgid "Video folder name:"
 msgstr "Nome cartella video:"
 
-#: ../raphodo/backuppanel.py:438 ../raphodo/nameeditor.py:883
+#: ../raphodo/backuppanel.py:449 ../raphodo/nameeditor.py:890
 #: ../raphodo/renamepanel.py:123
 msgid "Example:"
 msgstr "Esempio:"
 
-#: ../raphodo/backuppanel.py:448
-msgid "If you disable automatic detection, choose the exact backup locations."
+#: ../raphodo/backuppanel.py:460
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
 "Se si disabilita la rilevazione automatica, scegliere le posizioni esatte "
 "del salvataggio."
 
-#: ../raphodo/backuppanel.py:452
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:468
 msgid "Photo backup location:"
 msgstr "Posizione del salvataggio delle fotografie"
 
-#: ../raphodo/backuppanel.py:454
+#: ../raphodo/backuppanel.py:474
 msgid "Select Photo Backup Location"
 msgstr "Seleziona posizione backup foto"
 
-#: ../raphodo/backuppanel.py:460
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:485
 msgid "Video backup location:"
 msgstr "Posizione del salvataggio dei video"
 
-#: ../raphodo/backuppanel.py:462
+#: ../raphodo/backuppanel.py:491
 msgid "Select Video Backup Location"
 msgstr "Seleziona posizione backup video"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:564
+#: ../raphodo/backuppanel.py:595
 msgid "drive1"
 msgstr "unità1"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:567
+#: ../raphodo/backuppanel.py:598
 msgid "drive2"
 msgstr "unità2"
 
-#: ../raphodo/backuppanel.py:628
+#: ../raphodo/backuppanel.py:663
 msgid "Projected Backup Storage Use"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:632
+#: ../raphodo/backuppanel.py:669
 msgid "Backup Options"
 msgstr "Opzioni backup"
 
 #. translators: refers to the video thumbnail file that some
 #. cameras generate -- it has a .THM file extension
-#: ../raphodo/copyfiles.py:476
+#: ../raphodo/copyfiles.py:491
 msgid "video THM"
 msgstr "video THM"
 
-#: ../raphodo/copyfiles.py:482
+#: ../raphodo/copyfiles.py:497
 msgid "audio"
 msgstr "audio"
 
 #: ../raphodo/destinationdisplay.py:78 ../raphodo/devicedisplay.py:1079
-#: ../raphodo/rpdfile.py:321
+#: ../raphodo/rpdfile.py:342
 #, python-format
 msgid "%(no_photos)s Photos"
 msgstr "%(no_photos)s foto"
 
 #: ../raphodo/destinationdisplay.py:82 ../raphodo/devicedisplay.py:1081
-#: ../raphodo/rpdfile.py:316
+#: ../raphodo/rpdfile.py:333
 #, python-format
 msgid "%(no_videos)s Videos"
 msgstr "%(no_videos)s video"
@@ -161,15 +534,15 @@ msgid "%(size_free)s free of %(size_total)s"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:190 ../raphodo/devicedisplay.py:993
-#: ../raphodo/rapid.py:1964 ../raphodo/rapid.py:2079 ../raphodo/rapid.py:5753
-#: ../raphodo/rpdfile.py:905
+#: ../raphodo/rapid.py:2023 ../raphodo/rapid.py:2151 ../raphodo/rapid.py:6043
+#: ../raphodo/rpdfile.py:930
 msgid "Photos"
 msgstr "Foto"
 
 #. translators: the name of the Videos folder
 #: ../raphodo/destinationdisplay.py:191 ../raphodo/devicedisplay.py:994
-#: ../raphodo/rapid.py:1967 ../raphodo/rapid.py:2080 ../raphodo/rapid.py:5754
-#: ../raphodo/rpdfile.py:933 ../raphodo/storage.py:445
+#: ../raphodo/rapid.py:2028 ../raphodo/rapid.py:2152 ../raphodo/rapid.py:6044
+#: ../raphodo/rpdfile.py:958 ../raphodo/storage.py:449
 msgid "Videos"
 msgstr "Video"
 
@@ -177,7 +550,7 @@ msgstr "Video"
 msgid "Projected storage use after download"
 msgstr ""
 
-#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:516
+#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:521
 msgid "Custom..."
 msgstr "Personalizzato..."
 
@@ -215,57 +588,58 @@ msgstr "Analizza di nuovo"
 msgid "%s full"
 msgstr ""
 
-#: ../raphodo/devices.py:459
+#: ../raphodo/devices.py:463
 msgid "Cameras"
 msgstr "Fotocamere"
 
-#: ../raphodo/devices.py:460 ../raphodo/devices.py:920
-#: ../raphodo/preferencedialog.py:85 ../raphodo/rapid.py:1927
+#: ../raphodo/devices.py:464 ../raphodo/devices.py:927
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/rapid.py:1979
 msgid "Devices"
 msgstr "Dispositivi"
 
-#: ../raphodo/devices.py:720
+#: ../raphodo/devices.py:724
 #, python-format
 msgid "Downloading from %(device_names)s"
 msgstr "Scaricamento da %(device_names)s"
 
 #. Translators: e.g. Three Devices
-#: ../raphodo/devices.py:780
+#: ../raphodo/devices.py:784
 #, python-format
 msgid "%(no_devices)s %(device_type)s"
 msgstr "%(no_devices)s %(device_type)s"
 
-#: ../raphodo/devices.py:905 ../raphodo/rapid.py:1764
+#: ../raphodo/devices.py:912 ../raphodo/rapid.py:1807
 msgid "Select Source"
 msgstr "Seleziona sorgente"
 
-#: ../raphodo/devices.py:936 ../raphodo/devices.py:947
+#: ../raphodo/devices.py:943 ../raphodo/devices.py:954
 #, python-format
 msgid "%(device1)s + %(device2)s"
 msgstr "%(device1)s + %(device2)s"
 
 #. Number of cameras e.g. 3 Cameras
-#: ../raphodo/devices.py:958
+#: ../raphodo/devices.py:965
 #, python-format
 msgid "%(no_cameras)s Cameras"
 msgstr "%(no_cameras)s fotocamere"
 
-#: ../raphodo/devices.py:963
+#: ../raphodo/devices.py:970
 #, python-format
 msgid "%(no_devices)s Devices"
 msgstr "%(no_devices)s dispositivi"
 
 #. Translators: two folder names, separated by a plus sign
-#: ../raphodo/devices.py:1258
+#: ../raphodo/devices.py:1265
 #, python-format
 msgid "%s + %s"
 msgstr "%s + %s"
 
-#: ../raphodo/didyouknow.py:44
+#: ../raphodo/didyouknow.py:45
 msgid "Click on a file's checkbox to mark or unmark it for download."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:50
+#: ../raphodo/didyouknow.py:51
 msgid ""
 "Files that have already been downloaded are remembered. You can still mark "
 "previously downloaded files to download again, but they are unchecked by "
@@ -273,34 +647,67 @@ msgid ""
 "files that are yet to be downloaded."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:59
+#: ../raphodo/didyouknow.py:60
 msgid ""
 "If more than one file is selected, they'll all take the mark of the file "
 "whose checkbox was clicked, regardless of whether they previously had a "
 "checkmark or not."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:67
+#: ../raphodo/didyouknow.py:68
 msgid ""
 "Click on a device's checkbox to quickly mark or unmark all its files for "
 "downloading."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:74
+#: ../raphodo/didyouknow.py:75
+msgid ""
+"After a download finishes, an icon replaces the thumbnail's checkbox. The "
+"icon's color indicates whether the download was successful (green), had file "
+"renaming problems (yellow/orange), or failed (red)."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:83
+msgid ""
+"\n"
+"            In case of any problems, a red icon will appear at the bottom of "
+"the window\n"
+"            indicating how many error reports there are. Clicking on it "
+"opens the Error Report \n"
+"            window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:91
+msgid ""
+"\n"
+"            The Error Report window lists any problems encountered before, "
+"during or after the \n"
+"            download. An orange triangle represents a warning, a red circle "
+"indicates a failure, \n"
+"            and a black circle indicates more serious failures. You can "
+"click on the hyperlinks to \n"
+"            open its file or device in a file manager. You can also search "
+"the reports using the \n"
+"            search box in the lower left of the Error Report window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:103
 msgid ""
 "You can simultaneously download from multiple cameras, smartphones, memory "
 "cards, and hard drives&mdash;as many devices as your computer can handle at "
 "one time."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:81
+#: ../raphodo/didyouknow.py:110
 msgid ""
 "The <b>Timeline</b> groups photos and videos based on how much time elapsed "
 "between consecutive shots. Use it to identify photos and videos taken at "
 "different periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:88
+#: ../raphodo/didyouknow.py:117
 msgid ""
 "\n"
 "<p>In the illustration above, the first row of the Timeline is black because "
@@ -312,7 +719,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:99
+#: ../raphodo/didyouknow.py:128
 msgid ""
 "To view photos and videos for a particular time range, use the mouse "
 "(optionally in combination with the <tt>Shift</tt> or <tt>Ctrl</tt> keys) to "
@@ -320,20 +727,20 @@ msgid ""
 "the left side of the main window will be highlighted."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:106
+#: ../raphodo/didyouknow.py:135
 msgid ""
 "A download always includes all files that are checked for download, "
 "including those that are not currently displayed because the Timeline is "
 "being used."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:113
+#: ../raphodo/didyouknow.py:142
 msgid ""
 "You can hide or display the download sources by clicking on the name of the "
 "device you're downloading from at the top left of the program window."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:120
+#: ../raphodo/didyouknow.py:149
 msgid ""
 "\n"
 "          Thumbnails can be sorted using a variety of criteria:\n"
@@ -352,33 +759,33 @@ msgid ""
 "</ol> "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:137
+#: ../raphodo/didyouknow.py:166
 msgid ""
 "One of Rapid Photo Downloader's most useful features is its ability to "
 "automatically generate download subfolders and rename files as it downloads, "
 "using a scheme of your choosing."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:143
+#: ../raphodo/didyouknow.py:172
 msgid ""
 "To specify where you want your files downloaded and how you want them named, "
 "open the appropriate panel on the right-side of the application window: "
 "<b>Destination</b>, <b>Rename</b>, or <b>Job Code</b>."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:150
+#: ../raphodo/didyouknow.py:179
 msgid ""
 "\n"
 "When thinking about your download directory structure, keep in mind two "
 "different types\n"
 "of directory:\n"
 "<ol>\n"
-"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, &quot;"
-"Photos&quot;, or\n"
+"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, "
+"&quot;Photos&quot;, or\n"
 "&quot;Videos&quot;. This directory should already exist on your computer. In "
 "the illustration \n"
-"below, the destination folders are &quot;Pictures&quot; and &quot;"
-"Videos&quot;. The\n"
+"below, the destination folders are &quot;Pictures&quot; and "
+"&quot;Videos&quot;. The\n"
 "name of the destination folder is displayed in the grey bar directly above "
 "the folder tree, \n"
 "with a folder icon to its left and a gear icon to its far right.</li>\n"
@@ -391,7 +798,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:167
+#: ../raphodo/didyouknow.py:196
 msgid ""
 "\n"
 "You can download photos and videos to the same destination folder, or "
@@ -404,14 +811,14 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:177
+#: ../raphodo/didyouknow.py:206
 msgid ""
 "Automatically generated download subfolders can contain further "
 "automatically generated subfolders if need be. A common scheme is to create "
 "a year subfolder and then a series of year-month-day subfolders within it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:186
+#: ../raphodo/didyouknow.py:215
 msgid ""
 "\n"
 "Whenever possible, the program previews the download subfolders of photos "
@@ -429,7 +836,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:201
+#: ../raphodo/didyouknow.py:230
 msgid ""
 "\n"
 "Download subfolder names are typically generated using some or all of the "
@@ -453,7 +860,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:219
+#: ../raphodo/didyouknow.py:248
 msgid ""
 "\n"
 "To automatically create download subfolders as you download, \n"
@@ -463,7 +870,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:227
+#: ../raphodo/didyouknow.py:256
 msgid ""
 "\n"
 "Using the drop-down menu, select a built-in preset or click on <b>Custom</b> "
@@ -473,20 +880,20 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:237
+#: ../raphodo/didyouknow.py:266
 msgid ""
 "It's easy to download raw images into one folder, and jpeg images into "
 "another. Simply use the <b>Filename Extension</b> as part of your download "
 "subfolder generation scheme:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:242
+#: ../raphodo/didyouknow.py:271
 msgid ""
 "This illustration shows a saved custom preset named &quot;My custom "
 "preset&quot;."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:246
+#: ../raphodo/didyouknow.py:275
 msgid ""
 "\n"
 "You do not have to create nested download subfolders. This illustration "
@@ -497,7 +904,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:256
+#: ../raphodo/didyouknow.py:285
 msgid ""
 "\n"
 "Although there are many built-in date/time naming options, you may find that "
@@ -511,7 +918,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:265
+#: ../raphodo/didyouknow.py:294
 msgid ""
 "\n"
 "Read more about all the ways you can generate download subfolder names and "
@@ -521,7 +928,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:273
+#: ../raphodo/didyouknow.py:302
 msgid ""
 "\n"
 "<b>Job Codes</b> let you easily enter text that describes sets of photos and "
@@ -533,7 +940,7 @@ msgid ""
 "&quot;Green Bazaar&quot;: \n"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:282
+#: ../raphodo/didyouknow.py:311
 msgid ""
 "\n"
 "You can apply new or existing Job Codes before you start a download. If "
@@ -544,36 +951,36 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:291
+#: ../raphodo/didyouknow.py:320
 msgid "Look for hints to guide you when working with Job Codes:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:295
+#: ../raphodo/didyouknow.py:324
 msgid ""
 "Hints will vary depending on the context, such as when the mouse is hovering "
 "over a button."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:301
+#: ../raphodo/didyouknow.py:330
 msgid ""
 "\n"
 "When you give your photos and videos unique filenames, you'll never be "
 "confused as to \n"
 "which file is which. Using <b>sequence numbers</b> to make filenames unique "
 "is highly \n"
-"recommended!.\n"
+"recommended!\n"
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:309
+#: ../raphodo/didyouknow.py:338
 msgid ""
 "\n"
 "<p>Four types of sequence values are available to help you assign unique "
 "names to your photos and \n"
 "videos:\n"
 "<ol>\n"
-"<li><b>Downloads today</b>: tracks downloads completed during that day.</"
-"li>\n"
+"<li><b>Downloads today</b>: tracks downloads completed during that "
+"day.</li>\n"
 "<li><b>Stored number</b>: similar to Downloads today, but it is remembered "
 "from the last time the  \n"
 "program was run.</li>\n"
@@ -587,7 +994,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:327
+#: ../raphodo/didyouknow.py:356
 msgid ""
 "\n"
 "The <b>Rename</b> panel allows you to configure file renaming. To rename "
@@ -596,7 +1003,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:334
+#: ../raphodo/didyouknow.py:363
 msgid ""
 "\n"
 "<p>The <b>Synchronize RAW + JPEG</b> option is useful if you use the RAW + "
@@ -615,7 +1022,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:348
+#: ../raphodo/didyouknow.py:377
 msgid ""
 "\n"
 "You can have your photos and videos backed up to multiple locations as they "
@@ -626,13 +1033,13 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:356
+#: ../raphodo/didyouknow.py:385
 msgid ""
 "In this example, the drive <b>photobackup</b> does not contain a folder "
 "named <tt>Videos</tt>, so videos will not be backed up to it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:362
+#: ../raphodo/didyouknow.py:391
 msgid ""
 "\n"
 "Several of the program's preferences can be set from the command line, "
@@ -643,7 +1050,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:372
+#: ../raphodo/didyouknow.py:396
+msgid "You can also import program preferences from the older 0.4 version."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:401
 msgid ""
 "\n"
 "Rapid Photo Downloader deals with three types of cache:\n"
@@ -653,8 +1064,8 @@ msgid ""
 "memory cards, and other devices.</li>\n"
 "<li>A <b>temporary cache</b> of files downloaded from a camera, one for "
 "photos and another for \n"
-"videos. They are located in temporary subfolders in the download destination."
-"</li>\n"
+"videos. They are located in temporary subfolders in the download "
+"destination.</li>\n"
 "<li>The <b>desktop's thumbnail cache</b>, in which Rapid Photo Downloader "
 "stores thumbnails of \n"
 "RAW and TIFF photos once they have been downloaded. File browsers like Gnome "
@@ -669,23 +1080,23 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:431
+#: ../raphodo/didyouknow.py:460
 msgid "Tip of the Day"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:439
+#: ../raphodo/didyouknow.py:468
 msgid "Did you know...?"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:466
+#: ../raphodo/didyouknow.py:495
 msgid "Show tips on startup"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:470
+#: ../raphodo/didyouknow.py:499
 msgid "&Next"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:471
+#: ../raphodo/didyouknow.py:500
 msgid "&Previous"
 msgstr ""
 
@@ -792,68 +1203,68 @@ msgstr ""
 msgid "%(days)d days, %(hours)d hours"
 msgstr ""
 
-#: ../raphodo/errorlog.py:65
+#: ../raphodo/errorlog.py:66
 msgid "Find"
 msgstr ""
 
-#: ../raphodo/errorlog.py:135
+#: ../raphodo/errorlog.py:136
 msgid "Error Reports - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/errorlog.py:170
+#: ../raphodo/errorlog.py:171
 msgid "Find in reports"
 msgstr ""
 
-#: ../raphodo/errorlog.py:187
+#: ../raphodo/errorlog.py:188
 msgid "Find the previous occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:192
+#: ../raphodo/errorlog.py:193
 msgid "Find the next occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:194
+#: ../raphodo/errorlog.py:195
 msgid "&Highlight All"
 msgstr ""
 
-#: ../raphodo/errorlog.py:195
+#: ../raphodo/errorlog.py:196
 msgid "Highlight all occurrences of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:196
+#: ../raphodo/errorlog.py:197
 msgid "&Match Case"
 msgstr ""
 
-#: ../raphodo/errorlog.py:197
+#: ../raphodo/errorlog.py:198
 msgid "Search with case sensitivity"
 msgstr ""
 
-#: ../raphodo/errorlog.py:198
+#: ../raphodo/errorlog.py:199
 msgid "&Whole Words"
 msgstr ""
 
-#: ../raphodo/errorlog.py:199
+#: ../raphodo/errorlog.py:200
 msgid "Search whole words only"
 msgstr ""
 
-#: ../raphodo/errorlog.py:209 ../raphodo/errorlog.py:341
+#: ../raphodo/errorlog.py:210 ../raphodo/errorlog.py:345
 #, python-format
 msgid "%s of %s matches"
 msgstr ""
 
-#: ../raphodo/errorlog.py:228
+#: ../raphodo/errorlog.py:232
 msgid "Clear"
 msgstr ""
 
-#: ../raphodo/errorlog.py:328
+#: ../raphodo/errorlog.py:332
 msgid "Phrase not found"
 msgstr ""
 
-#: ../raphodo/errorlog.py:487
+#: ../raphodo/errorlog.py:491
 msgid "Search pending..."
 msgstr ""
 
-#: ../raphodo/errorlog.py:535
+#: ../raphodo/errorlog.py:539
 msgid ""
 "The number of new entries added to the Error Report since it was last open. "
 "Click to open the Error Report."
@@ -867,8 +1278,8 @@ msgstr ""
 #, python-brace-format
 msgid ""
 "<b>A problem occurred in Rapid Photo Downloader</b><br><br>\n"
-"    Please report the problem at <a href=\"{website}\">{website}</a>."
-"<br><br>\n"
+"    Please report the problem at <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
 "    Attach the log file <i>{log_file}</i> to your bug report (click\n"
 "    <a href=\"{log_path}\">here</a> to open the log directory).<br><br>If "
 "the same problem occurs\n"
@@ -889,7 +1300,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1601
+#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1643
 msgid "Open in File Browser..."
 msgstr ""
 
@@ -907,531 +1318,531 @@ msgstr ""
 msgid "%s (location does not exist)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:186
+#: ../raphodo/generatenameconfig.py:190
 msgid "Date time"
 msgstr "Data e ora"
 
-#: ../raphodo/generatenameconfig.py:187
+#: ../raphodo/generatenameconfig.py:191
 msgid "Text"
 msgstr "Testo"
 
-#: ../raphodo/generatenameconfig.py:188 ../raphodo/rapid.py:2053
+#: ../raphodo/generatenameconfig.py:192 ../raphodo/rapid.py:2125
 msgid "Filename"
 msgstr "Nome file"
 
-#: ../raphodo/generatenameconfig.py:189 ../raphodo/preferencedialog.py:488
+#: ../raphodo/generatenameconfig.py:193 ../raphodo/preferencedialog.py:724
 msgid "Metadata"
 msgstr "Meta-dati"
 
-#: ../raphodo/generatenameconfig.py:190
+#: ../raphodo/generatenameconfig.py:194
 msgid "Sequences"
 msgstr "Ordinamenti"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: ../raphodo/generatenameconfig.py:193
+#: ../raphodo/generatenameconfig.py:197
 msgid "Job code"
 msgstr "Codice lavoro"
 
-#: ../raphodo/generatenameconfig.py:194
+#: ../raphodo/generatenameconfig.py:198
 msgid "Image date"
 msgstr "Data dell'immagine"
 
-#: ../raphodo/generatenameconfig.py:195
+#: ../raphodo/generatenameconfig.py:199
 msgid "Video date"
 msgstr "Data del video"
 
-#: ../raphodo/generatenameconfig.py:196
+#: ../raphodo/generatenameconfig.py:200
 msgid "Today"
 msgstr "Oggi"
 
-#: ../raphodo/generatenameconfig.py:197
+#: ../raphodo/generatenameconfig.py:201
 msgid "Yesterday"
 msgstr "Ieri"
 
 #. Translators: Download time is the time and date that the download started (when the
 #. user clicked the Download button)
-#: ../raphodo/generatenameconfig.py:200
+#: ../raphodo/generatenameconfig.py:204
 msgid "Download time"
 msgstr "Tempo di scaricamento"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:203
+#: ../raphodo/generatenameconfig.py:207
 msgid "Name"
 msgstr "Nome"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:206 ../raphodo/rapid.py:2054
+#: ../raphodo/generatenameconfig.py:210 ../raphodo/rapid.py:2126
 msgid "Extension"
 msgstr "Estensione"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:209
+#: ../raphodo/generatenameconfig.py:213
 msgid "Image number"
 msgstr "Numero immagine"
 
-#: ../raphodo/generatenameconfig.py:210
+#: ../raphodo/generatenameconfig.py:214
 msgid "Video number"
 msgstr "Numero video"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:213
+#: ../raphodo/generatenameconfig.py:217
 msgid "Aperture"
 msgstr "Apertura"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:216
+#: ../raphodo/generatenameconfig.py:220
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:219
+#: ../raphodo/generatenameconfig.py:223
 msgid "Exposure time"
 msgstr "Tempo di esposizione"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:222
+#: ../raphodo/generatenameconfig.py:226
 msgid "Focal length"
 msgstr "Lunghezza focale"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:225
+#: ../raphodo/generatenameconfig.py:229
 msgid "Camera make"
 msgstr "Marca fotocamera"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:228
+#: ../raphodo/generatenameconfig.py:232
 msgid "Camera model"
 msgstr "Modello fotocamera"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:231
+#: ../raphodo/generatenameconfig.py:235
 msgid "Short camera model"
 msgstr "Modello fotocamera breve"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:234
+#: ../raphodo/generatenameconfig.py:238
 msgid "Hyphenated short camera model"
 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
-#: ../raphodo/generatenameconfig.py:237
+#: ../raphodo/generatenameconfig.py:241
 msgid "Serial number"
 msgstr "Numero seriale"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:240
+#: ../raphodo/generatenameconfig.py:244
 msgid "Shutter count"
 msgstr "Contatore dell'otturatore"
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: ../raphodo/generatenameconfig.py:242
+#: ../raphodo/generatenameconfig.py:246
 msgid "File number"
 msgstr "Numero file"
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:244
+#: ../raphodo/generatenameconfig.py:248
 msgid "Folder only"
 msgstr "Solo la cartella"
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:246
+#: ../raphodo/generatenameconfig.py:250
 msgid "Folder and file"
 msgstr "Cartella e file"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:249
+#: ../raphodo/generatenameconfig.py:253
 msgid "Owner name"
 msgstr "Nome del proprietario"
 
-#: ../raphodo/generatenameconfig.py:250
+#: ../raphodo/generatenameconfig.py:254
 msgid "Codec"
 msgstr "Codec"
 
-#: ../raphodo/generatenameconfig.py:251
+#: ../raphodo/generatenameconfig.py:255
 msgid "Width"
 msgstr "Larghezza"
 
-#: ../raphodo/generatenameconfig.py:252
+#: ../raphodo/generatenameconfig.py:256
 msgid "Height"
 msgstr "Altezza"
 
-#: ../raphodo/generatenameconfig.py:253
+#: ../raphodo/generatenameconfig.py:257
 msgid "Length"
 msgstr "Lunghezza"
 
-#: ../raphodo/generatenameconfig.py:254
+#: ../raphodo/generatenameconfig.py:258
 msgid "Frames Per Second"
 msgstr "Fotogrammi per secondo"
 
-#: ../raphodo/generatenameconfig.py:255
+#: ../raphodo/generatenameconfig.py:259
 msgid "Artist"
 msgstr "Artista"
 
-#: ../raphodo/generatenameconfig.py:256
+#: ../raphodo/generatenameconfig.py:260
 msgid "Copyright"
 msgstr "Copyright"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:259
+#: ../raphodo/generatenameconfig.py:263
 msgid "Downloads today"
 msgstr "Scaricati oggi"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:262
+#: ../raphodo/generatenameconfig.py:266
 msgid "Session number"
 msgstr "Numero della sessione"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:265
+#: ../raphodo/generatenameconfig.py:269
 msgid "Subfolder number"
 msgstr "Numero della sotto-cartella"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:268
+#: ../raphodo/generatenameconfig.py:272
 msgid "Stored number"
 msgstr "Numero memorizzato"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: ../raphodo/generatenameconfig.py:271
+#: ../raphodo/generatenameconfig.py:275
 msgid "Sequence letter"
 msgstr "Lettera di sequenza"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:274
+#: ../raphodo/generatenameconfig.py:278
 msgid "All digits"
 msgstr "Tutte le cifre"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:277
+#: ../raphodo/generatenameconfig.py:281
 msgid "Last digit"
 msgstr "Ultima cifra"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:280
+#: ../raphodo/generatenameconfig.py:284
 msgid "Last 2 digits"
 msgstr "Ultime 2 cifre"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:283
+#: ../raphodo/generatenameconfig.py:287
 msgid "Last 3 digits"
 msgstr "Ultime 3 cifre"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:286
+#: ../raphodo/generatenameconfig.py:290
 msgid "Last 4 digits"
 msgstr "Ultime 4 cifre"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:289
+#: ../raphodo/generatenameconfig.py:293
 msgid "Original Case"
 msgstr "Caso originale"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:292
+#: ../raphodo/generatenameconfig.py:296
 msgid "UPPERCASE"
 msgstr "MAIUSCOLO"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:295
+#: ../raphodo/generatenameconfig.py:299
 msgid "lowercase"
 msgstr "minuscolo"
 
-#: ../raphodo/generatenameconfig.py:296
+#: ../raphodo/generatenameconfig.py:300
 msgid "One digit"
 msgstr "Una cifra"
 
-#: ../raphodo/generatenameconfig.py:297
+#: ../raphodo/generatenameconfig.py:301
 msgid "Two digits"
 msgstr "Due cifre"
 
-#: ../raphodo/generatenameconfig.py:298
+#: ../raphodo/generatenameconfig.py:302
 msgid "Three digits"
 msgstr "Tre cifre"
 
-#: ../raphodo/generatenameconfig.py:299
+#: ../raphodo/generatenameconfig.py:303
 msgid "Four digits"
 msgstr "Quattro cifre"
 
-#: ../raphodo/generatenameconfig.py:300
+#: ../raphodo/generatenameconfig.py:304
 msgid "Five digits"
 msgstr "Cinque cifre"
 
-#: ../raphodo/generatenameconfig.py:301
+#: ../raphodo/generatenameconfig.py:305
 msgid "Six digits"
 msgstr "Sei cifre"
 
-#: ../raphodo/generatenameconfig.py:302
+#: ../raphodo/generatenameconfig.py:306
 msgid "Seven digits"
 msgstr "Sette cifre"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:305
+#: ../raphodo/generatenameconfig.py:309
 msgid "Subseconds"
 msgstr "Sotto-secondi"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:308 ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:312 ../raphodo/generatenameconfig.py:393
 msgid "YYYYMMDD"
 msgstr "AAAAMMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:311 ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:315 ../raphodo/generatenameconfig.py:394
 msgid "YYYY-MM-DD"
 msgstr "AAAA-MM-GG"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:314 ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:318 ../raphodo/generatenameconfig.py:395
 msgid "YYYY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:317
+#: ../raphodo/generatenameconfig.py:321
 msgid "YYMMDD"
 msgstr "AAMMGG"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:320
+#: ../raphodo/generatenameconfig.py:324
 msgid "YY-MM-DD"
 msgstr "AA-MM-GG"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:323
+#: ../raphodo/generatenameconfig.py:327
 msgid "YY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:326
+#: ../raphodo/generatenameconfig.py:330
 msgid "MMDDYYYY"
 msgstr "MMGGAAAA"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:329
+#: ../raphodo/generatenameconfig.py:333
 msgid "MMDDYY"
 msgstr "MMGGAA"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:332
+#: ../raphodo/generatenameconfig.py:336
 msgid "MMDD"
 msgstr "MMGG"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:335
+#: ../raphodo/generatenameconfig.py:339
 msgid "DDMMYYYY"
 msgstr "GGMMAAAA"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:338
+#: ../raphodo/generatenameconfig.py:342
 msgid "DDMMYY"
 msgstr "GGMMAA"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:341 ../raphodo/generatenameconfig.py:389
-#: ../raphodo/generatenameconfig.py:390 ../raphodo/generatenameconfig.py:391
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:345 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:394 ../raphodo/generatenameconfig.py:395
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:397
 msgid "YYYY"
 msgstr "AAAA"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:344
+#: ../raphodo/generatenameconfig.py:348
 msgid "YY"
 msgstr "AA"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:347
+#: ../raphodo/generatenameconfig.py:351
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:350
+#: ../raphodo/generatenameconfig.py:354
 msgid "DD"
 msgstr "GG"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:353
+#: ../raphodo/generatenameconfig.py:357
 msgid "Month (full)"
 msgstr "Mese (intero)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:356
+#: ../raphodo/generatenameconfig.py:360
 msgid "Month (abbreviated)"
 msgstr "Mese (abbreviato)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:359
+#: ../raphodo/generatenameconfig.py:363
 msgid "HHMMSS"
 msgstr "HHMMSS"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:362
+#: ../raphodo/generatenameconfig.py:366
 msgid "HHMM"
 msgstr "HHMM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:365
+#: ../raphodo/generatenameconfig.py:369
 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
-#: ../raphodo/generatenameconfig.py:368
+#: ../raphodo/generatenameconfig.py:372
 msgid "HH-MM"
 msgstr "HH-MM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:371
+#: ../raphodo/generatenameconfig.py:375
 msgid "HH"
 msgstr "HH"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:374
+#: ../raphodo/generatenameconfig.py:378
 msgid "MM (minutes)"
 msgstr "MM (minuti)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:377
+#: ../raphodo/generatenameconfig.py:381
 msgid "SS"
 msgstr "SS"
 
-#: ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:393
 msgid "Date"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:394
 msgid "Date (hyphens)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:395
 msgid "Date (underscores)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:438
-#: ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:442
+#: ../raphodo/generatenameconfig.py:537
 msgid "Date and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392
+#: ../raphodo/generatenameconfig.py:396
 msgid "YYYYMM_Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "Date and Job Code Subfolder"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "YYYYMM"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393 ../raphodo/jobcodepanel.py:198
-#: ../raphodo/nameeditor.py:827 ../raphodo/rapid.py:1809
+#: ../raphodo/generatenameconfig.py:397 ../raphodo/jobcodepanel.py:199
+#: ../raphodo/nameeditor.py:833 ../raphodo/rapid.py:1852
 #: ../raphodo/renamepanel.py:83 ../raphodo/renamepanel.py:241
 msgid "Job Code"
 msgstr "Codice lavoro"
 
-#: ../raphodo/generatenameconfig.py:433 ../raphodo/generatenameconfig.py:512
+#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:532
 msgid "Original Filename"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "Date-Time and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "YYYYMMDD-HHMM-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "Date and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "YYYYMMDD-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "Date-Time and Image number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "YYYYMMDD-1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "Date-Time and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "YYYYMMDD-HHMM-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:442 ../raphodo/generatenameconfig.py:537
 msgid "YYYYMMDD-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "Date-Time and Video number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "YYYYMMDD_1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "Resolution"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "YYYYMMDD-HHMM-1-1920x1080"
 msgstr ""
 
@@ -1490,76 +1901,77 @@ msgstr ""
 msgid "&Remember this choice"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:185
+#: ../raphodo/jobcodepanel.py:186
 msgid ""
 "Select photos and videos to be able to apply a new or existing Job Code to "
 "them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:186
-msgid "The new Job Code will be applied to all selected photos and/or videos."
+#: ../raphodo/jobcodepanel.py:187
+msgid ""
+"The new Job Code will be applied to all selected photos and/or videos."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:187
+#: ../raphodo/jobcodepanel.py:188
 msgid ""
 "Click the Apply button to apply the current Job Code to all selected photos "
 "and/or videos. You can also simply double click the Job Code."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:189
+#: ../raphodo/jobcodepanel.py:190
 msgid ""
 "Removing a Job Code removes it only from the list of saved Job Codes, not "
 "from any photos or videos that it may have been applied to."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:191
+#: ../raphodo/jobcodepanel.py:192
 msgid ""
 "If you want to use Job Codes, configure file renaming or destination "
 "subfolder names to use them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:197
+#: ../raphodo/jobcodepanel.py:198
 msgid "Last Used"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:202
+#: ../raphodo/jobcodepanel.py:203
 msgid "Job Code Sort:"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:205 ../raphodo/rapid.py:2061
+#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2133
 msgid "Ascending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2062
+#: ../raphodo/jobcodepanel.py:207 ../raphodo/rapid.py:2134
 msgid "Descending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:216
+#: ../raphodo/jobcodepanel.py:217
 msgid "&New..."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:220
+#: ../raphodo/jobcodepanel.py:221
 msgid "&Apply"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:224
+#: ../raphodo/jobcodepanel.py:225
 msgid "&Remove"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:228 ../raphodo/preferencedialog.py:125
-#: ../raphodo/preferencedialog.py:154 ../raphodo/preferencedialog.py:433
+#: ../raphodo/jobcodepanel.py:229 ../raphodo/preferencedialog.py:200
+#: ../raphodo/preferencedialog.py:229 ../raphodo/preferencedialog.py:531
 msgid "Remove All"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:427
+#: ../raphodo/jobcodepanel.py:428
 msgid "Do you really want to remove all the Job Codes?"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:429
+#: ../raphodo/jobcodepanel.py:430
 msgid "Remove all Job Codes"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:492
+#: ../raphodo/jobcodepanel.py:493
 msgid "Job Codes"
 msgstr "Codici Lavoro"
 
@@ -1570,42 +1982,58 @@ msgstr "Codici Lavoro"
 msgid "<i><b>Hint:</b> %(message)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:418 ../raphodo/nameeditor.py:432
+#: ../raphodo/nameeditor.py:423 ../raphodo/nameeditor.py:437
 #, python-format
 msgid "%(description)s - %(elements)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:512
+#: ../raphodo/nameeditor.py:517
 msgid "Save New Custom Preset..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:513
+#: ../raphodo/nameeditor.py:518
 msgid "Remove All Custom Presets..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:559
+#: ../raphodo/nameeditor.py:564
 msgid "(New Custom Preset)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:576
+#: ../raphodo/nameeditor.py:581
 #, python-format
 msgid "%s (edited)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:579 ../raphodo/nameeditor.py:1370
+#: ../raphodo/nameeditor.py:584 ../raphodo/nameeditor.py:1379
 #, python-format
 msgid "Update Custom Preset \"%s\""
 msgstr ""
 
-#: ../raphodo/nameeditor.py:667
+#: ../raphodo/nameeditor.py:672
 msgid "Save New Custom Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:675
+#: ../raphodo/nameeditor.py:680
 msgid "Preset Name:"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:836
+#: ../raphodo/nameeditor.py:799
+msgid "Photo Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:805
+msgid "Video Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:811
+msgid "Photo Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:817
+msgid "Video Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:842
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>There is insufficient data to "
 "fully generate the name. Please use other renaming options.</i>"
@@ -1614,7 +2042,7 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees.
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:846
+#: ../raphodo/nameeditor.py:853
 #, python-format
 msgid "The character</i> %(separator)s <i>creates a new subfolder level."
 msgstr ""
@@ -1622,50 +2050,50 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:851
+#: ../raphodo/nameeditor.py:858
 #, python-format
 msgid ""
 "There is no need start or end with the folder separator </i> "
 "%(separator)s<i>, because it is added automatically."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:859
+#: ../raphodo/nameeditor.py:866
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>Unique filenames may not be "
 "generated. Make filenames unique by using Sequence values.</i>"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:882 ../raphodo/renamepanel.py:121
+#: ../raphodo/nameeditor.py:889 ../raphodo/renamepanel.py:121
 msgid "Preset:"
 msgstr ""
 
 #. Translators: appears in a combobox, e.g. Image Date (YYYY)
-#: ../raphodo/nameeditor.py:959 ../raphodo/nameeditor.py:980
+#: ../raphodo/nameeditor.py:966 ../raphodo/nameeditor.py:987
 #, python-brace-format
 msgid "{choice} ({variant})"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1005 ../raphodo/preferencedialog.py:530
+#: ../raphodo/nameeditor.py:1012 ../raphodo/preferencedialog.py:783
 msgid "Get help online..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1025
+#: ../raphodo/nameeditor.py:1034
 msgid "Insert"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1351
+#: ../raphodo/nameeditor.py:1360
 msgid "Save Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1356
+#: ../raphodo/nameeditor.py:1365
 msgid ""
-"<b>Do you want to save the changes in a new custom preset?</"
-"b><br><br>Creating a custom preset is not required, but can help you keep "
-"organized.<br><br>The changes to the preferences will still be applied "
-"regardless of whether you create a new custom preset or not."
+"<b>Do you want to save the changes in a new custom "
+"preset?</b><br><br>Creating a custom preset is not required, but can help "
+"you keep organized.<br><br>The changes to the preferences will still be "
+"applied regardless of whether you create a new custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1365
+#: ../raphodo/nameeditor.py:1374
 msgid ""
 "<b>Do you want to save the changes in a custom preset?</b><br><br>If you "
 "like, you can create a new custom preset or update the existing custom "
@@ -1673,136 +2101,167 @@ msgid ""
 "regardless of whether you save a custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1372
+#: ../raphodo/nameeditor.py:1381
 msgid "Save New Custom Preset"
 msgstr ""
 
-#: ../raphodo/newversion.py:306
+#: ../raphodo/newversion.py:312
 msgid "Checking for new version..."
 msgstr ""
 
-#: ../raphodo/newversion.py:307
+#: ../raphodo/newversion.py:313
 msgid "You are running the latest version."
 msgstr ""
 
-#: ../raphodo/newversion.py:308
+#: ../raphodo/newversion.py:314
 msgid "Failed to contact the update server."
 msgstr ""
 
-#: ../raphodo/newversion.py:310
+#: ../raphodo/newversion.py:316
 #, python-format
 msgid "A new version of Rapid Photo Downloader (%s) is available."
 msgstr ""
 
-#: ../raphodo/newversion.py:312
+#: ../raphodo/newversion.py:318
 msgid "Do you want to download the new version?"
 msgstr ""
 
-#: ../raphodo/newversion.py:313
+#: ../raphodo/newversion.py:319
 #, python-format
 msgid "Changes in the new release can be viewed <a href=\"%s\">here</a>."
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the s key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:340 ../raphodo/newversion.py:353
+#: ../raphodo/newversion.py:348 ../raphodo/newversion.py:363
 msgid "&Skip this release"
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the o key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:356
+#: ../raphodo/newversion.py:366
 msgid "&Open Download Page"
 msgstr ""
 
-#: ../raphodo/newversion.py:376
+#: ../raphodo/newversion.py:386
 msgid "Rapid Photo Downloader updates"
 msgstr ""
 
 #. Translators: shows how much of a file has been downloaded e.g  123 KB of 1.3 MB
-#: ../raphodo/newversion.py:478
+#: ../raphodo/newversion.py:488
 #, python-format
 msgid "%(downloaded)s of %(total)s"
 msgstr ""
 
-#: ../raphodo/newversion.py:495
+#: ../raphodo/newversion.py:507
 msgid "Downloading..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:76
+#: ../raphodo/preferencedialog.py:86
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Automation"
 msgstr "Automazione"
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Thumbnails"
 msgstr "Miniature"
 
-#: ../raphodo/preferencedialog.py:85 ../raphodo/preferencedialog.py:343
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/preferencedialog.py:428
 msgid "Error Handling"
 msgstr "Gestione degli errori"
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:109
+msgid "Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:109 ../raphodo/preferencedialog.py:119
 msgid "Miscellaneous"
 msgstr "Varie"
 
-#: ../raphodo/preferencedialog.py:94
+#: ../raphodo/preferencedialog.py:147
 msgid "Device Scanning"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:96
+#: ../raphodo/preferencedialog.py:148
 msgid "Scan only external devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:98
+#: ../raphodo/preferencedialog.py:150
 msgid ""
 "Scan for photos and videos only on devices that are external to the "
 "computer,\n"
 "including cameras, memory cards, external hard drives, and USB flash drives."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:102
-msgid "Scan non-camera devices lacking a DCIM folder"
+#: ../raphodo/preferencedialog.py:153
+msgid "Scan only specific folders on devices"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:155
+msgid ""
+"Scan for photos and videos only in the folders specified below (except "
+"paths\n"
+"specified in Ignored Paths).\n"
+"\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:161
+msgid "Folders to scan:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:164
+msgid ""
+"Folders at the base level of device file systems that will be scanned\n"
+"for photos and videos."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:104
+#: ../raphodo/preferencedialog.py:167 ../raphodo/preferencedialog.py:219
+msgid "Add..."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:169
 msgid ""
-"Scan the entirety of a device for photos and videos, irrespective of whether "
-"it contains a DCIM folder,\n"
-"as opposed to only scanning within a DCIM folder.\n"
+"Add a folder to the list of folders to scan for photos and videos.\n"
 "\n"
-"Changing this setting causes all devices to be scanned again.\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:172 ../raphodo/preferencedialog.py:198
+#: ../raphodo/preferencedialog.py:224 ../raphodo/preferencedialog.py:529
+msgid "Remove"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:174
+msgid ""
+"Remove a folder from the list of folders to scan for photos and videos.\n"
 "\n"
-"Note: With cameras, only the DCIM folder is scanned."
+"Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:116
+#: ../raphodo/preferencedialog.py:191
 msgid "Devices that have been set to automatically ignore or download from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:117
+#: ../raphodo/preferencedialog.py:192
 msgid "Remembered Devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:121
+#: ../raphodo/preferencedialog.py:196
 msgid ""
 "Remove a device from the list of devices to automatically ignore or download "
 "from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:123 ../raphodo/preferencedialog.py:149
-#: ../raphodo/preferencedialog.py:431
-msgid "Remove"
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:127
+#: ../raphodo/preferencedialog.py:202
 msgid ""
 "Clear the list of devices from which to automatically ignore or download "
 "from.\n"
@@ -1810,317 +2269,438 @@ msgid ""
 "Note: Changes take effect when the computer is next scanned for devices."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:140
+#: ../raphodo/preferencedialog.py:215
 msgid "Ignored Paths"
 msgstr "Percorsi Ignorati"
 
-#: ../raphodo/preferencedialog.py:141
+#: ../raphodo/preferencedialog.py:216
 msgid ""
 "The end part of a path that should never be scanned for photos or videos."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:144
-msgid "Add..."
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:146
+#: ../raphodo/preferencedialog.py:221
 msgid ""
 "Add a path to the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:151
+#: ../raphodo/preferencedialog.py:226
 msgid ""
 "Remove a path from the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:156
+#: ../raphodo/preferencedialog.py:231
 msgid ""
 "Clear the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:164
+#: ../raphodo/preferencedialog.py:239
 msgid ""
-"Use python-style <a href=\"http://damonlynch.net/rapid/documentation/"
-"#regularexpressions\">regular expressions</a>"
+"Use python-style <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">regula"
+"r expressions</a>"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:168
+#: ../raphodo/preferencedialog.py:243
 msgid ""
 "Use regular expressions in the list of ignored paths.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:208
+#: ../raphodo/preferencedialog.py:283
 msgid "Program Automation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:209
+#: ../raphodo/preferencedialog.py:284
 msgid "Start downloading at program startup"
 msgstr "Inizia il download all'avvio del programma"
 
-#: ../raphodo/preferencedialog.py:210
+#: ../raphodo/preferencedialog.py:285
 msgid "Start downloading upon device insertion"
 msgstr "Inizia il download quando il dispositivo viene inserito"
 
-#: ../raphodo/preferencedialog.py:211
+#: ../raphodo/preferencedialog.py:286
 msgid "Unmount (eject) device upon download completion"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:212
+#: ../raphodo/preferencedialog.py:287
 msgid "Exit program when download completes"
 msgstr "Esce dal programma quando il download è completo"
 
-#: ../raphodo/preferencedialog.py:213
+#: ../raphodo/preferencedialog.py:288
 msgid "Exit program even if download had warnings or errors"
 msgstr ""
 "Esce dal programma anche se si sono verificati errori e avvisi durante il "
 "download"
 
-#: ../raphodo/preferencedialog.py:240
+#: ../raphodo/preferencedialog.py:315
 msgid "Thumbnail Generation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:241
+#: ../raphodo/preferencedialog.py:316
 msgid "Generate thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:242
+#: ../raphodo/preferencedialog.py:318
 msgid "Generate thumbnails to show in the main program window"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:244
+#: ../raphodo/preferencedialog.py:320
 msgid "Cache thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:245
+#: ../raphodo/preferencedialog.py:323
 msgid ""
 "Save thumbnails shown in the main program window in a thumbnail cache unique "
 "to Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:247
+#: ../raphodo/preferencedialog.py:327
 msgid "Generate system thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:248
+#: ../raphodo/preferencedialog.py:330
 msgid ""
 "While downloading, save thumbnails that can be used by desktop file managers "
 "and other programs"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:255
+#: ../raphodo/preferencedialog.py:339
 msgid "Number of CPU cores used to generate thumbnails."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:256
+#: ../raphodo/preferencedialog.py:340
 msgid "CPU cores:"
 msgstr ""
 
 #. Translators: the * acts as an asterisk to denote a reference to an annotation
 #. such as '* Takes effect upon program restart'
-#: ../raphodo/preferencedialog.py:271 ../raphodo/preferencedialog.py:317
+#: ../raphodo/preferencedialog.py:355 ../raphodo/preferencedialog.py:401
 msgid "*"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:294
+#: ../raphodo/preferencedialog.py:378
 msgid "Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:296
+#: ../raphodo/preferencedialog.py:380
 msgid "Calculating..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:302
+#: ../raphodo/preferencedialog.py:386
 msgid "days"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:303
+#: ../raphodo/preferencedialog.py:387
 msgid "forever"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:308
+#: ../raphodo/preferencedialog.py:392
 msgid "Cache size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:310
+#: ../raphodo/preferencedialog.py:394
 msgid "Number of thumbnails:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:312
+#: ../raphodo/preferencedialog.py:396
 msgid "Database size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:314
+#: ../raphodo/preferencedialog.py:398
 msgid "Cache unaccessed thumbnails for:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:322
+#: ../raphodo/preferencedialog.py:406
 msgid "Purge Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:323
+#: ../raphodo/preferencedialog.py:408
 msgid "Optimize Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:336
+#: ../raphodo/preferencedialog.py:421
 msgid "* Takes effect upon program restart"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:346
+#: ../raphodo/preferencedialog.py:431
 msgid "Skip download"
 msgstr "Salta il download"
 
-#: ../raphodo/preferencedialog.py:347
+#: ../raphodo/preferencedialog.py:432
 msgid "Don't download the file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:348
+#: ../raphodo/preferencedialog.py:433
 msgid "Add unique identifier"
 msgstr "Aggiunta di un identificatore univoco"
 
-#: ../raphodo/preferencedialog.py:349
+#: ../raphodo/preferencedialog.py:436
 msgid ""
 "Add an identifier like _1 or _2 to the end of the filename, immediately "
 "before the file's extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:355
+#: ../raphodo/preferencedialog.py:444
 msgid "Overwrite"
 msgstr "Sovrascrivi"
 
-#: ../raphodo/preferencedialog.py:356
+#: ../raphodo/preferencedialog.py:445
 msgid "Overwrite the previously backed up file"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:357
+#: ../raphodo/preferencedialog.py:446
 msgid "Skip"
 msgstr "Salta"
 
-#: ../raphodo/preferencedialog.py:358
+#: ../raphodo/preferencedialog.py:448
 msgid "Don't overwrite the backup file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:364
+#: ../raphodo/preferencedialog.py:455
 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 identifier:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:378
+#: ../raphodo/preferencedialog.py:464
+msgid ""
+"Using sequence numbers to automatically generate unique filenames is "
+"strongly recommended. Configure file renaming in the Rename panel in the "
+"main window."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:473
 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 ""
 
-#: ../raphodo/preferencedialog.py:398
+#: ../raphodo/preferencedialog.py:494
 msgid "Program Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:399
+#: ../raphodo/preferencedialog.py:495
 msgid "Show a warning when:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:402
+#: ../raphodo/preferencedialog.py:498
 msgid "Downloading files currently not displayed"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:403
+#: ../raphodo/preferencedialog.py:499
 msgid ""
 "Warn when about to download files that are not displayed in the main window."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:405
+#: ../raphodo/preferencedialog.py:501
 msgid "Backup destinations are missing"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:406
-msgid "Warn before starting a download if it is not possible to back up files."
+#: ../raphodo/preferencedialog.py:502
+msgid ""
+"Warn before starting a download if it is not possible to back up files."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:408
+#: ../raphodo/preferencedialog.py:504
 msgid "Program libraries are missing or broken"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:409
+#: ../raphodo/preferencedialog.py:505
 msgid ""
 "Warn if a software library used by Rapid Photo Downloader is missing or not "
 "functioning."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:412
+#: ../raphodo/preferencedialog.py:508
 msgid "Filesystem metadata cannot be set"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:413
+#: ../raphodo/preferencedialog.py:509
 msgid ""
 "Warn if there is an error setting a file's filesystem metadata, such as its "
 "modification time."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:416
+#: ../raphodo/preferencedialog.py:512
 msgid "Encountering unhandled files"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:417
+#: ../raphodo/preferencedialog.py:513
 msgid ""
 "Warn after scanning a device or this computer if there are unrecognized "
 "files that will not be included in the download."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:420
+#: ../raphodo/preferencedialog.py:517
 msgid "Do not warn about unhandled files with extensions:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:424
+#: ../raphodo/preferencedialog.py:522
 msgid ""
 "File extensions are case insensitive and do not need to include the leading "
 "dot."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:427
+#: ../raphodo/preferencedialog.py:525
 msgid "Add"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:428
+#: ../raphodo/preferencedialog.py:526
 msgid ""
 "Add a file extension to the list of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:430
+#: ../raphodo/preferencedialog.py:528
 msgid ""
 "Remove a file extension from the list of unhandled file types to not warn "
 "about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:434
+#: ../raphodo/preferencedialog.py:532
 msgid ""
 "Clear the list of file extensions of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:469
+#: ../raphodo/preferencedialog.py:568
+msgid "Photo and Video Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:571
+msgid "Consolidate files across devices and downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:574
+msgid ""
+"Analyze the results of device scans looking for duplicate files and matching "
+"RAW and JPEG pairs,\n"
+"comparing them across multiple devices and download sessions."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:580
+msgid "Treat matching RAW and JPEG files as:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:581
+msgid "One photo"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:582
+msgid "Two photos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:584
+msgid ""
+"Display matching pairs of RAW and JPEG photos as one photo, and if marked, "
+"download both."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:589
+msgid ""
+"Display matching pairs of RAW and JPEG photos as two different photos. You "
+"can still synchronize their sequence numbers."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:598
+msgid "With matching RAW and JPEG photos:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:600
+msgid "Do not mark JPEG for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:601
+msgid "Do not mark RAW for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:602
+msgid "Mark both for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:609
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"JPEG for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:614
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"RAW for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:619
+msgid ""
+"When matching RAW and JPEG photos are found, automatically mark both for "
+"download."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:625
+msgid ""
+"If you disable file consolidation, choose what to do when a download device "
+"is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:631
+msgid ""
+"When a download device is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:642
+msgid "Clear completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:643
+msgid "Keep displaying completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:644
+msgid "Prompt for what to do"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:649
+msgid ""
+"Automatically clear the display of completed downloads whenever a new "
+"download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:654
+msgid ""
+"Keep displaying completed downloads whenever a new download device is "
+"inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:658
+msgid ""
+"Prompt whether to keep displaying completed downloads or clear them whenever "
+"a new download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:702
 msgid "Version Check"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:470
+#: ../raphodo/preferencedialog.py:703
 msgid "Check for new version at startup"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:471
+#: ../raphodo/preferencedialog.py:705
 msgid "Check for a new version of the program each time the program starts."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:473
+#: ../raphodo/preferencedialog.py:707
 msgid "Include development releases"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:474
+#: ../raphodo/preferencedialog.py:709
 msgid ""
 "Include alpha, beta and other development releases when checking for a new "
 "version of the program.\n"
@@ -2129,11 +2709,11 @@ msgid ""
 "occur."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:489
+#: ../raphodo/preferencedialog.py:725
 msgid "Ignore DNG date/time metadata on MTP devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:490
+#: ../raphodo/preferencedialog.py:727
 msgid ""
 "Ignore date/time metadata in DNG files located on MTP devices, and use the "
 "file's modification time instead.\n"
@@ -2142,72 +2722,88 @@ msgid ""
 "metadata."
 msgstr ""
 
+#: ../raphodo/preferencedialog.py:741
+msgid "Completed Downloads"
+msgstr ""
+
 #. Translators: substituted value is a description for the set of preferences
 #. shown in the preference dialog window, e.g. Devices, Automation, etc.
 #. This string is shown in a tooltip for the "Restore Defaults" button
-#: ../raphodo/preferencedialog.py:710
+#: ../raphodo/preferencedialog.py:1067
 #, python-format
 msgid "Restores default %s preference values"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:832
+#: ../raphodo/preferencedialog.py:1208
 msgid ""
 "Do you want to purge the thumbnail cache? The cache will be purged when the "
 "program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:835
+#: ../raphodo/preferencedialog.py:1212
 msgid "Purge Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:847
+#: ../raphodo/preferencedialog.py:1225
 msgid ""
 "Do you want to optimize the thumbnail cache? The cache will be optimized "
 "when the program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:850
+#: ../raphodo/preferencedialog.py:1229
 msgid "Optimize Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1045
+#: ../raphodo/preferencedialog.py:1481
+msgid "Enter a Folder to Scan"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1482
+msgid "Specify a folder that will be scanned for photos and videos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1483
+msgid "Folder:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1497
 msgid "Enter a Path to Ignore"
 msgstr "Inserire un persorco da ignorare"
 
-#: ../raphodo/preferencedialog.py:1046
+#: ../raphodo/preferencedialog.py:1498
 msgid "Specify a path that will never be scanned for photos or videos"
 msgstr ""
 "Specificare un percorso che non sarà mai esaminato per cercare fotografie e "
 "video"
 
-#: ../raphodo/preferencedialog.py:1047
+#: ../raphodo/preferencedialog.py:1499
 msgid "Path:"
 msgstr "Percorso:"
 
-#: ../raphodo/preferencedialog.py:1061
+#: ../raphodo/preferencedialog.py:1513
 msgid "Enter a File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1062
+#: ../raphodo/preferencedialog.py:1514
 msgid "Specify a file extension (without the leading dot)"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1063 ../raphodo/renamepanel.py:122
+#: ../raphodo/preferencedialog.py:1515 ../raphodo/renamepanel.py:122
 msgid "Extension:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1078
+#: ../raphodo/preferencedialog.py:1530
 msgid "Invalid File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1079
+#: ../raphodo/preferencedialog.py:1531
 #, python-format
 msgid ""
 "The file extension <b>%s</b> is recognized by Rapid Photo Downloader, so it "
 "makes no sense to warn about its presence."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1081
+#: ../raphodo/preferencedialog.py:1533
 #, python-format
 msgid ""
 "Recognized file types:\n"
@@ -2233,106 +2829,106 @@ msgstr ""
 msgid "Birthday"
 msgstr ""
 
-#: ../raphodo/preferences.py:614
+#: ../raphodo/preferences.py:624
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Le preferenze della sotto-cartella non dovrebbero iniziare con un %s"
 
-#: ../raphodo/preferences.py:617
+#: ../raphodo/preferences.py:627
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
-msgstr "Le preferenze della sotto-cartella non dovrebbero terminare con un %s"
+msgstr ""
+"Le preferenze della sotto-cartella non dovrebbero terminare con un %s"
 
-#: ../raphodo/preferences.py:622
+#: ../raphodo/preferences.py:632
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
 "Le preferenze della sotto-cartella non dovrebbero contenere due %s uno dopo "
 "l'altro"
 
-#. self.setFlat(True)
 #: ../raphodo/primarybutton.py:72
 msgid "Download 8 Photos and 10 Videos"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:86 ../raphodo/problemnotification.py:208
+#: ../raphodo/problemnotification.py:87 ../raphodo/problemnotification.py:209
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:89
+#: ../raphodo/problemnotification.py:90
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:116
+#: ../raphodo/problemnotification.py:117
 #, python-format
 msgid "GPhoto2 Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:124
+#: ../raphodo/problemnotification.py:125
 msgid ""
 "Unable to initialize the camera, probably because another program is using "
 "it. No files were copied from it."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:134
+#: ../raphodo/problemnotification.py:135
 #, python-format
 msgid "Unable to read directory %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:140
+#: ../raphodo/problemnotification.py:141
 #, python-format
 msgid "Unable to access modification time or size from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:146
+#: ../raphodo/problemnotification.py:147
 #, python-format
 msgid "Unable to read file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:152
+#: ../raphodo/problemnotification.py:153
 #, python-format
 msgid "Unable to write file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:158
+#: ../raphodo/problemnotification.py:159
 #, python-format
 msgid "Unable to move file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:164
+#: ../raphodo/problemnotification.py:165
 #, python-format
 msgid "Unable to remove file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:170
+#: ../raphodo/problemnotification.py:171
 #, python-format
 msgid "Unable to copy file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:176
+#: ../raphodo/problemnotification.py:177
 #, python-format
 msgid "Zero length file %s will not be downloaded"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:182
+#: ../raphodo/problemnotification.py:183
 #, python-format
 msgid "Could not determine filesystem modification time for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:188
+#: ../raphodo/problemnotification.py:189
 #, python-format
 msgid "Unable to load metadata from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:194
+#: ../raphodo/problemnotification.py:195
 #, python-format
 msgid ""
 "Unable to load metadata from %(name)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:202
+#: ../raphodo/problemnotification.py:203
 #, python-format
 msgid ""
 "An error occurred setting a file's filesystem metadata on the filesystem %s. "
@@ -2340,78 +2936,78 @@ msgid ""
 "again."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:216
+#: ../raphodo/problemnotification.py:217
 #, python-format
 msgid "Encountered unhandled file %s. It will not be downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:223
+#: ../raphodo/problemnotification.py:224
 #, python-format
 msgid "%(filetype)s %(destination)s already exists."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:234 ../raphodo/problemnotification.py:262
+#: ../raphodo/problemnotification.py:235 ../raphodo/problemnotification.py:263
 #, python-format
 msgid ""
 "The existing %(filetype)s %(destination)s was last modified on %(date)s at "
 "%(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:245
+#: ../raphodo/problemnotification.py:246
 #, python-format
 msgid "The %(filetype)s %(source)s was not downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:273
+#: ../raphodo/problemnotification.py:274
 #, python-format
 msgid "The %(filetype)s %(source)s was downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:282
+#: ../raphodo/problemnotification.py:283
 #, python-format
 msgid "The unique identifier '%s' was added to the filename."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:298
+#: ../raphodo/problemnotification.py:299
 #, python-format
 msgid ""
 "The existing backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:309
+#: ../raphodo/problemnotification.py:310
 #, python-format
 msgid "The %(filetype)s %(source)s was not backed up from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:326
+#: ../raphodo/problemnotification.py:327
 #, python-format
 msgid ""
 "The previous backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:337
+#: ../raphodo/problemnotification.py:338
 #, python-format
 msgid ""
 "The %(filetype)s %(source)s from %(device)s was backed up, overwriting the "
 "previous backup %(filetype)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:356
+#: ../raphodo/problemnotification.py:357
 #, python-format
 msgid ""
 "When synchronizing RAW + JPEG sequence values, a duplicate %(filetype)s "
 "%(file)s was encountered, and was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:366
+#: ../raphodo/problemnotification.py:367
 msgid ""
 "When synchronizing RAW + JPEG sequence values, photos were detected with the "
 "same filenames, but taken at different times:"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:373
+#: ../raphodo/problemnotification.py:374
 #, python-format
 msgid ""
 "%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
@@ -2420,134 +3016,134 @@ msgstr ""
 "%(image1)s è stata scattata il %(image1_date)s alle %(image1_time)s, e "
 "%(image2)s il %(image2_date)s alle %(image2_time)s."
 
-#: ../raphodo/problemnotification.py:389
+#: ../raphodo/problemnotification.py:390
 #, python-format
 msgid "Unable to finalize the filename for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:424
+#: ../raphodo/problemnotification.py:425
 #, python-format
 msgid ""
 "The filename %(destination)s was not fully generated for %(filetype)s "
 "%(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:433
+#: ../raphodo/problemnotification.py:434
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr "Il %(type)s metadata è mancante."
 
-#: ../raphodo/problemnotification.py:439
+#: ../raphodo/problemnotification.py:440
 #, python-format
 msgid "The following metadata is missing: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:445
+#: ../raphodo/problemnotification.py:446
 #, python-format
 msgid "Date/time conversion failed: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:451
+#: ../raphodo/problemnotification.py:452
 msgid ""
 "Could not extract valid date/time metadata or determine the file "
 "modification time."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:457
+#: ../raphodo/problemnotification.py:458
 msgid "Filename does not have an extension."
 msgstr "Il nome del file non ha un'estensione."
 
-#: ../raphodo/problemnotification.py:460
+#: ../raphodo/problemnotification.py:461
 msgid "Filename does not have a number component."
 msgstr "Il nome del file non ha una componente numerica."
 
-#: ../raphodo/problemnotification.py:464
+#: ../raphodo/problemnotification.py:465
 #, python-format
 msgid "Error generating component %(component)s. Error: %(error)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:477
+#: ../raphodo/problemnotification.py:478
 #, python-format
 msgid ""
 "The download subfolders %(folder)s were only partially generated for "
 "%(filetype)s %(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:486
+#: ../raphodo/problemnotification.py:487
 #, python-format
 msgid ""
 "There is no data with which to generate the %(subfolder_file)s for "
 "%(filename)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:499
+#: ../raphodo/problemnotification.py:500
 #, python-format
 msgid ""
 "Unable to create the %(filetype)s %(destination)s in %(folder)s. The "
 "download file was %(source)s in %(device)s. It was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:514
+#: ../raphodo/problemnotification.py:515
 #, python-format
 msgid "Unable to create the download subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:526
+#: ../raphodo/problemnotification.py:527
 #, python-format
 msgid "Unable to create the backup subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:577
+#: ../raphodo/problemnotification.py:578
 #, python-format
 msgid "Problems scanning %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:584
+#: ../raphodo/problemnotification.py:585
 #, python-format
 msgid "Problems copying from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:591
+#: ../raphodo/problemnotification.py:592
 msgid "Problems while finalizing filenames and generating subfolders"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:598
+#: ../raphodo/problemnotification.py:599
 #, python-format
 msgid "Problems backing up to %s"
 msgstr ""
 
-#. Translators: for example Nov 3 or Dec 31
-#. The start and end dates are on a different day
-#. Translators: for example Nov 3 or Dec 31
-#: ../raphodo/proximity.py:105 ../raphodo/proximity.py:221
-#: ../raphodo/proximity.py:224 ../raphodo/proximity.py:828
+#. Translators: for example Nov 3 2015, 11:25 AM
+#. Translators: for example, Nov 3, 12:15 PM
+#: ../raphodo/proximity.py:188 ../raphodo/proximity.py:213
+#: ../raphodo/proximity.py:236 ../raphodo/proximity.py:239
 #, python-format
-msgid "%(month)s %(numeric_day)s"
+msgid "%(date)s, %(time)s"
 msgstr ""
 
-#. Translators: for example Nov 15 2015
-#. Translators: for example Nov 3 2015
-#: ../raphodo/proximity.py:109 ../raphodo/proximity.py:230
-#: ../raphodo/proximity.py:231 ../raphodo/proximity.py:831
+#: ../raphodo/proximity.py:204
 #, python-format
-msgid "%(date)s %(year)s"
+msgid "%(starttime)s - %(endtime)s"
 msgstr ""
 
-#. Translators: for example Nov 3 2015, 11:25 AM
-#. Translators: for example, Nov 3, 12:15 PM
-#: ../raphodo/proximity.py:197 ../raphodo/proximity.py:215
-#: ../raphodo/proximity.py:234 ../raphodo/proximity.py:236
+#. The start and end dates are on a different day
+#. Translators: for example Nov 3 or Dec 31
+#: ../raphodo/proximity.py:221 ../raphodo/proximity.py:225
+#: ../raphodo/proximity.py:980 ../raphodo/timeutils.py:105
 #, python-format
-msgid "%(date)s, %(time)s"
+msgid "%(month)s %(numeric_day)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:209
+#. Translators: for example Nov 3 2015
+#. Translators: for example Nov 2 2015
+#. Translators: for example Nov 15 2015
+#: ../raphodo/proximity.py:232 ../raphodo/proximity.py:233
+#: ../raphodo/proximity.py:985 ../raphodo/timeutils.py:110
 #, python-format
-msgid "%(starttime)s - %(endtime)s"
+msgid "%(date)s %(year)s"
 msgstr ""
 
 #. Translators: for example, Nov 3, 12:15 PM - Nov 4, 1:00 AM
-#: ../raphodo/proximity.py:241
+#: ../raphodo/proximity.py:245
 #, python-format
 msgid "%(earlier_time)s - %(later_time)s"
 msgstr ""
@@ -2556,25 +3152,25 @@ msgstr ""
 #. Nov 3 2012, 12:15 PM -
 #. Nov 4 2012, 1:00 AM
 #. (please keep the line break signified by \n)
-#: ../raphodo/proximity.py:248
+#: ../raphodo/proximity.py:253
 #, python-format
 msgid ""
 "%(earlier_time)s -\n"
 "%(later_time)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:359
+#: ../raphodo/proximity.py:382
 #, python-format
 msgid "%(month)s  %(year)s"
 msgstr ""
 
 #. Translators: for example Nov 2015
-#: ../raphodo/proximity.py:833
+#: ../raphodo/proximity.py:987
 #, python-format
 msgid "%(month)s %(year)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:1344
+#: ../raphodo/proximity.py:1595
 msgid ""
 "The time elapsed between consecutive photos and videos that is used to build "
 "the Timeline"
@@ -2584,47 +3180,47 @@ msgstr ""
 #. Replace the very last character (after the d) with the correct
 #. localized value, keeping everything else. In other words, change
 #. only the m character.
-#: ../raphodo/proximity.py:1406
+#: ../raphodo/proximity.py:1652
 #, python-format
 msgid "%(minutes)dm"
 msgstr ""
 
 #. Translators: i.e. "1.5h", which is short for 1.5 hours.
 #. Replace the entire string with the correct localized value
-#: ../raphodo/proximity.py:1410
+#: ../raphodo/proximity.py:1656
 msgid "1.5h"
 msgstr ""
 
 #. Translators: e.g. "5h", which is short for 5 hours.
 #. Replace the very last character (after the d) with the correct localized value,
 #. keeping everything else. In other words, change only the h character.
-#: ../raphodo/proximity.py:1415
+#: ../raphodo/proximity.py:1661
 #, python-format
 msgid "%(hours)dh"
 msgstr ""
 
-#: ../raphodo/proximity.py:1461
+#: ../raphodo/proximity.py:1710
 msgid ""
 "The Timeline groups photos and videos based on how much time elapsed between "
 "consecutive shots. Use it to identify photos and videos taken at different "
 "periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/proximity.py:1464
+#: ../raphodo/proximity.py:1715
 msgid ""
 "Use the slider (below) to adjust the time elapsed between consecutive shots "
 "that is used to build the Timeline."
 msgstr ""
 
-#: ../raphodo/proximity.py:1466
+#: ../raphodo/proximity.py:1718
 msgid "Timeline build pending..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1467
+#: ../raphodo/proximity.py:1719
 msgid "Timeline is building..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1468
+#: ../raphodo/proximity.py:1721
 msgid ""
 "The Timeline needs to be rebuilt because the file modification time does not "
 "match the time a shot was taken for one or more shots.<br><br>The Timeline "
@@ -2636,61 +3232,61 @@ msgid ""
 "downloading, which is when the metadata is read."
 msgstr ""
 
-#: ../raphodo/rapid.py:485 ../raphodo/rapid.py:2461 ../raphodo/rapid.py:3728
-#: ../raphodo/rapid.py:3846 ../raphodo/rapid.py:3850 ../raphodo/rapid.py:3870
-#: ../raphodo/rapid.py:3874 ../raphodo/rapid.py:3998 ../raphodo/rapid.py:4007
-#: ../raphodo/rapid.py:4495 ../raphodo/rapid.py:4888 ../raphodo/rapid.py:5722
-#: ../raphodo/rememberthisdialog.py:97
+#: ../raphodo/rapid.py:493 ../raphodo/rapid.py:2555 ../raphodo/rapid.py:3934
+#: ../raphodo/rapid.py:4065 ../raphodo/rapid.py:4069 ../raphodo/rapid.py:4092
+#: ../raphodo/rapid.py:4096 ../raphodo/rapid.py:4226 ../raphodo/rapid.py:4237
+#: ../raphodo/rapid.py:4743 ../raphodo/rapid.py:5195 ../raphodo/rapid.py:5997
+#: ../raphodo/rememberthisdialog.py:99
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:3
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: ../raphodo/rapid.py:1100
+#: ../raphodo/rapid.py:1131
 msgid ""
 "<b>ExifTool has a problem</b><br><br> Rapid Photo Downloader uses ExifTool "
 "to get metadata from videos and photos. The program will run without it, but "
 "installing it is <b>highly</b> recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1110 ../raphodo/rapid.py:1130
+#: ../raphodo/rapid.py:1141 ../raphodo/rapid.py:1161
 msgid "Problem with libmediainfo"
 msgstr ""
 
-#: ../raphodo/rapid.py:1119
+#: ../raphodo/rapid.py:1150
 msgid ""
 "<b>The library libmediainfo appears to be missing</b><br><br> Rapid Photo "
 "Downloader uses libmediainfo to get the date and time a video was shot. The "
 "program will run  without it, but installing it is recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1417
+#: ../raphodo/rapid.py:1448
 msgid "Download failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1419
+#: ../raphodo/rapid.py:1450
 msgid ""
 "Sorry, the download of the new version of Rapid Photo Downloader failed."
 msgstr ""
 
-#: ../raphodo/rapid.py:1425
+#: ../raphodo/rapid.py:1457
 msgid ""
 "The new version was successfully downloaded. Do you want to close Rapid "
 "Photo Downloader and install it now?"
 msgstr ""
 
-#: ../raphodo/rapid.py:1428
+#: ../raphodo/rapid.py:1461
 msgid "Update Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:1432
+#: ../raphodo/rapid.py:1465
 msgid "Install"
 msgstr ""
 
-#: ../raphodo/rapid.py:1450
+#: ../raphodo/rapid.py:1483
 msgid "New version saved"
 msgstr ""
 
-#: ../raphodo/rapid.py:1451
+#: ../raphodo/rapid.py:1485
 #, python-format
 msgid ""
 "The tar file and installer script are saved at:\n"
@@ -2698,163 +3294,163 @@ msgid ""
 " %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:1468
+#: ../raphodo/rapid.py:1502
 msgid "Upgrade failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1469
+#: ../raphodo/rapid.py:1505
 msgid ""
 "Sorry, upgrading Rapid Photo Downloader failed because there was an error "
 "opening the installer."
 msgstr ""
 
-#: ../raphodo/rapid.py:1667 ../raphodo/rapid.py:2331
+#: ../raphodo/rapid.py:1709 ../raphodo/rapid.py:2425
 msgid "Download"
 msgstr "Scarica"
 
-#: ../raphodo/rapid.py:1671
+#: ../raphodo/rapid.py:1713
 msgid "&Refresh..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1675
+#: ../raphodo/rapid.py:1717
 msgid "&Preferences"
 msgstr ""
 
-#: ../raphodo/rapid.py:1679
+#: ../raphodo/rapid.py:1721
 msgid "&Quit"
 msgstr ""
 
-#: ../raphodo/rapid.py:1683
+#: ../raphodo/rapid.py:1725
 msgid "Error &Reports"
 msgstr ""
 
-#: ../raphodo/rapid.py:1687
+#: ../raphodo/rapid.py:1729
 msgid "Clear Completed Downloads"
 msgstr ""
 
-#: ../raphodo/rapid.py:1691
+#: ../raphodo/rapid.py:1733
 msgid "Get Help Online..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1695
+#: ../raphodo/rapid.py:1737
 msgid "&Tip of the Day..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1699
+#: ../raphodo/rapid.py:1741
 msgid "Report a Problem..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1703
+#: ../raphodo/rapid.py:1745
 msgid "Make a Donation..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1707
+#: ../raphodo/rapid.py:1749
 msgid "Translate this Application..."
 msgstr "Traduci questa applicazione..."
 
-#: ../raphodo/rapid.py:1711
+#: ../raphodo/rapid.py:1753
 msgid "&About..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1715
+#: ../raphodo/rapid.py:1757
 msgid "Check for Updates..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1797
+#: ../raphodo/rapid.py:1840
 msgid "Timeline"
 msgstr ""
 
-#: ../raphodo/rapid.py:1807
+#: ../raphodo/rapid.py:1850
 msgid "Destination"
 msgstr ""
 
-#: ../raphodo/rapid.py:1808
+#: ../raphodo/rapid.py:1851
 msgid "Rename"
 msgstr ""
 
-#: ../raphodo/rapid.py:1810
+#: ../raphodo/rapid.py:1853
 msgid "Back Up"
 msgstr ""
 
 #. Devices Header and View
-#: ../raphodo/rapid.py:1926
+#: ../raphodo/rapid.py:1977
 msgid ""
 "Turn on or off the use of devices attached to this computer as download "
 "sources"
 msgstr ""
 
 #. This Computer Header and View
-#: ../raphodo/rapid.py:1940
+#: ../raphodo/rapid.py:1994
 msgid ""
 "Turn on or off the use of a folder on this computer as a download source"
 msgstr ""
 
-#: ../raphodo/rapid.py:1941
+#: ../raphodo/rapid.py:1996
 msgid "This Computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:1952
+#: ../raphodo/rapid.py:2009
 msgid "Select a source folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:1975
+#: ../raphodo/rapid.py:2038
 msgid "Projected Storage Use"
 msgstr ""
 
-#: ../raphodo/rapid.py:1989 ../raphodo/rapid.py:1997
+#: ../raphodo/rapid.py:2056 ../raphodo/rapid.py:2068
 msgid "Select a destination folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:2045
+#: ../raphodo/rapid.py:2117
 msgid "All"
 msgstr ""
 
-#: ../raphodo/rapid.py:2046
+#: ../raphodo/rapid.py:2118
 msgid "New"
 msgstr ""
 
-#: ../raphodo/rapid.py:2048
+#: ../raphodo/rapid.py:2120
 msgid "Show:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2051
+#: ../raphodo/rapid.py:2123
 msgid "Modification Time"
 msgstr ""
 
-#: ../raphodo/rapid.py:2052
+#: ../raphodo/rapid.py:2124
 msgid "Checked State"
 msgstr ""
 
-#: ../raphodo/rapid.py:2055
+#: ../raphodo/rapid.py:2127
 msgid "File Type"
 msgstr ""
 
-#: ../raphodo/rapid.py:2056
+#: ../raphodo/rapid.py:2128
 msgid "Device"
 msgstr "Dispositivo"
 
-#: ../raphodo/rapid.py:2058
+#: ../raphodo/rapid.py:2130
 msgid "Sort:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2069
+#: ../raphodo/rapid.py:2141
 msgid "Select All:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2311
+#: ../raphodo/rapid.py:2405
 #, python-format
 msgid "Download %(files)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2327
+#: ../raphodo/rapid.py:2421
 msgid "Resume Download"
 msgstr ""
 
-#: ../raphodo/rapid.py:2329
+#: ../raphodo/rapid.py:2423
 msgid "Pause"
 msgstr "Sospendi"
 
-#: ../raphodo/rapid.py:2417
+#: ../raphodo/rapid.py:2511
 #, python-brace-format
 msgid ""
 "Please report the problem at <a href=\"{website}\">{website}</a>.<br><br>\n"
@@ -2863,11 +3459,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/rapid.py:2431
+#: ../raphodo/rapid.py:2525
 msgid "Thank you for reporting a problem in Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:2529
+#: ../raphodo/rapid.py:2624
 #, python-format
 msgid ""
 "<b>Changing This Computer source path</b><br><br>Do you really want to "
@@ -2876,30 +3472,29 @@ msgid ""
 "from This Computer will be cancelled."
 msgstr ""
 
-#: ../raphodo/rapid.py:2595
+#: ../raphodo/rapid.py:2694
 msgid "You cannot change the download destination while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:2604
+#: ../raphodo/rapid.py:2704
 #, python-format
 msgid ""
 "<b>Confirm Download Destination</b><br><br>Are you sure you want to set the "
 "%(file_type)s download destination to %(path)s?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2682
+#: ../raphodo/rapid.py:2785
 msgid ""
+"\n"
 "<b>Downloading all files</b><br><br>\n"
-"                    A download always includes all files that are checked "
-"for download,\n"
-"                    including those that are not currently displayed because "
-"the Timeline\n"
-"                    is being used or because only new files are being shown."
-"<br><br>\n"
-"                    Do you want to proceed with the download?"
+"A download always includes all files that are checked for download,\n"
+"including those that are not currently displayed because the Timeline\n"
+"is being used or because only new files are being shown.<br><br>\n"
+"Do you want to proceed with the download?\n"
+"                        "
 msgstr ""
 
-#: ../raphodo/rapid.py:2820
+#: ../raphodo/rapid.py:2937
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -2910,7 +3505,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: ../raphodo/rapid.py:2824
+#: ../raphodo/rapid.py:2940
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -2919,199 +3514,193 @@ msgstr ""
 "La seguente cartella da scaricare non è valida:\n"
 "%s"
 
-#: ../raphodo/rapid.py:2827
+#: ../raphodo/rapid.py:2943
 msgid "Download Failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:2828
+#: ../raphodo/rapid.py:2944
 msgid "The download cannot proceed."
 msgstr ""
 
-#: ../raphodo/rapid.py:2842
+#: ../raphodo/rapid.py:2962
 msgid ""
 "Photos and videos will not be backed up because there is nowhere to back "
 "them up. Do you still want to start the download?"
 msgstr ""
 
-#. Translators: filetype will be replaced with 'photos' or 'videos'
-#: ../raphodo/rapid.py:2847 ../raphodo/rapid.py:2854
+#: ../raphodo/rapid.py:2969 ../raphodo/rapid.py:2979
 #, python-format
 msgid ""
 "No backup device exists for backing up %(filetype)s. Do you still want to "
 "start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2848 ../raphodo/rpdfile.py:228
+#: ../raphodo/rapid.py:2971 ../raphodo/rpdfile.py:228
 msgid "photos"
 msgstr "foto"
 
-#: ../raphodo/rapid.py:2855 ../raphodo/rpdfile.py:223
+#: ../raphodo/rapid.py:2981 ../raphodo/rpdfile.py:223
 msgid "videos"
 msgstr "video"
 
-#: ../raphodo/rapid.py:2861
+#: ../raphodo/rapid.py:2989
 msgid ""
 "<b>The photo and video backup destinations do not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2869 ../raphodo/rapid.py:2876
+#: ../raphodo/rapid.py:2999 ../raphodo/rapid.py:3008
 #, python-format
 msgid ""
 "<b>The %(filetype)s backup destination does not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2871 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:818
+#: ../raphodo/rapid.py:3001 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:843
 msgid "photo"
 msgstr "foto"
 
-#: ../raphodo/rapid.py:2878 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:858
+#: ../raphodo/rapid.py:3010 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:883
 msgid "video"
 msgstr "video"
 
-#: ../raphodo/rapid.py:2886
+#: ../raphodo/rapid.py:3018
 msgid "Backup problem"
 msgstr "Problema nel backup"
 
-#. Translators - in the middle is a unicode em dash - please retain it
-#. This string is displayed in the status bar when the download is running
-#: ../raphodo/rapid.py:3571
+#: ../raphodo/rapid.py:3756
 #, python-format
 msgid "%(downloading_from)s — %(time_left)s left (%(speed)s)"
 msgstr ""
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3640
+#: ../raphodo/rapid.py:3828
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "Scaricati %(noFiles)s %(filetypes)s"
 
-#. Translators: e.g. 2 videos failed to download
-#: ../raphodo/rapid.py:3645
+#: ../raphodo/rapid.py:3836
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "Impossibile scaricare %(noFiles)s %(filetypes)s"
 
-#: ../raphodo/rapid.py:3650 ../raphodo/rapid.py:3723
+#: ../raphodo/rapid.py:3842 ../raphodo/rapid.py:3927
 msgid "warnings"
 msgstr "avvisi"
 
-#: ../raphodo/rapid.py:3679
+#: ../raphodo/rapid.py:3873
 msgid "All downloads complete"
 msgstr "Scaricamenti completati"
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3686 ../raphodo/rapid.py:3695 ../raphodo/rapid.py:3704
-#: ../raphodo/rapid.py:3713 ../raphodo/rapid.py:3721
+#: ../raphodo/rapid.py:3881 ../raphodo/rapid.py:3892 ../raphodo/rapid.py:3903
+#: ../raphodo/rapid.py:3914 ../raphodo/rapid.py:3924
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: ../raphodo/rapid.py:3688 ../raphodo/rapid.py:3706
+#: ../raphodo/rapid.py:3884 ../raphodo/rapid.py:3906
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s scaricati"
 
-#: ../raphodo/rapid.py:3697 ../raphodo/rapid.py:3715
+#: ../raphodo/rapid.py:3895 ../raphodo/rapid.py:3917
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "impossibile scaricare %(filetype)s"
 
-#: ../raphodo/rapid.py:3742
+#: ../raphodo/rapid.py:3950
 msgid "1 failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:3744
+#: ../raphodo/rapid.py:3952
 #, python-format
 msgid "%d failures"
 msgstr ""
 
-#: ../raphodo/rapid.py:3749
+#: ../raphodo/rapid.py:3957
 msgid "1 warning"
 msgstr ""
 
-#: ../raphodo/rapid.py:3751
+#: ../raphodo/rapid.py:3959
 #, python-format
 msgid "%d warnings"
 msgstr ""
 
-#: ../raphodo/rapid.py:3771
+#: ../raphodo/rapid.py:3981
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3774
+#: ../raphodo/rapid.py:3985
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3779
+#: ../raphodo/rapid.py:3989
 #, python-format
 msgid "No files downloaded — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3781
+#: ../raphodo/rapid.py:3991
 msgid "No files downloaded"
 msgstr ""
 
-#: ../raphodo/rapid.py:3805
+#: ../raphodo/rapid.py:4021
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3809
+#: ../raphodo/rapid.py:4026
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3812
+#: ../raphodo/rapid.py:4031
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3820
+#: ../raphodo/rapid.py:4039
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3833
+#: ../raphodo/rapid.py:4052
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3837
+#: ../raphodo/rapid.py:4056
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3841
+#: ../raphodo/rapid.py:4060
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices"
 msgstr ""
 
-#: ../raphodo/rapid.py:3867
+#: ../raphodo/rapid.py:4087
 msgid "The Destination subfolders and Timeline have been rebuilt"
 msgstr ""
 
-#: ../raphodo/rapid.py:3922
+#: ../raphodo/rapid.py:4144
 msgid "Program preferences are invalid"
 msgstr "Le preferenze del programma non sono valide"
 
-#: ../raphodo/rapid.py:3999
+#: ../raphodo/rapid.py:4228
 #, python-format
 msgid ""
 "<b>All files on the %(camera)s are inaccessible</b>.<br><br>It may be locked "
@@ -3121,179 +3710,205 @@ msgid ""
 "ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4008
+#: ../raphodo/rapid.py:4239
 #, python-format
 msgid ""
-"<b>The %(camera)s appears to be in use by another application.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again.<br><br>Alternatively, you can ignore this "
-"device."
+"<b>The %(camera)s appears to be in use by another "
+"application.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again.<br><br>Alternatively, you "
+"can ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4019
+#: ../raphodo/rapid.py:4250
 msgid "&Try Again"
 msgstr ""
 
-#: ../raphodo/rapid.py:4020
+#: ../raphodo/rapid.py:4251
 msgid "&Ignore This Device"
 msgstr ""
 
-#: ../raphodo/rapid.py:4086
+#: ../raphodo/rapid.py:4323
 #, python-format
 msgid "Sorry, an unexpected problem occurred while scanning %s."
 msgstr ""
 
-#: ../raphodo/rapid.py:4087
+#: ../raphodo/rapid.py:4324
 msgid "Unfortunately you cannot download from this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4091
+#: ../raphodo/rapid.py:4328
 msgid ""
 "A possible workaround for the problem might be downloading from the camera's "
 "memory card using a card reader."
 msgstr ""
 
-#: ../raphodo/rapid.py:4096
+#: ../raphodo/rapid.py:4333
 msgid "Device scan failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:4472
+#: ../raphodo/rapid.py:4720
 #, python-format
 msgid ""
-"<b>The %(camera)s cannot be scanned because it cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again."
+"<b>The %(camera)s cannot be scanned because it cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again."
 msgstr ""
 
-#: ../raphodo/rapid.py:4496
+#: ../raphodo/rapid.py:4745
 #, python-format
 msgid ""
-"<b>The download cannot start because the %(camera)s cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again, and choose which files you want to "
-"download from it."
+"<b>The download cannot start because the %(camera)s cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again, and choose which files "
+"you want to download from it."
+msgstr ""
+
+#: ../raphodo/rapid.py:4842
+msgid "Completed Downloads Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4844
+#, python-format
+msgid "%s whose download have completed are displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4846
+msgid "Do you want to clear the completed downloads?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4848
+msgid "Completed Download Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4850
+#, python-format
+msgid "%s whose download has completed is displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4852
+msgid "Do you want to clear the completed download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:4635
+#: ../raphodo/rapid.py:4933
 #, python-format
 msgid ""
 "Do you want to download photos and videos from the device <i>%(device)s</i>?"
 msgstr ""
 
-#: ../raphodo/rapid.py:4877
+#: ../raphodo/rapid.py:5183
 #, python-format
 msgid "<b>Do you want to ignore the %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4879
+#: ../raphodo/rapid.py:5186
 msgid ""
 "All cameras, phones and tablets with the same model name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:4883
+#: ../raphodo/rapid.py:5190
 #, python-format
 msgid ""
 "<b>Do you want to ignore the device %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4885
+#: ../raphodo/rapid.py:5192
 msgid "Any device with the same name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:5178
+#: ../raphodo/rapid.py:5492
 #, python-format
 msgid "Downloading from %(location)s on This Computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5180
+#: ../raphodo/rapid.py:5496
 msgid ""
 "Do you really want to download from here?<br><br>On some systems, scanning "
 "this location can take a very long time."
 msgstr ""
 
-#: ../raphodo/rapid.py:5224
+#: ../raphodo/rapid.py:5537
 #, python-format
 msgid "Generating thumbnails for %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5227
+#: ../raphodo/rapid.py:5540
 #, python-format
 msgid "Scanning %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5237
+#: ../raphodo/rapid.py:5551
 #, python-format
 msgid ""
 "%(number)s of %(available files)s checked for download (%(hidden)s hidden)"
 msgstr ""
 
-#: ../raphodo/rapid.py:5243
+#: ../raphodo/rapid.py:5559
 #, python-format
 msgid "%(number)s of %(available files)s checked for download"
 msgstr ""
 
-#: ../raphodo/rapid.py:5494
+#: ../raphodo/rapid.py:5764
 msgid "Display program information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5496
+#: ../raphodo/rapid.py:5766
 msgid "Display debugging information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5499
+#: ../raphodo/rapid.py:5769
 msgid "List photo and video file extensions the program recognizes and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5502
+#: ../raphodo/rapid.py:5772
 msgid "Turn on or off the the renaming of photos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5504
+#: ../raphodo/rapid.py:5774
 msgid "turn on or off the the renaming of videos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5506
+#: ../raphodo/rapid.py:5776
 msgid ""
 "Turn on or off the automatic detection of devices from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5510
+#: ../raphodo/rapid.py:5780
 msgid "Turn on or off downloading from this computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5512 ../raphodo/rapid.py:5515 ../raphodo/rapid.py:5518
-#: ../raphodo/rapid.py:5539 ../raphodo/rapid.py:5543
+#: ../raphodo/rapid.py:5782 ../raphodo/rapid.py:5785 ../raphodo/rapid.py:5788
+#: ../raphodo/rapid.py:5809 ../raphodo/rapid.py:5813
 msgid "PATH"
 msgstr ""
 
-#: ../raphodo/rapid.py:5513
+#: ../raphodo/rapid.py:5783
 msgid "The PATH on this computer from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5516
+#: ../raphodo/rapid.py:5786
 msgid "The PATH where photos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5519
+#: ../raphodo/rapid.py:5789
 msgid "The PATH where videos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5521
+#: ../raphodo/rapid.py:5791
 msgid "Turn on or off the backing up of photos and videos while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:5525
+#: ../raphodo/rapid.py:5795
 msgid "Turn on or off the automatic detection of backup devices."
 msgstr ""
 
-#: ../raphodo/rapid.py:5527 ../raphodo/rapid.py:5533
+#: ../raphodo/rapid.py:5797 ../raphodo/rapid.py:5803
 msgid "FOLDER"
 msgstr ""
 
-#: ../raphodo/rapid.py:5528
+#: ../raphodo/rapid.py:5798
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected photo "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3301,7 +3916,7 @@ msgid ""
 "photos up to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5534
+#: ../raphodo/rapid.py:5804
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected video "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3309,115 +3924,124 @@ msgid ""
 "up videos to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5540
+#: ../raphodo/rapid.py:5810
 msgid ""
 "The PATH where photos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5544
+#: ../raphodo/rapid.py:5814
 msgid ""
 "The PATH where videos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5547
+#: ../raphodo/rapid.py:5817
 #, python-format
 msgid "Ignore photos with the following extensions: %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5551
-msgid "Turn on or off starting downloads as soon as the program itself starts."
+#: ../raphodo/rapid.py:5821
+msgid ""
+"Turn on or off starting downloads as soon as the program itself starts."
 msgstr ""
 
-#: ../raphodo/rapid.py:5554
+#: ../raphodo/rapid.py:5824
 msgid "Turn on or off starting downloads as soon as a device is inserted."
 msgstr ""
 
-#: ../raphodo/rapid.py:5557
+#: ../raphodo/rapid.py:5827
 msgid ""
 "Turn on or off use of the Rapid Photo Downloader Thumbnail Cache. Turning it "
 "off does not delete existing cache contents."
 msgstr ""
 
-#: ../raphodo/rapid.py:5561
+#: ../raphodo/rapid.py:5831
 msgid ""
 "Delete all thumbnails in the Rapid Photo Downloader Thumbnail Cache, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5565
+#: ../raphodo/rapid.py:5835
 msgid "Forget which files have been previously downloaded, and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5568
+#: ../raphodo/rapid.py:5838
 msgid ""
 "Import preferences from an old program version and exit. Requires the "
 "command line program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5571
+#: ../raphodo/rapid.py:5841
 msgid ""
 "Reset all program settings to their default values, delete all thumbnails in "
 "the Thumbnail cache, forget which files have been previously downloaded, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5575
+#: ../raphodo/rapid.py:5845
 msgid "Include gphoto2 debugging information in log files."
 msgstr ""
 
-#: ../raphodo/rapid.py:5579
+#: ../raphodo/rapid.py:5849
 msgid "Print information to the terminal about attached cameras and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5640
+#: ../raphodo/rapid.py:5911
 msgid ""
 "To import preferences from the old version of Rapid Photo Downloader, you "
 "must install the program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5649
+#: ../raphodo/rapid.py:5920
 msgid "No prior program preferences detected: exiting"
 msgstr ""
 
-#: ../raphodo/rapid.py:5652
+#: ../raphodo/rapid.py:5923
 #, python-format
 msgid "Importing preferences from Rapid Photo Downloader %(version)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5714
+#: ../raphodo/rapid.py:5989
 #, python-format
-msgid "Do you want to copy the stored sequence number, which has the value %d?"
+msgid ""
+"Do you want to copy the stored sequence number, which has the value %d?"
 msgstr ""
 
-#: ../raphodo/rapid.py:5726
+#: ../raphodo/rapid.py:6000
 msgid "Program aborting."
 msgstr ""
 
-#: ../raphodo/rapid.py:5736
+#: ../raphodo/rapid.py:6010
 msgid "Never run this program as the sudo / root user."
 msgstr ""
 
-#: ../raphodo/rapid.py:5740
+#: ../raphodo/rapid.py:6014
 msgid "You must install ExifTool to run Rapid Photo Downloader."
 msgstr ""
 
-#: ../raphodo/rapid.py:5794
+#: ../raphodo/rapid.py:6026
+msgid ""
+"Rapid Photo Downloader is installed in multiple locations.\n"
+"\n"
+"Uninstall all copies except the version you want to run."
+msgstr ""
+
+#: ../raphodo/rapid.py:6083
 msgid ""
 "When specifying a path on the command line, do not also specify an\n"
 "option for device auto detection or a path on \"This Computer\"."
 msgstr ""
 
-#: ../raphodo/rapid.py:5950
+#: ../raphodo/rapid.py:6243
 msgid "All settings and caches have been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5958
+#: ../raphodo/rapid.py:6251
 msgid "Thumbnail Cache has been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5964
+#: ../raphodo/rapid.py:6257
 msgid "Remembered files have been forgotten"
 msgstr ""
 
@@ -3433,15 +4057,15 @@ msgstr ""
 msgid "&Don't warn me again about missing or broken program libraries"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:546
+#: ../raphodo/renameandmovefile.py:554
 msgid "subfolder and filename"
 msgstr "sottocartella e nome del file"
 
-#: ../raphodo/renameandmovefile.py:548
+#: ../raphodo/renameandmovefile.py:556
 msgid "filename"
 msgstr "nome del file"
 
-#: ../raphodo/renameandmovefile.py:550
+#: ../raphodo/renameandmovefile.py:558
 msgid "subfolder"
 msgstr "sotto-cartella"
 
@@ -3521,161 +4145,238 @@ msgstr "foto e video"
 msgid "photos or videos"
 msgstr "foto o video"
 
-#: ../raphodo/rpdfile.py:306
+#: ../raphodo/rpdfile.py:315
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: ../raphodo/rpdfile.py:318
+#. translators: natural language expression signifying a single video
+#: ../raphodo/rpdfile.py:337
+msgid "a video"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:339
 msgid "1 Video"
 msgstr "1 video"
 
-#: ../raphodo/rpdfile.py:323
+#. translators: natural language expression signifying a single photo
+#: ../raphodo/rpdfile.py:346
+msgid "a photo"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:348
 msgid "1 Photo"
 msgstr "1 foto"
 
-#: ../raphodo/rpdfile.py:803
+#: ../raphodo/rpdfile.py:828
 #, python-format
 msgid "%(path)s on %(camera)s"
 msgstr "%(path)s su %(camera)s"
 
-#: ../raphodo/rpdfile.py:819
+#: ../raphodo/rpdfile.py:844
 msgid "Photo"
 msgstr "Foto"
 
-#: ../raphodo/rpdfile.py:859
+#: ../raphodo/rpdfile.py:884
 msgid "Video"
 msgstr "Video"
 
-#: ../raphodo/storage.py:138
+#: ../raphodo/storage.py:141
 msgid "File system root"
 msgstr ""
 
 #. translators: the name of the Pictures folder
-#: ../raphodo/storage.py:433
+#: ../raphodo/storage.py:437
 msgid "Pictures"
 msgstr "Immagini"
 
-#: ../raphodo/thumbnaildisplay.py:426
+#: ../raphodo/thumbnaildisplay.py:432
 #, python-format
 msgid "Taken on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:431
+#: ../raphodo/thumbnaildisplay.py:439
 #, python-format
 msgid "Modified on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:437 ../raphodo/thumbnaildisplay.py:466
+#: ../raphodo/thumbnaildisplay.py:447 ../raphodo/thumbnaildisplay.py:481
 #, python-format
 msgid "%(date_time)s (%(human_readable)s)"
 msgstr "%(date_time)s (%(human_readable)s)"
 
-#: ../raphodo/thumbnaildisplay.py:451
+#: ../raphodo/thumbnaildisplay.py:464
 #, python-format
 msgid "Memory cards: %s"
 msgstr "Schede di memoria: %s"
 
-#: ../raphodo/thumbnaildisplay.py:457
+#: ../raphodo/thumbnaildisplay.py:468
+#, python-format
+msgid "Memory card: %s"
+msgstr ""
+
+#: ../raphodo/thumbnaildisplay.py:473
 msgid "Downloaded as:"
 msgstr "Scaricato come:"
 
-#: ../raphodo/thumbnaildisplay.py:472
+#: ../raphodo/thumbnaildisplay.py:489
 #, python-format
 msgid "<br><br>Previous download:<br>%(filename)s<br>%(path)s<br>%(date)s"
 msgstr ""
 "<br><br>Scaricamenti precedenti:<br>%(filename)s<br>%(path)s<br>%(date)s"
 
-#: ../raphodo/thumbnaildisplay.py:1603
+#: ../raphodo/thumbnaildisplay.py:1645
 msgid "Copy Path"
 msgstr "Copia percorso"
 
+#. Translators: these values are file size suffixes like B representing bytes, KB representing
+#. kilobytes, etc.
+#: ../raphodo/utilities.py:170
+msgid "B"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "KB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "MB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "GB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "TB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "PB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "EB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "ZB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "YB"
+msgstr ""
+
 #. two things in a list e.g. "device1 and device2"
-#: ../raphodo/utilities.py:391
+#: ../raphodo/utilities.py:394
 #, python-format
 msgid "%(first_item)s and %(last_item)s"
 msgstr "%(first_item)s e %(last_item)s"
 
-#: ../raphodo/utilities.py:464
+#: ../raphodo/utilities.py:468
 msgid "one"
 msgstr "uno"
 
-#: ../raphodo/utilities.py:465
+#: ../raphodo/utilities.py:469
 msgid "two"
 msgstr "due"
 
-#: ../raphodo/utilities.py:466
+#: ../raphodo/utilities.py:470
 msgid "three"
 msgstr "tre"
 
-#: ../raphodo/utilities.py:467
+#: ../raphodo/utilities.py:471
 msgid "four"
 msgstr "quattro"
 
-#: ../raphodo/utilities.py:468
+#: ../raphodo/utilities.py:472
 msgid "five"
 msgstr "cinque"
 
-#: ../raphodo/utilities.py:469
+#: ../raphodo/utilities.py:473
 msgid "six"
 msgstr "sei"
 
-#: ../raphodo/utilities.py:470
+#: ../raphodo/utilities.py:474
 msgid "seven"
 msgstr "sette"
 
-#: ../raphodo/utilities.py:471
+#: ../raphodo/utilities.py:475
 msgid "eight"
 msgstr "otto"
 
-#: ../raphodo/utilities.py:472
+#: ../raphodo/utilities.py:476
 msgid "nine"
 msgstr "nove"
 
-#: ../raphodo/utilities.py:473
+#: ../raphodo/utilities.py:477
 msgid "ten"
 msgstr "dieci"
 
-#: ../raphodo/utilities.py:474
+#: ../raphodo/utilities.py:478
 msgid "eleven"
 msgstr "undici"
 
-#: ../raphodo/utilities.py:475
+#: ../raphodo/utilities.py:479
 msgid "twelve"
 msgstr "dodici"
 
-#: ../raphodo/utilities.py:476
+#: ../raphodo/utilities.py:480
 msgid "thirteen"
 msgstr "tredici"
 
-#: ../raphodo/utilities.py:477
+#: ../raphodo/utilities.py:481
 msgid "fourteen"
 msgstr "quattordici"
 
-#: ../raphodo/utilities.py:478
+#: ../raphodo/utilities.py:482
 msgid "fifteen"
 msgstr "quindici"
 
-#: ../raphodo/utilities.py:479
+#: ../raphodo/utilities.py:483
 msgid "sixteen"
 msgstr "sedici"
 
-#: ../raphodo/utilities.py:480
+#: ../raphodo/utilities.py:484
 msgid "seventeen"
 msgstr "diciassette"
 
-#: ../raphodo/utilities.py:481
+#: ../raphodo/utilities.py:485
 msgid "eighteen"
 msgstr "diciotto"
 
-#: ../raphodo/utilities.py:482
+#: ../raphodo/utilities.py:486
 msgid "ninenteen"
 msgstr "diciannove"
 
-#: ../raphodo/utilities.py:483
+#: ../raphodo/utilities.py:487
 msgid "twenty"
 msgstr "venti"
 
+#: ../raphodo/viewutils.py:240
+msgid "&OK"
+msgstr ""
+
+#: ../raphodo/viewutils.py:243
+msgid "&Save"
+msgstr ""
+
+#: ../raphodo/viewutils.py:244
+msgid "&Help"
+msgstr ""
+
+#: ../raphodo/viewutils.py:245
+msgid "Restore Defaults"
+msgstr ""
+
+#: ../raphodo/viewutils.py:246
+msgid "&Yes"
+msgstr ""
+
+#: ../raphodo/viewutils.py:247
+msgid "&No"
+msgstr ""
+
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:1
 msgid ""
 "Rapid Photo Downloader imports photos and videos from cameras, phones, "
@@ -3729,14 +4430,15 @@ msgstr ""
 #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:5
 msgid ""
-"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;"
-"memory;card;"
+"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;memory"
+";card;"
 msgstr ""
 
 #: ../data/kde/net.damonlynch.rapid-photo-downloader.desktop.in.h:1
 msgid "Download Photos and Videos with Rapid Photo Downloader"
 msgstr ""
 
+#, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
 #~ "Destination: %(destination)s"
@@ -3750,6 +4452,7 @@ msgstr ""
 #~ msgid "MB/s"
 #~ msgstr "MB/s"
 
+#, python-format
 #~ msgid "<i>Example: %s</i>"
 #~ msgstr "<i>Esempio: %s</i>"
 
@@ -3768,6 +4471,7 @@ msgstr ""
 #~ msgid "Using backup device"
 #~ msgstr "Si utilizza un dispositivo di backup"
 
+#, python-format
 #~ msgid "and %s"
 #~ msgstr "e %s"
 
@@ -3811,9 +4515,9 @@ msgstr ""
 #~ "Choose the download folder. Subfolders for the downloaded photos will be "
 #~ "automatically created in this folder using the structure specified below."
 #~ msgstr ""
-#~ "Scelta della cartella di download. Sottocartelle per le fotografie "
-#~ "scaricate saranno create automaticamente in questa cartella utilizzando "
-#~ "la struttura specificata sotto."
+#~ "Scelta della cartella di download. Sottocartelle per le fotografie scaricate "
+#~ "saranno create automaticamente in questa cartella utilizzando la struttura "
+#~ "specificata sotto."
 
 #~ msgid "Download folder:"
 #~ msgstr "Cartella di download:"
@@ -3918,12 +4622,14 @@ msgstr ""
 #~ msgid "Synchronize RAW + JPEG sequence numbers"
 #~ msgstr "Sincronizza i numeri di sequenza RAW + JPEG"
 
+#, python-format
 #~ msgid "Source: %(source)s"
 #~ msgstr "Origine: %(source)s"
 
 #~ msgid "Select a folder to download videos to"
 #~ msgstr "Selezionare una cartella in cui scaricare i video"
 
+#, python-format
 #~ msgid "Select a folder containing %(file_types)s"
 #~ msgstr "Selezionare una cartella contenente %(file_types)s"
 
@@ -3938,8 +4644,8 @@ msgstr ""
 #~ "automatically created in this folder using the structure specified below."
 #~ msgstr ""
 #~ "Scegliere la cartella per il download. Le sottocartelle per i video "
-#~ "scaricati saranno create automaticamente in questa cartella utilizzando "
-#~ "la struttura specificata sotto."
+#~ "scaricati saranno create automaticamente in questa cartella utilizzando la "
+#~ "struttura specificata sotto."
 
 #~ msgid "Automatically detect devices"
 #~ msgstr "Rileva i dispositivi automaticamente"
@@ -3964,9 +4670,11 @@ msgstr ""
 #~ "Scegliere se, durante un salvataggio, si vuole sovrascrivere un file che "
 #~ "abbia lo stesso nome sul dispositivo di salvataggio, o ignorarne la copia."
 
+#, python-format
 #~ msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
+#, python-format
 #~ msgid ""
 #~ "%(date)s\n"
 #~ "%(time)s"
@@ -3974,9 +4682,11 @@ msgstr ""
 #~ "%(date)s\n"
 #~ "%(time)s"
 
+#, python-format
 #~ msgid "%(date)s %(time)s"
 #~ msgstr "%(date)s %(time)s"
 
+#, python-format
 #~ msgid "Error: %(inst)s"
 #~ msgstr "Errore: %(inst)s"
 
@@ -3992,12 +4702,12 @@ msgstr ""
 #~ msgid "_Select"
 #~ msgstr "_Seleziona"
 
-#~ msgid ""
-#~ "Photos detected with the same filenames, but taken at different times"
+#~ 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"
 
+#, python-format
 #~ msgid "%(freespace)s. %(backuppaths)s."
 #~ msgstr "%(freespace)s. %(backuppaths)s."
 
@@ -4010,12 +4720,15 @@ msgstr ""
 #~ msgid "."
 #~ msgstr "."
 
+#, python-format
 #~ msgid "Folder: %s"
 #~ msgstr "Cartella: %s"
 
+#, python-format
 #~ msgid "%s, "
 #~ msgstr "%s, "
 
+#, python-format
 #~ msgid "Path: %s"
 #~ msgstr "Percorso: %s"
 
@@ -4025,21 +4738,26 @@ msgstr ""
 #~ msgid "Previous File"
 #~ msgstr "File precedente"
 
+#, python-format
 #~ msgid "%(free)s free"
 #~ msgstr "%(free)s liberi"
 
+#, python-format
 #~ msgid "(%(file_type)s)"
 #~ msgstr "(%(file_type)s)"
 
+#, python-format
 #~ msgid "%(free)s %(file_type)s"
 #~ msgstr "%(free)s %(file_type)s"
 
+#, python-format
 #~ msgid "Backing up to %(path)s"
 #~ msgstr "Backup su %(path)s"
 
 #~ msgid "Videos:"
 #~ msgstr "Video:"
 
+#, python-format
 #~ msgid ""
 #~ "%(problem)s\n"
 #~ "File: %(file)s"
@@ -4050,18 +4768,23 @@ msgstr ""
 #~ msgid "Select a folder to download photos to"
 #~ msgstr "Selezionare una cartella in cui scaricare le foto"
 
+#, python-format
 #~ msgid "Error generating component %s."
 #~ msgstr "Errore nel generare la componente %s."
 
+#, python-format
 #~ msgid "%(filetype)s %(area)s could not be generated"
 #~ msgstr "%(filetype)s %(area)s non può essere generato"
 
+#, python-format
 #~ msgid "An error occurred when copying the %(filetype)s"
 #~ msgstr "Si è verificato un errore durante la copia di %(filetype)s"
 
+#, python-format
 #~ msgid "%(filetype)s already exists"
 #~ msgstr "%(filetype)s esiste già"
 
+#, python-format
 #~ msgid ""
 #~ "%(filetype)s could not be backed up because no suitable backup locations "
 #~ "were found."
@@ -4069,12 +4792,15 @@ msgstr ""
 #~ "Non si può effettuare il backup di %(filetype)s in quanto non è stata "
 #~ "travata nessuna posizione adatta."
 
+#, python-format
 #~ msgid "%(filetype)s was already downloaded"
 #~ msgstr "%(filetype)s è stato già scaricato"
 
+#, 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."
 
+#, python-format
 #~ msgid "Error: %(errorno)s %(strerror)s"
 #~ msgstr "Errore: %(errorno)s %(strerror)s"
 
@@ -4088,12 +4814,14 @@ msgstr ""
 #~ "Il nome del file, l'estensione e le informazioni Exif indicano che è già "
 #~ "stato scaricato."
 
+#, python-format
 #~ msgid " It was backed up to %(volume)s"
 #~ msgstr " È stato effettuato il backup su %(volume)s"
 
 #~ msgid " It was backed up to these devices: "
 #~ msgstr " È stato effettuato il backup su questi di dispositivi: "
 
+#, python-format
 #~ msgid ""
 #~ "Photos detected with the same filenames, but taken at different times: "
 #~ "%(details)s"
@@ -4103,47 +4831,53 @@ msgstr ""
 
 #~ 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: "
+#~ "Si sono verificati degli errori durante il backup sui seguenti dispositivi "
+#~ "di backup: "
 
+#, python-format
 #~ msgid "%(volume)s (%(inst)s), "
 #~ msgstr "%(volume)s (%(inst)s), "
 
+#, python-format
 #~ msgid "%(volume)s, "
 #~ msgstr "%(volume)s, "
 
+#, python-format
 #~ msgid "%(volumes)s and %(volume)s (%(inst)s)."
 #~ msgstr "%(volumes)s e %(volume)s (%(inst)s)."
 
+#, python-format
 #~ msgid "%(volumes)s and %(volume)s."
 #~ msgstr "%(volumes)s e %(volume)s."
 
+#, python-format
 #~ msgid "Backup already exists on %(volume)s."
 #~ msgstr "Il backup esiste già su %(volume)s."
 
 #~ msgid "Backups already exist in these locations: "
 #~ msgstr "Il backup esiste già in queste posizioni: "
 
+#, 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."
 
 #~ msgid ""
-#~ "Errors occurred when creating directories on the following backup "
-#~ "devices: "
+#~ "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: "
+#~ "Si è verificato un errore durante la creazione delle directory sui seguenti "
+#~ "dispositivi di backup: "
 
+#, python-format
 #~ msgid " Furthermore, there were %(problems)s."
 #~ msgstr " Inoltre, si è verificato %(problems)s."
 
 #~ msgid "The following metadata is missing: "
 #~ msgstr "I seguenti metadata sono mancanti: "
 
-#~ msgid ""
-#~ "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
+#, python-format
+#~ msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
 #~ msgstr "%(missing_metadata_elements)s e %(final_missing_metadata_element)s."
 
 #~ msgid "Problems in subfolder and filename generation"
@@ -4152,11 +4886,12 @@ msgstr ""
 #~ msgid "Problem in subfolder and filename generation"
 #~ msgstr "Problema nella generazione della sottocartella e del nome del file"
 
+#, python-format
 #~ msgid "%(filetype)s already exists, but it was backed up"
 #~ msgstr "%(filetype)s esiste già, ma si è effettuato il backup"
 
-#~ msgid ""
-#~ "An error occurred when copying the %(filetype)s, but it was backed up"
+#, 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"
@@ -4164,6 +4899,7 @@ msgstr ""
 #~ msgid "Multiple problems were encountered"
 #~ msgstr "Si sono verificati molteplici errori"
 
+#, python-format
 #~ msgid "%(previousproblem)s, and %(backinguperror)s"
 #~ msgstr "%(previousproblem)s, e %(backinguperror)s"
 
@@ -4262,14 +4998,14 @@ msgstr ""
 #~ "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>"
+#~ "used for backups. For each device you wish to use for backing up to, create "
+#~ "a folder in it with one of these names.</i>"
 #~ msgstr ""
 #~ "Specificare la cartella in cui memorizzare i backup sul dispositivo.  \n"
 #~ "\n"
-#~ "<i>Nota: sarà usato anche per determinare se il dispositivo è utilizzato "
-#~ "o meno per i backup. Per ogni dispositivo che vuoi utilizzare per i "
-#~ "backup, crea una cartella al suo interno con uno di questi nomi.</i>"
+#~ "<i>Nota: sarà usato anche per determinare se il dispositivo è utilizzato o "
+#~ "meno per i backup. Per ogni dispositivo che vuoi utilizzare per i backup, "
+#~ "crea una cartella al suo interno con uno di questi nomi.</i>"
 
 #~ msgid "Unmount (\"eject\") device upon download completion"
 #~ msgstr "Smonta (\"espelli\") il dispositivo al completamento del download"
@@ -4284,13 +5020,11 @@ msgstr ""
 #~ msgstr "Nome della cartella di backup dei video:"
 
 #~ 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."
+#~ "When a photo or video of the same name has already been downloaded, choose "
+#~ "whether to skip downloading the file, or to add a unique indentifier."
 #~ msgstr ""
-#~ "Quando una fotografia o un video con lo stesso nome è già stata "
-#~ "scaricata, scegli se saltare il download oppure aggiungere un "
-#~ "identificatore unico."
+#~ "Quando una fotografia o un video con lo stesso nome è già stata scaricata, "
+#~ "scegli se saltare il download oppure aggiungere un identificatore unico."
 
 #~ msgid "_Add..."
 #~ msgstr "_Aggiungere..."
@@ -4322,12 +5056,14 @@ msgstr ""
 #~ msgid "Should all ignored paths be removed?"
 #~ msgstr "Occorre rimuovere tutti i percorsi ignorati?"
 
+#, python-format
 #~ msgid "Backup overwritten on %(volume)s."
 #~ msgstr "Salvataggio sovrascritto su %(volume)s."
 
+#, python-format
 #~ msgid ""
-#~ "The existing %(filetype)s was last modified on %(date)s at %(time)s. "
-#~ "Unique identifier '%(identifier)s' added."
+#~ "The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
+#~ "identifier '%(identifier)s' added."
 #~ msgstr ""
 #~ "La data di ultima modifica dei %(filetype)s esistenti è %(date)s alle "
 #~ "%(time)s. E' stato aggiunto l'identificatoe univoco '%(identifier)s'."
@@ -4335,24 +5071,30 @@ msgstr ""
 #~ msgid "Invalid regular expression"
 #~ msgstr "Espressione regolare non valida"
 
+#, 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."
 
+#, python-format
 #~ msgid "An error occurred when backing up on %(volume)s."
 #~ msgstr "Si è verificato un errore salvando su %(volume)s."
 
+#, 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."
 
+#, python-format
 #~ msgid "%(volumes)s and %(final_volume)s."
 #~ msgstr "%(volumes)s e %(final_volume)s."
 
 #~ msgid "Backups overwritten on these devices: "
 #~ msgstr "Salvataggi sovrascritti su questi dispositivi: "
 
+#, python-format
 #~ msgid "Problem in %s generation"
 #~ msgstr "Problema nella generazione %s"
 
+#, python-format
 #~ msgid "Problems in %s generation"
 #~ msgstr "Problemi nella generazione %s"
 
@@ -4368,6 +5110,7 @@ msgstr ""
 #~ msgid "There was an error backing up"
 #~ msgstr "Si è verificato un errore salvando"
 
+#, python-format
 #~ msgid "%(previousproblem)s Additionally, %(newproblem)s"
 #~ msgstr "%(previousproblem)s Inoltre, %(newproblem)s"
 
@@ -4385,8 +5128,8 @@ msgstr ""
 #~ msgstr "Ruota automaticamente le immagini JPEG"
 
 #~ msgid ""
-#~ "If you disable automatic detection, choose the exact location of the "
-#~ "photos and videos."
+#~ "If you disable automatic detection, choose the exact location of the photos "
+#~ "and videos."
 #~ msgstr ""
 #~ "Se si disabilita la rilevazione automatica, scegliere la posizione esatte "
 #~ "delle fotografie e dei video."
@@ -4395,12 +5138,12 @@ msgstr ""
 #~ "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."
+#~ "When this option is enabled, and a potential device is detected, you will be "
+#~ "prompted to determine if it should be scanned or not."
 #~ msgstr ""
 #~ "Se abiliti la rilevazione automatica dei Dispositivi di Memorizzazione "
-#~ "Portatile (PSD), sarà analizzato tutto il dispositivo. Su grossi "
-#~ "dispositivi ciò potrebbe richiedere un po' di tempo.\n"
+#~ "Portatile (PSD), sarà analizzato tutto il dispositivo. Su grossi dispositivi "
+#~ "ciò potrebbe richiedere un po' di tempo.\n"
 #~ "\n"
 #~ "Quando questa opzione è abilitata, ed un dispositivo potenziale  viene "
 #~ "rilevato, ti verrà richiesto di determinare se questo dovrà essere "
@@ -4410,26 +5153,26 @@ msgstr ""
 #~ "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"
+#~ "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>"
+#~ "<i>Downloading directly from cameras is currently an experimental feature. "
+#~ "If downloading directly from your camera works poorly or not at all, try "
+#~ "setting it to PTP mode. If that is not possible, a card reader must be "
+#~ "used.</i>"
 #~ msgstr ""
 #~ "I dispositivi indicano da dove si scaricano fotografie e video, come "
 #~ "macchine fotografiche, schede di memoria o Dispositivi di Memorizzazione "
 #~ "Portatile (PSD).\n"
 #~ "\n"
-#~ "Puoi scaricare da più dispositivi simultaneamente, oppure puoi "
-#~ "specificare una posizione sul tuo disco fisso.\n"
+#~ "Puoi scaricare da più dispositivi simultaneamente, oppure puoi specificare "
+#~ "una posizione sul tuo disco fisso.\n"
 #~ "\n"
 #~ "<i>Scaricare direttamente dalla macchina fotografica è attualmenet una "
-#~ "caratteristica sperimentale. Se scaricando direttamente dalla tua "
-#~ "macchina fotografica funziona male o per niente, prova ad impostarla in "
-#~ "modalità PTP.  Se ciò non fosse possibile, occorre utilizzare un lettore "
-#~ "di schede di memoria.</i>"
+#~ "caratteristica sperimentale. Se scaricando direttamente dalla tua macchina "
+#~ "fotografica funziona male o per niente, prova ad impostarla in modalità PTP. "
+#~ " Se ciò non fosse possibile, occorre utilizzare un lettore di schede di "
+#~ "memoria.</i>"
 
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Device Options</span>"
 #~ msgstr "<span weight=\"bold\" size=\"x-large\">Opzioni Dispositivo</span>"
@@ -4439,12 +5182,12 @@ msgstr ""
 
 #~ 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."
+#~ "devices for photos or videos. Any path ending with the values below will not "
+#~ "be scanned."
 #~ msgstr ""
 #~ "Specifica la porzione finale dei percorsi che vuoi ignorare quando si "
-#~ "analizzano i dispositivi per le fotografie o i video. Qualsiasi percorso "
-#~ "che termini con i valori di seguito non sarà analizzato."
+#~ "analizzano i dispositivi per le fotografie o i video. Qualsiasi percorso che "
+#~ "termini con i valori di seguito non sarà analizzato."
 
 #~ msgid "Use _python-style regular expressions"
 #~ msgstr "Utilizza espressioni regolari _python-style"
@@ -4453,14 +5196,15 @@ msgstr ""
 #~ msgstr "Percorsi Memorizzati"
 
 #~ 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>."
+#~ "Sorry, video downloading functionality disabled. To download videos, please "
+#~ "install either the <i>hachoir metadata</i> and <i>kaa metadata</i> packages "
+#~ "for python, or <i>exiftool</i>."
 #~ msgstr ""
 #~ "Spiacenti, la funzionalità dello scarico dei video è disabilitata. Per "
 #~ "scaricare i video, si prega di installare i pacchetti python  <i>hachoir "
 #~ "metadata</i> e <i>kaa metadata</i>, oppure <i>exiftool</i>."
 
+#, python-format
 #~ msgid " Furthermore, there was a %(problem)s."
 #~ msgstr " Inoltre, si è verificato un %(problem)s."
 
@@ -4468,21 +5212,24 @@ msgstr ""
 #~ msgstr "Ri_muovi Tutto"
 
 #~ 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."
+#~ "Remembered paths are those associated with devices that you have chosen to "
+#~ "always scan or ignore when automatic detection of Portable Storage Devices "
+#~ "is enabled."
 #~ msgstr ""
 #~ "I percorsi memorizzati sono quelli associati con i dispositivi che hai "
 #~ "scelto di analizzare sempre oppure di ignorare quando la rilevazione "
 #~ "automatica dei Dispositivi di Memorizzazione Portatile (PSD) è abilitata."
 
+#, python-format
 #~ msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
 #~ msgstr ""
 #~ "scansione in corso (trovate %(photos)s fotografie e %(videos)s video)..."
 
+#, python-format
 #~ msgid "%(device)s did not unmount"
 #~ msgstr "%(device)s non è stato smontato correttamente"
 
+#, python-format
 #~ msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(date)s %(hour)s.%(minute)s.%(second)s.%(subsecond)s"
 
@@ -4492,6 +5239,7 @@ msgstr ""
 #~ msgid "scanning..."
 #~ msgstr "Analisi..."
 
+#, python-format
 #~ msgid "Downloading from %(location)s."
 #~ msgstr "Scaricamento da %(location)s."
 
@@ -4505,39 +5253,49 @@ msgstr ""
 #~ msgid "Download cannot proceed"
 #~ msgstr "Impossibile procedere con lo scaricamento"
 
+#, python-format
 #~ msgid "About %i seconds remaining"
 #~ msgstr "Mancano circa %i secondi"
 
 #~ msgid "About 1 second remaining"
 #~ msgstr "Manca circa 1 secondo"
 
+#, python-format
 #~ msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 #~ msgstr "Mancano circa %(minutes)i.%(seconds)02i minuti"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 #~ msgstr "%(number)s su %(total)s %(filetypes)s (%(remaining)s rimanenti)"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s"
 #~ msgstr "%(number)s su %(total)s %(filetypes)s"
 
 #~ msgid "To"
 #~ msgstr "Su"
 
+#, python-format
 #~ msgid "Backing up photos to %(path)s and videos to %(path2)s"
 #~ msgstr "Backup delle fotografie su %(path)s, dei video su %(path2)s"
 
+#, python-format
 #~ msgid "Backing up photos and videos to %(path)s"
 #~ msgstr "Backup di fotografie e video su %(path)s"
 
+#, python-format
 #~ msgid "%(file_type)s download folder is not writable"
 #~ msgstr "la cartella per scaricare %(file_type)s non è scrivibile"
 
+#, python-format
 #~ msgid "%(file_type)s download folder is invalid"
 #~ msgstr "la cartella per scaricare %(file_type)s non è valida"
 
+#, python-format
 #~ msgid "%(file_type)s download folder does not exist"
 #~ msgstr "la cartella per scaricare %(file_type)s non esiste"
 
+#, python-format
 #~ msgid ""
 #~ "display program information on the command line as the program runs "
 #~ "(default: %default)"
@@ -4568,6 +5326,7 @@ msgstr ""
 #~ "Elenca le estensioni delle foto e dei video riconosciuti dal programma ed "
 #~ "esce"
 
+#, python-format
 #~ msgid "Destination directory could not be created: %(directory)s\n"
 #~ msgstr "Impossibile creare la directory di destinazione: %(directory)s\n"
 
@@ -4575,8 +5334,8 @@ msgstr ""
 #~ msgstr "Visualizza solo gli errori sulla riga comando"
 
 #~ msgid ""
-#~ "manually specify the PATH of the device from which to download, "
-#~ "overwriting existing program preferences"
+#~ "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 esistenti del programma"
@@ -4627,66 +5386,75 @@ msgstr ""
 #~ msgid "Enter a Job Code"
 #~ msgstr "Inserire un codice lavoro"
 
+#, 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"
 
+#, python-format
 #~ msgid ""
-#~ "This regular expression is invalid, and will be removed unless you "
-#~ "correct it:\n"
+#~ "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"
 
+#, 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 sotto-cartella %(filetype)s inserite non sono valide "
-#~ "e non possono essere utilizzate.\n"
+#~ "Le preferenze della sotto-cartella %(filetype)s inserite non sono valide e "
+#~ "non possono essere utilizzate.\n"
 #~ "Vengono ripristinati i valori predefiniti."
 
 #~ 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> meta-dati insufficienti per generare completamente "
-#~ "il nome. 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>"
 
 #~ 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> meta-dati insufficienti per generare completamente "
-#~ "le sotto-cartelle. Utilizzare altre opzioni per identificare le sotto-"
+#~ "<i><b>Attenzione:</b> meta-dati insufficienti per generare completamente le "
+#~ "sotto-cartelle. Utilizzare altre opzioni per identificare le sotto-"
 #~ "cartelle.</i>"
 
 #~ msgid "Sydney"
 #~ msgstr "Sydney"
 
+#, python-format
 #~ msgid "Date time value %s appears invalid."
 #~ msgstr "Il valore della data %s non sembra essere valido"
 
+#, python-format
 #~ msgid "%(filetype)s metadata cannot be read"
 #~ msgstr "i meta-dati %(filetype)s non sono leggibili"
 
+#, python-format
 #~ msgid "Backup %(file_type)s overwritten"
 #~ msgstr "Backup %(file_type)s sovrascritto"
 
+#, python-format
 #~ msgid "%(file_type)s not backed up"
 #~ msgstr "Backup di %(file_type)s non eseguito"
 
+#, python-format
 #~ msgid "Backup of %(file_type)s already exists"
 #~ msgstr "Il backup di %(file_type)s esiste già"
 
+#, python-format
 #~ msgid "The %(filetype)s did not download correctly"
 #~ msgstr "%(filetype)s non è stato scaricato correttamente"
 
@@ -4714,6 +5482,7 @@ msgstr ""
 #~ msgid "Verify files as they are downloaded"
 #~ msgstr "Controllare i file mentre vengono scaricati"
 
+#, 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 "
@@ -4726,9 +5495,10 @@ msgstr ""
 #~ "Controllo del file non riuscito. La versione scaricata è diversa "
 #~ "dall'originale."
 
+#, python-format
 #~ msgid ""
-#~ "File verification failed on %(volume)s. The backed up version is "
-#~ "different from the downloaded version."
+#~ "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."
diff --git a/po/ja.po b/po/ja.po
index f1f014f..a6052b4 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,138 +7,511 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: damonlynch@gmail.com\n"
-"POT-Creation-Date: 2017-07-08 19:16-0500\n"
-"PO-Revision-Date: 2017-07-04 11:06+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2017-09-12 17:01-0400\n"
+"PO-Revision-Date: 2017-09-13 18:45+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: Japanese <ja@li.org>\n"
-"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-07-05 23:04+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-09-26 22:04+0000\n"
+"X-Generator: Launchpad (build 18463)\n"
+"Language: ja\n"
+
+#: ../install.py:65
+msgid "Rapid Photo Downloader installer"
+msgstr "高速写真ダウンローダ・インストーラ"
+
+#: ../install.py:66
+msgid "Download and install latest version of Rapid Photo Downloader."
+msgstr "高速写真ダウンローダの最新版をダウンロードして導入します．"
+
+#: ../install.py:236 ../install.py:1732
+msgid "Installer not found:"
+msgstr "インストーラが見つかりません："
+
+#. Translators: do not translate the term tar.gz
+#: ../install.py:240 ../install.py:1736
+msgid "Installer not in tar.gz format:"
+msgstr "インストーラがtar.gz形式になっていません："
+
+#: ../install.py:465
+msgid ""
+"Incorrect folder ownership detected. Changing ownership of and resetting "
+"permissions for"
+msgstr "フォルダ所有者が正しくないことを検知しました．次の所有権を変更し権限をリセットします："
+
+#: ../install.py:540
+msgid "The following command will be run:"
+msgstr "次のコマンドが実行されます："
+
+#: ../install.py:543 ../install.py:1479 ../install.py:1484
+msgid "sudo may prompt you for the sudo password."
+msgstr "sudoがsudoパスワードを尋ねるかもしれません．"
+
+#: ../install.py:547
+msgid "Would you like to run the command now?"
+msgstr "このコマンドをいま実行しますか？"
+
+#: ../install.py:549
+msgid "Answer is not yes, exiting."
+msgstr "回答が「はい」ではありませんでしたので終了します．"
+
+#: ../install.py:559 ../install.py:751 ../install.py:966
+msgid "Command failed"
+msgstr "コマンド失敗"
+
+#: ../install.py:561 ../install.py:752 ../install.py:967
+msgid "Exiting"
+msgstr "終了します"
+
+#: ../install.py:582
+msgid "The Universe repository must be enabled."
+msgstr "Universeリポジトリを有効にしなくてはなりません．"
+
+#: ../install.py:606
+msgid ""
+"Do you want to to uninstall the previous version of Rapid Photo Downloader:"
+msgstr "高速写真ダウンローダの旧版をアンインストールしますか？"
+
+#: ../install.py:715 ../install.py:740
+msgid ""
+"Querying package system to see if an older version of Rapid Photo Downloader "
+"is installed (this may take a while)..."
+msgstr "旧版の高速写真ダウンローダが導入済みかパッケージシステムに問い合わせています（これには時間を要することがあります）…"
+
+#: ../install.py:726
+msgid ""
+"Unable to query package system. Please check your Internet connection and "
+"try again"
+msgstr "パッケージシステムに問い合わせができませんでした．インターネット接続を確認して再度実行してください"
+
+#: ../install.py:756
+msgid "Checking if previous version installed with pip..."
+msgstr "旧版が導入済みかpipで確認しています…"
+
+#: ../install.py:850
+msgid "The following package is unknown on your system: {}\n"
+msgstr "次のパッケージはシステム上で既知ではありません：{}\n"
+
+#: ../install.py:857 ../install.py:929 ../install.py:974
+msgid ""
+"To continue, some packages required to run the application will be installed."
+msgstr "続けると，アプリケーションを実行するのに必要なパッケージが導入されます．"
+
+#: ../install.py:886
+msgid "Querying installed and available packages (this may take a while)"
+msgstr "導入済みで利用できるパッケージを問い合わせています（これには時間を要することがあります）"
+
+#: ../install.py:958
+msgid ""
+"Querying zypper to see if any required packages are already installed (this "
+"may take a while)... "
+msgstr "必要なパッケージが導入済みかzypperに問い合わせています（これには時間を要することがあります）… "
+
+#: ../install.py:1004
+msgid "Query to confirm action at each step."
+msgstr "各段階での操作確認を求める"
+
+#: ../install.py:1011
+msgid ""
+"When downloading the latest version, install the development version if it "
+"is newer than the stable version."
+msgstr "最新版をダウンロードする際，開発版が安定版よりも新しければ，そちらをインストールする"
+
+#: ../install.py:1020
+msgid ""
+"Optional tar.gz Rapid Photo Downloader installer archive. If not specified, "
+"the latest version is downloaded from the Internet."
+msgstr ""
+"オプションの高速写真ダウンローダのインストーラのtar.gz版アーカイブ．これを指定しない場合は，最新版がインターネットからダウンロードされます．"
+
+#: ../install.py:1043
+msgid ""
+"Do not run the installer in the tar.gz Rapid Photo Downloader installer "
+"archive if it is newer than this version ({}). The default is to run "
+"whichever installer is newer."
+msgstr ""
+"高速写真ダウンローダのインストーラのtar.gz版アーカイブが，このバージョン（{}）よりも新しいときでも，アーカイブ内のインストーラは実行しない．既定値"
+"では，新しい方のインストーラを実行します．"
+
+#: ../install.py:1050
+msgid ""
+"Uninstall Rapid Photo Downloader that was installed with pip, keeping its "
+"dependencies."
+msgstr "pipでインストールした高速写真ダウンローダを，依存プログラムは保持したまま，アンインストールします．"
+
+#: ../install.py:1054
+msgid ""
+"Uninstall the dependencies installed by pip during Rapid Photo Downloader's "
+"installation, and Rapid Photo Downloader itself, then exit."
+msgstr ""
+"高速写真ダウンローダをpipでインストール中にインストールした依存プログラムをアンインストールし，高速写真ダウンローダ自身もアンインストールして，終了しま"
+"す．"
+
+#: ../install.py:1059
+msgid ""
+"Note: this will not uninstall any version of Rapid Photo Downloader "
+"installed by your Linux distribution's package manager."
+msgstr "【註】この操作では，Linux頒布版のパッケージマネージャがインストールした高速写真ダウンローダは，アンインストールされません．"
+
+#: ../install.py:1066
+msgid ""
+"Dependencies will only be removed if they are not required by other programs."
+msgstr "依存プログラムは，他のプログラムによって必要とされていない場合にのみ削除されます．"
+
+#: ../install.py:1072
+msgid ""
+"Note: this option will remove the dependencies regardless of whether they "
+"are required by another program pip has installed. Upgrade to pip 9.0 or "
+"above if you want to avoid this behavior. You can do so using the command "
+"'python3 -m pip install pip -U --user'. Also note that any version of Rapid "
+"Photo Downloader installed by your Linux distribution's package manager will "
+"not be uninstalled."
+msgstr ""
+"【註】このオプションは，pipがインストールした他のプログラムに必要とされているか否かに関わらず，依存プログラムを削除します．この挙動を回避したい場合には"
+"，pip 9.0以上にアップグレードしてください．コマンド「python3 -m pip install pip -U --"
+"user」でアップグレードできます．また，Linux頒布版のパッケージマネージャがインストールした高速写真ダウンローダは，アンインストールされないことに注"
+"意してください．"
+
+#: ../install.py:1122
+msgid "Failed to download versions file"
+msgstr "バージョンファイルのダウンロードに失敗しました"
+
+#: ../install.py:1126
+msgid "Got error code {} while accessing versions file"
+msgstr "バージョンファイルへのアクセス中に，エラーコード{}を受け取りました．"
+
+#: ../install.py:1234
+msgid ""
+"Sorry, could not locate installer. Please check your Internet connection and "
+"verify if you can reach https://www.damonlynch.net\n"
+"\n"
+"Exiting.\n"
+msgstr ""
+"ごめんなさい．インストーラが見つかりませんでした．インターネット接続を確認して，https://www.damonlynch.netにたどり着けることを確"
+"かめてください．\n"
+"\n"
+"終了します．\n"
+
+#: ../install.py:1408
+msgid "Installing application requirements..."
+msgstr "アプリケーションの必要物を導入しています…"
+
+#: ../install.py:1424
+msgid "Received error code"
+msgstr "エラーコードを受け取りました"
+
+#: ../install.py:1425
+msgid "Failed to install application requirements: exiting"
+msgstr "アプリケーションの必要物を導入するのに失敗しました：終了します"
+
+#: ../install.py:1428
+msgid "Installing application..."
+msgstr "アプリケーションを導入しています…"
+
+#: ../install.py:1441
+msgid "Failed to install application: exiting..."
+msgstr "アプリケーションの導入に失敗しました：終了します…"
+
+#: ../install.py:1465
+msgid ""
+"You may have to restart the computer to be able to run the program from the "
+"commmand line or application launcher."
+msgstr "プログラムをコマンドラインやアプリケーション・ロンチャーから起動するためには，コンピュータを再起動する必要があるかもしれません．"
+
+#: ../install.py:1476
+msgid "Do you want to install the application's man pages?"
+msgstr "アプリケーションのmanページを導入しますか？"
+
+#: ../install.py:1477
+msgid "They will be installed into {}"
+msgstr "これらは{}に導入されます"
+
+#: ../install.py:1478 ../install.py:1483
+msgid "If you uninstall the application, remove these manpages yourself."
+msgstr "アプリケーションをアンインストールした場合には，これらのmanページをご自身で削除してください．"
+
+#: ../install.py:1480
+msgid "Do want to install the man pages?"
+msgstr "manページもインストールしますか？"
+
+#: ../install.py:1482
+msgid "Installing man pages into {}"
+msgstr "manページを{}にインストールしています"
+
+#: ../install.py:1499
+msgid "Failed to create man page directory: exiting"
+msgstr "manページディレクトリを作成できませんでした：終了します"
+
+#: ../install.py:1511
+msgid "Failed to copy man page."
+msgstr "manページをコピーできませんでした"
+
+#: ../install.py:1521
+msgid "(If a segmentation fault occurs at exit, you can ignore it...)"
+msgstr "（終了時にセグメンテーションフォルトが起きたとしても，無視して構いません…）"
+
+#: ../install.py:1534
+msgid ""
+"The python3 tool pip is required to uninstall a version of Rapid Photo "
+"Downloader that was installed with pip.\n"
+"Cannot continue. Exiting."
+msgstr ""
+"pipでインストールした高速写真ダウンローダをアンインストールするには，python3ツールのpipが必要です．\n"
+"先に進めません．終了します．"
+
+#: ../install.py:1575
+msgid ""
+"Do not run this installer script as sudo / root user.\n"
+"Run it using the user who will run the program.\n"
+msgstr ""
+"このインストールスクリプトをsudoもしくはrootユーザとして実行してはいけません．\n"
+"このプログラムを実行するユーザとして実行してください．\n"
+
+#: ../install.py:1585 ../install.py:1599
+msgid "Do not include any other command line arguments when specifying"
+msgstr "指定時に他のコマンドライン引数を入れないでください"
+
+#: ../install.py:1614
+msgid ""
+"Sorry, this installer does not support a custom python installation.\n"
+"Exiting..."
+msgstr ""
+"ごめんなさい，このインストーラはカスタムpythonインストールはサポートしていません．\n"
+"終了します…"
+
+#: ../install.py:1620
+msgid "Restarting script using system python..."
+msgstr "システムpythonを使用してスクリプトを再開します…"
+
+#: ../install.py:1651
+msgid "Exiting..."
+msgstr "終了します..."
+
+#. Translators: do not translate the term python3-apt
+#: ../install.py:1670
+msgid "To continue, the package python3-apt must be installed."
+msgstr "続けるには，python3-aptパッケージが導入済みでなくてはなりません．"
+
+#: ../install.py:1689
+msgid ""
+"Install the following packages using your Linux distribution's standard "
+"package manager, and then rerun this installer"
+msgstr "Linux頒布版の標準パッケージマネージャを使用して，以下のパッケージを導入し，このインストーラを再実行してください"
+
+#: ../install.py:1698
+msgid ""
+"To run this program, programs to assist Python 3 and its package management "
+"must be installed."
+msgstr "このプログラムを実行するには，Python3とそのパッケージ管理を行うプログラムが導入済みでなくてはなりません．"
+
+#. Translators: do not translate the terms Python 3, pip and setuptools
+#: ../install.py:1713
+msgid "Python 3's pip and setuptools must be upgraded for your user."
+msgstr "Python3のpipとsetuptoolsが更新されなくてはなりません．"
+
+#. Translators: do not translate the term python or requests
+#: ../install.py:1726
+msgid "Installing python requests"
+msgstr "python requestsを導入しています"
+
+#: ../upgrade.py:79
+msgid "Upgrade Rapid Photo Downloader"
+msgstr "高速写真ダウンローダを更新"
+
+#: ../upgrade.py:401 ../raphodo/viewutils.py:242
+msgid "&Cancel"
+msgstr "中止(&C)"
+
+#: ../upgrade.py:405
+msgid "&Upgrade"
+msgstr "更新(&U)"
+
+#: ../upgrade.py:410
+#, python-format
+msgid "Click the Upgrade button to upgrade to version %s."
+msgstr "バージョン%sに更新するには，更新ボタンをクリックしてください"
+
+#: ../upgrade.py:413
+msgid "Click the Upgrade button to start the upgrade."
+msgstr "更新を開始するには，更新ボタンをクリックしてください．"
+
+#: ../upgrade.py:416 ../upgrade.py:422 ../raphodo/viewutils.py:241
+msgid "&Close"
+msgstr "閉じる(&C)"
+
+#: ../upgrade.py:417
+msgid "&Run"
+msgstr "実行(&R)"
+
+#: ../upgrade.py:447
+msgid "Close Rapid Photo Downloader before running this upgrade"
+msgstr "この更新を実行する前に高速写真ダウンローダを終了してください"
+
+#: ../upgrade.py:450
+msgid "Upgrade running..."
+msgstr "更新中です…"
+
+#: ../upgrade.py:486
+#, python-format
+msgid ""
+"Successfully upgraded to %s. Click Close to exit, or Run to start the "
+"program."
+msgstr "%sへの更新に成功しました．終了するには閉じるをクリックしてください．プログラムを実行するには実行をクリックしてください．"
+
+#: ../upgrade.py:491
+msgid ""
+"Upgrade finished successfully. Click Close to exit, or Run to start the "
+"program."
+msgstr "更新は成功しました．終了するには閉じるをクリックしてください．プログラムを実行するには実行をクリックしてください．"
+
+#: ../upgrade.py:495
+msgid "Upgrade failed. Click Close to exit."
+msgstr "更新に失敗しました．閉じるをクリックして終了してください．"
+
+#: ../upgrade.py:6967
+#, python-format
+msgid "Upgrading %s..."
+msgstr "%sを更新中…"
+
+#: ../upgrade.py:6969
+msgid "Press any key to continue..."
+msgstr "何かキーを押して続けてください…"
 
-#. type: QPushButton
-#: ../raphodo/aboutdialog.py:217
+#: ../upgrade.py:6982
+msgid "Rapid Photo Downloader upgrade failed"
+msgstr "高速写真ダウンローダの更新に失敗しました"
+
+#: ../upgrade.py:6984
+#, python-format
+msgid ""
+"The python package %s could not be updated. The upgrade cannot continue."
+msgstr "pythonパッケージ%sを更新できませんでした．アップグレードを続けることができません．"
+
+#: ../raphodo/aboutdialog.py:225
 msgid "Credits"
 msgstr "クレジット"
 
-#: ../raphodo/backuppanel.py:239
+#: ../raphodo/backuppanel.py:240
 msgid "Backups are not configured"
 msgstr "バックアップの設定が為されていません"
 
-#: ../raphodo/backuppanel.py:241
+#: ../raphodo/backuppanel.py:242
 msgid "No backup devices detected"
 msgstr "バックアップデバイスを検出できません"
 
-#: ../raphodo/backuppanel.py:243
+#: ../raphodo/backuppanel.py:244
 msgid "Valid backup locations not yet specified"
 msgstr "有効なバックアップ場所がまだ指定されていません"
 
-#: ../raphodo/backuppanel.py:401
+#: ../raphodo/backuppanel.py:404
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
-msgstr ""
-"ダウンロードに際して，写真や動画を複数の場所(例: 外部ハードディスク)にバック"
-"アップすることができます．"
+msgstr "ダウンロードに際して，写真や動画を複数の場所(例: 外部ハードディスク)にバックアップすることができます．"
 
-#: ../raphodo/backuppanel.py:407
+#: ../raphodo/backuppanel.py:412
 msgid "Back up photos and videos when downloading"
 msgstr "ダウンロードの際，写真や動画をバックアップ"
 
-#: ../raphodo/backuppanel.py:413
+#: ../raphodo/backuppanel.py:418
 msgid "Automatically detect backup devices"
 msgstr "バックアップデバイスを自動検出"
 
-#: ../raphodo/backuppanel.py:417
+#: ../raphodo/backuppanel.py:424
 msgid ""
-"Specify the folder in which backups are stored on the device."
-"<br><br><i>Note: the presence of a folder with this name is used to "
+"Specify the folder in which backups are stored on the "
+"device.<br><br><i>Note: the presence of a folder with this name is used to "
 "determine if 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 folder names. By "
 "adding both folders, the same device can be used to back up both photos and "
 "videos.</i>"
 msgstr ""
-"デバイス上でバックアップを保管するフォルダを指定してください．"
-"<br><br><strong>註：この名前のフォルダがあるかどうかで，そのデバイスがバック"
-"アップ用か否かを判定します．バックアップ先として使用したいデバイス全てに，こ"
-"れらのフォルダ名のいずれかを持つフォルダを作成してください．両方のフォルダを"
-"作成すると，写真と動画の両方を同じデバイスにバックアップすることができます．"
-"</strong>"
-
-#: ../raphodo/backuppanel.py:428
+"デバイス上でバックアップを保管するフォルダを指定してください．<br><br><strong>註：この名前のフォルダがあるかどうかで，そのデバイスがバック"
+"アップ用か否かを判定します．バックアップ先として使用したいデバイス全てに，これらのフォルダ名のいずれかを持つフォルダを作成してください．両方のフォルダを作"
+"成すると，写真と動画の両方を同じデバイスにバックアップすることができます．</strong>"
+
+#: ../raphodo/backuppanel.py:439
 msgid "Photo folder name:"
 msgstr "写真フォルダ名："
 
-#: ../raphodo/backuppanel.py:433
+#: ../raphodo/backuppanel.py:444
 msgid "Video folder name:"
 msgstr "動画フォルダ名："
 
-#: ../raphodo/backuppanel.py:438 ../raphodo/nameeditor.py:883
+#: ../raphodo/backuppanel.py:449 ../raphodo/nameeditor.py:890
 #: ../raphodo/renamepanel.py:123
 msgid "Example:"
 msgstr "例："
 
-#: ../raphodo/backuppanel.py:448
-msgid "If you disable automatic detection, choose the exact backup locations."
-msgstr ""
-"自動検出を無効にした場合には，正確なバックアップ場所を選択してください．"
+#: ../raphodo/backuppanel.py:460
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
+msgstr "自動検出を無効にした場合には，正確なバックアップ場所を選択してください．"
 
-#: ../raphodo/backuppanel.py:452
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:468
 msgid "Photo backup location:"
 msgstr "写真のバックアップ場所："
 
-#: ../raphodo/backuppanel.py:454
+#: ../raphodo/backuppanel.py:474
 msgid "Select Photo Backup Location"
 msgstr "写真のバックアップ場所を選択してください"
 
-#: ../raphodo/backuppanel.py:460
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:485
 msgid "Video backup location:"
 msgstr "動画のバックアップ場所："
 
-#: ../raphodo/backuppanel.py:462
+#: ../raphodo/backuppanel.py:491
 msgid "Select Video Backup Location"
 msgstr "動画のバックアップ場所を選んでください"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:564
+#: ../raphodo/backuppanel.py:595
 msgid "drive1"
 msgstr "ドライブ１"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:567
+#: ../raphodo/backuppanel.py:598
 msgid "drive2"
 msgstr "ドライブ２"
 
-#: ../raphodo/backuppanel.py:628
+#: ../raphodo/backuppanel.py:663
 msgid "Projected Backup Storage Use"
 msgstr "バックアップの予測使用容量"
 
-#: ../raphodo/backuppanel.py:632
+#: ../raphodo/backuppanel.py:669
 msgid "Backup Options"
 msgstr "バックアップ オプション"
 
 #. translators: refers to the video thumbnail file that some
 #. cameras generate -- it has a .THM file extension
-#: ../raphodo/copyfiles.py:476
+#: ../raphodo/copyfiles.py:491
 msgid "video THM"
 msgstr "動画THM"
 
-#: ../raphodo/copyfiles.py:482
+#: ../raphodo/copyfiles.py:497
 msgid "audio"
 msgstr "音声"
 
 #: ../raphodo/destinationdisplay.py:78 ../raphodo/devicedisplay.py:1079
-#: ../raphodo/rpdfile.py:321
+#: ../raphodo/rpdfile.py:342
 #, python-format
 msgid "%(no_photos)s Photos"
 msgstr "%(no_photos)s個の写真"
 
 #: ../raphodo/destinationdisplay.py:82 ../raphodo/devicedisplay.py:1081
-#: ../raphodo/rpdfile.py:316
+#: ../raphodo/rpdfile.py:333
 #, python-format
 msgid "%(no_videos)s Videos"
 msgstr "%(no_videos)s個の動画"
@@ -166,15 +539,15 @@ msgid "%(size_free)s free of %(size_total)s"
 msgstr "%(size_total)s中%(size_free)sの空き"
 
 #: ../raphodo/destinationdisplay.py:190 ../raphodo/devicedisplay.py:993
-#: ../raphodo/rapid.py:1964 ../raphodo/rapid.py:2079 ../raphodo/rapid.py:5753
-#: ../raphodo/rpdfile.py:905
+#: ../raphodo/rapid.py:2023 ../raphodo/rapid.py:2151 ../raphodo/rapid.py:6043
+#: ../raphodo/rpdfile.py:930
 msgid "Photos"
 msgstr "写真"
 
 #. translators: the name of the Videos folder
 #: ../raphodo/destinationdisplay.py:191 ../raphodo/devicedisplay.py:994
-#: ../raphodo/rapid.py:1967 ../raphodo/rapid.py:2080 ../raphodo/rapid.py:5754
-#: ../raphodo/rpdfile.py:933 ../raphodo/storage.py:445
+#: ../raphodo/rapid.py:2028 ../raphodo/rapid.py:2152 ../raphodo/rapid.py:6044
+#: ../raphodo/rpdfile.py:958 ../raphodo/storage.py:449
 msgid "Videos"
 msgstr "動画"
 
@@ -182,7 +555,7 @@ msgstr "動画"
 msgid "Projected storage use after download"
 msgstr "ダウンロード後の予測使用容量"
 
-#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:516
+#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:521
 msgid "Custom..."
 msgstr "設定..."
 
@@ -220,108 +593,148 @@ msgstr "再走査"
 msgid "%s full"
 msgstr "%s使用済"
 
-#: ../raphodo/devices.py:459
+#: ../raphodo/devices.py:463
 msgid "Cameras"
 msgstr "カメラ"
 
-#: ../raphodo/devices.py:460 ../raphodo/devices.py:920
-#: ../raphodo/preferencedialog.py:85 ../raphodo/rapid.py:1927
+#: ../raphodo/devices.py:464 ../raphodo/devices.py:927
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/rapid.py:1979
 msgid "Devices"
 msgstr "デバイス"
 
-#: ../raphodo/devices.py:720
+#: ../raphodo/devices.py:724
 #, python-format
 msgid "Downloading from %(device_names)s"
 msgstr "%(device_names)sからダウンロード中"
 
 #. Translators: e.g. Three Devices
-#: ../raphodo/devices.py:780
+#: ../raphodo/devices.py:784
 #, python-format
 msgid "%(no_devices)s %(device_type)s"
 msgstr "%(no_devices)s個の%(device_type)s"
 
-#: ../raphodo/devices.py:905 ../raphodo/rapid.py:1764
+#: ../raphodo/devices.py:912 ../raphodo/rapid.py:1807
 msgid "Select Source"
 msgstr "ソースを選択"
 
-#: ../raphodo/devices.py:936 ../raphodo/devices.py:947
+#: ../raphodo/devices.py:943 ../raphodo/devices.py:954
 #, python-format
 msgid "%(device1)s + %(device2)s"
 msgstr "%(device1)s + %(device2)s"
 
 #. Number of cameras e.g. 3 Cameras
-#: ../raphodo/devices.py:958
+#: ../raphodo/devices.py:965
 #, python-format
 msgid "%(no_cameras)s Cameras"
 msgstr "%(no_cameras)s個のカメラ"
 
-#: ../raphodo/devices.py:963
+#: ../raphodo/devices.py:970
 #, python-format
 msgid "%(no_devices)s Devices"
 msgstr "%(no_devices)s個のデバイス"
 
 #. Translators: two folder names, separated by a plus sign
-#: ../raphodo/devices.py:1258
+#: ../raphodo/devices.py:1265
 #, python-format
 msgid "%s + %s"
 msgstr "%s + %s"
 
-#: ../raphodo/didyouknow.py:44
+#: ../raphodo/didyouknow.py:45
 msgid "Click on a file's checkbox to mark or unmark it for download."
-msgstr ""
-"ダウンロードするか否かマークするには，ファイルのチェックボックスをクリックし"
-"てください．"
+msgstr "ダウンロードするか否かマークするには，ファイルのチェックボックスをクリックしてください．"
 
-#: ../raphodo/didyouknow.py:50
+#: ../raphodo/didyouknow.py:51
 msgid ""
 "Files that have already been downloaded are remembered. You can still mark "
 "previously downloaded files to download again, but they are unchecked by "
 "default, and their thumbnails are dimmed so you can differentiate them from "
 "files that are yet to be downloaded."
 msgstr ""
-"すでにダウンロードされたファイルは記憶されています．前回ダウンロードしたファ"
-"イルを再度ダウンロードするようにマークすることもできますが，既定値ではこれら"
-"のファイルのチェックは外されており，そのサムネールも，これからダウンロードし"
-"なくてはならないファイルから区別するために，淡色表示されています．"
+"すでにダウンロードされたファイルは記憶されています．前回ダウンロードしたファイルを再度ダウンロードするようにマークすることもできますが，既定値ではこれらの"
+"ファイルのチェックは外されており，そのサムネールも，これからダウンロードしなくてはならないファイルから区別するために，淡色表示されています．"
 
-#: ../raphodo/didyouknow.py:59
+#: ../raphodo/didyouknow.py:60
 msgid ""
 "If more than one file is selected, they'll all take the mark of the file "
 "whose checkbox was clicked, regardless of whether they previously had a "
 "checkmark or not."
 msgstr ""
-"2つ以上のファイルが選択されている場合には，前回チェックマークがされていたかど"
-"うかに関わらず，チェックボックスがクリックされているファイルのマークが用いら"
+"2つ以上のファイルが選択されている場合には，前回チェックマークがされていたかどうかに関わらず，チェックボックスがクリックされているファイルのマークが用いら"
 "れます．"
 
-#: ../raphodo/didyouknow.py:67
+#: ../raphodo/didyouknow.py:68
 msgid ""
 "Click on a device's checkbox to quickly mark or unmark all its files for "
 "downloading."
+msgstr "デバイス内の全ファイルを，手早くダウンロード用に指定したり外したりするには，デバイスのチェックボックスをクリックしてください．"
+
+#: ../raphodo/didyouknow.py:75
+msgid ""
+"After a download finishes, an icon replaces the thumbnail's checkbox. The "
+"icon's color indicates whether the download was successful (green), had file "
+"renaming problems (yellow/orange), or failed (red)."
 msgstr ""
-"デバイス内の全ファイルを，手早くダウンロード用に指定したり外したりするには，"
-"デバイスのチェックボックスをクリックしてください．"
+"ダウンロードが終わった後，サムネイルのチェックボックスがアイコンに変わります．アイコンの色は，ダウンロードが成功したのか（緑色），改名に問題があったのか（"
+"黄色／橙色），失敗したのか（赤色）を示します．"
 
-#: ../raphodo/didyouknow.py:74
+#: ../raphodo/didyouknow.py:83
+msgid ""
+"\n"
+"            In case of any problems, a red icon will appear at the bottom of "
+"the window\n"
+"            indicating how many error reports there are. Clicking on it "
+"opens the Error Report \n"
+"            window.\n"
+"            "
+msgstr ""
+"\n"
+"            問題が生じた場合には，エラーレポートの数を表示した\n"
+"            赤いアイコンがウィンドウ下部に表示されます．それを\n"
+"            クリックするとエラーレポートウィンドウが開きます．\n"
+"            "
+
+#: ../raphodo/didyouknow.py:91
+msgid ""
+"\n"
+"            The Error Report window lists any problems encountered before, "
+"during or after the \n"
+"            download. An orange triangle represents a warning, a red circle "
+"indicates a failure, \n"
+"            and a black circle indicates more serious failures. You can "
+"click on the hyperlinks to \n"
+"            open its file or device in a file manager. You can also search "
+"the reports using the \n"
+"            search box in the lower left of the Error Report window.\n"
+"            "
+msgstr ""
+"\n"
+"            エラーレポートウィンドウには，ダウンロード中および前後に生じた問題の全てが\n"
+"            表示されます．橙色の三角形は警告を赤丸はエラーを，黒丸はさらに深刻なエラー\n"
+"            を示します．ハイパーリンクをクリックすると，当該ファイルかファイルマネージャー\n"
+"            中にデバイスが開きます．また，エラーレポートウィンドウの左下にある検索ボッ\n"
+"            クスで，レポートに対して検索をかけることもできます．\n"
+"            "
+
+#: ../raphodo/didyouknow.py:103
 msgid ""
 "You can simultaneously download from multiple cameras, smartphones, memory "
 "cards, and hard drives&mdash;as many devices as your computer can handle at "
 "one time."
 msgstr ""
-"カメラ・スマートフォン・メモリーカード・ハードディスクなど，お使いのコン"
-"ピュータが同時に取り扱うことができる数のデバイスから，同時にダウンロードする"
-"ことができます．"
+"カメラ・スマートフォン・メモリーカード・ハードディスクなど，お使いのコンピュータが同時に取り扱うことができる数のデバイスから，同時にダウンロードすることが"
+"できます．"
 
-#: ../raphodo/didyouknow.py:81
+#: ../raphodo/didyouknow.py:110
 msgid ""
 "The <b>Timeline</b> groups photos and videos based on how much time elapsed "
 "between consecutive shots. Use it to identify photos and videos taken at "
 "different periods in a single day or over consecutive days."
 msgstr ""
-"<b>時間軸</b>は，撮影間の経過時間によって写真や動画をグループ化します．1日も"
-"しくは数日内の別の時間帯に撮られた写真や動画を認識するのにお使いください．"
+"<b>時間軸</b>は，撮影間の経過時間によって写真や動画をグループ化します．1日もしくは数日内の別の時間帯に撮られた写真や動画を認識するのにお使いくださ"
+"い．"
 
-#: ../raphodo/didyouknow.py:88
+#: ../raphodo/didyouknow.py:117
 msgid ""
 "\n"
 "<p>In the illustration above, the first row of the Timeline is black because "
@@ -339,36 +752,32 @@ msgstr ""
 "するのに使われます．</p>\n"
 "            "
 
-#: ../raphodo/didyouknow.py:99
+#: ../raphodo/didyouknow.py:128
 msgid ""
 "To view photos and videos for a particular time range, use the mouse "
 "(optionally in combination with the <tt>Shift</tt> or <tt>Ctrl</tt> keys) to "
 "select time periods. When a time range is selected, the Timeline button on "
 "the left side of the main window will be highlighted."
 msgstr ""
-"ある期間の写真・動画を見るには，マウスを使用して（場合により<tt>Shift></tt>や"
-"<tt>Ctrl</tt>を併用して）期間を選択してください．期間が選択されると，メイン"
-"ウィンドウの左側の時間軸ボタンがハイライトされます．"
+"ある期間の写真・動画を見るには，マウスを使用して（場合により<tt>Shift></tt>や<tt>Ctrl</tt>を併用して）期間を選択してください．"
+"期間が選択されると，メインウィンドウの左側の時間軸ボタンがハイライトされます．"
 
-#: ../raphodo/didyouknow.py:106
+#: ../raphodo/didyouknow.py:135
 msgid ""
 "A download always includes all files that are checked for download, "
 "including those that are not currently displayed because the Timeline is "
 "being used."
 msgstr ""
-"ダウンロードの際は，時間軸が使用されているために現在表示されていないファイル"
-"も含み，ダウンロード用にチェックされている全てのファイルがつねにダウンロード"
-"されます．"
+"ダウンロードの際は，時間軸が使用されているために現在表示されていないファイルも含み，ダウンロード用にチェックされている全てのファイルがつねにダウンロードさ"
+"れます．"
 
-#: ../raphodo/didyouknow.py:113
+#: ../raphodo/didyouknow.py:142
 msgid ""
 "You can hide or display the download sources by clicking on the name of the "
 "device you're downloading from at the top left of the program window."
-msgstr ""
-"プログラムウィンドウの左上で，ダウンロード中のデバイス名をクリックすること"
-"で，ダウンロードソースを表示したり消したりすることができます．"
+msgstr "プログラムウィンドウの左上で，ダウンロード中のデバイス名をクリックすることで，ダウンロードソースを表示したり消したりすることができます．"
 
-#: ../raphodo/didyouknow.py:120
+#: ../raphodo/didyouknow.py:149
 msgid ""
 "\n"
 "          Thumbnails can be sorted using a variety of criteria:\n"
@@ -389,49 +798,45 @@ msgstr ""
 "\n"
 "          サムネールは様々な方法で整序することができます：\n"
 "<ol>\n"
-"<li><b>修正日時：</b>最後にファイルが修正されたとき．（可能ならば）メタデータ"
-"を使用し，（そうでない時は）ファイルシステムのデータを使用します．</li>\n"
-"<li><b>チェック状態：</b>ファイルがダウンロード用にマークされているか否か．</"
-"li>\n"
+"<li><b>修正日時：</b>最後にファイルが修正されたとき．（可能ならば）メタデータを使用し，（そうでない時は）ファイルシステムのデータを使用します．"
+"</li>\n"
+"<li><b>チェック状態：</b>ファイルがダウンロード用にマークされているか否か．</li>\n"
 "<li><b>ファイル名：</b>拡張子を含む完全ファイル名．</li>\n"
-"<li><b>拡張子：</b>ファイル名の拡張子．たとえば，JPEG画像とRAW画像をグループ"
-"化するのに使うことができます．</li>\n"
+"<li><b>拡張子：</b>ファイル名の拡張子．たとえば，JPEG画像とRAW画像をグループ化するのに使うことができます．</li>\n"
 "<li><b>ファイル型：</b>写真であるか動画であるか．</li>\n"
 "<li><b>デバイス：</b>写真や動画のダウンロード元であるデバイス名．</li> "
 
-#: ../raphodo/didyouknow.py:137
+#: ../raphodo/didyouknow.py:166
 msgid ""
 "One of Rapid Photo Downloader's most useful features is its ability to "
 "automatically generate download subfolders and rename files as it downloads, "
 "using a scheme of your choosing."
 msgstr ""
-"高速写真ダウンローダの最も便利な機能の一つに，自動的にダウンロードするサブ"
-"フォルダを作り，選択したスキームに従って，ダウンロードしたファイル名を変更す"
-"ることができることがあります．"
+"高速写真ダウンローダの最も便利な機能の一つに，自動的にダウンロードするサブフォルダを作り，選択したスキームに従って，ダウンロードしたファイル名を変更するこ"
+"とができることがあります．"
 
-#: ../raphodo/didyouknow.py:143
+#: ../raphodo/didyouknow.py:172
 msgid ""
 "To specify where you want your files downloaded and how you want them named, "
 "open the appropriate panel on the right-side of the application window: "
 "<b>Destination</b>, <b>Rename</b>, or <b>Job Code</b>."
 msgstr ""
-"どこにファイルをダウンロードするか，それらをどのように命名するかを指定するに"
-"は，アプリケーション ウィンドウの右側の<b>受入先</b>・<b>名称変更</b>・<b>"
-"ジョブコード</b>のうち，適切なパネルを開いてください．"
+"どこにファイルをダウンロードするか，それらをどのように命名するかを指定するには，アプリケーション "
+"ウィンドウの右側の<b>受入先</b>・<b>名称変更</b>・<b>ジョブコード</b>のうち，適切なパネルを開いてください．"
 
-#: ../raphodo/didyouknow.py:150
+#: ../raphodo/didyouknow.py:179
 msgid ""
 "\n"
 "When thinking about your download directory structure, keep in mind two "
 "different types\n"
 "of directory:\n"
 "<ol>\n"
-"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, &quot;"
-"Photos&quot;, or\n"
+"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, "
+"&quot;Photos&quot;, or\n"
 "&quot;Videos&quot;. This directory should already exist on your computer. In "
 "the illustration \n"
-"below, the destination folders are &quot;Pictures&quot; and &quot;"
-"Videos&quot;. The\n"
+"below, the destination folders are &quot;Pictures&quot; and "
+"&quot;Videos&quot;. The\n"
 "name of the destination folder is displayed in the grey bar directly above "
 "the folder tree, \n"
 "with a folder icon to its left and a gear icon to its far right.</li>\n"
@@ -444,8 +849,7 @@ msgid ""
 "            "
 msgstr ""
 "\n"
-"ダウンロード ディレクトリの構造を考える際には，ディレクトリの型が2つあること"
-"を念頭においてください：\n"
+"ダウンロード ディレクトリの構造を考える際には，ディレクトリの型が2つあることを念頭においてください：\n"
 "<ol>\n"
 "<li><b>受入先フォルダ</b>（例：「ピクチャ」・「フォト」・「ビデオ」）\n"
 "このディレクトリは，コンピュータ上に既になくてはなりません．\n"
@@ -458,7 +862,7 @@ msgstr ""
 "</ol>\n"
 "            "
 
-#: ../raphodo/didyouknow.py:167
+#: ../raphodo/didyouknow.py:196
 msgid ""
 "\n"
 "You can download photos and videos to the same destination folder, or "
@@ -471,27 +875,22 @@ msgid ""
 "            "
 msgstr ""
 "\n"
-"写真と動画は，同じフォルダにダウンロードすることもできますが，別々のフォルダ"
-"を指定する\n"
-"こともできます．写真と動画のダウンロード サブフォルダについても同様です．− 写"
-"真と動画を\n"
-"同じサブフォルダにダウンロードをすることもできますが，各型に別々のスキームを"
-"使用するこ\n"
+"写真と動画は，同じフォルダにダウンロードすることもできますが，別々のフォルダを指定する\n"
+"こともできます．写真と動画のダウンロード サブフォルダについても同様です．− 写真と動画を\n"
+"同じサブフォルダにダウンロードをすることもできますが，各型に別々のスキームを使用するこ\n"
 "ともできます．            \n"
 "            "
 
-#: ../raphodo/didyouknow.py:177
+#: ../raphodo/didyouknow.py:206
 msgid ""
 "Automatically generated download subfolders can contain further "
 "automatically generated subfolders if need be. A common scheme is to create "
 "a year subfolder and then a series of year-month-day subfolders within it."
 msgstr ""
-"自動的に生成されたダウンロードサブフォルダには，必要ならば，さらに自動的に生"
-"成されたサブフォルダを含むことができます．よくあるスキームとしては，年のサブ"
-"フォルダを生成し，その中に年-月-日と続くサブフォルダを生成する方法がありま"
-"す．"
+"自動的に生成されたダウンロードサブフォルダには，必要ならば，さらに自動的に生成されたサブフォルダを含むことができます．よくあるスキームとしては，年のサブフ"
+"ォルダを生成し，その中に年-月-日と続くサブフォルダを生成する方法があります．"
 
-#: ../raphodo/didyouknow.py:186
+#: ../raphodo/didyouknow.py:215
 msgid ""
 "\n"
 "Whenever possible, the program previews the download subfolders of photos "
@@ -509,8 +908,7 @@ msgid ""
 "            "
 msgstr ""
 "\n"
-"高速写真ダウンローダは，いつでも可能な場合は，ダウンロードする写真・動画のダ"
-"ウンロード サブフォルダをプレビューします：\n"
+"高速写真ダウンローダは，いつでも可能な場合は，ダウンロードする写真・動画のダウンロード サブフォルダをプレビューします：\n"
 "<ol>\n"
 "<li>受入先フォルダツリーには，すでにコンピュータ上にあるダウンロード\n"
 "    サブフォルダ（斜字体でない通常フォント）とダウンロード中に作成される\n"
@@ -520,7 +918,7 @@ msgstr ""
 "</ol>\n"
 "            "
 
-#: ../raphodo/didyouknow.py:201
+#: ../raphodo/didyouknow.py:230
 msgid ""
 "\n"
 "Download subfolder names are typically generated using some or all of the "
@@ -544,22 +942,19 @@ msgid ""
 "            "
 msgstr ""
 "\n"
-"ダウンロード サブフォルダ名は，通常，以下の要素を，全てまたは一部使って構成さ"
-"れます：\n"
+"ダウンロード サブフォルダ名は，通常，以下の要素を，全てまたは一部使って構成されます：\n"
 "<ol>\n"
-"<li><b>ファイル メタデータ</b>：通常，写真や動画が生成された日を含みます"
-"が，\n"
+"<li><b>ファイル メタデータ</b>：通常，写真や動画が生成された日を含みますが，\n"
 "カメラのモデル名，カメラのシリアル番号，JPGやCR2などのファイル拡張子も\n"
 "含まれることがあります．</li>\n"
 "<li><b>ジョブコード</b>：イベント名や地名など，\n"
 "ダウンロードが行われた時に指定した自由文．</li>\n"
 "<li><b>テキスト</b>：ハイフンや空白など，常時表示される要素．</li>\n"
 "</ol>\n"
-"年月日の数字でサブフォルダを命名すると，簡単にファイルマネジャ中で整序された"
-"状態にできますので，これが既定オプションになっています：\n"
+"年月日の数字でサブフォルダを命名すると，簡単にファイルマネジャ中で整序された状態にできますので，これが既定オプションになっています：\n"
 "            "
 
-#: ../raphodo/didyouknow.py:219
+#: ../raphodo/didyouknow.py:248
 msgid ""
 "\n"
 "To automatically create download subfolders as you download, \n"
@@ -570,13 +965,11 @@ msgid ""
 msgstr ""
 "\n"
 "ダウンロードと同時にダウンロード サブフォルダを自動生成するには，\n"
-"高速写真ダウンローダの組込スキームを使用するか，設定スキームを作成することが"
-"できます．\n"
-"歯車アイコンをクリックして，ドロップダウンメニューを開いてくださ"
-"い：            \n"
+"高速写真ダウンローダの組込スキームを使用するか，設定スキームを作成することができます．\n"
+"歯車アイコンをクリックして，ドロップダウンメニューを開いてください：            \n"
 "            "
 
-#: ../raphodo/didyouknow.py:227
+#: ../raphodo/didyouknow.py:256
 msgid ""
 "\n"
 "Using the drop-down menu, select a built-in preset or click on <b>Custom</b> "
@@ -586,30 +979,26 @@ msgid ""
 "            "
 msgstr ""
 "\n"
-"ドロップダウンメニューから組込スキームを選択するか，<b>設定</b>をクリックして"
-"自分のスキームを設定してください．\n"
-"写真・動画サブフォルダ生成エディタを使用して，自分のスキームを作ることができ"
-"ます：             \n"
+"ドロップダウンメニューから組込スキームを選択するか，<b>設定</b>をクリックして自分のスキームを設定してください．\n"
+"写真・動画サブフォルダ生成エディタを使用して，自分のスキームを作ることができます：             \n"
 "            "
 
-#: ../raphodo/didyouknow.py:237
+#: ../raphodo/didyouknow.py:266
 msgid ""
 "It's easy to download raw images into one folder, and jpeg images into "
 "another. Simply use the <b>Filename Extension</b> as part of your download "
 "subfolder generation scheme:"
 msgstr ""
-"raw画像とjpeg画像を別々のフォルダにダウンロードするのは簡単です．ダウンロード"
-"サブフォルダ生成スキームの一部で<b>ファイル名拡張子</b>を使用するだけです："
+"raw画像とjpeg画像を別々のフォルダにダウンロードするのは簡単です．ダウンロードサブフォルダ生成スキームの一部で<b>ファイル名拡張子</b>を使用す"
+"るだけです："
 
-#: ../raphodo/didyouknow.py:242
+#: ../raphodo/didyouknow.py:271
 msgid ""
 "This illustration shows a saved custom preset named &quot;My custom "
 "preset&quot;."
-msgstr ""
-"この例では，「My custom preset」という名称の保存済み設定スキームを示していま"
-"す．"
+msgstr "この例では，「My custom preset」という名称の保存済み設定スキームを示しています．"
 
-#: ../raphodo/didyouknow.py:246
+#: ../raphodo/didyouknow.py:275
 msgid ""
 "\n"
 "You do not have to create nested download subfolders. This illustration "
@@ -620,13 +1009,12 @@ msgid ""
 "            "
 msgstr ""
 "\n"
-"入れ子状にダウンロード サブフォルダを作成する必要はありません．このイラスト"
-"は，\n"
+"入れ子状にダウンロード サブフォルダを作成する必要はありません．このイラストは，\n"
 "写真が撮られた日付とジョブコードのみを含むダウンロード サブフォルダの生成を\n"
 "表しています：\n"
 "            "
 
-#: ../raphodo/didyouknow.py:256
+#: ../raphodo/didyouknow.py:285
 msgid ""
 "\n"
 "Although there are many built-in date/time naming options, you may find that "
@@ -640,17 +1028,13 @@ msgid ""
 "            "
 msgstr ""
 "\n"
-"すでに多くの日時命名オプションが組込で用意されていますが，これらとは違うもの"
-"が必要になることもあるでしょう．\n"
-"自分自身のオプションを作成しても全く問題ありません．日時を新しい組み合わせで"
-"生成させるようにすることができます．\n"
-"暦年(YYYY)とハイフン，月(MM)を組み合わせてYYYY-MMという日付フォーマットが欲し"
-"いものとしましょう．\n"
-"下記のようにして作ることができます（ハイフンの周りの赤丸に注目してくださ"
-"い）：\n"
+"すでに多くの日時命名オプションが組込で用意されていますが，これらとは違うものが必要になることもあるでしょう．\n"
+"自分自身のオプションを作成しても全く問題ありません．日時を新しい組み合わせで生成させるようにすることができます．\n"
+"暦年(YYYY)とハイフン，月(MM)を組み合わせてYYYY-MMという日付フォーマットが欲しいものとしましょう．\n"
+"下記のようにして作ることができます（ハイフンの周りの赤丸に注目してください）：\n"
 "            "
 
-#: ../raphodo/didyouknow.py:265
+#: ../raphodo/didyouknow.py:294
 msgid ""
 "\n"
 "Read more about all the ways you can generate download subfolder names and "
@@ -661,11 +1045,11 @@ msgid ""
 msgstr ""
 "\n"
 "ダウンロード サブフォルダ名とファイル名を生成する全方法については，<a \n"
-"href=\"http://damonlynch.net/rapid/documentation/#renamedateandtime\">オンラ"
-"イン説明書</a>をご覧ください．\n"
+"href=\"http://damonlynch.net/rapid/documentation/#renamedateandtime\">オンライン説明"
+"書</a>をご覧ください．\n"
 "            "
 
-#: ../raphodo/didyouknow.py:273
+#: ../raphodo/didyouknow.py:302
 msgid ""
 "\n"
 "<b>Job Codes</b> let you easily enter text that describes sets of photos and "
@@ -677,15 +1061,12 @@ msgid ""
 "&quot;Green Bazaar&quot;: \n"
 msgstr ""
 "\n"
-"<b>ジョブコード</b>を使えば，写真や動画の組を叙述する文を簡単に入力することが"
-"できます．\n"
-"ジョブコードは，サブフォルダやファイル名に使用することができます．この例で"
-"は，ファイルの\n"
-"いくつかは「Street」というジョブコードをすでに持っており，選択したファイルに"
-"「Green Bazaar」\n"
+"<b>ジョブコード</b>を使えば，写真や動画の組を叙述する文を簡単に入力することができます．\n"
+"ジョブコードは，サブフォルダやファイル名に使用することができます．この例では，ファイルの\n"
+"いくつかは「Street」というジョブコードをすでに持っており，選択したファイルに「Green Bazaar」\n"
 "というジョブコードを与えようとしているところです． \n"
 
-#: ../raphodo/didyouknow.py:282
+#: ../raphodo/didyouknow.py:311
 msgid ""
 "\n"
 "You can apply new or existing Job Codes before you start a download. If "
@@ -696,50 +1077,46 @@ msgid ""
 "            "
 msgstr ""
 "\n"
-"ダウンロード開始前に新規もしくは既存のジョブコードを適用することができま"
-"す．\n"
-"ダウンロード中に，まだジョブコードを適用していないファイルがあった場合に"
-"は，\n"
+"ダウンロード開始前に新規もしくは既存のジョブコードを適用することができます．\n"
+"ダウンロード中に，まだジョブコードを適用していないファイルがあった場合には，\n"
 "ダウンロード開始前に，それらのジョブコードを入力するように促されます．\n"
 "            "
 
-#: ../raphodo/didyouknow.py:291
+#: ../raphodo/didyouknow.py:320
 msgid "Look for hints to guide you when working with Job Codes:"
 msgstr "ジョブコードに関して作業をしている時に助けとなるヒントを探す："
 
-#: ../raphodo/didyouknow.py:295
+#: ../raphodo/didyouknow.py:324
 msgid ""
 "Hints will vary depending on the context, such as when the mouse is hovering "
 "over a button."
 msgstr "ヒントは，マウスがボタン上にあるときなど，その文脈によって変わります．"
 
-#: ../raphodo/didyouknow.py:301
+#: ../raphodo/didyouknow.py:330
 msgid ""
 "\n"
 "When you give your photos and videos unique filenames, you'll never be "
 "confused as to \n"
 "which file is which. Using <b>sequence numbers</b> to make filenames unique "
 "is highly \n"
-"recommended!.\n"
+"recommended!\n"
 "            "
 msgstr ""
 "\n"
-"写真や動画に固有のファイル名を与えれば，どのファイルがどれだったか混乱するこ"
-"とは\n"
-"ありません．ファイル名を固有のものとするために，<b>連番</b>を使用することが強"
-"く\n"
-"推奨されます！\n"
+"写真や動画に重複しないファイル名をつけると，どのファイルがどれだったか混乱する\n"
+"ことはありません．ファイル名が重複しないようにするために<b>連番</b>を用いるこ\n"
+"とが，高く推奨されます．\n"
 "            "
 
-#: ../raphodo/didyouknow.py:309
+#: ../raphodo/didyouknow.py:338
 msgid ""
 "\n"
 "<p>Four types of sequence values are available to help you assign unique "
 "names to your photos and \n"
 "videos:\n"
 "<ol>\n"
-"<li><b>Downloads today</b>: tracks downloads completed during that day.</"
-"li>\n"
+"<li><b>Downloads today</b>: tracks downloads completed during that "
+"day.</li>\n"
 "<li><b>Stored number</b>: similar to Downloads today, but it is remembered "
 "from the last time the  \n"
 "program was run.</li>\n"
@@ -764,11 +1141,11 @@ msgstr ""
 "</ol></p>\n"
 "<p>\n"
 "連番について詳しくは，<a \n"
-"href=\"http://damonlynch.net/rapid/documentation/#sequencenumbers\">オンライ"
-"ン説明書</a>をご覧ください．</p>\n"
+"href=\"http://damonlynch.net/rapid/documentation/#sequencenumbers\">オンライン説明書<"
+"/a>をご覧ください．</p>\n"
 "            "
 
-#: ../raphodo/didyouknow.py:327
+#: ../raphodo/didyouknow.py:356
 msgid ""
 "\n"
 "The <b>Rename</b> panel allows you to configure file renaming. To rename "
@@ -777,13 +1154,11 @@ msgid ""
 "            "
 msgstr ""
 "\n"
-"<b>名称変更</b>パネルでは，ファイルの名称変更を設定することができます．ファイ"
-"ルの名称変更を行うには，\n"
-"既存の名称変更スキームの中から選択するか，自作のものを選択することができま"
-"す．              \n"
+"<b>名称変更</b>パネルでは，ファイルの名称変更を設定することができます．ファイルの名称変更を行うには，\n"
+"既存の名称変更スキームの中から選択するか，自作のものを選択することができます．              \n"
 "            "
 
-#: ../raphodo/didyouknow.py:334
+#: ../raphodo/didyouknow.py:363
 msgid ""
 "\n"
 "<p>The <b>Synchronize RAW + JPEG</b> option is useful if you use the RAW + "
@@ -802,20 +1177,18 @@ msgid ""
 "            "
 msgstr ""
 "\n"
-"<p><b>RAWとJPEGを同期</b>オプションは，カメラでRAW + JPEG機能を使用してい"
-"て，\n"
-"写真の命名に連番を使用している場合に便利です．このオプションを有効にする"
-"と，\n"
+"<p><b>RAWとJPEGを同期</b>オプションは，カメラでRAW + JPEG機能を使用していて，\n"
+"写真の命名に連番を使用している場合に便利です．このオプションを有効にすると，\n"
 "プログラムはRAWおよびJPEG写真の一致ペアの検出を試み，検出された場合には，\n"
 "両方の写真名に同じ連番が適用されます．さらに，これらの写真が1つであるかの\n"
 "ように連番は更新されます．</p>\n"
 "<p>\n"
 "ファイルの命名についての詳細は，<a \n"
-"href=\"http://damonlynch.net/rapid/documentation/#rename\">オンライン説明書</"
-"a>をご覧ください．</p>\n"
+"href=\"http://damonlynch.net/rapid/documentation/#rename\">オンライン説明書</a>をご覧くださ"
+"い．</p>\n"
 "            "
 
-#: ../raphodo/didyouknow.py:348
+#: ../raphodo/didyouknow.py:377
 msgid ""
 "\n"
 "You can have your photos and videos backed up to multiple locations as they "
@@ -826,22 +1199,19 @@ msgid ""
 "            "
 msgstr ""
 "\n"
-"ダウンロードをしながら，写真や動画を，外部ハードドライブやネットワーク共有"
-"等，複数の場所に\n"
-"バックアップをすることができます．バックアップデバイスは自動検出させることも"
-"できますが，\n"
+"ダウンロードをしながら，写真や動画を，外部ハードドライブやネットワーク共有等，複数の場所に\n"
+"バックアップをすることができます．バックアップデバイスは自動検出させることもできますが，\n"
 "バックアップ場所を細かく指定することもできます．\n"
 "            "
 
-#: ../raphodo/didyouknow.py:356
+#: ../raphodo/didyouknow.py:385
 msgid ""
 "In this example, the drive <b>photobackup</b> does not contain a folder "
 "named <tt>Videos</tt>, so videos will not be backed up to it."
 msgstr ""
-"この例では，<b>photobackup</b>というドライブに<tt>Videos</tt>というフォルダが"
-"ないので，動画はバックアップされません．"
+"この例では，<b>photobackup</b>というドライブに<tt>Videos</tt>というフォルダがないので，動画はバックアップされません．"
 
-#: ../raphodo/didyouknow.py:362
+#: ../raphodo/didyouknow.py:391
 msgid ""
 "\n"
 "Several of the program's preferences can be set from the command line, "
@@ -852,14 +1222,16 @@ msgid ""
 "            "
 msgstr ""
 "\n"
-"ダウンロードソースや受け入れ先，バックアップなど，プログラム設定の一部はコマ"
-"ンドラインから\n"
-"設定することができます．さらに，設定は既定値にリセットすることができ，キャッ"
-"シュや記憶され\n"
+"ダウンロードソースや受け入れ先，バックアップなど，プログラム設定の一部はコマンドラインから\n"
+"設定することができます．さらに，設定は既定値にリセットすることができ，キャッシュや記憶され\n"
 "ているファイルを消去することもできます．            \n"
 "            "
 
-#: ../raphodo/didyouknow.py:372
+#: ../raphodo/didyouknow.py:396
+msgid "You can also import program preferences from the older 0.4 version."
+msgstr "古い0.4版からもプログラム設定を読み込むことができます．"
+
+#: ../raphodo/didyouknow.py:401
 msgid ""
 "\n"
 "Rapid Photo Downloader deals with three types of cache:\n"
@@ -869,8 +1241,8 @@ msgid ""
 "memory cards, and other devices.</li>\n"
 "<li>A <b>temporary cache</b> of files downloaded from a camera, one for "
 "photos and another for \n"
-"videos. They are located in temporary subfolders in the download destination."
-"</li>\n"
+"videos. They are located in temporary subfolders in the download "
+"destination.</li>\n"
 "<li>The <b>desktop's thumbnail cache</b>, in which Rapid Photo Downloader "
 "stores thumbnails of \n"
 "RAW and TIFF photos once they have been downloaded. File browsers like Gnome "
@@ -887,41 +1259,37 @@ msgstr ""
 "\n"
 "高速写真ダウンローダには，3つの型のキャッシュがあります：\n"
 "<ol>\n"
-"<li><b>サムネイル キャッシュ</b>は，カメラやメモリカードなどのデバイスからの"
-"ファイルのサムネイルを\n"
+"<li><b>サムネイル キャッシュ</b>は，カメラやメモリカードなどのデバイスからのファイルのサムネイルを\n"
 "保管することを唯一の目的としています．</li>\n"
-"<li>カメラからダウンロードしたファイルの<b>一時キャッシュ</b>は，写真用と動画"
-"用に一つずつ，\n"
+"<li>カメラからダウンロードしたファイルの<b>一時キャッシュ</b>は，写真用と動画用に一つずつ，\n"
 "ダウンロード受け入れ先の一時サブフォルダに設けられています．</li>\n"
-"<li><b>デスクトップ サムネイル</b>は，RAWおよびTIFF写真がダウンロードされる"
-"と，高速写真ダウンローダが\n"
-"そのサムネイルを保管する場所です．Gnome Filesのようなファイルブラウザもこの"
-"キャッシュを使用しますので，\n"
+"<li><b>デスクトップ サムネイル</b>は，RAWおよびTIFF写真がダウンロードされると，高速写真ダウンローダが\n"
+"そのサムネイルを保管する場所です．Gnome Filesのようなファイルブラウザもこのキャッシュを使用しますので，\n"
 "そこでもこれらのファイルのサムネイルが表示されるようになります．\n"
 "</li>\n"
 "</ol>\n"
 "これらのキャッシュとそのダウンロード パフォーマンスについての詳細は，<a \n"
-"href=\"http://damonlynch.net/rapid/documentation/#caches\">オンライン説明書</"
-"a>をご覧ください．\n"
+"href=\"http://damonlynch.net/rapid/documentation/#caches\">オンライン説明書</a>をご覧くださ"
+"い．\n"
 "            "
 
-#: ../raphodo/didyouknow.py:431
+#: ../raphodo/didyouknow.py:460
 msgid "Tip of the Day"
 msgstr "今日の豆知識"
 
-#: ../raphodo/didyouknow.py:439
+#: ../raphodo/didyouknow.py:468
 msgid "Did you know...?"
 msgstr "ご存知でしたか？"
 
-#: ../raphodo/didyouknow.py:466
+#: ../raphodo/didyouknow.py:495
 msgid "Show tips on startup"
 msgstr "今日の豆知識を起動時に表示"
 
-#: ../raphodo/didyouknow.py:470
+#: ../raphodo/didyouknow.py:499
 msgid "&Next"
 msgstr "次へ(&N)"
 
-#: ../raphodo/didyouknow.py:471
+#: ../raphodo/didyouknow.py:500
 msgid "&Previous"
 msgstr "前へ(&P)"
 
@@ -1028,74 +1396,72 @@ msgstr "%d 日 １ 時間"
 msgid "%(days)d days, %(hours)d hours"
 msgstr "%(days)d 日 %(hours)d 時間"
 
-#: ../raphodo/errorlog.py:65
+#: ../raphodo/errorlog.py:66
 msgid "Find"
 msgstr "検索"
 
-#: ../raphodo/errorlog.py:135
+#: ../raphodo/errorlog.py:136
 msgid "Error Reports - Rapid Photo Downloader"
 msgstr "エラーリポート ー 高速写真ダウンローダ"
 
-#: ../raphodo/errorlog.py:170
+#: ../raphodo/errorlog.py:171
 msgid "Find in reports"
 msgstr "リポートを検索"
 
-#: ../raphodo/errorlog.py:187
+#: ../raphodo/errorlog.py:188
 msgid "Find the previous occurrence of the phrase"
 msgstr "この語句が前に使用されている場所を検索"
 
-#: ../raphodo/errorlog.py:192
+#: ../raphodo/errorlog.py:193
 msgid "Find the next occurrence of the phrase"
 msgstr "語句の次の使用位置を検索"
 
-#: ../raphodo/errorlog.py:194
+#: ../raphodo/errorlog.py:195
 msgid "&Highlight All"
 msgstr "すべて強調表示(&H)"
 
-#: ../raphodo/errorlog.py:195
+#: ../raphodo/errorlog.py:196
 msgid "Highlight all occurrences of the phrase"
 msgstr "この語句をすべて強調表示"
 
-#: ../raphodo/errorlog.py:196
+#: ../raphodo/errorlog.py:197
 msgid "&Match Case"
 msgstr "大小文字を区別(&M)"
 
-#: ../raphodo/errorlog.py:197
+#: ../raphodo/errorlog.py:198
 msgid "Search with case sensitivity"
 msgstr "大小文字を区別して検索"
 
-#: ../raphodo/errorlog.py:198
+#: ../raphodo/errorlog.py:199
 msgid "&Whole Words"
 msgstr "単語全体(&W)"
 
-#: ../raphodo/errorlog.py:199
+#: ../raphodo/errorlog.py:200
 msgid "Search whole words only"
 msgstr "単語全体のみを検索"
 
-#: ../raphodo/errorlog.py:209 ../raphodo/errorlog.py:341
+#: ../raphodo/errorlog.py:210 ../raphodo/errorlog.py:345
 #, python-format
 msgid "%s of %s matches"
 msgstr "%s (%s 一致中)"
 
-#: ../raphodo/errorlog.py:228
+#: ../raphodo/errorlog.py:232
 msgid "Clear"
 msgstr "消去"
 
-#: ../raphodo/errorlog.py:328
+#: ../raphodo/errorlog.py:332
 msgid "Phrase not found"
 msgstr "語句が見つかりませんでした"
 
-#: ../raphodo/errorlog.py:487
+#: ../raphodo/errorlog.py:491
 msgid "Search pending..."
 msgstr "検索停止..."
 
-#: ../raphodo/errorlog.py:535
+#: ../raphodo/errorlog.py:539
 msgid ""
 "The number of new entries added to the Error Report since it was last open. "
 "Click to open the Error Report."
-msgstr ""
-"最後に開いてからエラーリポートに追加された新規項目の数です．クリックしてエ"
-"ラーリポートを開いてください．"
+msgstr "最後に開いてからエラーリポートに追加された新規項目の数です．クリックしてエラーリポートを開いてください．"
 
 #: ../raphodo/excepthook.py:77
 msgid "Problem in Rapid Photo Downloader"
@@ -1105,8 +1471,8 @@ msgstr "高速写真ダウンローダに問題"
 #, python-brace-format
 msgid ""
 "<b>A problem occurred in Rapid Photo Downloader</b><br><br>\n"
-"    Please report the problem at <a href=\"{website}\">{website}</a>."
-"<br><br>\n"
+"    Please report the problem at <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
 "    Attach the log file <i>{log_file}</i> to your bug report (click\n"
 "    <a href=\"{log_path}\">here</a> to open the log directory).<br><br>If "
 "the same problem occurs\n"
@@ -1114,13 +1480,10 @@ msgid ""
 "    "
 msgstr ""
 "<b>高速写真ダウンローダに問題発生</b><br><br>\n"
-"    この問題を<a href=\"{website}\">{website}</a>で報告してください．"
-"<br><br>\n"
+"    この問題を<a href=\"{website}\">{website}</a>で報告してください．<br><br>\n"
 "    バグレポートには，ログファイル <i>{log_file}</i> を添付してください\n"
-"    （ログディレクトリを開くには，<a href=\"{log_path}\">ここ</a>をクリックし"
-"てください）．<br><br>\n"
-"    プログラム終了前にまた同じ問題が発生した場合には，同じお知らせはもう為さ"
-"れません．\n"
+"    （ログディレクトリを開くには，<a href=\"{log_path}\">ここ</a>をクリックしてください）．<br><br>\n"
+"    プログラム終了前にまた同じ問題が発生した場合には，同じお知らせはもう為されません．\n"
 "    "
 
 #: ../raphodo/excepthook.py:98
@@ -1140,7 +1503,7 @@ msgstr ""
 "    その際，{log_path}にあるログファイルをバグレポートに添付してください．\n"
 "\n"
 
-#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1601
+#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1643
 msgid "Open in File Browser..."
 msgstr "ファイルブラウザで開く..."
 
@@ -1158,531 +1521,531 @@ msgstr "その他..."
 msgid "%s (location does not exist)"
 msgstr "%s (パスが存在しません)"
 
-#: ../raphodo/generatenameconfig.py:186
+#: ../raphodo/generatenameconfig.py:190
 msgid "Date time"
 msgstr "日時"
 
-#: ../raphodo/generatenameconfig.py:187
+#: ../raphodo/generatenameconfig.py:191
 msgid "Text"
 msgstr "文字列"
 
-#: ../raphodo/generatenameconfig.py:188 ../raphodo/rapid.py:2053
+#: ../raphodo/generatenameconfig.py:192 ../raphodo/rapid.py:2125
 msgid "Filename"
 msgstr "ファイル名"
 
-#: ../raphodo/generatenameconfig.py:189 ../raphodo/preferencedialog.py:488
+#: ../raphodo/generatenameconfig.py:193 ../raphodo/preferencedialog.py:724
 msgid "Metadata"
 msgstr "メタデータ"
 
-#: ../raphodo/generatenameconfig.py:190
+#: ../raphodo/generatenameconfig.py:194
 msgid "Sequences"
 msgstr "連番"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: ../raphodo/generatenameconfig.py:193
+#: ../raphodo/generatenameconfig.py:197
 msgid "Job code"
 msgstr "ジョブコード"
 
-#: ../raphodo/generatenameconfig.py:194
+#: ../raphodo/generatenameconfig.py:198
 msgid "Image date"
 msgstr "画像の日付"
 
-#: ../raphodo/generatenameconfig.py:195
+#: ../raphodo/generatenameconfig.py:199
 msgid "Video date"
 msgstr "動画の日付"
 
-#: ../raphodo/generatenameconfig.py:196
+#: ../raphodo/generatenameconfig.py:200
 msgid "Today"
 msgstr "今日"
 
-#: ../raphodo/generatenameconfig.py:197
+#: ../raphodo/generatenameconfig.py:201
 msgid "Yesterday"
 msgstr "昨日"
 
 #. Translators: Download time is the time and date that the download started (when the
 #. user clicked the Download button)
-#: ../raphodo/generatenameconfig.py:200
+#: ../raphodo/generatenameconfig.py:204
 msgid "Download time"
 msgstr "ダウンロード日時"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:203
+#: ../raphodo/generatenameconfig.py:207
 msgid "Name"
 msgstr "ファイル名"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:206 ../raphodo/rapid.py:2054
+#: ../raphodo/generatenameconfig.py:210 ../raphodo/rapid.py:2126
 msgid "Extension"
 msgstr "拡張子"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:209
+#: ../raphodo/generatenameconfig.py:213
 msgid "Image number"
 msgstr "画像番号"
 
-#: ../raphodo/generatenameconfig.py:210
+#: ../raphodo/generatenameconfig.py:214
 msgid "Video number"
 msgstr "動画番号"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:213
+#: ../raphodo/generatenameconfig.py:217
 msgid "Aperture"
 msgstr "絞り"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:216
+#: ../raphodo/generatenameconfig.py:220
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:219
+#: ../raphodo/generatenameconfig.py:223
 msgid "Exposure time"
 msgstr "露出時間"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:222
+#: ../raphodo/generatenameconfig.py:226
 msgid "Focal length"
 msgstr "焦点距離"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:225
+#: ../raphodo/generatenameconfig.py:229
 msgid "Camera make"
 msgstr "写真機メーカー"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:228
+#: ../raphodo/generatenameconfig.py:232
 msgid "Camera model"
 msgstr "写真機型式"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:231
+#: ../raphodo/generatenameconfig.py:235
 msgid "Short camera model"
 msgstr "写真機形式(短縮形)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:234
+#: ../raphodo/generatenameconfig.py:238
 msgid "Hyphenated short camera model"
 msgstr "写真機形式(短縮形：ハイフン区切り)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:237
+#: ../raphodo/generatenameconfig.py:241
 msgid "Serial number"
 msgstr "シリアル番号"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:240
+#: ../raphodo/generatenameconfig.py:244
 msgid "Shutter count"
 msgstr "シャッター数"
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: ../raphodo/generatenameconfig.py:242
+#: ../raphodo/generatenameconfig.py:246
 msgid "File number"
 msgstr "ファイル番号"
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:244
+#: ../raphodo/generatenameconfig.py:248
 msgid "Folder only"
 msgstr "フォルダのみ"
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:246
+#: ../raphodo/generatenameconfig.py:250
 msgid "Folder and file"
 msgstr "フォルダとファイル"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:249
+#: ../raphodo/generatenameconfig.py:253
 msgid "Owner name"
 msgstr "オーナー名"
 
-#: ../raphodo/generatenameconfig.py:250
+#: ../raphodo/generatenameconfig.py:254
 msgid "Codec"
 msgstr "コーデック"
 
-#: ../raphodo/generatenameconfig.py:251
+#: ../raphodo/generatenameconfig.py:255
 msgid "Width"
 msgstr "横幅"
 
-#: ../raphodo/generatenameconfig.py:252
+#: ../raphodo/generatenameconfig.py:256
 msgid "Height"
 msgstr "縦幅"
 
-#: ../raphodo/generatenameconfig.py:253
+#: ../raphodo/generatenameconfig.py:257
 msgid "Length"
 msgstr "長さ"
 
-#: ../raphodo/generatenameconfig.py:254
+#: ../raphodo/generatenameconfig.py:258
 msgid "Frames Per Second"
 msgstr "毎秒フレーム数"
 
-#: ../raphodo/generatenameconfig.py:255
+#: ../raphodo/generatenameconfig.py:259
 msgid "Artist"
 msgstr "アーティスト"
 
-#: ../raphodo/generatenameconfig.py:256
+#: ../raphodo/generatenameconfig.py:260
 msgid "Copyright"
 msgstr "著作権"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:259
+#: ../raphodo/generatenameconfig.py:263
 msgid "Downloads today"
 msgstr "本日のダウンロード数"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:262
+#: ../raphodo/generatenameconfig.py:266
 msgid "Session number"
 msgstr "セッション番号"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:265
+#: ../raphodo/generatenameconfig.py:269
 msgid "Subfolder number"
 msgstr "サブフォルダ番号"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:268
+#: ../raphodo/generatenameconfig.py:272
 msgid "Stored number"
 msgstr "保存番号"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: ../raphodo/generatenameconfig.py:271
+#: ../raphodo/generatenameconfig.py:275
 msgid "Sequence letter"
 msgstr "アルファベット列"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:274
+#: ../raphodo/generatenameconfig.py:278
 msgid "All digits"
 msgstr "全桁"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:277
+#: ../raphodo/generatenameconfig.py:281
 msgid "Last digit"
 msgstr "下1桁"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:280
+#: ../raphodo/generatenameconfig.py:284
 msgid "Last 2 digits"
 msgstr "下2桁"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:283
+#: ../raphodo/generatenameconfig.py:287
 msgid "Last 3 digits"
 msgstr "下3桁"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:286
+#: ../raphodo/generatenameconfig.py:290
 msgid "Last 4 digits"
 msgstr "下4桁"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:289
+#: ../raphodo/generatenameconfig.py:293
 msgid "Original Case"
 msgstr "原文通り"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:292
+#: ../raphodo/generatenameconfig.py:296
 msgid "UPPERCASE"
 msgstr "大文字"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:295
+#: ../raphodo/generatenameconfig.py:299
 msgid "lowercase"
 msgstr "小文字"
 
-#: ../raphodo/generatenameconfig.py:296
+#: ../raphodo/generatenameconfig.py:300
 msgid "One digit"
 msgstr "1桁"
 
-#: ../raphodo/generatenameconfig.py:297
+#: ../raphodo/generatenameconfig.py:301
 msgid "Two digits"
 msgstr "2桁"
 
-#: ../raphodo/generatenameconfig.py:298
+#: ../raphodo/generatenameconfig.py:302
 msgid "Three digits"
 msgstr "3桁"
 
-#: ../raphodo/generatenameconfig.py:299
+#: ../raphodo/generatenameconfig.py:303
 msgid "Four digits"
 msgstr "4桁"
 
-#: ../raphodo/generatenameconfig.py:300
+#: ../raphodo/generatenameconfig.py:304
 msgid "Five digits"
 msgstr "5桁"
 
-#: ../raphodo/generatenameconfig.py:301
+#: ../raphodo/generatenameconfig.py:305
 msgid "Six digits"
 msgstr "6桁"
 
-#: ../raphodo/generatenameconfig.py:302
+#: ../raphodo/generatenameconfig.py:306
 msgid "Seven digits"
 msgstr "7桁"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:305
+#: ../raphodo/generatenameconfig.py:309
 msgid "Subseconds"
 msgstr "秒未満"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:308 ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:312 ../raphodo/generatenameconfig.py:393
 msgid "YYYYMMDD"
 msgstr "YYYYMMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:311 ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:315 ../raphodo/generatenameconfig.py:394
 msgid "YYYY-MM-DD"
 msgstr "YYYY-MM-DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:314 ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:318 ../raphodo/generatenameconfig.py:395
 msgid "YYYY_MM_DD"
 msgstr "YYYY_MM_DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:317
+#: ../raphodo/generatenameconfig.py:321
 msgid "YYMMDD"
 msgstr "YYMMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:320
+#: ../raphodo/generatenameconfig.py:324
 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
-#: ../raphodo/generatenameconfig.py:323
+#: ../raphodo/generatenameconfig.py:327
 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
-#: ../raphodo/generatenameconfig.py:326
+#: ../raphodo/generatenameconfig.py:330
 msgid "MMDDYYYY"
 msgstr "MMDDYYYY"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:329
+#: ../raphodo/generatenameconfig.py:333
 msgid "MMDDYY"
 msgstr "MMDDYY"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:332
+#: ../raphodo/generatenameconfig.py:336
 msgid "MMDD"
 msgstr "MMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:335
+#: ../raphodo/generatenameconfig.py:339
 msgid "DDMMYYYY"
 msgstr "DDMMYYYY"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:338
+#: ../raphodo/generatenameconfig.py:342
 msgid "DDMMYY"
 msgstr "DDMMYY"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:341 ../raphodo/generatenameconfig.py:389
-#: ../raphodo/generatenameconfig.py:390 ../raphodo/generatenameconfig.py:391
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:345 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:394 ../raphodo/generatenameconfig.py:395
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:397
 msgid "YYYY"
 msgstr "YYYY"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:344
+#: ../raphodo/generatenameconfig.py:348
 msgid "YY"
 msgstr "YY"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:347
+#: ../raphodo/generatenameconfig.py:351
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:350
+#: ../raphodo/generatenameconfig.py:354
 msgid "DD"
 msgstr "DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:353
+#: ../raphodo/generatenameconfig.py:357
 msgid "Month (full)"
 msgstr "月(完全名)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:356
+#: ../raphodo/generatenameconfig.py:360
 msgid "Month (abbreviated)"
 msgstr "月(短縮名)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:359
+#: ../raphodo/generatenameconfig.py:363
 msgid "HHMMSS"
 msgstr "HHMMSS"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:362
+#: ../raphodo/generatenameconfig.py:366
 msgid "HHMM"
 msgstr "HHMM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:365
+#: ../raphodo/generatenameconfig.py:369
 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
-#: ../raphodo/generatenameconfig.py:368
+#: ../raphodo/generatenameconfig.py:372
 msgid "HH-MM"
 msgstr "HH-MM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:371
+#: ../raphodo/generatenameconfig.py:375
 msgid "HH"
 msgstr "HH"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:374
+#: ../raphodo/generatenameconfig.py:378
 msgid "MM (minutes)"
 msgstr "MM (分)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:377
+#: ../raphodo/generatenameconfig.py:381
 msgid "SS"
 msgstr "SS"
 
-#: ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:393
 msgid "Date"
 msgstr "日付"
 
-#: ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:394
 msgid "Date (hyphens)"
 msgstr "日付（ハイフン）"
 
-#: ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:395
 msgid "Date (underscores)"
 msgstr "日付（アンダースコア）"
 
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:438
-#: ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:442
+#: ../raphodo/generatenameconfig.py:537
 msgid "Date and Job Code"
 msgstr "日付とジョブコード"
 
-#: ../raphodo/generatenameconfig.py:392
+#: ../raphodo/generatenameconfig.py:396
 msgid "YYYYMM_Job Code"
 msgstr "YYYYMM_ジョブコード"
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "Date and Job Code Subfolder"
 msgstr "日付とジョブコードサブフォルダ"
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "YYYYMM"
 msgstr "YYYYMM"
 
-#: ../raphodo/generatenameconfig.py:393 ../raphodo/jobcodepanel.py:198
-#: ../raphodo/nameeditor.py:827 ../raphodo/rapid.py:1809
+#: ../raphodo/generatenameconfig.py:397 ../raphodo/jobcodepanel.py:199
+#: ../raphodo/nameeditor.py:833 ../raphodo/rapid.py:1852
 #: ../raphodo/renamepanel.py:83 ../raphodo/renamepanel.py:241
 msgid "Job Code"
 msgstr "ジョブコード"
 
-#: ../raphodo/generatenameconfig.py:433 ../raphodo/generatenameconfig.py:512
+#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:532
 msgid "Original Filename"
 msgstr "元のファイル名"
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "Date-Time and Downloads today"
 msgstr "日付-時間と今日のダウンロード数"
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "YYYYMMDD-HHMM-1"
 msgstr "YYYYMMDD-HHMM-1"
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "Date and Downloads today"
 msgstr "日付と今日のダウンロード数"
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "YYYYMMDD-1"
 msgstr "YYYYMMDD-1"
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "Date-Time and Image number"
 msgstr "日付-時間と画像番号"
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "YYYYMMDD-1234"
 msgstr "YYYYMMDD-1234"
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "Date-Time and Job Code"
 msgstr "日付- 時間とジョブコード"
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "YYYYMMDD-HHMM-Job Code-1"
 msgstr "YYYYMMDD-HHMM-ジョブコード-1"
 
-#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:442 ../raphodo/generatenameconfig.py:537
 msgid "YYYYMMDD-Job Code-1"
 msgstr "YYYYMMDD-ジョブコード-1"
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "Date-Time and Video number"
 msgstr "日付-時間と動画番号"
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "YYYYMMDD_1234"
 msgstr "YYYYMMDD_1234"
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "Resolution"
 msgstr "解像度"
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "YYYYMMDD-HHMM-1-1920x1080"
 msgstr "YYYYMMDD-HHMM-1-1920x1080"
 
@@ -1741,82 +2104,77 @@ msgstr "ジョブコード(&J)"
 msgid "&Remember this choice"
 msgstr "この選択を記憶させる(&R)"
 
-#: ../raphodo/jobcodepanel.py:185
+#: ../raphodo/jobcodepanel.py:186
 msgid ""
 "Select photos and videos to be able to apply a new or existing Job Code to "
 "them."
 msgstr "新規または既存のジョブコードを適用する写真・動画を選択してください．"
 
-#: ../raphodo/jobcodepanel.py:186
-msgid "The new Job Code will be applied to all selected photos and/or videos."
+#: ../raphodo/jobcodepanel.py:187
+msgid ""
+"The new Job Code will be applied to all selected photos and/or videos."
 msgstr "新規ジョブコードは，選択された全ての写真・動画に適用されます．"
 
-#: ../raphodo/jobcodepanel.py:187
+#: ../raphodo/jobcodepanel.py:188
 msgid ""
 "Click the Apply button to apply the current Job Code to all selected photos "
 "and/or videos. You can also simply double click the Job Code."
-msgstr ""
-"適用ボタンを押して，現在のジョブコードを全ての選択した写真・動画に適用してく"
-"ださい．ジョブコードをダブルクリックしても結構です．"
+msgstr "適用ボタンを押して，現在のジョブコードを全ての選択した写真・動画に適用してください．ジョブコードをダブルクリックしても結構です．"
 
-#: ../raphodo/jobcodepanel.py:189
+#: ../raphodo/jobcodepanel.py:190
 msgid ""
 "Removing a Job Code removes it only from the list of saved Job Codes, not "
 "from any photos or videos that it may have been applied to."
-msgstr ""
-"ジョブコードの削除は，保存されているジョブコードのリストから削除するだけで，"
-"適用済みの写真や動画から削除するわけではありません．"
+msgstr "ジョブコードの削除は，保存されているジョブコードのリストから削除するだけで，適用済みの写真や動画から削除するわけではありません．"
 
-#: ../raphodo/jobcodepanel.py:191
+#: ../raphodo/jobcodepanel.py:192
 msgid ""
 "If you want to use Job Codes, configure file renaming or destination "
 "subfolder names to use them."
-msgstr ""
-"ジョブコードを使用したい場合には，ファイル名称変更を設定したり，サブフォルダ"
-"名を設定したりしてください．"
+msgstr "ジョブコードを使用したい場合には，ファイル名称変更を設定したり，サブフォルダ名を設定したりしてください．"
 
-#: ../raphodo/jobcodepanel.py:197
+#: ../raphodo/jobcodepanel.py:198
 msgid "Last Used"
 msgstr "最後に使用した順"
 
-#: ../raphodo/jobcodepanel.py:202
+#: ../raphodo/jobcodepanel.py:203
 msgid "Job Code Sort:"
 msgstr "ジョブコードの整序:"
 
-#: ../raphodo/jobcodepanel.py:205 ../raphodo/rapid.py:2061
+#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2133
 msgid "Ascending"
 msgstr "昇順"
 
-#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2062
+#: ../raphodo/jobcodepanel.py:207 ../raphodo/rapid.py:2134
 msgid "Descending"
 msgstr "降順"
 
-#: ../raphodo/jobcodepanel.py:216
+#: ../raphodo/jobcodepanel.py:217
 msgid "&New..."
 msgstr "新規(&N)..."
 
-#: ../raphodo/jobcodepanel.py:220
+#: ../raphodo/jobcodepanel.py:221
 msgid "&Apply"
 msgstr "適用 (&A)"
 
-#: ../raphodo/jobcodepanel.py:224
+#: ../raphodo/jobcodepanel.py:225
 msgid "&Remove"
 msgstr "削除(&R)"
 
-#: ../raphodo/jobcodepanel.py:228 ../raphodo/preferencedialog.py:125
-#: ../raphodo/preferencedialog.py:154 ../raphodo/preferencedialog.py:433
+#: ../raphodo/jobcodepanel.py:229 ../raphodo/preferencedialog.py:200
+#: ../raphodo/preferencedialog.py:229 ../raphodo/preferencedialog.py:531
 msgid "Remove All"
 msgstr "すべて削除"
 
-#: ../raphodo/jobcodepanel.py:427
+#: ../raphodo/jobcodepanel.py:428
 msgid "Do you really want to remove all the Job Codes?"
 msgstr "本当に全てのジョブコードを削除しますか？"
 
-#: ../raphodo/jobcodepanel.py:429
+#: ../raphodo/jobcodepanel.py:430
 msgid "Remove all Job Codes"
 msgstr "全てのジョブコードを削除"
 
-#: ../raphodo/jobcodepanel.py:492
+#: ../raphodo/jobcodepanel.py:493
 msgid "Job Codes"
 msgstr "ジョブコード"
 
@@ -1827,53 +2185,69 @@ msgstr "ジョブコード"
 msgid "<i><b>Hint:</b> %(message)s"
 msgstr "<i><b>ヒント：</b> %(message)s"
 
-#: ../raphodo/nameeditor.py:418 ../raphodo/nameeditor.py:432
+#: ../raphodo/nameeditor.py:423 ../raphodo/nameeditor.py:437
 #, python-format
 msgid "%(description)s - %(elements)s"
 msgstr "%(description)s - %(elements)s"
 
-#: ../raphodo/nameeditor.py:512
+#: ../raphodo/nameeditor.py:517
 msgid "Save New Custom Preset..."
 msgstr "新規設定スキームを保存..."
 
-#: ../raphodo/nameeditor.py:513
+#: ../raphodo/nameeditor.py:518
 msgid "Remove All Custom Presets..."
 msgstr "全ての設定スキームを削除"
 
-#: ../raphodo/nameeditor.py:559
+#: ../raphodo/nameeditor.py:564
 msgid "(New Custom Preset)"
 msgstr "（新規設定スキーム）"
 
-#: ../raphodo/nameeditor.py:576
+#: ../raphodo/nameeditor.py:581
 #, python-format
 msgid "%s (edited)"
 msgstr "%s（編集済み）"
 
-#: ../raphodo/nameeditor.py:579 ../raphodo/nameeditor.py:1370
+#: ../raphodo/nameeditor.py:584 ../raphodo/nameeditor.py:1379
 #, python-format
 msgid "Update Custom Preset \"%s\""
 msgstr "設定スキーム「%s」を更新"
 
-#: ../raphodo/nameeditor.py:667
+#: ../raphodo/nameeditor.py:672
 msgid "Save New Custom Preset - Rapid Photo Downloader"
 msgstr "新規設定スキームを保存 ー 高速写真ダウンローダ"
 
-#: ../raphodo/nameeditor.py:675
+#: ../raphodo/nameeditor.py:680
 msgid "Preset Name:"
 msgstr "スキーム名："
 
-#: ../raphodo/nameeditor.py:836
+#: ../raphodo/nameeditor.py:799
+msgid "Photo Subfolder Generation Editor"
+msgstr "写真サブフォルダ生成エディタ"
+
+#: ../raphodo/nameeditor.py:805
+msgid "Video Subfolder Generation Editor"
+msgstr "動画サブフォルダ生成エディタ"
+
+#: ../raphodo/nameeditor.py:811
+msgid "Photo Renaming Editor"
+msgstr "写真名称変更エディタ"
+
+#: ../raphodo/nameeditor.py:817
+msgid "Video Renaming Editor"
+msgstr "動画名称変更エディタ"
+
+#: ../raphodo/nameeditor.py:842
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>There is insufficient data to "
 "fully generate the name. Please use other renaming options.</i>"
 msgstr ""
-"<b><font color=\"red\">警告：</font></b> <i>名前を完全に生成するのに十分な"
-"データがありません．他の名称変更オプションを使用してください．</i>"
+"<b><font color=\"red\">警告：</font></b> "
+"<i>名前を完全に生成するのに十分なデータがありません．他の名称変更オプションを使用してください．</i>"
 
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees.
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:846
+#: ../raphodo/nameeditor.py:853
 #, python-format
 msgid "The character</i> %(separator)s <i>creates a new subfolder level."
 msgstr "</i> %(separator)s <i>の文字は，新規のサブフォルダレベルを生成します．"
@@ -1881,208 +2255,235 @@ msgstr "</i> %(separator)s <i>の文字は，新規のサブフォルダレベ�
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:851
+#: ../raphodo/nameeditor.py:858
 #, python-format
 msgid ""
 "There is no need start or end with the folder separator </i> "
 "%(separator)s<i>, because it is added automatically."
-msgstr ""
-"フォルダ区切り</i>%(separator)s<i>は，自動的に付加されるので，前後に付ける必"
-"要はありません．"
+msgstr "フォルダ区切り</i>%(separator)s<i>は，自動的に付加されるので，前後に付ける必要はありません．"
 
-#: ../raphodo/nameeditor.py:859
+#: ../raphodo/nameeditor.py:866
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>Unique filenames may not be "
 "generated. Make filenames unique by using Sequence values.</i>"
 msgstr ""
-"<b><font color=\"red\">警告：</font></b> <i>排他的なファイル名が生成されない"
-"可能性があります．連番の値を使用してファイル名を排他的なものにしてください．"
-"</i>"
+"<b><font color=\"red\">警告：</font></b> "
+"<i>排他的なファイル名が生成されない可能性があります．連番の値を使用してファイル名を排他的なものにしてください．</i>"
 
-#: ../raphodo/nameeditor.py:882 ../raphodo/renamepanel.py:121
+#: ../raphodo/nameeditor.py:889 ../raphodo/renamepanel.py:121
 msgid "Preset:"
 msgstr "スキーム："
 
 #. Translators: appears in a combobox, e.g. Image Date (YYYY)
-#: ../raphodo/nameeditor.py:959 ../raphodo/nameeditor.py:980
+#: ../raphodo/nameeditor.py:966 ../raphodo/nameeditor.py:987
 #, python-brace-format
 msgid "{choice} ({variant})"
 msgstr "{choice} ({variant})"
 
-#: ../raphodo/nameeditor.py:1005 ../raphodo/preferencedialog.py:530
+#: ../raphodo/nameeditor.py:1012 ../raphodo/preferencedialog.py:783
 msgid "Get help online..."
 msgstr "オンラインでヘルプを得る..."
 
-#: ../raphodo/nameeditor.py:1025
+#: ../raphodo/nameeditor.py:1034
 msgid "Insert"
 msgstr "挿入"
 
-#: ../raphodo/nameeditor.py:1351
+#: ../raphodo/nameeditor.py:1360
 msgid "Save Preset - Rapid Photo Downloader"
 msgstr "スキームを保存 ー 高速写真ダウンローダ"
 
-#: ../raphodo/nameeditor.py:1356
+#: ../raphodo/nameeditor.py:1365
 msgid ""
-"<b>Do you want to save the changes in a new custom preset?</"
-"b><br><br>Creating a custom preset is not required, but can help you keep "
-"organized.<br><br>The changes to the preferences will still be applied "
-"regardless of whether you create a new custom preset or not."
+"<b>Do you want to save the changes in a new custom "
+"preset?</b><br><br>Creating a custom preset is not required, but can help "
+"you keep organized.<br><br>The changes to the preferences will still be "
+"applied regardless of whether you create a new custom preset or not."
 msgstr ""
-"<b>新規設定スキームの変更を保存しますか？</b><br><br>設定スキームを作る必要は"
-"ありませんが，整理に役立ちます．<br><br>新規設定スキームを作成してもしなくて"
-"も，設定の変更は適用されます．"
+"<b>新規設定スキームの変更を保存しますか？</b><br><br>設定スキームを作る必要はありませんが，整理に役立ちます．<br><br>新規設定スキー"
+"ムを作成してもしなくても，設定の変更は適用されます．"
 
-#: ../raphodo/nameeditor.py:1365
+#: ../raphodo/nameeditor.py:1374
 msgid ""
 "<b>Do you want to save the changes in a custom preset?</b><br><br>If you "
 "like, you can create a new custom preset or update the existing custom "
 "preset.<br><br>The changes to the preferences will still be applied "
 "regardless of whether you save a custom preset or not."
 msgstr ""
-"<b>設定スキームの変更を保存しますか？</b><br><br>ご希望ならば，新規設定スキー"
-"ムを作るか既存の設定スキームを更新することができます．<br><br>新規設定スキー"
-"ムを作成してもしなくても，設定の変更は適用されます．"
+"<b>設定スキームの変更を保存しますか？</b><br><br>ご希望ならば，新規設定スキームを作るか既存の設定スキームを更新することができます．<br>"
+"<br>新規設定スキームを作成してもしなくても，設定の変更は適用されます．"
 
-#: ../raphodo/nameeditor.py:1372
+#: ../raphodo/nameeditor.py:1381
 msgid "Save New Custom Preset"
 msgstr "新規設定スキームを保存"
 
-#: ../raphodo/newversion.py:306
+#: ../raphodo/newversion.py:312
 msgid "Checking for new version..."
 msgstr "新しいバージョンを確認しています..."
 
-#: ../raphodo/newversion.py:307
+#: ../raphodo/newversion.py:313
 msgid "You are running the latest version."
 msgstr "最新バージョンを実行しています．"
 
-#: ../raphodo/newversion.py:308
+#: ../raphodo/newversion.py:314
 msgid "Failed to contact the update server."
 msgstr "更新サーバへの接続に失敗しました．"
 
-#: ../raphodo/newversion.py:310
+#: ../raphodo/newversion.py:316
 #, python-format
 msgid "A new version of Rapid Photo Downloader (%s) is available."
 msgstr "高速写真ダウンローダの新しいバージョン（%s）があります．"
 
-#: ../raphodo/newversion.py:312
+#: ../raphodo/newversion.py:318
 msgid "Do you want to download the new version?"
 msgstr "新しいバージョンをダウンロードしますか？"
 
-#: ../raphodo/newversion.py:313
+#: ../raphodo/newversion.py:319
 #, python-format
 msgid "Changes in the new release can be viewed <a href=\"%s\">here</a>."
 msgstr "新しいリリースの変更点は，<a href=\"%s\">こちら</a>でご覧になれます．"
 
 #. Translators: this text appears in a button - the & sets the s key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:340 ../raphodo/newversion.py:353
+#: ../raphodo/newversion.py:348 ../raphodo/newversion.py:363
 msgid "&Skip this release"
 msgstr "このリリースは無視(&S)"
 
 #. Translators: this text appears in a button - the & sets the o key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:356
+#: ../raphodo/newversion.py:366
 msgid "&Open Download Page"
 msgstr "ダウンロードページを開く(&O)"
 
-#: ../raphodo/newversion.py:376
+#: ../raphodo/newversion.py:386
 msgid "Rapid Photo Downloader updates"
 msgstr "高速写真ダウンローダの更新"
 
 #. Translators: shows how much of a file has been downloaded e.g  123 KB of 1.3 MB
-#: ../raphodo/newversion.py:478
+#: ../raphodo/newversion.py:488
 #, python-format
 msgid "%(downloaded)s of %(total)s"
 msgstr "%(total)s 中 %(downloaded)s"
 
-#: ../raphodo/newversion.py:495
+#: ../raphodo/newversion.py:507
 msgid "Downloading..."
 msgstr "ダウンロード中..."
 
-#: ../raphodo/preferencedialog.py:76
+#: ../raphodo/preferencedialog.py:86
 msgid "Preferences"
 msgstr "設定"
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Automation"
 msgstr "自動化"
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Thumbnails"
 msgstr "サムネイル"
 
-#: ../raphodo/preferencedialog.py:85 ../raphodo/preferencedialog.py:343
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/preferencedialog.py:428
 msgid "Error Handling"
 msgstr "エラー処理"
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Warnings"
 msgstr "警告"
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:109
+msgid "Consolidation"
+msgstr "統合"
+
+#: ../raphodo/preferencedialog.py:109 ../raphodo/preferencedialog.py:119
 msgid "Miscellaneous"
 msgstr "その他"
 
-#: ../raphodo/preferencedialog.py:94
+#: ../raphodo/preferencedialog.py:147
 msgid "Device Scanning"
 msgstr "スキャン中のデバイス"
 
-#: ../raphodo/preferencedialog.py:96
+#: ../raphodo/preferencedialog.py:148
 msgid "Scan only external devices"
 msgstr "外部デバイスのみスキャンする"
 
-#: ../raphodo/preferencedialog.py:98
+#: ../raphodo/preferencedialog.py:150
 msgid ""
 "Scan for photos and videos only on devices that are external to the "
 "computer,\n"
 "including cameras, memory cards, external hard drives, and USB flash drives."
 msgstr ""
-"写真・動画を探す際，カメラ・メモリーカード・外部ハードディスク・USBフラッシュ"
-"ディスクなど，コンピュータ外部のデバイスのみをスキャンする．"
+"写真・動画を探す際，カメラ・メモリーカード・外部ハードディスク・USBフラッシュディスクなど，コンピュータ外部のデバイスのみをスキャンする．"
 
-#: ../raphodo/preferencedialog.py:102
-msgid "Scan non-camera devices lacking a DCIM folder"
-msgstr "DCIMフォルダがない非カメラデバイスをスキャンする"
+#: ../raphodo/preferencedialog.py:153
+msgid "Scan only specific folders on devices"
+msgstr "デバイス上の特定のフォルダのみ走査"
 
-#: ../raphodo/preferencedialog.py:104
+#: ../raphodo/preferencedialog.py:155
 msgid ""
-"Scan the entirety of a device for photos and videos, irrespective of whether "
-"it contains a DCIM folder,\n"
-"as opposed to only scanning within a DCIM folder.\n"
+"Scan for photos and videos only in the folders specified below (except "
+"paths\n"
+"specified in Ignored Paths).\n"
+"\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+"以下に指定するフォルダ内（無視するパスに指定されているパスは除く）の\n"
+"写真と動画のみ走査する．\n"
 "\n"
-"Changing this setting causes all devices to be scanned again.\n"
+"この設定を変更すると，全てのデバイスが再走査されます．"
+
+#: ../raphodo/preferencedialog.py:161
+msgid "Folders to scan:"
+msgstr "走査対象フォルダ："
+
+#: ../raphodo/preferencedialog.py:164
+msgid ""
+"Folders at the base level of device file systems that will be scanned\n"
+"for photos and videos."
+msgstr "デバイスファイルシステムのベースレベルで写真や動画を走査するフォルダ"
+
+#: ../raphodo/preferencedialog.py:167 ../raphodo/preferencedialog.py:219
+msgid "Add..."
+msgstr "追加..."
+
+#: ../raphodo/preferencedialog.py:169
+msgid ""
+"Add a folder to the list of folders to scan for photos and videos.\n"
 "\n"
-"Note: With cameras, only the DCIM folder is scanned."
+"Changing this setting causes all devices to be scanned again."
 msgstr ""
-"写真・動画を探す際，DCIMフォルダ内部のみスキャンするのではなく，\n"
-"DCIMフォルダの有無にかかわらず，デバイス全体をスキャンする．\n"
+"写真や動画を走査するフォルダリストにフォルダを追加します．\n"
 "\n"
-"この設定を変更すると，全てのデバイスが再度スキャンされます．\n"
+"この設定を変更すると，全てのデバイスが再走査されます．"
+
+#: ../raphodo/preferencedialog.py:172 ../raphodo/preferencedialog.py:198
+#: ../raphodo/preferencedialog.py:224 ../raphodo/preferencedialog.py:529
+msgid "Remove"
+msgstr "削除"
+
+#: ../raphodo/preferencedialog.py:174
+msgid ""
+"Remove a folder from the list of folders to scan for photos and videos.\n"
+"\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+"写真や動画を走査するフォルダリストからフォルダを削除します．\n"
 "\n"
-"註：カメラの場合，DCIMフォルダのみがスキャンされます．"
+"この設定を変更すると，全てのデバイスが再走査されます．"
 
-#: ../raphodo/preferencedialog.py:116
+#: ../raphodo/preferencedialog.py:191
 msgid "Devices that have been set to automatically ignore or download from."
 msgstr "自動的に無視するかダウンロードするか設定されたデバイス"
 
-#: ../raphodo/preferencedialog.py:117
+#: ../raphodo/preferencedialog.py:192
 msgid "Remembered Devices"
 msgstr "記憶されているデバイス"
 
-#: ../raphodo/preferencedialog.py:121
+#: ../raphodo/preferencedialog.py:196
 msgid ""
 "Remove a device from the list of devices to automatically ignore or download "
 "from."
-msgstr ""
-"自動的に無視したりダウンロードしたりするデバイスのリストからデバイスを削除し"
-"ます．"
-
-#: ../raphodo/preferencedialog.py:123 ../raphodo/preferencedialog.py:149
-#: ../raphodo/preferencedialog.py:431
-msgid "Remove"
-msgstr "削除"
+msgstr "自動的に無視したりダウンロードしたりするデバイスのリストからデバイスを削除します．"
 
-#: ../raphodo/preferencedialog.py:127
+#: ../raphodo/preferencedialog.py:202
 msgid ""
 "Clear the list of devices from which to automatically ignore or download "
 "from.\n"
@@ -2090,27 +2491,23 @@ msgid ""
 "Note: Changes take effect when the computer is next scanned for devices."
 msgstr "自動的にダウンロードするか否か設定されたデバイスリストを消去"
 
-#: ../raphodo/preferencedialog.py:140
+#: ../raphodo/preferencedialog.py:215
 msgid "Ignored Paths"
 msgstr "対象外パス"
 
-#: ../raphodo/preferencedialog.py:141
+#: ../raphodo/preferencedialog.py:216
 msgid ""
 "The end part of a path that should never be scanned for photos or videos."
 msgstr "写真や動画のスキャンを行わないパスの最後の部分"
 
-#: ../raphodo/preferencedialog.py:144
-msgid "Add..."
-msgstr "追加..."
-
-#: ../raphodo/preferencedialog.py:146
+#: ../raphodo/preferencedialog.py:221
 msgid ""
 "Add a path to the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr "対象外パスのリストにパスを追加します．"
 
-#: ../raphodo/preferencedialog.py:151
+#: ../raphodo/preferencedialog.py:226
 msgid ""
 "Remove a path from the list of paths to ignore.\n"
 "\n"
@@ -2120,7 +2517,7 @@ msgstr ""
 "\n"
 "この設定を変更すると，全てのデバイスが再度スキャンされます．"
 
-#: ../raphodo/preferencedialog.py:156
+#: ../raphodo/preferencedialog.py:231
 msgid ""
 "Clear the list of paths to ignore.\n"
 "\n"
@@ -2130,15 +2527,17 @@ msgstr ""
 "\n"
 "この設定を変更すると，全てのデバイスが再度スキャンされます．"
 
-#: ../raphodo/preferencedialog.py:164
+#: ../raphodo/preferencedialog.py:239
 msgid ""
-"Use python-style <a href=\"http://damonlynch.net/rapid/documentation/"
-"#regularexpressions\">regular expressions</a>"
+"Use python-style <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">regula"
+"r expressions</a>"
 msgstr ""
-"pythonスタイルの<a href=\"http://damonlynch.net/rapid/documentation/"
-"#regularexpressions\">正規表現</a>を使用"
+"pythonスタイルの<a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">正規表現</"
+"a>を使用"
 
-#: ../raphodo/preferencedialog.py:168
+#: ../raphodo/preferencedialog.py:243
 msgid ""
 "Use regular expressions in the list of ignored paths.\n"
 "\n"
@@ -2148,287 +2547,400 @@ msgstr ""
 "\n"
 "この設定を変更すると，全てのデバイスが再度操作されます．"
 
-#: ../raphodo/preferencedialog.py:208
+#: ../raphodo/preferencedialog.py:283
 msgid "Program Automation"
 msgstr "プログラム自動化"
 
-#: ../raphodo/preferencedialog.py:209
+#: ../raphodo/preferencedialog.py:284
 msgid "Start downloading at program startup"
 msgstr "プログラム開始とともにダウンロード開始"
 
-#: ../raphodo/preferencedialog.py:210
+#: ../raphodo/preferencedialog.py:285
 msgid "Start downloading upon device insertion"
 msgstr "デバイス挿入とともにダウンロード開始"
 
-#: ../raphodo/preferencedialog.py:211
+#: ../raphodo/preferencedialog.py:286
 msgid "Unmount (eject) device upon download completion"
 msgstr "ダウンロード完了時にデバイスをアンマウント（取り出す）"
 
-#: ../raphodo/preferencedialog.py:212
+#: ../raphodo/preferencedialog.py:287
 msgid "Exit program when download completes"
 msgstr "ダウンロード完了とともにプログラムを終了"
 
-#: ../raphodo/preferencedialog.py:213
+#: ../raphodo/preferencedialog.py:288
 msgid "Exit program even if download had warnings or errors"
 msgstr "ダウンロードに警告やエラーがあった場合でもプログラムを終了"
 
-#: ../raphodo/preferencedialog.py:240
+#: ../raphodo/preferencedialog.py:315
 msgid "Thumbnail Generation"
 msgstr "サムネイルの生成"
 
-#: ../raphodo/preferencedialog.py:241
+#: ../raphodo/preferencedialog.py:316
 msgid "Generate thumbnails"
 msgstr "サムネイルを生成"
 
-#: ../raphodo/preferencedialog.py:242
+#: ../raphodo/preferencedialog.py:318
 msgid "Generate thumbnails to show in the main program window"
 msgstr "プログラムのメインウィンドウに表示するサムネイルを生成します"
 
-#: ../raphodo/preferencedialog.py:244
+#: ../raphodo/preferencedialog.py:320
 msgid "Cache thumbnails"
 msgstr "サムネイルをキャッシュする"
 
-#: ../raphodo/preferencedialog.py:245
+#: ../raphodo/preferencedialog.py:323
 msgid ""
 "Save thumbnails shown in the main program window in a thumbnail cache unique "
 "to Rapid Photo Downloader"
-msgstr ""
-"プログラムのメインウィンドウに表示されるサムネイルを，高速写真ダウンローダ固"
-"有のサムネイルキャッシュに保存する"
+msgstr "プログラムのメインウィンドウに表示されるサムネイルを，高速写真ダウンローダ固有のサムネイルキャッシュに保存する"
 
-#: ../raphodo/preferencedialog.py:247
+#: ../raphodo/preferencedialog.py:327
 msgid "Generate system thumbnails"
 msgstr "システムサムネイルを生成"
 
-#: ../raphodo/preferencedialog.py:248
+#: ../raphodo/preferencedialog.py:330
 msgid ""
 "While downloading, save thumbnails that can be used by desktop file managers "
 "and other programs"
-msgstr ""
-"ダウンロード中に，デスクトップファイルマネージャ等に使用可能なサムネイルを保"
-"存する"
+msgstr "ダウンロード中に，デスクトップファイルマネージャ等に使用可能なサムネイルを保存する"
 
-#: ../raphodo/preferencedialog.py:255
+#: ../raphodo/preferencedialog.py:339
 msgid "Number of CPU cores used to generate thumbnails."
 msgstr "サムネイルを生成するのに使用するCPUコアの数"
 
-#: ../raphodo/preferencedialog.py:256
+#: ../raphodo/preferencedialog.py:340
 msgid "CPU cores:"
 msgstr "CPUコア："
 
 #. Translators: the * acts as an asterisk to denote a reference to an annotation
 #. such as '* Takes effect upon program restart'
-#: ../raphodo/preferencedialog.py:271 ../raphodo/preferencedialog.py:317
+#: ../raphodo/preferencedialog.py:355 ../raphodo/preferencedialog.py:401
 msgid "*"
 msgstr "*"
 
-#: ../raphodo/preferencedialog.py:294
+#: ../raphodo/preferencedialog.py:378
 msgid "Thumbnail Cache"
 msgstr "サムネイルのキャッシュ"
 
-#: ../raphodo/preferencedialog.py:296
+#: ../raphodo/preferencedialog.py:380
 msgid "Calculating..."
 msgstr "計算中..."
 
-#: ../raphodo/preferencedialog.py:302
+#: ../raphodo/preferencedialog.py:386
 msgid "days"
 msgstr "日"
 
-#: ../raphodo/preferencedialog.py:303
+#: ../raphodo/preferencedialog.py:387
 msgid "forever"
 msgstr "永久に"
 
-#: ../raphodo/preferencedialog.py:308
+#: ../raphodo/preferencedialog.py:392
 msgid "Cache size:"
 msgstr "キャッシュ容量："
 
-#: ../raphodo/preferencedialog.py:310
+#: ../raphodo/preferencedialog.py:394
 msgid "Number of thumbnails:"
 msgstr "サムネイル数："
 
-#: ../raphodo/preferencedialog.py:312
+#: ../raphodo/preferencedialog.py:396
 msgid "Database size:"
 msgstr "データベース容量："
 
-#: ../raphodo/preferencedialog.py:314
+#: ../raphodo/preferencedialog.py:398
 msgid "Cache unaccessed thumbnails for:"
 msgstr "アクセスのないサムネールのキャッシュ保持期間："
 
-#: ../raphodo/preferencedialog.py:322
+#: ../raphodo/preferencedialog.py:406
 msgid "Purge Cache..."
 msgstr "キャッシュを削除..."
 
-#: ../raphodo/preferencedialog.py:323
+#: ../raphodo/preferencedialog.py:408
 msgid "Optimize Cache..."
 msgstr "キャッシュの最適化..."
 
-#: ../raphodo/preferencedialog.py:336
+#: ../raphodo/preferencedialog.py:421
 msgid "* Takes effect upon program restart"
 msgstr "* プログラムを再起動後有効となります"
 
-#: ../raphodo/preferencedialog.py:346
+#: ../raphodo/preferencedialog.py:431
 msgid "Skip download"
 msgstr "ダウンロードをスキップ"
 
-#: ../raphodo/preferencedialog.py:347
+#: ../raphodo/preferencedialog.py:432
 msgid "Don't download the file, and issue an error message"
 msgstr "ファイルをダウンロードせず，エラーメッセージを表示する"
 
-#: ../raphodo/preferencedialog.py:348
+#: ../raphodo/preferencedialog.py:433
 msgid "Add unique identifier"
 msgstr "重複しない識別子を追記"
 
-#: ../raphodo/preferencedialog.py:349
+#: ../raphodo/preferencedialog.py:436
 msgid ""
 "Add an identifier like _1 or _2 to the end of the filename, immediately "
 "before the file's extension"
-msgstr ""
-"ファイル拡張子の直前，ファイル名の終わりに_1や_2のような識別子を追加します．"
+msgstr "ファイル拡張子の直前，ファイル名の終わりに_1や_2のような識別子を追加します．"
 
-#: ../raphodo/preferencedialog.py:355
+#: ../raphodo/preferencedialog.py:444
 msgid "Overwrite"
 msgstr "上書き"
 
-#: ../raphodo/preferencedialog.py:356
+#: ../raphodo/preferencedialog.py:445
 msgid "Overwrite the previously backed up file"
 msgstr "前回のバックアップファイルを上書きします"
 
-#: ../raphodo/preferencedialog.py:357
+#: ../raphodo/preferencedialog.py:446
 msgid "Skip"
 msgstr "スキップ"
 
-#: ../raphodo/preferencedialog.py:358
+#: ../raphodo/preferencedialog.py:448
 msgid "Don't overwrite the backup file, and issue an error message"
 msgstr "バックアップファイルを上書きしないで，エラーメッセージを表示します"
 
-#: ../raphodo/preferencedialog.py:364
+#: ../raphodo/preferencedialog.py:455
 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 identifier:"
 msgstr ""
-"同じ名前の写真や動画がすでにダウンロードされている場合には，ファイルのダウン"
-"ロードをスキップするか重複しない識別子を書き加えるかを選択します："
+"同じ名前の写真や動画がすでにダウンロードされている場合には，ファイルのダウンロードをスキップするか重複しない識別子を書き加えるかを選択します："
 
-#: ../raphodo/preferencedialog.py:378
+#: ../raphodo/preferencedialog.py:464
+msgid ""
+"Using sequence numbers to automatically generate unique filenames is "
+"strongly recommended. Configure file renaming in the Rename panel in the "
+"main window."
+msgstr ""
+"重複しないファイル名を自動生成するのに，連番を用いることが強く推奨されます．メインウィンドウの改名パネルでファイル改名の設定をしてください．"
+
+#: ../raphodo/preferencedialog.py:473
 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 ""
-"バックアップの際，同じ名前を持つバックアップデバイス上にファイルがある場合，"
-"上書きするかバックアップをしないかを選択します："
+msgstr "バックアップの際，同じ名前を持つバックアップデバイス上にファイルがある場合，上書きするかバックアップをしないかを選択します："
 
-#: ../raphodo/preferencedialog.py:398
+#: ../raphodo/preferencedialog.py:494
 msgid "Program Warnings"
 msgstr "プログラムの警告"
 
-#: ../raphodo/preferencedialog.py:399
+#: ../raphodo/preferencedialog.py:495
 msgid "Show a warning when:"
 msgstr "警告を発するケース："
 
-#: ../raphodo/preferencedialog.py:402
+#: ../raphodo/preferencedialog.py:498
 msgid "Downloading files currently not displayed"
 msgstr "現在表示されていないファイルをダウンロード中"
 
-#: ../raphodo/preferencedialog.py:403
+#: ../raphodo/preferencedialog.py:499
 msgid ""
 "Warn when about to download files that are not displayed in the main window."
-msgstr ""
-"メインウィンドウに表示されていないファイルをダウンロードしようとするときには"
-"警告します．"
+msgstr "メインウィンドウに表示されていないファイルをダウンロードしようとするときには警告します．"
 
-#: ../raphodo/preferencedialog.py:405
+#: ../raphodo/preferencedialog.py:501
 msgid "Backup destinations are missing"
 msgstr "バックアップ先がない"
 
-#: ../raphodo/preferencedialog.py:406
-msgid "Warn before starting a download if it is not possible to back up files."
+#: ../raphodo/preferencedialog.py:502
+msgid ""
+"Warn before starting a download if it is not possible to back up files."
 msgstr "ファイルをバックアップできない時，ダウンロード開始前に警告する．"
 
-#: ../raphodo/preferencedialog.py:408
+#: ../raphodo/preferencedialog.py:504
 msgid "Program libraries are missing or broken"
 msgstr "プログラムライブラリが見当たらないか破損している"
 
-#: ../raphodo/preferencedialog.py:409
+#: ../raphodo/preferencedialog.py:505
 msgid ""
 "Warn if a software library used by Rapid Photo Downloader is missing or not "
 "functioning."
-msgstr ""
-"高速写真ダウンローダが使用しているソフトウェアライブラリが，なかったり機能し"
-"ていなかったりした場合には警告する．"
+msgstr "高速写真ダウンローダが使用しているソフトウェアライブラリが，なかったり機能していなかったりした場合には警告する．"
 
-#: ../raphodo/preferencedialog.py:412
+#: ../raphodo/preferencedialog.py:508
 msgid "Filesystem metadata cannot be set"
 msgstr "ファイルシステムのメタデータを設定することができません"
 
-#: ../raphodo/preferencedialog.py:413
+#: ../raphodo/preferencedialog.py:509
 msgid ""
 "Warn if there is an error setting a file's filesystem metadata, such as its "
 "modification time."
-msgstr ""
-"ファイルシステムの修正日時など，ファイルシステムのメタデータを設定する際に，"
-"エラーが発生した場合には警告する．"
+msgstr "ファイルシステムの修正日時など，ファイルシステムのメタデータを設定する際に，エラーが発生した場合には警告する．"
 
-#: ../raphodo/preferencedialog.py:416
+#: ../raphodo/preferencedialog.py:512
 msgid "Encountering unhandled files"
 msgstr "非取扱ファイルに遭遇"
 
-#: ../raphodo/preferencedialog.py:417
+#: ../raphodo/preferencedialog.py:513
 msgid ""
 "Warn after scanning a device or this computer if there are unrecognized "
 "files that will not be included in the download."
-msgstr ""
-"デバイスやこのコンピュータを操作して，ダウンロードの対象とならない認識不可能"
-"なファイルがあった場合，警告する．"
+msgstr "デバイスやこのコンピュータを操作して，ダウンロードの対象とならない認識不可能なファイルがあった場合，警告する．"
 
-#: ../raphodo/preferencedialog.py:420
+#: ../raphodo/preferencedialog.py:517
 msgid "Do not warn about unhandled files with extensions:"
 msgstr "これらの拡張子のファイルについては取り扱っていなくても警告しない："
 
-#: ../raphodo/preferencedialog.py:424
+#: ../raphodo/preferencedialog.py:522
 msgid ""
 "File extensions are case insensitive and do not need to include the leading "
 "dot."
-msgstr ""
-"ファイル拡張子は大小文字を区別せず，前置されるドットは含める必要はありませ"
-"ん．"
+msgstr "ファイル拡張子は大小文字を区別せず，前置されるドットは含める必要はありません．"
 
-#: ../raphodo/preferencedialog.py:427
+#: ../raphodo/preferencedialog.py:525
 msgid "Add"
 msgstr "追加"
 
-#: ../raphodo/preferencedialog.py:428
+#: ../raphodo/preferencedialog.py:526
 msgid ""
 "Add a file extension to the list of unhandled file types to not warn about."
 msgstr "警告を発しない非取扱ファイル型のリストにファイル拡張子を追加する．"
 
-#: ../raphodo/preferencedialog.py:430
+#: ../raphodo/preferencedialog.py:528
 msgid ""
 "Remove a file extension from the list of unhandled file types to not warn "
 "about."
 msgstr "警告を発しない非取扱ファイル型のリストからファイル拡張子を削除する．"
 
-#: ../raphodo/preferencedialog.py:434
+#: ../raphodo/preferencedialog.py:532
 msgid ""
 "Clear the list of file extensions of unhandled file types to not warn about."
 msgstr "警告を発しない非取扱ファイル型のリストを消去する．"
 
-#: ../raphodo/preferencedialog.py:469
+#: ../raphodo/preferencedialog.py:568
+msgid "Photo and Video Consolidation"
+msgstr "写真と動画の統合"
+
+#: ../raphodo/preferencedialog.py:571
+msgid "Consolidate files across devices and downloads"
+msgstr "デバイスおよびダウンロードにまたがるファイルの統合"
+
+#: ../raphodo/preferencedialog.py:574
+msgid ""
+"Analyze the results of device scans looking for duplicate files and matching "
+"RAW and JPEG pairs,\n"
+"comparing them across multiple devices and download sessions."
+msgstr ""
+"複数のデバイスとダウンロードセッションを比較して，重複ファイルや一致するRAW対JPEGの\n"
+"組がないか検索するデバイス走査の結果を分析します．"
+
+#: ../raphodo/preferencedialog.py:580
+msgid "Treat matching RAW and JPEG files as:"
+msgstr "対応するRAWファイルとJPEGファイルの取扱："
+
+#: ../raphodo/preferencedialog.py:581
+msgid "One photo"
+msgstr "1枚の写真"
+
+#: ../raphodo/preferencedialog.py:582
+msgid "Two photos"
+msgstr "2枚の写真"
+
+#: ../raphodo/preferencedialog.py:584
+msgid ""
+"Display matching pairs of RAW and JPEG photos as one photo, and if marked, "
+"download both."
+msgstr "一致するRAWおよびJPEG写真を一つの写真として表示し，マークされた場合には両方ともダウンロードする．"
+
+#: ../raphodo/preferencedialog.py:589
+msgid ""
+"Display matching pairs of RAW and JPEG photos as two different photos. You "
+"can still synchronize their sequence numbers."
+msgstr "一致するRAWおよびJPEG写真を別々の二つの写真として表示する．そのことに関わらず，これらの連番を同期することは可能です．"
+
+#: ../raphodo/preferencedialog.py:598
+msgid "With matching RAW and JPEG photos:"
+msgstr "一致するRAWおよびJPEG写真とともに："
+
+#: ../raphodo/preferencedialog.py:600
+msgid "Do not mark JPEG for download"
+msgstr "JPEGをダウンロード用にマークしない"
+
+#: ../raphodo/preferencedialog.py:601
+msgid "Do not mark RAW for download"
+msgstr "RAWをダウンロード用にマークしない"
+
+#: ../raphodo/preferencedialog.py:602
+msgid "Mark both for download"
+msgstr "両方ともダウンロード用にマークする"
+
+#: ../raphodo/preferencedialog.py:609
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"JPEG for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+"一致するRAWおよびJPEG写真が検出された場合，JPEGをダウンロード対象として自動的に\n"
+"マークしない．手動でダウンロードにマークすることは可能です．"
+
+#: ../raphodo/preferencedialog.py:614
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"RAW for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+"一致するRAWおよびJPEG写真が検出された場合，RAWをダウンロード対象として自動的に\n"
+"マークしない．手動でダウンロードにマークすることは可能です．"
+
+#: ../raphodo/preferencedialog.py:619
+msgid ""
+"When matching RAW and JPEG photos are found, automatically mark both for "
+"download."
+msgstr "一致するRAWおよびJPEG写真が検出された場合，両方をダウンロード対象として自動的にマークします．"
+
+#: ../raphodo/preferencedialog.py:625
+msgid ""
+"If you disable file consolidation, choose what to do when a download device "
+"is inserted while completed downloads are displayed:"
+msgstr "ファイル統合を無効にした場合に，終了したダウンロードが表示されたまま，ダウンロードデバイスが挿入されたとき，どうするか選択してください："
+
+#: ../raphodo/preferencedialog.py:631
+msgid ""
+"When a download device is inserted while completed downloads are displayed:"
+msgstr "終了したダウンロードが表示されたまま，ダウンロードデバイスが挿入されたとき："
+
+#: ../raphodo/preferencedialog.py:642
+msgid "Clear completed downloads"
+msgstr "完了したダウンロードを消去"
+
+#: ../raphodo/preferencedialog.py:643
+msgid "Keep displaying completed downloads"
+msgstr "完了したダウンロードの表示を維持"
+
+#: ../raphodo/preferencedialog.py:644
+msgid "Prompt for what to do"
+msgstr "どうするかプロンプトを表示"
+
+#: ../raphodo/preferencedialog.py:649
+msgid ""
+"Automatically clear the display of completed downloads whenever a new "
+"download device is inserted."
+msgstr "新しいダウンロードデバイスが挿入された際，完了分のダウンロードの表示を自動的に消去する．"
+
+#: ../raphodo/preferencedialog.py:654
+msgid ""
+"Keep displaying completed downloads whenever a new download device is "
+"inserted."
+msgstr "新しいダウンロードデバイスが挿入された際，完了分のダウンロードの表示を維持する．"
+
+#: ../raphodo/preferencedialog.py:658
+msgid ""
+"Prompt whether to keep displaying completed downloads or clear them whenever "
+"a new download device is inserted."
+msgstr "新しいダウンロードデバイスが挿入された際，完了分のダウンロードの表示を消去するか維持するかの選択を表示する．"
+
+#: ../raphodo/preferencedialog.py:702
 msgid "Version Check"
 msgstr "バージョンチェック"
 
-#: ../raphodo/preferencedialog.py:470
+#: ../raphodo/preferencedialog.py:703
 msgid "Check for new version at startup"
 msgstr "起動時に新しいバージョンをチェック"
 
-#: ../raphodo/preferencedialog.py:471
+#: ../raphodo/preferencedialog.py:705
 msgid "Check for a new version of the program each time the program starts."
 msgstr "プログラムを起動するたびに，新しいバージョンがないかチェックします．"
 
-#: ../raphodo/preferencedialog.py:473
+#: ../raphodo/preferencedialog.py:707
 msgid "Include development releases"
 msgstr "開発リリースを含む"
 
-#: ../raphodo/preferencedialog.py:474
+#: ../raphodo/preferencedialog.py:709
 msgid ""
 "Include alpha, beta and other development releases when checking for a new "
 "version of the program.\n"
@@ -2436,16 +2948,15 @@ msgid ""
 "If you are currently running a development version, the check will always "
 "occur."
 msgstr ""
-"プログラムの新しいバージョンをチェックする際，アルファ版・ベータ版などの開発"
-"リリースも含める．\n"
+"プログラムの新しいバージョンをチェックする際，アルファ版・ベータ版などの開発リリースも含める．\n"
 "\n"
 "開発版を実行中であれば，これらは常にチェックされます．"
 
-#: ../raphodo/preferencedialog.py:489
+#: ../raphodo/preferencedialog.py:725
 msgid "Ignore DNG date/time metadata on MTP devices"
 msgstr "MTPデバイス上のDNG日時メタデータは無視"
 
-#: ../raphodo/preferencedialog.py:490
+#: ../raphodo/preferencedialog.py:727
 msgid ""
 "Ignore date/time metadata in DNG files located on MTP devices, and use the "
 "file's modification time instead.\n"
@@ -2453,82 +2964,90 @@ msgid ""
 "Useful for devices like some phones and tablets that create incorrect DNG "
 "metadata."
 msgstr ""
-"MTPデバイス上にあるDNGファイルの日時メタデータは無視し，代わりにファイルの修"
-"正日時を使用します．\n"
+"MTPデバイス上にあるDNGファイルの日時メタデータは無視し，代わりにファイルの修正日時を使用します．\n"
 "\n"
-"正しくないDNGメタデータを生成する一部の電話・タブレットのようなデバイスに便利"
-"です．"
+"正しくないDNGメタデータを生成する一部の電話・タブレットのようなデバイスに便利です．"
+
+#: ../raphodo/preferencedialog.py:741
+msgid "Completed Downloads"
+msgstr "完了したダウンロード"
 
 #. Translators: substituted value is a description for the set of preferences
 #. shown in the preference dialog window, e.g. Devices, Automation, etc.
 #. This string is shown in a tooltip for the "Restore Defaults" button
-#: ../raphodo/preferencedialog.py:710
+#: ../raphodo/preferencedialog.py:1067
 #, python-format
 msgid "Restores default %s preference values"
 msgstr "%sの既定設定値に戻す"
 
-#: ../raphodo/preferencedialog.py:832
+#: ../raphodo/preferencedialog.py:1208
 msgid ""
 "Do you want to purge the thumbnail cache? The cache will be purged when the "
 "program is next started."
-msgstr ""
-"サムネイルキャッシュを消去しますか？キャッシュは，次回プログラムを起動した際"
-"に消去されます．"
+msgstr "サムネイルキャッシュを消去しますか？キャッシュは，次回プログラムを起動した際に消去されます．"
 
-#: ../raphodo/preferencedialog.py:835
+#: ../raphodo/preferencedialog.py:1212
 msgid "Purge Thumbnail Cache"
 msgstr "サムネイルキャッシュを消去"
 
-#: ../raphodo/preferencedialog.py:847
+#: ../raphodo/preferencedialog.py:1225
 msgid ""
 "Do you want to optimize the thumbnail cache? The cache will be optimized "
 "when the program is next started."
-msgstr ""
-"サムネイルキャッシュを最適化しますか？キャッシュは，次回プログラムを起動した"
-"際に最適化されます．"
+msgstr "サムネイルキャッシュを最適化しますか？キャッシュは，次回プログラムを起動した際に最適化されます．"
 
-#: ../raphodo/preferencedialog.py:850
+#: ../raphodo/preferencedialog.py:1229
 msgid "Optimize Thumbnail Cache"
 msgstr "サムネイルキャッシュを最適化"
 
-#: ../raphodo/preferencedialog.py:1045
+#: ../raphodo/preferencedialog.py:1481
+msgid "Enter a Folder to Scan"
+msgstr "走査するフォルダを入力"
+
+#: ../raphodo/preferencedialog.py:1482
+msgid "Specify a folder that will be scanned for photos and videos"
+msgstr "写真と動画の走査対象となるフォルダを指定"
+
+#: ../raphodo/preferencedialog.py:1483
+msgid "Folder:"
+msgstr "フォルダ："
+
+#: ../raphodo/preferencedialog.py:1497
 msgid "Enter a Path to Ignore"
 msgstr "対象外パスを入力してください"
 
-#: ../raphodo/preferencedialog.py:1046
+#: ../raphodo/preferencedialog.py:1498
 msgid "Specify a path that will never be scanned for photos or videos"
 msgstr "写真や動画のスキャンで検索されないパスを指定してください"
 
-#: ../raphodo/preferencedialog.py:1047
+#: ../raphodo/preferencedialog.py:1499
 msgid "Path:"
 msgstr "パス:"
 
-#: ../raphodo/preferencedialog.py:1061
+#: ../raphodo/preferencedialog.py:1513
 msgid "Enter a File Extension"
 msgstr "ファイル拡張子を入力してください"
 
-#: ../raphodo/preferencedialog.py:1062
+#: ../raphodo/preferencedialog.py:1514
 msgid "Specify a file extension (without the leading dot)"
 msgstr "ファイル拡張子を指定してください（最初のピリオドは除く）"
 
-#: ../raphodo/preferencedialog.py:1063 ../raphodo/renamepanel.py:122
+#: ../raphodo/preferencedialog.py:1515 ../raphodo/renamepanel.py:122
 msgid "Extension:"
 msgstr "拡張子:"
 
-#: ../raphodo/preferencedialog.py:1078
+#: ../raphodo/preferencedialog.py:1530
 msgid "Invalid File Extension"
 msgstr "ファイル拡張子が無効です"
 
-#: ../raphodo/preferencedialog.py:1079
+#: ../raphodo/preferencedialog.py:1531
 #, python-format
 msgid ""
 "The file extension <b>%s</b> is recognized by Rapid Photo Downloader, so it "
 "makes no sense to warn about its presence."
-msgstr ""
-"ファイル拡張子<b>%s</b>を高速写真ダウンローダは認識しますので，それがあること"
-"を警告させることは無意味です．"
+msgstr "ファイル拡張子<b>%s</b>を高速写真ダウンローダは認識しますので，それがあることを警告させることは無意味です．"
 
-#: ../raphodo/preferencedialog.py:1081
+#: ../raphodo/preferencedialog.py:1533
 #, python-format
 msgid ""
 "Recognized file types:\n"
@@ -2567,352 +3086,328 @@ msgstr "結婚式"
 msgid "Birthday"
 msgstr "誕生日"
 
-#: ../raphodo/preferences.py:614
+#: ../raphodo/preferences.py:624
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "サブフォルダ設定は%sから始まってはなりません"
 
-#: ../raphodo/preferences.py:617
+#: ../raphodo/preferences.py:627
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "サブフォルダ設定は%sで終わってはなりません"
 
-#: ../raphodo/preferences.py:622
+#: ../raphodo/preferences.py:632
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr "サブフォルダ設定では、2つの%sが連続して入っていてはなりません"
 
-#. self.setFlat(True)
 #: ../raphodo/primarybutton.py:72
 msgid "Download 8 Photos and 10 Videos"
 msgstr "8枚の写真と10個の動画をダウンロード"
 
-#: ../raphodo/problemnotification.py:86 ../raphodo/problemnotification.py:208
+#: ../raphodo/problemnotification.py:87 ../raphodo/problemnotification.py:209
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr "エラー：%(errno)s %(strerror)s"
 
-#: ../raphodo/problemnotification.py:89
+#: ../raphodo/problemnotification.py:90
 #, python-format
 msgid "Error: %s"
 msgstr "エラー：%s"
 
-#: ../raphodo/problemnotification.py:116
+#: ../raphodo/problemnotification.py:117
 #, python-format
 msgid "GPhoto2 Error: %s"
 msgstr "GPhoto2エラー：%s"
 
-#: ../raphodo/problemnotification.py:124
+#: ../raphodo/problemnotification.py:125
 msgid ""
 "Unable to initialize the camera, probably because another program is using "
 "it. No files were copied from it."
-msgstr ""
-"おそらく他のプログラムが使用中のため，カメラを初期化できません．コピーされた"
-"ファイルはありません．"
+msgstr "おそらく他のプログラムが使用中のため，カメラを初期化できません．コピーされたファイルはありません．"
 
-#: ../raphodo/problemnotification.py:134
+#: ../raphodo/problemnotification.py:135
 #, python-format
 msgid "Unable to read directory %s"
 msgstr "ディレクトリー %s を読み込めません"
 
-#: ../raphodo/problemnotification.py:140
+#: ../raphodo/problemnotification.py:141
 #, python-format
 msgid "Unable to access modification time or size from %s"
 msgstr "%sからの修正日時やサイズにアクセスできません"
 
-#: ../raphodo/problemnotification.py:146
+#: ../raphodo/problemnotification.py:147
 #, python-format
 msgid "Unable to read file %s"
 msgstr "ファイル%sを読み込むことができませんでした"
 
-#: ../raphodo/problemnotification.py:152
+#: ../raphodo/problemnotification.py:153
 #, python-format
 msgid "Unable to write file %s"
 msgstr "ファイル%sに書き込むことができませんでした"
 
-#: ../raphodo/problemnotification.py:158
+#: ../raphodo/problemnotification.py:159
 #, python-format
 msgid "Unable to move file %s"
 msgstr "ファイル%sを移動することができませんでした"
 
-#: ../raphodo/problemnotification.py:164
+#: ../raphodo/problemnotification.py:165
 #, python-format
 msgid "Unable to remove file %s"
 msgstr "ファイル%sを削除できませんでした"
 
-#: ../raphodo/problemnotification.py:170
+#: ../raphodo/problemnotification.py:171
 #, python-format
 msgid "Unable to copy file %s"
 msgstr "ファイル%sをコピーすることができませんでした"
 
-#: ../raphodo/problemnotification.py:176
+#: ../raphodo/problemnotification.py:177
 #, python-format
 msgid "Zero length file %s will not be downloaded"
 msgstr "ファイル%sは大きさが0なのでダウンロードしません"
 
-#: ../raphodo/problemnotification.py:182
+#: ../raphodo/problemnotification.py:183
 #, python-format
 msgid "Could not determine filesystem modification time for %s"
 msgstr "%sのファイルシステム上の修正時刻を知ることができませんでした"
 
-#: ../raphodo/problemnotification.py:188
+#: ../raphodo/problemnotification.py:189
 #, python-format
 msgid "Unable to load metadata from %s"
 msgstr "%sからメタデータを読み込めませんでした"
 
-#: ../raphodo/problemnotification.py:194
+#: ../raphodo/problemnotification.py:195
 #, python-format
 msgid ""
 "Unable to load metadata from %(name)s. The %(filetype)s was not downloaded."
-msgstr ""
-"%(name)sからメタデータを読み込めませんでした．%(filetype)sはダウンロードされ"
-"ませんでした．"
+msgstr "%(name)sからメタデータを読み込めませんでした．%(filetype)sはダウンロードされませんでした．"
 
-#: ../raphodo/problemnotification.py:202
+#: ../raphodo/problemnotification.py:203
 #, python-format
 msgid ""
 "An error occurred setting a file's filesystem metadata on the filesystem %s. "
 "If this error occurs again on the same filesystem, it will not be reported "
 "again."
 msgstr ""
-"ファイルシステム%s上で，ファイルのファイルシステム メタデータを設定する際にエ"
-"ラーが発生しました．同じファイルシステム上で，このエラーが再度発生した場合に"
-"は，もう通知されません．"
+"ファイルシステム%s上で，ファイルのファイルシステム "
+"メタデータを設定する際にエラーが発生しました．同じファイルシステム上で，このエラーが再度発生した場合には，もう通知されません．"
 
-#: ../raphodo/problemnotification.py:216
+#: ../raphodo/problemnotification.py:217
 #, python-format
 msgid "Encountered unhandled file %s. It will not be downloaded."
 msgstr "非取扱ファイル%sを検出しました．これはダウンロードされません．"
 
-#: ../raphodo/problemnotification.py:223
+#: ../raphodo/problemnotification.py:224
 #, python-format
 msgid "%(filetype)s %(destination)s already exists."
 msgstr "%(filetype)s %(destination)sはすでに存在します．"
 
-#: ../raphodo/problemnotification.py:234 ../raphodo/problemnotification.py:262
+#: ../raphodo/problemnotification.py:235 ../raphodo/problemnotification.py:263
 #, python-format
 msgid ""
 "The existing %(filetype)s %(destination)s was last modified on %(date)s at "
 "%(time)s."
-msgstr ""
-"既存の%(filetype)s %(destination)sは，最後に%(date)s %(time)sに修正されまし"
-"た．"
+msgstr "既存の%(filetype)s %(destination)sは，最後に%(date)s %(time)sに修正されました．"
 
-#: ../raphodo/problemnotification.py:245
+#: ../raphodo/problemnotification.py:246
 #, python-format
 msgid "The %(filetype)s %(source)s was not downloaded from %(device)s."
-msgstr ""
-"%(filetype)s %(source)sは%(device)sからダウンロードされたものではありません．"
+msgstr "%(filetype)s %(source)sは%(device)sからダウンロードされたものではありません．"
 
-#: ../raphodo/problemnotification.py:273
+#: ../raphodo/problemnotification.py:274
 #, python-format
 msgid "The %(filetype)s %(source)s was downloaded from %(device)s."
 msgstr "%(filetype)s %(source)sは%(device)sからダウンロードされたものです．"
 
-#: ../raphodo/problemnotification.py:282
+#: ../raphodo/problemnotification.py:283
 #, python-format
 msgid "The unique identifier '%s' was added to the filename."
 msgstr "ファイル名に非重複識別子「%s」が追加されました．"
 
-#: ../raphodo/problemnotification.py:298
+#: ../raphodo/problemnotification.py:299
 #, python-format
 msgid ""
 "The existing backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
-"既存のバックアップ%(filetype)s %(destination)sは，最後に%(date)s %(time)sに修"
-"正されています．"
+"既存のバックアップ%(filetype)s %(destination)sは，最後に%(date)s %(time)sに修正されています．"
 
-#: ../raphodo/problemnotification.py:309
+#: ../raphodo/problemnotification.py:310
 #, python-format
 msgid "The %(filetype)s %(source)s was not backed up from %(device)s."
-msgstr ""
-"%(filetype)s %(source)sは，%(device)sからバックアップされたものではありませ"
-"ん．"
+msgstr "%(filetype)s %(source)sは，%(device)sからバックアップされたものではありません．"
 
-#: ../raphodo/problemnotification.py:326
+#: ../raphodo/problemnotification.py:327
 #, python-format
 msgid ""
 "The previous backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
-"前回のバックアップ%(filetype)s %(destination)sは，最後に%(date)s %(time)sに修"
-"正されています．"
+"前回のバックアップ%(filetype)s %(destination)sは，最後に%(date)s %(time)sに修正されています．"
 
-#: ../raphodo/problemnotification.py:337
+#: ../raphodo/problemnotification.py:338
 #, python-format
 msgid ""
 "The %(filetype)s %(source)s from %(device)s was backed up, overwriting the "
 "previous backup %(filetype)s."
 msgstr ""
-"%(device)sからの%(filetype)s %(source)sはバックアップされ，前回のバックアッ"
-"プ%(filetype)sを上書きしました．"
+"%(device)sからの%(filetype)s %(source)sはバックアップされ，前回のバックアップ%(filetype)sを上書きしました．"
 
-#: ../raphodo/problemnotification.py:356
+#: ../raphodo/problemnotification.py:357
 #, python-format
 msgid ""
 "When synchronizing RAW + JPEG sequence values, a duplicate %(filetype)s "
 "%(file)s was encountered, and was not downloaded."
 msgstr ""
-"RAW + JPEGの連番を同期する際，重複する%(filetype)s %(file)sが検出されたため，"
-"ダウンロードされませんでした．"
+"RAW + JPEGの連番を同期する際，重複する%(filetype)s %(file)sが検出されたため，ダウンロードされませんでした．"
 
-#: ../raphodo/problemnotification.py:366
+#: ../raphodo/problemnotification.py:367
 msgid ""
 "When synchronizing RAW + JPEG sequence values, photos were detected with the "
 "same filenames, but taken at different times:"
-msgstr ""
-"RAW + JPEGの連番を同期する際，違う時間に撮られた同じファイル名の写真が検出さ"
-"れました："
+msgstr "RAW + JPEGの連番を同期する際，違う時間に撮られた同じファイル名の写真が検出されました："
 
-#: ../raphodo/problemnotification.py:373
+#: ../raphodo/problemnotification.py:374
 #, python-format
 msgid ""
 "%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
 "on %(image2_date)s at %(image2_time)s."
 msgstr ""
-"%(image1)sは%(image1_date)sの%(image1_time)sに撮影され、%(image2)s"
-"は%(image2_date)sの%(image2_time)sに撮影されました。"
+"%(image1)sは%(image1_date)sの%(image1_time)sに撮影され、%(image2)sは%(image2_date)sの%("
+"image2_time)sに撮影されました。"
 
-#: ../raphodo/problemnotification.py:389
+#: ../raphodo/problemnotification.py:390
 #, python-format
 msgid "Unable to finalize the filename for %s"
 msgstr "%sのファイル名の終了処理ができませんでした"
 
-#: ../raphodo/problemnotification.py:424
+#: ../raphodo/problemnotification.py:425
 #, python-format
 msgid ""
 "The filename %(destination)s was not fully generated for %(filetype)s "
 "%(source)s."
-msgstr ""
-"%(filetype)s %(source)sのファイル名%(destination)sが完全には生成されませんで"
-"した．"
+msgstr "%(filetype)s %(source)sのファイル名%(destination)sが完全には生成されませんでした．"
 
-#: ../raphodo/problemnotification.py:433
+#: ../raphodo/problemnotification.py:434
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr "%(type)sのメタデータがありません。"
 
-#: ../raphodo/problemnotification.py:439
+#: ../raphodo/problemnotification.py:440
 #, python-format
 msgid "The following metadata is missing: %s."
 msgstr "右記のメタデータがありません：%s"
 
-#: ../raphodo/problemnotification.py:445
+#: ../raphodo/problemnotification.py:446
 #, python-format
 msgid "Date/time conversion failed: %s."
 msgstr "日時変換に失敗しました：%s"
 
-#: ../raphodo/problemnotification.py:451
+#: ../raphodo/problemnotification.py:452
 msgid ""
 "Could not extract valid date/time metadata or determine the file "
 "modification time."
-msgstr ""
-"有効な日時メタデータを抽出できなかったか，またはファイル修正時間を確定するこ"
-"とができませんでした．"
+msgstr "有効な日時メタデータを抽出できなかったか，またはファイル修正時間を確定することができませんでした．"
 
-#: ../raphodo/problemnotification.py:457
+#: ../raphodo/problemnotification.py:458
 msgid "Filename does not have an extension."
 msgstr "ファイル名に拡張子がありません。"
 
-#: ../raphodo/problemnotification.py:460
+#: ../raphodo/problemnotification.py:461
 msgid "Filename does not have a number component."
 msgstr "ファイル名には数字の要素がありません。"
 
-#: ../raphodo/problemnotification.py:464
+#: ../raphodo/problemnotification.py:465
 #, python-format
 msgid "Error generating component %(component)s. Error: %(error)s"
-msgstr ""
-"コンポーネント%(component)sの生成時にエラーが発生しました．エラー：%(error)s"
+msgstr "コンポーネント%(component)sの生成時にエラーが発生しました．エラー：%(error)s"
 
-#: ../raphodo/problemnotification.py:477
+#: ../raphodo/problemnotification.py:478
 #, python-format
 msgid ""
 "The download subfolders %(folder)s were only partially generated for "
 "%(filetype)s %(source)s."
-msgstr ""
-"%(filetype)s %(source)sのダウンロード サブフォルダ%(folder)sは部分的にしか生"
-"成されませんでした．"
+msgstr "%(filetype)s %(source)sのダウンロード サブフォルダ%(folder)sは部分的にしか生成されませんでした．"
 
-#: ../raphodo/problemnotification.py:486
+#: ../raphodo/problemnotification.py:487
 #, python-format
 msgid ""
 "There is no data with which to generate the %(subfolder_file)s for "
 "%(filename)s. The %(filetype)s was not downloaded."
 msgstr ""
-"%(filename)sの%(subfolder_file)sを生成するためのデータがありませ"
-"ん．%(filetype)sはダウンロードされませんでした．"
+"%(filename)sの%(subfolder_file)sを生成するためのデータがありません．%(filetype)sはダウンロードされませんでした．"
 
-#: ../raphodo/problemnotification.py:499
+#: ../raphodo/problemnotification.py:500
 #, python-format
 msgid ""
 "Unable to create the %(filetype)s %(destination)s in %(folder)s. The "
 "download file was %(source)s in %(device)s. It was not downloaded."
 msgstr ""
-"%(folder)sに%(filetype)s %(destination)sを生成できませんでした．ダウンロード"
-"ファイルは，%(device)s中の%(source)sでしたが，ダウンロードされませんでした．"
+"%(folder)sに%(filetype)s "
+"%(destination)sを生成できませんでした．ダウンロードファイルは，%(device)s中の%(source)sでしたが，ダウンロードされません"
+"でした．"
 
-#: ../raphodo/problemnotification.py:514
+#: ../raphodo/problemnotification.py:515
 #, python-format
 msgid "Unable to create the download subfolder %s."
 msgstr "ダウンロード サブフォルダ%sを生成できません．"
 
-#: ../raphodo/problemnotification.py:526
+#: ../raphodo/problemnotification.py:527
 #, python-format
 msgid "Unable to create the backup subfolder %s."
 msgstr "バックアップ サブフォルダ%sを生成できません．"
 
-#: ../raphodo/problemnotification.py:577
+#: ../raphodo/problemnotification.py:578
 #, python-format
 msgid "Problems scanning %s"
 msgstr "%sを操作中に問題発生"
 
-#: ../raphodo/problemnotification.py:584
+#: ../raphodo/problemnotification.py:585
 #, python-format
 msgid "Problems copying from %s"
 msgstr "%sからのコピー中に問題発生"
 
-#: ../raphodo/problemnotification.py:591
+#: ../raphodo/problemnotification.py:592
 msgid "Problems while finalizing filenames and generating subfolders"
 msgstr "ファイル名の終了処理とサブフォルダの生成中に問題発生"
 
-#: ../raphodo/problemnotification.py:598
+#: ../raphodo/problemnotification.py:599
 #, python-format
 msgid "Problems backing up to %s"
 msgstr "%sにバックアップ中に問題発生"
 
-#. Translators: for example Nov 3 or Dec 31
+#. Translators: for example Nov 3 2015, 11:25 AM
+#. Translators: for example, Nov 3, 12:15 PM
+#: ../raphodo/proximity.py:188 ../raphodo/proximity.py:213
+#: ../raphodo/proximity.py:236 ../raphodo/proximity.py:239
+#, python-format
+msgid "%(date)s, %(time)s"
+msgstr "%(date)s, %(time)s"
+
+#: ../raphodo/proximity.py:204
+#, python-format
+msgid "%(starttime)s - %(endtime)s"
+msgstr "%(starttime)s - %(endtime)s"
+
 #. The start and end dates are on a different day
 #. Translators: for example Nov 3 or Dec 31
-#: ../raphodo/proximity.py:105 ../raphodo/proximity.py:221
-#: ../raphodo/proximity.py:224 ../raphodo/proximity.py:828
+#: ../raphodo/proximity.py:221 ../raphodo/proximity.py:225
+#: ../raphodo/proximity.py:980 ../raphodo/timeutils.py:105
 #, python-format
 msgid "%(month)s %(numeric_day)s"
 msgstr "%(month)s月%(numeric_day)s日"
 
-#. Translators: for example Nov 15 2015
 #. Translators: for example Nov 3 2015
-#: ../raphodo/proximity.py:109 ../raphodo/proximity.py:230
-#: ../raphodo/proximity.py:231 ../raphodo/proximity.py:831
+#. Translators: for example Nov 2 2015
+#. Translators: for example Nov 15 2015
+#: ../raphodo/proximity.py:232 ../raphodo/proximity.py:233
+#: ../raphodo/proximity.py:985 ../raphodo/timeutils.py:110
 #, python-format
 msgid "%(date)s %(year)s"
 msgstr "%(year)s年%(date)s"
 
-#. Translators: for example Nov 3 2015, 11:25 AM
-#. Translators: for example, Nov 3, 12:15 PM
-#: ../raphodo/proximity.py:197 ../raphodo/proximity.py:215
-#: ../raphodo/proximity.py:234 ../raphodo/proximity.py:236
-#, python-format
-msgid "%(date)s, %(time)s"
-msgstr "%(date)s, %(time)s"
-
-#: ../raphodo/proximity.py:209
-#, python-format
-msgid "%(starttime)s - %(endtime)s"
-msgstr "%(starttime)s - %(endtime)s"
-
 #. Translators: for example, Nov 3, 12:15 PM - Nov 4, 1:00 AM
-#: ../raphodo/proximity.py:241
+#: ../raphodo/proximity.py:245
 #, python-format
 msgid "%(earlier_time)s - %(later_time)s"
 msgstr "%(earlier_time)s - %(later_time)s"
@@ -2921,7 +3416,7 @@ msgstr "%(earlier_time)s - %(later_time)s"
 #. Nov 3 2012, 12:15 PM -
 #. Nov 4 2012, 1:00 AM
 #. (please keep the line break signified by \n)
-#: ../raphodo/proximity.py:248
+#: ../raphodo/proximity.py:253
 #, python-format
 msgid ""
 "%(earlier_time)s -\n"
@@ -2930,18 +3425,18 @@ msgstr ""
 "%(earlier_time)s -\n"
 "%(later_time)s"
 
-#: ../raphodo/proximity.py:359
+#: ../raphodo/proximity.py:382
 #, python-format
 msgid "%(month)s  %(year)s"
 msgstr "%(year)s年%(month)s月"
 
 #. Translators: for example Nov 2015
-#: ../raphodo/proximity.py:833
+#: ../raphodo/proximity.py:987
 #, python-format
 msgid "%(month)s %(year)s"
 msgstr "%(year)s年%(month)s月"
 
-#: ../raphodo/proximity.py:1344
+#: ../raphodo/proximity.py:1595
 msgid ""
 "The time elapsed between consecutive photos and videos that is used to build "
 "the Timeline"
@@ -2951,51 +3446,48 @@ msgstr "時間軸を構築するのに用いられる写真・動画間の経過
 #. Replace the very last character (after the d) with the correct
 #. localized value, keeping everything else. In other words, change
 #. only the m character.
-#: ../raphodo/proximity.py:1406
+#: ../raphodo/proximity.py:1652
 #, python-format
 msgid "%(minutes)dm"
 msgstr "%(minutes)d分"
 
 #. Translators: i.e. "1.5h", which is short for 1.5 hours.
 #. Replace the entire string with the correct localized value
-#: ../raphodo/proximity.py:1410
+#: ../raphodo/proximity.py:1656
 msgid "1.5h"
 msgstr "1.5時間"
 
 #. Translators: e.g. "5h", which is short for 5 hours.
 #. Replace the very last character (after the d) with the correct localized value,
 #. keeping everything else. In other words, change only the h character.
-#: ../raphodo/proximity.py:1415
+#: ../raphodo/proximity.py:1661
 #, python-format
 msgid "%(hours)dh"
 msgstr "%(hours)d時間"
 
-#: ../raphodo/proximity.py:1461
+#: ../raphodo/proximity.py:1710
 msgid ""
 "The Timeline groups photos and videos based on how much time elapsed between "
 "consecutive shots. Use it to identify photos and videos taken at different "
 "periods in a single day or over consecutive days."
 msgstr ""
-"時間軸は，撮影間の経過時間によって写真や動画をグループ化します．1日もしくは数"
-"日内の別の時間帯に撮られた写真や動画を認識するのにお使いください．"
+"時間軸は，撮影間の経過時間によって写真や動画をグループ化します．1日もしくは数日内の別の時間帯に撮られた写真や動画を認識するのにお使いください．"
 
-#: ../raphodo/proximity.py:1464
+#: ../raphodo/proximity.py:1715
 msgid ""
 "Use the slider (below) to adjust the time elapsed between consecutive shots "
 "that is used to build the Timeline."
-msgstr ""
-"下のスライダを使用して，時間軸を構築するのに使用する，各撮影間の経過時間を調"
-"整してください．"
+msgstr "下のスライダを使用して，時間軸を構築するのに使用する，各撮影間の経過時間を調整してください．"
 
-#: ../raphodo/proximity.py:1466
+#: ../raphodo/proximity.py:1718
 msgid "Timeline build pending..."
 msgstr "時間軸の構築を停止中..."
 
-#: ../raphodo/proximity.py:1467
+#: ../raphodo/proximity.py:1719
 msgid "Timeline is building..."
 msgstr "時間軸を構築中.."
 
-#: ../raphodo/proximity.py:1468
+#: ../raphodo/proximity.py:1721
 msgid ""
 "The Timeline needs to be rebuilt because the file modification time does not "
 "match the time a shot was taken for one or more shots.<br><br>The Timeline "
@@ -3006,79 +3498,70 @@ msgid ""
 "The time a shot was taken is confirmed when generating thumbnails or "
 "downloading, which is when the metadata is read."
 msgstr ""
-"ファイル修正時刻が，撮影された時刻と一致しないものがあるため，時間軸を再構築"
-"する必要があります．<br><br>時間軸は撮影が行われた時を示します．撮影が行われ"
-"た時刻は，写真や動画のメタデータに存在しています．メタデータを読み込むと時間"
-"を消費するため，高速写真ダウンローダは，ファイル走査中はメタデータを読み込み"
-"ません．その代わりに，撮影時刻の代用としてファイルの最終修正時刻を使用してい"
-"ます．撮影時刻は，メタデータの読み込みが行われるサムネイル生成時やダウンロー"
-"ド時に，照合されます．"
-
-#: ../raphodo/rapid.py:485 ../raphodo/rapid.py:2461 ../raphodo/rapid.py:3728
-#: ../raphodo/rapid.py:3846 ../raphodo/rapid.py:3850 ../raphodo/rapid.py:3870
-#: ../raphodo/rapid.py:3874 ../raphodo/rapid.py:3998 ../raphodo/rapid.py:4007
-#: ../raphodo/rapid.py:4495 ../raphodo/rapid.py:4888 ../raphodo/rapid.py:5722
-#: ../raphodo/rememberthisdialog.py:97
+"ファイル修正時刻が，撮影された時刻と一致しないものがあるため，時間軸を再構築する必要があります．<br><br>時間軸は撮影が行われた時を示します．撮影が"
+"行われた時刻は，写真や動画のメタデータに存在しています．メタデータを読み込むと時間を消費するため，高速写真ダウンローダは，ファイル走査中はメタデータを読み"
+"込みません．その代わりに，撮影時刻の代用としてファイルの最終修正時刻を使用しています．撮影時刻は，メタデータの読み込みが行われるサムネイル生成時やダウンロ"
+"ード時に，照合されます．"
+
+#: ../raphodo/rapid.py:493 ../raphodo/rapid.py:2555 ../raphodo/rapid.py:3934
+#: ../raphodo/rapid.py:4065 ../raphodo/rapid.py:4069 ../raphodo/rapid.py:4092
+#: ../raphodo/rapid.py:4096 ../raphodo/rapid.py:4226 ../raphodo/rapid.py:4237
+#: ../raphodo/rapid.py:4743 ../raphodo/rapid.py:5195 ../raphodo/rapid.py:5997
+#: ../raphodo/rememberthisdialog.py:99
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:3
 msgid "Rapid Photo Downloader"
 msgstr "高速写真ダウンローダ"
 
-#: ../raphodo/rapid.py:1100
+#: ../raphodo/rapid.py:1131
 msgid ""
 "<b>ExifTool has a problem</b><br><br> Rapid Photo Downloader uses ExifTool "
 "to get metadata from videos and photos. The program will run without it, but "
 "installing it is <b>highly</b> recommended."
 msgstr ""
-"<b>ExifToolに問題発生</b><br><br>高速写真ダウンローダは動画と写真からメタデー"
-"タを取得するのにExifToolを使用します．これがなくても実行可能ですが，導入して"
-"おくことが<b>強く</b>推奨されます．"
+"<b>ExifToolに問題発生</b><br><br>高速写真ダウンローダは動画と写真からメタデータを取得するのにExifToolを使用します．これがな"
+"くても実行可能ですが，導入しておくことが<b>強く</b>推奨されます．"
 
-#: ../raphodo/rapid.py:1110 ../raphodo/rapid.py:1130
+#: ../raphodo/rapid.py:1141 ../raphodo/rapid.py:1161
 msgid "Problem with libmediainfo"
 msgstr "libmediainfoの問題"
 
-#: ../raphodo/rapid.py:1119
+#: ../raphodo/rapid.py:1150
 msgid ""
 "<b>The library libmediainfo appears to be missing</b><br><br> Rapid Photo "
 "Downloader uses libmediainfo to get the date and time a video was shot. The "
 "program will run  without it, but installing it is recommended."
 msgstr ""
-"<b>ライブラリlibmediainfoがないようです</b><br><br>高速写真ダウンローダは，動"
-"画が撮られた日付と時間を取得するのにlibmediainfoを使用します．これがなくても"
-"プログラムは実行できますが，導入することが推奨されます．"
+"<b>ライブラリlibmediainfoがないようです</b><br><br>高速写真ダウンローダは，動画が撮られた日付と時間を取得するのにlibmedi"
+"ainfoを使用します．これがなくてもプログラムは実行できますが，導入することが推奨されます．"
 
-#: ../raphodo/rapid.py:1417
+#: ../raphodo/rapid.py:1448
 msgid "Download failed"
 msgstr "ダウンロードに失敗しました"
 
-#: ../raphodo/rapid.py:1419
+#: ../raphodo/rapid.py:1450
 msgid ""
 "Sorry, the download of the new version of Rapid Photo Downloader failed."
-msgstr ""
-"すみません，高速写真ダウンローダの新しいバージョンをダウンロードするのに失敗"
-"しました．"
+msgstr "すみません，高速写真ダウンローダの新しいバージョンをダウンロードするのに失敗しました．"
 
-#: ../raphodo/rapid.py:1425
+#: ../raphodo/rapid.py:1457
 msgid ""
 "The new version was successfully downloaded. Do you want to close Rapid "
 "Photo Downloader and install it now?"
-msgstr ""
-"新しいバージョンが無事ダウンロードされました．高速写真ダウンローダを終了し"
-"て，新しいバージョンを導入して良いですか？"
+msgstr "新しいバージョンが無事ダウンロードされました．高速写真ダウンローダを終了して，新しいバージョンを導入して良いですか？"
 
-#: ../raphodo/rapid.py:1428
+#: ../raphodo/rapid.py:1461
 msgid "Update Rapid Photo Downloader"
 msgstr "高速写真ダウンローダを更新"
 
-#: ../raphodo/rapid.py:1432
+#: ../raphodo/rapid.py:1465
 msgid "Install"
 msgstr "導入"
 
-#: ../raphodo/rapid.py:1450
+#: ../raphodo/rapid.py:1483
 msgid "New version saved"
 msgstr "新しいバージョンが保存されました"
 
-#: ../raphodo/rapid.py:1451
+#: ../raphodo/rapid.py:1485
 #, python-format
 msgid ""
 "The tar file and installer script are saved at:\n"
@@ -3089,169 +3572,163 @@ msgstr ""
 " %s\n"
 "に保存されています"
 
-#: ../raphodo/rapid.py:1468
+#: ../raphodo/rapid.py:1502
 msgid "Upgrade failed"
 msgstr "アップグレードに失敗しました"
 
-#: ../raphodo/rapid.py:1469
+#: ../raphodo/rapid.py:1505
 msgid ""
 "Sorry, upgrading Rapid Photo Downloader failed because there was an error "
 "opening the installer."
-msgstr ""
-"すみません，インストーラを開く際にエラーが発生したため，高速写真ダウンローダ"
-"の更新に失敗しました．"
+msgstr "すみません，インストーラを開く際にエラーが発生したため，高速写真ダウンローダの更新に失敗しました．"
 
-#: ../raphodo/rapid.py:1667 ../raphodo/rapid.py:2331
+#: ../raphodo/rapid.py:1709 ../raphodo/rapid.py:2425
 msgid "Download"
 msgstr "ダウンロード"
 
-#: ../raphodo/rapid.py:1671
+#: ../raphodo/rapid.py:1713
 msgid "&Refresh..."
 msgstr "更新(&R)..."
 
-#: ../raphodo/rapid.py:1675
+#: ../raphodo/rapid.py:1717
 msgid "&Preferences"
 msgstr "設定(&P)"
 
-#: ../raphodo/rapid.py:1679
+#: ../raphodo/rapid.py:1721
 msgid "&Quit"
 msgstr "終了(&Q)"
 
-#: ../raphodo/rapid.py:1683
+#: ../raphodo/rapid.py:1725
 msgid "Error &Reports"
 msgstr "エラー報告(&R)"
 
-#: ../raphodo/rapid.py:1687
+#: ../raphodo/rapid.py:1729
 msgid "Clear Completed Downloads"
 msgstr "終了したダウンロードを削除"
 
-#: ../raphodo/rapid.py:1691
+#: ../raphodo/rapid.py:1733
 msgid "Get Help Online..."
 msgstr "オンラインでヘルプを得る..."
 
-#: ../raphodo/rapid.py:1695
+#: ../raphodo/rapid.py:1737
 msgid "&Tip of the Day..."
 msgstr "今日の豆知識(&T)"
 
-#: ../raphodo/rapid.py:1699
+#: ../raphodo/rapid.py:1741
 msgid "Report a Problem..."
 msgstr "問題の報告..."
 
-#: ../raphodo/rapid.py:1703
+#: ../raphodo/rapid.py:1745
 msgid "Make a Donation..."
 msgstr "寄付をする..."
 
-#: ../raphodo/rapid.py:1707
+#: ../raphodo/rapid.py:1749
 msgid "Translate this Application..."
 msgstr "このアプリケーションを翻訳..."
 
-#: ../raphodo/rapid.py:1711
+#: ../raphodo/rapid.py:1753
 msgid "&About..."
 msgstr "このソフトウェアについて(&A)..."
 
-#: ../raphodo/rapid.py:1715
+#: ../raphodo/rapid.py:1757
 msgid "Check for Updates..."
 msgstr "更新のチェック..."
 
-#: ../raphodo/rapid.py:1797
+#: ../raphodo/rapid.py:1840
 msgid "Timeline"
 msgstr "時間軸"
 
-#: ../raphodo/rapid.py:1807
+#: ../raphodo/rapid.py:1850
 msgid "Destination"
 msgstr "ダウンロード先"
 
-#: ../raphodo/rapid.py:1808
+#: ../raphodo/rapid.py:1851
 msgid "Rename"
 msgstr "名称変更"
 
-#: ../raphodo/rapid.py:1810
+#: ../raphodo/rapid.py:1853
 msgid "Back Up"
 msgstr "バックアップ"
 
 #. Devices Header and View
-#: ../raphodo/rapid.py:1926
+#: ../raphodo/rapid.py:1977
 msgid ""
 "Turn on or off the use of devices attached to this computer as download "
 "sources"
-msgstr ""
-"このコンピュータに接続しているデバイスをダウンロードソースとして使用するかど"
-"うかを切り替えます"
+msgstr "このコンピュータに接続しているデバイスをダウンロードソースとして使用するかどうかを切り替えます"
 
 #. This Computer Header and View
-#: ../raphodo/rapid.py:1940
+#: ../raphodo/rapid.py:1994
 msgid ""
 "Turn on or off the use of a folder on this computer as a download source"
-msgstr ""
-"このコンピュータ上のフォルダをダウンロードソースとして使用するかどうかを切り"
-"替えます"
+msgstr "このコンピュータ上のフォルダをダウンロードソースとして使用するかどうかを切り替えます"
 
-#: ../raphodo/rapid.py:1941
+#: ../raphodo/rapid.py:1996
 msgid "This Computer"
 msgstr "このコンピュータ"
 
-#: ../raphodo/rapid.py:1952
+#: ../raphodo/rapid.py:2009
 msgid "Select a source folder"
 msgstr "ソースフォルダを選択してください"
 
-#: ../raphodo/rapid.py:1975
+#: ../raphodo/rapid.py:2038
 msgid "Projected Storage Use"
 msgstr "予測使用容量"
 
-#: ../raphodo/rapid.py:1989 ../raphodo/rapid.py:1997
+#: ../raphodo/rapid.py:2056 ../raphodo/rapid.py:2068
 msgid "Select a destination folder"
 msgstr "ダウンロード先フォルダを選択してください"
 
-#: ../raphodo/rapid.py:2045
+#: ../raphodo/rapid.py:2117
 msgid "All"
 msgstr "全て"
 
-#: ../raphodo/rapid.py:2046
+#: ../raphodo/rapid.py:2118
 msgid "New"
 msgstr "新規"
 
-#: ../raphodo/rapid.py:2048
+#: ../raphodo/rapid.py:2120
 msgid "Show:"
 msgstr "表示:"
 
-#: ../raphodo/rapid.py:2051
+#: ../raphodo/rapid.py:2123
 msgid "Modification Time"
 msgstr "修正日時"
 
-#: ../raphodo/rapid.py:2052
+#: ../raphodo/rapid.py:2124
 msgid "Checked State"
 msgstr "チェック状態"
 
-#: ../raphodo/rapid.py:2055
+#: ../raphodo/rapid.py:2127
 msgid "File Type"
 msgstr "ファイル型"
 
-#: ../raphodo/rapid.py:2056
+#: ../raphodo/rapid.py:2128
 msgid "Device"
 msgstr "デバイス"
 
-#: ../raphodo/rapid.py:2058
+#: ../raphodo/rapid.py:2130
 msgid "Sort:"
 msgstr "整序:"
 
-#: ../raphodo/rapid.py:2069
+#: ../raphodo/rapid.py:2141
 msgid "Select All:"
 msgstr "すべてを選択:"
 
-#: ../raphodo/rapid.py:2311
+#: ../raphodo/rapid.py:2405
 #, python-format
 msgid "Download %(files)s"
 msgstr "%(files)sをダウンロード"
 
-#: ../raphodo/rapid.py:2327
+#: ../raphodo/rapid.py:2421
 msgid "Resume Download"
 msgstr "ダウンロード再開"
 
-#: ../raphodo/rapid.py:2329
+#: ../raphodo/rapid.py:2423
 msgid "Pause"
 msgstr "一時停止"
 
-#: ../raphodo/rapid.py:2417
+#: ../raphodo/rapid.py:2511
 #, python-brace-format
 msgid ""
 "Please report the problem at <a href=\"{website}\">{website}</a>.<br><br>\n"
@@ -3260,17 +3737,15 @@ msgid ""
 "            "
 msgstr ""
 "<a href=\"{website}\">{website}</a>で問題を報告してください．<br><br>\n"
-"            レポートにログファイル<i>{log_file}</i>を添付してください（ログ"
-"ディレクトリを\n"
-"            開くには<a href=\"{log_path}\">ここ</a>をクリックしてくださ"
-"い）．\n"
+"            レポートにログファイル<i>{log_file}</i>を添付してください（ログディレクトリを\n"
+"            開くには<a href=\"{log_path}\">ここ</a>をクリックしてください）．\n"
 "            "
 
-#: ../raphodo/rapid.py:2431
+#: ../raphodo/rapid.py:2525
 msgid "Thank you for reporting a problem in Rapid Photo Downloader"
 msgstr "高速写真ダウンローダの問題を報告いただきありがとうございます"
 
-#: ../raphodo/rapid.py:2529
+#: ../raphodo/rapid.py:2624
 #, python-format
 msgid ""
 "<b>Changing This Computer source path</b><br><br>Do you really want to "
@@ -3278,45 +3753,39 @@ msgid ""
 "from %(source_path)s.<br><br>If you do change the path, the current download "
 "from This Computer will be cancelled."
 msgstr ""
-"<b>このコンピュータのソースパスを変更</b><br><br>ソースパスを本当"
-"に%(new_path)sに変更しますか？<br><br>現在，%(source_path)sからダウンロードを"
-"実行中です．<br><br>パスを変更すると，現在実行中のこのコンピュータへのダウン"
-"ロードは取り消されます．"
+"<b>このコンピュータのソースパスを変更</b><br><br>ソースパスを本当に%(new_path)sに変更しますか？<br><br>現在，%(sou"
+"rce_path)sからダウンロードを実行中です．<br><br>パスを変更すると，現在実行中のこのコンピュータへのダウンロードは取り消されます．"
 
-#: ../raphodo/rapid.py:2595
+#: ../raphodo/rapid.py:2694
 msgid "You cannot change the download destination while downloading."
 msgstr "ダウンロード中にダウンロード先を変更することはできません．"
 
-#: ../raphodo/rapid.py:2604
+#: ../raphodo/rapid.py:2704
 #, python-format
 msgid ""
 "<b>Confirm Download Destination</b><br><br>Are you sure you want to set the "
 "%(file_type)s download destination to %(path)s?"
-msgstr ""
-"<b>ダウンロード先の確認</b><br><br>%(file_type)sのダウンロード先を%(path)sに"
-"設定してよろしいですか？"
+msgstr "<b>ダウンロード先の確認</b><br><br>%(file_type)sのダウンロード先を%(path)sに設定してよろしいですか？"
 
-#: ../raphodo/rapid.py:2682
+#: ../raphodo/rapid.py:2785
 msgid ""
+"\n"
 "<b>Downloading all files</b><br><br>\n"
-"                    A download always includes all files that are checked "
-"for download,\n"
-"                    including those that are not currently displayed because "
-"the Timeline\n"
-"                    is being used or because only new files are being shown."
-"<br><br>\n"
-"                    Do you want to proceed with the download?"
+"A download always includes all files that are checked for download,\n"
+"including those that are not currently displayed because the Timeline\n"
+"is being used or because only new files are being shown.<br><br>\n"
+"Do you want to proceed with the download?\n"
+"                        "
 msgstr ""
-"<b>全ファイルをダウンロード中</b><br><br>\n"
-"                    ダウンロード時には，時間軸が使われていたり新規ファイルの"
-"みが\n"
-"                    表示されていたりして，現在は表示されていないファイルも含"
-"めて，\n"
-"                    チェックされた全てのファイルがダウンロードされます．"
-"<br><br>\n"
-"                    ダウンロードを開始しますか？"
+"\n"
+"<b>全ファイルをダウンロードしています</b><br><br>\n"
+"ダウンロードには，ダウンロード用にチェックした全ファイルが常に含\n"
+"まれます．これには，時間軸が使用されていたり新規ファイルのみが表\n"
+"示対象となっているため，現在表示されていないファイルも含まれます．<br><br>\n"
+"ダウンロードを開始しますか？\n"
+"                        "
 
-#: ../raphodo/rapid.py:2820
+#: ../raphodo/rapid.py:2937
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -3327,7 +3796,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: ../raphodo/rapid.py:2824
+#: ../raphodo/rapid.py:2940
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -3336,222 +3805,196 @@ msgstr ""
 "下記のダウンロードフォルダは無効です:\n"
 "%s"
 
-#: ../raphodo/rapid.py:2827
+#: ../raphodo/rapid.py:2943
 msgid "Download Failure"
 msgstr "ダウンロードエラー"
 
-#: ../raphodo/rapid.py:2828
+#: ../raphodo/rapid.py:2944
 msgid "The download cannot proceed."
 msgstr "ダウンロードを進めることができません．"
 
-#: ../raphodo/rapid.py:2842
+#: ../raphodo/rapid.py:2962
 msgid ""
 "Photos and videos will not be backed up because there is nowhere to back "
 "them up. Do you still want to start the download?"
-msgstr ""
-"バックアップ場所がないので，写真と動画はバックアップされません．これに関わら"
-"ずダウンロードを開始しますか？"
+msgstr "バックアップ場所がないので，写真と動画はバックアップされません．これに関わらずダウンロードを開始しますか？"
 
-#. Translators: filetype will be replaced with 'photos' or 'videos'
-#: ../raphodo/rapid.py:2847 ../raphodo/rapid.py:2854
+#: ../raphodo/rapid.py:2969 ../raphodo/rapid.py:2979
 #, python-format
 msgid ""
 "No backup device exists for backing up %(filetype)s. Do you still want to "
 "start the download?"
-msgstr ""
-"%(filetype)sをバックアップするバックアップデバイスがありません．これに関わら"
-"ずダウンロードを開始しますか？"
+msgstr "%(filetype)sをバックアップするバックアップデバイスがありません．これに関わらずダウンロードを開始しますか？"
 
-#: ../raphodo/rapid.py:2848 ../raphodo/rpdfile.py:228
+#: ../raphodo/rapid.py:2971 ../raphodo/rpdfile.py:228
 msgid "photos"
 msgstr "写真"
 
-#: ../raphodo/rapid.py:2855 ../raphodo/rpdfile.py:223
+#: ../raphodo/rapid.py:2981 ../raphodo/rpdfile.py:223
 msgid "videos"
 msgstr "動画"
 
-#: ../raphodo/rapid.py:2861
+#: ../raphodo/rapid.py:2989
 msgid ""
 "<b>The photo and video backup destinations do not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
-msgstr ""
-"<b>写真・動画バックアップ先が存在しないか書き込みができません．</b><br><br>こ"
-"れに関わらずダウンロードを開始しますか？"
+msgstr "<b>写真・動画バックアップ先が存在しないか書き込みができません．</b><br><br>これに関わらずダウンロードを開始しますか？"
 
-#: ../raphodo/rapid.py:2869 ../raphodo/rapid.py:2876
+#: ../raphodo/rapid.py:2999 ../raphodo/rapid.py:3008
 #, python-format
 msgid ""
 "<b>The %(filetype)s backup destination does not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
-"<b>%(filetype)sのバックアップ先が存在しないか書き込みができません．</"
-"b><br><br>これに関わらずダウンロードを開始しますか？"
+"<b>%(filetype)sのバックアップ先が存在しないか書き込みができません．</b><br><br>これに関わらずダウンロードを開始しますか？"
 
-#: ../raphodo/rapid.py:2871 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:818
+#: ../raphodo/rapid.py:3001 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:843
 msgid "photo"
 msgstr "写真"
 
-#: ../raphodo/rapid.py:2878 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:858
+#: ../raphodo/rapid.py:3010 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:883
 msgid "video"
 msgstr "動画"
 
-#: ../raphodo/rapid.py:2886
+#: ../raphodo/rapid.py:3018
 msgid "Backup problem"
 msgstr "バックアップに障害"
 
-#. Translators - in the middle is a unicode em dash - please retain it
-#. This string is displayed in the status bar when the download is running
-#: ../raphodo/rapid.py:3571
+#: ../raphodo/rapid.py:3756
 #, python-format
 msgid "%(downloading_from)s — %(time_left)s left (%(speed)s)"
 msgstr "%(downloading_from)s — あと%(time_left)s（%(speed)s）"
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3640
+#: ../raphodo/rapid.py:3828
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s個の%(filetypes)sがダウンロードされました"
 
-#. Translators: e.g. 2 videos failed to download
-#: ../raphodo/rapid.py:3645
+#: ../raphodo/rapid.py:3836
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "%(noFiles)s個の%(filetypes)sがダウンロードに失敗しました"
 
-#: ../raphodo/rapid.py:3650 ../raphodo/rapid.py:3723
+#: ../raphodo/rapid.py:3842 ../raphodo/rapid.py:3927
 msgid "warnings"
 msgstr "警告"
 
-#: ../raphodo/rapid.py:3679
+#: ../raphodo/rapid.py:3873
 msgid "All downloads complete"
 msgstr "全ダウンロード完了"
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3686 ../raphodo/rapid.py:3695 ../raphodo/rapid.py:3704
-#: ../raphodo/rapid.py:3713 ../raphodo/rapid.py:3721
+#: ../raphodo/rapid.py:3881 ../raphodo/rapid.py:3892 ../raphodo/rapid.py:3903
+#: ../raphodo/rapid.py:3914 ../raphodo/rapid.py:3924
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: ../raphodo/rapid.py:3688 ../raphodo/rapid.py:3706
+#: ../raphodo/rapid.py:3884 ../raphodo/rapid.py:3906
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)sがダウンロードされました"
 
-#: ../raphodo/rapid.py:3697 ../raphodo/rapid.py:3715
+#: ../raphodo/rapid.py:3895 ../raphodo/rapid.py:3917
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "%(filetype)sのダウンロードに失敗しました"
 
-#: ../raphodo/rapid.py:3742
+#: ../raphodo/rapid.py:3950
 msgid "1 failure"
 msgstr "1エラー"
 
-#: ../raphodo/rapid.py:3744
+#: ../raphodo/rapid.py:3952
 #, python-format
 msgid "%d failures"
 msgstr "%dエラー"
 
-#: ../raphodo/rapid.py:3749
+#: ../raphodo/rapid.py:3957
 msgid "1 warning"
 msgstr "1警告"
 
-#: ../raphodo/rapid.py:3751
+#: ../raphodo/rapid.py:3959
 #, python-format
 msgid "%d warnings"
 msgstr "%d警告"
 
-#: ../raphodo/rapid.py:3771
+#: ../raphodo/rapid.py:3981
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s"
 msgstr "%(devices)sから%(no_files_and_types)sをダウンロードしました"
 
-#: ../raphodo/rapid.py:3774
+#: ../raphodo/rapid.py:3985
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s — %(failures)s"
-msgstr ""
-"%(devices)sから%(no_files_and_types)sをダウンロードしました — %(failures)s"
+msgstr "%(devices)sから%(no_files_and_types)sをダウンロードしました — %(failures)s"
 
-#: ../raphodo/rapid.py:3779
+#: ../raphodo/rapid.py:3989
 #, python-format
 msgid "No files downloaded — %(failures)s"
 msgstr "ファイルはダウンロードされませんでした — %(failures)s"
 
-#: ../raphodo/rapid.py:3781
+#: ../raphodo/rapid.py:3991
 msgid "No files downloaded"
 msgstr "ファイルはダウンロードされませんでした"
 
-#: ../raphodo/rapid.py:3805
+#: ../raphodo/rapid.py:4021
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s"
-msgstr ""
-"%(camera)sのサムネイルが全て生成された後，受入先サブフォルダと時間軸は再構築"
-"されます"
+msgstr "%(camera)sのサムネイルが全て生成された後，受入先サブフォルダと時間軸は再構築されます"
 
-#: ../raphodo/rapid.py:3809
+#: ../raphodo/rapid.py:4026
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for this computer"
-msgstr ""
-"このコンピュータのサムネイルが全て生成された後，受入先サブフォルダと時間軸は"
-"再構築されます"
+msgstr "このコンピュータのサムネイルが全て生成された後，受入先サブフォルダと時間軸は再構築されます"
 
-#: ../raphodo/rapid.py:3812
+#: ../raphodo/rapid.py:4031
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s"
-msgstr ""
-"%(device)sのサムネイルが全て生成された後，受入先サブフォルダと時間軸は再構築"
-"されます"
+msgstr "%(device)sのサムネイルが全て生成された後，受入先サブフォルダと時間軸は再構築されます"
 
-#: ../raphodo/rapid.py:3820
+#: ../raphodo/rapid.py:4039
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices and this computer"
 msgstr ""
-"%(number_devices)s個のデバイスとこのコンピュータのサムネイルが全て生成された"
-"後，受入先サブフォルダと時間軸は再構築されます"
+"%(number_devices)s個のデバイスとこのコンピュータのサムネイルが全て生成された後，受入先サブフォルダと時間軸は再構築されます"
 
-#: ../raphodo/rapid.py:3833
+#: ../raphodo/rapid.py:4052
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s and this computer"
-msgstr ""
-"%(camera)sとこのコンピュータのサムネイルが全て生成された後，受入先サブフォル"
-"ダと時間軸は再構築されます"
+msgstr "%(camera)sとこのコンピュータのサムネイルが全て生成された後，受入先サブフォルダと時間軸は再構築されます"
 
-#: ../raphodo/rapid.py:3837
+#: ../raphodo/rapid.py:4056
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s and this computer"
-msgstr ""
-"%(device)sとこのコンピュータのサムネイルが全て生成された後，受入先サブフォル"
-"ダと時間軸は再構築されます"
+msgstr "%(device)sとこのコンピュータのサムネイルが全て生成された後，受入先サブフォルダと時間軸は再構築されます"
 
-#: ../raphodo/rapid.py:3841
+#: ../raphodo/rapid.py:4060
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices"
 msgstr ""
-"%(number_devices)s個のデバイスとこのコンピュータのサムネイルが全て生成された"
-"後，受入先サブフォルダと時間軸は再構築されます"
+"%(number_devices)s個のデバイスとこのコンピュータのサムネイルが全て生成された後，受入先サブフォルダと時間軸は再構築されます"
 
-#: ../raphodo/rapid.py:3867
+#: ../raphodo/rapid.py:4087
 msgid "The Destination subfolders and Timeline have been rebuilt"
 msgstr "受入先サブフォルダと時間軸は再構築されました"
 
-#: ../raphodo/rapid.py:3922
+#: ../raphodo/rapid.py:4144
 msgid "Program preferences are invalid"
 msgstr "プログラム設定が無効です"
 
-#: ../raphodo/rapid.py:3999
+#: ../raphodo/rapid.py:4228
 #, python-format
 msgid ""
 "<b>All files on the %(camera)s are inaccessible</b>.<br><br>It may be locked "
@@ -3560,354 +4003,360 @@ msgid ""
 "charging</i> to <i>USB for file transfers</i>.<br><br>Alternatively, you can "
 "ignore this device."
 msgstr ""
-"<b>%(camera)s上の全ファイルがアクセス不能</b><br><br>ロックされているか，MTP"
-"ファイル送信用に設定されていないかもしれません．ロックを解除して再度試みてく"
-"ださい．<br><br>モデルによっては，<i>USB充電モード</i>設定を<i>USBファイル送"
-"信モード</i>に変更する必要があるかもしれません．<br><br>このデバイスを無視す"
-"ることも可能です．"
+"<b>%(camera)s上の全ファイルがアクセス不能</b><br><br>ロックされているか，MTPファイル送信用に設定されていないかもしれません．ロ"
+"ックを解除して再度試みてください．<br><br>モデルによっては，<i>USB充電モード</i>設定を<i>USBファイル送信モード</i>に変更する必"
+"要があるかもしれません．<br><br>このデバイスを無視することも可能です．"
 
-#: ../raphodo/rapid.py:4008
+#: ../raphodo/rapid.py:4239
 #, python-format
 msgid ""
-"<b>The %(camera)s appears to be in use by another application.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again.<br><br>Alternatively, you can ignore this "
-"device."
+"<b>The %(camera)s appears to be in use by another "
+"application.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again.<br><br>Alternatively, you "
+"can ignore this device."
 msgstr ""
-"<b>%(camera)sは他のアプリケーションで使用されているようです．</"
-"b><br><br>（ファイルブラウザ等）これを使用している他のアプリケーションを終了"
-"して，再試行してください．それでもうまくいかない場合は，%(camera)sをコン"
-"ピューターから外して再度差し込んでください．<br><br>あるいは，このデバイスを"
-"無視しても結構です．"
+"<b>%(camera)sは他のアプリケーションで使用されているようです．</b><br><br>（ファイルブラウザ等）これを使用している他のアプリケーシ"
+"ョンを終了して，再試行してください．それでもうまくいかない場合は，%(camera)sをコンピューターから外して再度差し込んでください．<br><br>あ"
+"るいは，このデバイスを無視しても結構です．"
 
-#: ../raphodo/rapid.py:4019
+#: ../raphodo/rapid.py:4250
 msgid "&Try Again"
 msgstr "再試行(&T)"
 
-#: ../raphodo/rapid.py:4020
+#: ../raphodo/rapid.py:4251
 msgid "&Ignore This Device"
 msgstr "このデバイスは無視(&I)"
 
-#: ../raphodo/rapid.py:4086
+#: ../raphodo/rapid.py:4323
 #, python-format
 msgid "Sorry, an unexpected problem occurred while scanning %s."
 msgstr "すみません，%sを走査中に予期しない問題が発生しました．"
 
-#: ../raphodo/rapid.py:4087
+#: ../raphodo/rapid.py:4324
 msgid "Unfortunately you cannot download from this device."
 msgstr "残念ながら，このデバイスからはダウンロードできません．"
 
-#: ../raphodo/rapid.py:4091
+#: ../raphodo/rapid.py:4328
 msgid ""
 "A possible workaround for the problem might be downloading from the camera's "
 "memory card using a card reader."
-msgstr ""
-"この問題の回避策としては，カードリーダを使用して，カメラのメモリカードからダ"
-"ウンロードすることが考えられます．"
+msgstr "この問題の回避策としては，カードリーダを使用して，カメラのメモリカードからダウンロードすることが考えられます．"
 
-#: ../raphodo/rapid.py:4096
+#: ../raphodo/rapid.py:4333
 msgid "Device scan failed"
 msgstr "デバイス走査失敗"
 
-#: ../raphodo/rapid.py:4472
+#: ../raphodo/rapid.py:4720
 #, python-format
 msgid ""
-"<b>The %(camera)s cannot be scanned because it cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again."
+"<b>The %(camera)s cannot be scanned because it cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again."
 msgstr ""
-"<b>%(camera)sをアンマウントできないので，走査できません．</b><br><br>（ファイ"
-"ルブラウザ等）これを使用している他のアプリケーションを終了して，再試行してく"
-"ださい．それでもうまくいかない場合は，%(camera)sをコンピューターから外して再"
-"度差し込んでください．"
+"<b>%(camera)sをアンマウントできないので，走査できません．</b><br><br>（ファイルブラウザ等）これを使用している他のアプリケーション"
+"を終了して，再試行してください．それでもうまくいかない場合は，%(camera)sをコンピューターから外して再度差し込んでください．"
 
-#: ../raphodo/rapid.py:4496
+#: ../raphodo/rapid.py:4745
 #, python-format
 msgid ""
-"<b>The download cannot start because the %(camera)s cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again, and choose which files you want to "
-"download from it."
+"<b>The download cannot start because the %(camera)s cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again, and choose which files "
+"you want to download from it."
 msgstr ""
-"<b>%(camera)sをアンマウントできないのでダウンロードを開始できません．</"
-"b><br><br>（ファイルブラウザ等）これを使用している他のアプリケーションを終了"
-"して，再試行してください．それでもうまくいかない場合は，%(camera)sをコン"
-"ピューターから外してから再度差し込み，ダウンロードしたいファイルを選択してく"
-"ださい．"
+"<b>%(camera)sをアンマウントできないのでダウンロードを開始できません．</b><br><br>（ファイルブラウザ等）これを使用している他のアプ"
+"リケーションを終了して，再試行してください．それでもうまくいかない場合は，%(camera)sをコンピューターから外してから再度差し込み，ダウンロードした"
+"いファイルを選択してください．"
+
+#: ../raphodo/rapid.py:4842
+msgid "Completed Downloads Present"
+msgstr "完了したダウンロードがあります"
 
-#: ../raphodo/rapid.py:4635
+#: ../raphodo/rapid.py:4844
+#, python-format
+msgid "%s whose download have completed are displayed."
+msgstr "ダウンロードが完了した%sが表示されます．"
+
+#: ../raphodo/rapid.py:4846
+msgid "Do you want to clear the completed downloads?"
+msgstr "完了したダウンロードを消去しますか？"
+
+#: ../raphodo/rapid.py:4848
+msgid "Completed Download Present"
+msgstr "完了したダウンロードがあります"
+
+#: ../raphodo/rapid.py:4850
+#, python-format
+msgid "%s whose download has completed is displayed."
+msgstr "ダウンロードが完了した%sが表示されます．"
+
+#: ../raphodo/rapid.py:4852
+msgid "Do you want to clear the completed download?"
+msgstr "完了したダウンロードを消去しますか？"
+
+#: ../raphodo/rapid.py:4933
 #, python-format
 msgid ""
 "Do you want to download photos and videos from the device <i>%(device)s</i>?"
 msgstr "写真と動画をデバイス<i>%(device)s</i>からダウンロードしますか？"
 
-#: ../raphodo/rapid.py:4877
+#: ../raphodo/rapid.py:5183
 #, python-format
 msgid "<b>Do you want to ignore the %s whenever this program is run?</b>"
 msgstr "<b>このプログラムの実行中はつねに%sを無視しますか？</b>"
 
-#: ../raphodo/rapid.py:4879
+#: ../raphodo/rapid.py:5186
 msgid ""
 "All cameras, phones and tablets with the same model name will be ignored."
 msgstr "同じモデル名のカメラ・携帯・タブレットはすべて無視されます．"
 
-#: ../raphodo/rapid.py:4883
+#: ../raphodo/rapid.py:5190
 #, python-format
 msgid ""
 "<b>Do you want to ignore the device %s whenever this program is run?</b>"
 msgstr "<b>このプログラムの実行中はつねにデバイス%sを無視しますか？</b>"
 
-#: ../raphodo/rapid.py:4885
+#: ../raphodo/rapid.py:5192
 msgid "Any device with the same name will be ignored."
 msgstr "同じ名前のデバイスは全て無視されます．"
 
-#: ../raphodo/rapid.py:5178
+#: ../raphodo/rapid.py:5492
 #, python-format
 msgid "Downloading from %(location)s on This Computer."
 msgstr "このコンピュータの%(location)sからダウンロードしています．"
 
-#: ../raphodo/rapid.py:5180
+#: ../raphodo/rapid.py:5496
 msgid ""
 "Do you really want to download from here?<br><br>On some systems, scanning "
 "this location can take a very long time."
-msgstr ""
-"本当にここからダウンロードしますか？<br><br>システムによっては，この場所の走"
-"査には非常に永くの時間がかかります．"
+msgstr "本当にここからダウンロードしますか？<br><br>システムによっては，この場所の走査には非常に永くの時間がかかります．"
 
-#: ../raphodo/rapid.py:5224
+#: ../raphodo/rapid.py:5537
 #, python-format
 msgid "Generating thumbnails for %s"
 msgstr "%sのサムネイルを生成しています"
 
-#: ../raphodo/rapid.py:5227
+#: ../raphodo/rapid.py:5540
 #, python-format
 msgid "Scanning %s"
 msgstr "%sを走査中"
 
-#: ../raphodo/rapid.py:5237
+#: ../raphodo/rapid.py:5551
 #, python-format
 msgid ""
 "%(number)s of %(available files)s checked for download (%(hidden)s hidden)"
-msgstr ""
-"%(available files)s中%(number)sがダウンロード用にチェックされました"
-"（%(hidden)s非表示）"
+msgstr "%(available files)s中%(number)sがダウンロード用にチェックされました（%(hidden)s非表示）"
 
-#: ../raphodo/rapid.py:5243
+#: ../raphodo/rapid.py:5559
 #, python-format
 msgid "%(number)s of %(available files)s checked for download"
 msgstr "%(available files)s中%(number)sがダウンロード用にチェックされました"
 
-#: ../raphodo/rapid.py:5494
+#: ../raphodo/rapid.py:5764
 msgid "Display program information when run from the command line."
 msgstr "コマンドラインから実行する際，プログラム情報を表示します．"
 
-#: ../raphodo/rapid.py:5496
+#: ../raphodo/rapid.py:5766
 msgid "Display debugging information when run from the command line."
 msgstr "コマンドラインから実行する際，デバッグ情報を表示します．"
 
-#: ../raphodo/rapid.py:5499
+#: ../raphodo/rapid.py:5769
 msgid "List photo and video file extensions the program recognizes and exit."
-msgstr ""
-"プログラムが認識する写真と動画のファイル拡張子を一覧表示して終了します．"
+msgstr "プログラムが認識する写真と動画のファイル拡張子を一覧表示して終了します．"
 
-#: ../raphodo/rapid.py:5502
+#: ../raphodo/rapid.py:5772
 msgid "Turn on or off the the renaming of photos."
 msgstr "写真の名称変更を入切します．"
 
-#: ../raphodo/rapid.py:5504
+#: ../raphodo/rapid.py:5774
 msgid "turn on or off the the renaming of videos."
 msgstr "動画の名称変更を入切します．"
 
-#: ../raphodo/rapid.py:5506
+#: ../raphodo/rapid.py:5776
 msgid ""
 "Turn on or off the automatic detection of devices from which to download."
 msgstr "ダウンロード元デバイスの自動検出を入切します．"
 
-#: ../raphodo/rapid.py:5510
+#: ../raphodo/rapid.py:5780
 msgid "Turn on or off downloading from this computer."
 msgstr "このコンピュータからダウンロードするか切り替えます"
 
-#: ../raphodo/rapid.py:5512 ../raphodo/rapid.py:5515 ../raphodo/rapid.py:5518
-#: ../raphodo/rapid.py:5539 ../raphodo/rapid.py:5543
+#: ../raphodo/rapid.py:5782 ../raphodo/rapid.py:5785 ../raphodo/rapid.py:5788
+#: ../raphodo/rapid.py:5809 ../raphodo/rapid.py:5813
 msgid "PATH"
 msgstr "パス"
 
-#: ../raphodo/rapid.py:5513
+#: ../raphodo/rapid.py:5783
 msgid "The PATH on this computer from which to download."
 msgstr "このコンピュータのダウンロード元のPATH"
 
-#: ../raphodo/rapid.py:5516
+#: ../raphodo/rapid.py:5786
 msgid "The PATH where photos will be downloaded to."
 msgstr "写真をダウンロードするパス．"
 
-#: ../raphodo/rapid.py:5519
+#: ../raphodo/rapid.py:5789
 msgid "The PATH where videos will be downloaded to."
 msgstr "動画をダウンロードするパス．"
 
-#: ../raphodo/rapid.py:5521
+#: ../raphodo/rapid.py:5791
 msgid "Turn on or off the backing up of photos and videos while downloading."
 msgstr "ダウンロード中の写真・動画のバックアップを入切します．"
 
-#: ../raphodo/rapid.py:5525
+#: ../raphodo/rapid.py:5795
 msgid "Turn on or off the automatic detection of backup devices."
 msgstr "バックアップデバイスの自動検出を入切します．"
 
-#: ../raphodo/rapid.py:5527 ../raphodo/rapid.py:5533
+#: ../raphodo/rapid.py:5797 ../raphodo/rapid.py:5803
 msgid "FOLDER"
 msgstr "フォルダ"
 
-#: ../raphodo/rapid.py:5528
+#: ../raphodo/rapid.py:5798
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected photo "
 "backup device, with the folder's name being used to identify whether or not "
 "the device is used for backups. For each device you wish to use for backing "
 "photos up to, create a folder on it with this name."
 msgstr ""
-"自動検出された写真バックアップデバイスで，バックアップを保存するフォルダで，"
-"フォルダ名はデバイスがバックアップ用かどうかを認識するのに用いられます．写真"
-"バックアップ用に使いたいデバイスには，すべてこの名前のフォルダを作ってくださ"
-"い．"
+"自動検出された写真バックアップデバイスで，バックアップを保存するフォルダで，フォルダ名はデバイスがバックアップ用かどうかを認識するのに用いられます．写真バ"
+"ックアップ用に使いたいデバイスには，すべてこの名前のフォルダを作ってください．"
 
-#: ../raphodo/rapid.py:5534
+#: ../raphodo/rapid.py:5804
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected video "
 "backup device, with the folder's name being used to identify whether or not "
 "the device is used for backups. For each device you wish to use for backing "
 "up videos to, create a folder on it with this name."
 msgstr ""
-"自動検出された動画バックアップデバイス上にバックアップを保存するフォルダで"
-"す．このフォルダ名のあるなしでデバイスがバックアップ用であるか否かを判定しま"
-"す．ビデオをバックアップしたいデバイスには，全てこの名前のフォルダを作成して"
-"ください．"
+"自動検出された動画バックアップデバイス上にバックアップを保存するフォルダです．このフォルダ名のあるなしでデバイスがバックアップ用であるか否かを判定します．"
+"ビデオをバックアップしたいデバイスには，全てこの名前のフォルダを作成してください．"
 
-#: ../raphodo/rapid.py:5540
+#: ../raphodo/rapid.py:5810
 msgid ""
 "The PATH where photos will be backed up when automatic detection of backup "
 "devices is turned off."
-msgstr ""
-"バックアップデバイスの自動検出が切のとき，写真をバックアップするパスです．"
+msgstr "バックアップデバイスの自動検出が切のとき，写真をバックアップするパスです．"
 
-#: ../raphodo/rapid.py:5544
+#: ../raphodo/rapid.py:5814
 msgid ""
 "The PATH where videos will be backed up when automatic detection of backup "
 "devices is turned off."
-msgstr ""
-"バックアップデバイスの自動検出が切のとき，動画をバックアップするパスです．"
+msgstr "バックアップデバイスの自動検出が切のとき，動画をバックアップするパスです．"
 
-#: ../raphodo/rapid.py:5547
+#: ../raphodo/rapid.py:5817
 #, python-format
 msgid "Ignore photos with the following extensions: %s"
 msgstr "無視する写真の拡張子：%s"
 
-#: ../raphodo/rapid.py:5551
-msgid "Turn on or off starting downloads as soon as the program itself starts."
+#: ../raphodo/rapid.py:5821
+msgid ""
+"Turn on or off starting downloads as soon as the program itself starts."
 msgstr "プログラムが起動してすぐのダウンロードの開始を入切"
 
-#: ../raphodo/rapid.py:5554
+#: ../raphodo/rapid.py:5824
 msgid "Turn on or off starting downloads as soon as a device is inserted."
 msgstr "デバイスの挿入と同時にダウンロードを開始するか否かを設定．"
 
-#: ../raphodo/rapid.py:5557
+#: ../raphodo/rapid.py:5827
 msgid ""
 "Turn on or off use of the Rapid Photo Downloader Thumbnail Cache. Turning it "
 "off does not delete existing cache contents."
-msgstr ""
-"高速写真ダウンローダのサムネイルキャッシュの使用を入切．これを切にしても既存"
-"のキャッシュの内容は削除されません．"
+msgstr "高速写真ダウンローダのサムネイルキャッシュの使用を入切．これを切にしても既存のキャッシュの内容は削除されません．"
 
-#: ../raphodo/rapid.py:5561
+#: ../raphodo/rapid.py:5831
 msgid ""
 "Delete all thumbnails in the Rapid Photo Downloader Thumbnail Cache, and "
 "exit."
-msgstr ""
-"高速写真ダウンローダのサムネイルキャッシュ中の全サムネイルを削除して終了しま"
-"す．"
+msgstr "高速写真ダウンローダのサムネイルキャッシュ中の全サムネイルを削除して終了します．"
 
-#: ../raphodo/rapid.py:5565
+#: ../raphodo/rapid.py:5835
 msgid "Forget which files have been previously downloaded, and exit."
 msgstr "以前にダウンロードされたファイルを忘却して終了します．"
 
-#: ../raphodo/rapid.py:5568
+#: ../raphodo/rapid.py:5838
 msgid ""
 "Import preferences from an old program version and exit. Requires the "
 "command line program gconftool-2."
-msgstr ""
-"古いバージョンのプログラムから設定をインポートして終了します．コマンドライン"
-"プログラムのgconftool-2が必要です．"
+msgstr "古いバージョンのプログラムから設定をインポートして終了します．コマンドラインプログラムのgconftool-2が必要です．"
 
-#: ../raphodo/rapid.py:5571
+#: ../raphodo/rapid.py:5841
 msgid ""
 "Reset all program settings to their default values, delete all thumbnails in "
 "the Thumbnail cache, forget which files have been previously downloaded, and "
 "exit."
 msgstr ""
-"プログラム設定を全て既定値にリセットして，サムネイルキャッシュ中の全サムネイ"
-"ルを削除し，以前にダウンロードされたファイルを忘却して，終了します．"
+"プログラム設定を全て既定値にリセットして，サムネイルキャッシュ中の全サムネイルを削除し，以前にダウンロードされたファイルを忘却して，終了します．"
 
-#: ../raphodo/rapid.py:5575
+#: ../raphodo/rapid.py:5845
 msgid "Include gphoto2 debugging information in log files."
 msgstr "ログファイルにgphoto2デバッグ情報を含めます．"
 
-#: ../raphodo/rapid.py:5579
+#: ../raphodo/rapid.py:5849
 msgid "Print information to the terminal about attached cameras and exit."
 msgstr "接続されているカメラの情報を端末に表示して終了します．"
 
-#: ../raphodo/rapid.py:5640
+#: ../raphodo/rapid.py:5911
 msgid ""
 "To import preferences from the old version of Rapid Photo Downloader, you "
 "must install the program gconftool-2."
-msgstr ""
-"古いバージョンの高速写真ダウンローダから設定を読み込むには，gconftool-2という"
-"プログラムを導入する必要があります．"
+msgstr "古いバージョンの高速写真ダウンローダから設定を読み込むには，gconftool-2というプログラムを導入する必要があります．"
 
-#: ../raphodo/rapid.py:5649
+#: ../raphodo/rapid.py:5920
 msgid "No prior program preferences detected: exiting"
 msgstr "以前のプログラム設定は検出されませんでした：終了します"
 
-#: ../raphodo/rapid.py:5652
+#: ../raphodo/rapid.py:5923
 #, python-format
 msgid "Importing preferences from Rapid Photo Downloader %(version)s"
 msgstr "高速写真ダウンローダ%(version)sから設定を読み込みます"
 
-#: ../raphodo/rapid.py:5714
+#: ../raphodo/rapid.py:5989
 #, python-format
-msgid "Do you want to copy the stored sequence number, which has the value %d?"
+msgid ""
+"Do you want to copy the stored sequence number, which has the value %d?"
 msgstr "保存されている連番（値：%d）をコピーしますか？"
 
-#: ../raphodo/rapid.py:5726
+#: ../raphodo/rapid.py:6000
 msgid "Program aborting."
 msgstr "プログラムを終了します．"
 
-#: ../raphodo/rapid.py:5736
+#: ../raphodo/rapid.py:6010
 msgid "Never run this program as the sudo / root user."
 msgstr "sudo / rootユーザーではこのプログラムを決して実行しないでください"
 
-#: ../raphodo/rapid.py:5740
+#: ../raphodo/rapid.py:6014
 msgid "You must install ExifTool to run Rapid Photo Downloader."
+msgstr "高速写真ダウンローダを実行するには，ExifToolを導入しなくてはなりません．"
+
+#: ../raphodo/rapid.py:6026
+msgid ""
+"Rapid Photo Downloader is installed in multiple locations.\n"
+"\n"
+"Uninstall all copies except the version you want to run."
 msgstr ""
-"高速写真ダウンローダを実行するには，ExifToolを導入しなくてはなりません．"
+"高速写真ダウンローダは，複数の場所にインストールされています．\n"
+"\n"
+"実行したいバージョンを除き，全コピーをアンインストールしてください．"
 
-#: ../raphodo/rapid.py:5794
+#: ../raphodo/rapid.py:6083
 msgid ""
 "When specifying a path on the command line, do not also specify an\n"
 "option for device auto detection or a path on \"This Computer\"."
 msgstr ""
-"コマンドライン上にパスを指定する際，デバイス自動検出のオプションを同時に指定"
-"したり，\n"
+"コマンドライン上にパスを指定する際，デバイス自動検出のオプションを同時に指定したり，\n"
 "「このコンピュータ」のパスを指定したりしないでください．"
 
-#: ../raphodo/rapid.py:5950
+#: ../raphodo/rapid.py:6243
 msgid "All settings and caches have been reset"
 msgstr "設定とキャッシュは全てリセットされました"
 
-#: ../raphodo/rapid.py:5958
+#: ../raphodo/rapid.py:6251
 msgid "Thumbnail Cache has been reset"
 msgstr "サムネイルキャッシュはリセットされました"
 
-#: ../raphodo/rapid.py:5964
+#: ../raphodo/rapid.py:6257
 msgid "Remembered files have been forgotten"
 msgstr "記憶されていたファイルは忘れられました"
 
@@ -3923,15 +4372,15 @@ msgstr "これについては今後警告しない(&D)"
 msgid "&Don't warn me again about missing or broken program libraries"
 msgstr "不備のあるプログラムライブラリについては，今後警告しない(&D)"
 
-#: ../raphodo/renameandmovefile.py:546
+#: ../raphodo/renameandmovefile.py:554
 msgid "subfolder and filename"
 msgstr "サブフォルダ及びファイル名"
 
-#: ../raphodo/renameandmovefile.py:548
+#: ../raphodo/renameandmovefile.py:556
 msgid "filename"
 msgstr "ファイル名"
 
-#: ../raphodo/renameandmovefile.py:550
+#: ../raphodo/renameandmovefile.py:558
 msgid "subfolder"
 msgstr "サブフォルダ"
 
@@ -3988,9 +4437,7 @@ msgstr "互換性のない文字を削除"
 msgid ""
 "Whether photo, video and folder names should have any characters removed "
 "that are not allowed by other operating systems"
-msgstr ""
-"他のオペレーティングシステムでは許されていない文字を，すべて写真・動画・フォ"
-"ルダ名から削除するか否か"
+msgstr "他のオペレーティングシステムでは許されていない文字を，すべて写真・動画・フォルダ名から削除するか否か"
 
 #: ../raphodo/renamepanel.py:365
 msgid "Compatibility"
@@ -4016,160 +4463,237 @@ msgstr "写真と動画"
 msgid "photos or videos"
 msgstr "写真または動画"
 
-#: ../raphodo/rpdfile.py:306
+#: ../raphodo/rpdfile.py:315
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s個の%(filetypes)s"
 
-#: ../raphodo/rpdfile.py:318
+#. translators: natural language expression signifying a single video
+#: ../raphodo/rpdfile.py:337
+msgid "a video"
+msgstr "動画"
+
+#: ../raphodo/rpdfile.py:339
 msgid "1 Video"
 msgstr "1動画"
 
-#: ../raphodo/rpdfile.py:323
+#. translators: natural language expression signifying a single photo
+#: ../raphodo/rpdfile.py:346
+msgid "a photo"
+msgstr "写真"
+
+#: ../raphodo/rpdfile.py:348
 msgid "1 Photo"
 msgstr "1写真"
 
-#: ../raphodo/rpdfile.py:803
+#: ../raphodo/rpdfile.py:828
 #, python-format
 msgid "%(path)s on %(camera)s"
 msgstr "%(camera)s上の%(path)s"
 
-#: ../raphodo/rpdfile.py:819
+#: ../raphodo/rpdfile.py:844
 msgid "Photo"
 msgstr "写真"
 
-#: ../raphodo/rpdfile.py:859
+#: ../raphodo/rpdfile.py:884
 msgid "Video"
 msgstr "動画"
 
-#: ../raphodo/storage.py:138
+#: ../raphodo/storage.py:141
 msgid "File system root"
 msgstr "ファイルシステム ルート"
 
 #. translators: the name of the Pictures folder
-#: ../raphodo/storage.py:433
+#: ../raphodo/storage.py:437
 msgid "Pictures"
 msgstr "ピクチャ"
 
-#: ../raphodo/thumbnaildisplay.py:426
+#: ../raphodo/thumbnaildisplay.py:432
 #, python-format
 msgid "Taken on %(date_time)s (%(human_readable)s)"
 msgstr "%(date_time)s（%(human_readable)s）に取得"
 
-#: ../raphodo/thumbnaildisplay.py:431
+#: ../raphodo/thumbnaildisplay.py:439
 #, python-format
 msgid "Modified on %(date_time)s (%(human_readable)s)"
 msgstr "%(date_time)s（%(human_readable)s）に修正されました"
 
-#: ../raphodo/thumbnaildisplay.py:437 ../raphodo/thumbnaildisplay.py:466
+#: ../raphodo/thumbnaildisplay.py:447 ../raphodo/thumbnaildisplay.py:481
 #, python-format
 msgid "%(date_time)s (%(human_readable)s)"
 msgstr "%(date_time)s（%(human_readable)s）"
 
-#: ../raphodo/thumbnaildisplay.py:451
+#: ../raphodo/thumbnaildisplay.py:464
 #, python-format
 msgid "Memory cards: %s"
 msgstr "メモリーカード：%s"
 
-#: ../raphodo/thumbnaildisplay.py:457
+#: ../raphodo/thumbnaildisplay.py:468
+#, python-format
+msgid "Memory card: %s"
+msgstr "メモリーカード：%s"
+
+#: ../raphodo/thumbnaildisplay.py:473
 msgid "Downloaded as:"
 msgstr "ダウンロード結果："
 
-#: ../raphodo/thumbnaildisplay.py:472
+#: ../raphodo/thumbnaildisplay.py:489
 #, python-format
 msgid "<br><br>Previous download:<br>%(filename)s<br>%(path)s<br>%(date)s"
 msgstr "<br><br>前回ダウンロード：<br>%(filename)s<br>%(path)s<br>%(date)s"
 
-#: ../raphodo/thumbnaildisplay.py:1603
+#: ../raphodo/thumbnaildisplay.py:1645
 msgid "Copy Path"
 msgstr "パスをコピー"
 
+#. Translators: these values are file size suffixes like B representing bytes, KB representing
+#. kilobytes, etc.
+#: ../raphodo/utilities.py:170
+msgid "B"
+msgstr "B"
+
+#: ../raphodo/utilities.py:170
+msgid "KB"
+msgstr "KB"
+
+#: ../raphodo/utilities.py:170
+msgid "MB"
+msgstr "MB"
+
+#: ../raphodo/utilities.py:170
+msgid "GB"
+msgstr "GB"
+
+#: ../raphodo/utilities.py:170
+msgid "TB"
+msgstr "TB"
+
+#: ../raphodo/utilities.py:170
+msgid "PB"
+msgstr "PB"
+
+#: ../raphodo/utilities.py:170
+msgid "EB"
+msgstr "EB"
+
+#: ../raphodo/utilities.py:170
+msgid "ZB"
+msgstr "ZB"
+
+#: ../raphodo/utilities.py:170
+msgid "YB"
+msgstr "YB"
+
 #. two things in a list e.g. "device1 and device2"
-#: ../raphodo/utilities.py:391
+#: ../raphodo/utilities.py:394
 #, python-format
 msgid "%(first_item)s and %(last_item)s"
 msgstr "%(first_item)s と %(last_item)s"
 
-#: ../raphodo/utilities.py:464
+#: ../raphodo/utilities.py:468
 msgid "one"
 msgstr "1"
 
-#: ../raphodo/utilities.py:465
+#: ../raphodo/utilities.py:469
 msgid "two"
 msgstr "2"
 
-#: ../raphodo/utilities.py:466
+#: ../raphodo/utilities.py:470
 msgid "three"
 msgstr "3"
 
-#: ../raphodo/utilities.py:467
+#: ../raphodo/utilities.py:471
 msgid "four"
 msgstr "4"
 
-#: ../raphodo/utilities.py:468
+#: ../raphodo/utilities.py:472
 msgid "five"
 msgstr "5"
 
-#: ../raphodo/utilities.py:469
+#: ../raphodo/utilities.py:473
 msgid "six"
 msgstr "6"
 
-#: ../raphodo/utilities.py:470
+#: ../raphodo/utilities.py:474
 msgid "seven"
 msgstr "7"
 
-#: ../raphodo/utilities.py:471
+#: ../raphodo/utilities.py:475
 msgid "eight"
 msgstr "8"
 
-#: ../raphodo/utilities.py:472
+#: ../raphodo/utilities.py:476
 msgid "nine"
 msgstr "9"
 
-#: ../raphodo/utilities.py:473
+#: ../raphodo/utilities.py:477
 msgid "ten"
 msgstr "10"
 
-#: ../raphodo/utilities.py:474
+#: ../raphodo/utilities.py:478
 msgid "eleven"
 msgstr "11"
 
-#: ../raphodo/utilities.py:475
+#: ../raphodo/utilities.py:479
 msgid "twelve"
 msgstr "12"
 
-#: ../raphodo/utilities.py:476
+#: ../raphodo/utilities.py:480
 msgid "thirteen"
 msgstr "13"
 
-#: ../raphodo/utilities.py:477
+#: ../raphodo/utilities.py:481
 msgid "fourteen"
 msgstr "14"
 
-#: ../raphodo/utilities.py:478
+#: ../raphodo/utilities.py:482
 msgid "fifteen"
 msgstr "15"
 
-#: ../raphodo/utilities.py:479
+#: ../raphodo/utilities.py:483
 msgid "sixteen"
 msgstr "16"
 
-#: ../raphodo/utilities.py:480
+#: ../raphodo/utilities.py:484
 msgid "seventeen"
 msgstr "17"
 
-#: ../raphodo/utilities.py:481
+#: ../raphodo/utilities.py:485
 msgid "eighteen"
 msgstr "18"
 
-#: ../raphodo/utilities.py:482
+#: ../raphodo/utilities.py:486
 msgid "ninenteen"
 msgstr "19"
 
-#: ../raphodo/utilities.py:483
+#: ../raphodo/utilities.py:487
 msgid "twenty"
 msgstr "20"
 
+#: ../raphodo/viewutils.py:240
+msgid "&OK"
+msgstr "&OK"
+
+#: ../raphodo/viewutils.py:243
+msgid "&Save"
+msgstr "保存(&S)"
+
+#: ../raphodo/viewutils.py:244
+msgid "&Help"
+msgstr "ヘルプ(&H)"
+
+#: ../raphodo/viewutils.py:245
+msgid "Restore Defaults"
+msgstr "標準に戻す"
+
+#: ../raphodo/viewutils.py:246
+msgid "&Yes"
+msgstr "はい(&Y)"
+
+#: ../raphodo/viewutils.py:247
+msgid "&No"
+msgstr "いいえ(&N)"
+
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:1
 msgid ""
 "Rapid Photo Downloader imports photos and videos from cameras, phones, "
@@ -4178,11 +4702,9 @@ msgid ""
 "photos and videos as they are downloaded. It downloads from and backs up to "
 "multiple devices simultaneously."
 msgstr ""
-"高速写真ダウンローダは，カメラや携帯，メモリカードなどのデバイスから，高速で"
-"写真や動画を取り込みます．写真や動画は，指定した意味ある名前に変更されるよう"
-"に設定することができます．ダウンロード中に写真・動画をバックアップすることも"
-"可能です．複数のデバイスからダウンロードするのと並行してバックアップも行うこ"
-"とができます．"
+"高速写真ダウンローダは，カメラや携帯，メモリカードなどのデバイスから，高速で写真や動画を取り込みます．写真や動画は，指定した意味ある名前に変更されるように"
+"設定することができます．ダウンロード中に写真・動画をバックアップすることも可能です．複数のデバイスからダウンロードするのと並行してバックアップも行うことが"
+"できます．"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:2
 msgid ""
@@ -4191,8 +4713,7 @@ msgid ""
 "identify photos and videos taken at different periods in a single day or "
 "over consecutive days."
 msgstr ""
-"高速写真ダウンローダに特徴的なものとして時間軸があります．これは，撮影間の経"
-"過時間によって写真や動画をグループ化するものです．1日もしくは数日内の別の時間"
+"高速写真ダウンローダに特徴的なものとして時間軸があります．これは，撮影間の経過時間によって写真や動画をグループ化するものです．1日もしくは数日内の別の時間"
 "帯に撮られた写真や動画を認識するのにお使いください．"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:3
@@ -4202,33 +4723,29 @@ msgid ""
 "configured without the need for complicated codes. Common tasks can be "
 "automated, such as unmounting a memory card when the download is complete."
 msgstr ""
-"高速写真ダウンローダは，プロ・アマ写真家用に写真家が作成してあるので，簡単に"
-"設定を行って使用することができます．プログラムの設定は，複雑なコードを書くこ"
-"となく行うことができます．ダウンロード完了後のメモリのアンマウントなど，よく"
-"行われるタスクは自動化されています．"
+"高速写真ダウンローダは，プロ・アマ写真家用に写真家が作成してあるので，簡単に設定を行って使用することができます．プログラムの設定は，複雑なコードを書くこと"
+"なく行うことができます．ダウンロード完了後のメモリのアンマウントなど，よく行われるタスクは自動化されています．"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:4
 msgid "The main window"
-msgstr ""
+msgstr "メインウィンドウ"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:5
 msgid "Downloading"
-msgstr ""
+msgstr "ダウンロードしています"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:6
 msgid "The Timeline"
-msgstr ""
+msgstr "時間軸"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:7
 msgid "Right-clicking on a device"
-msgstr ""
+msgstr "デバイスを右クリック"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:1
 msgid ""
 "Download, rename and back up photos and videos from cameras and other devices"
-msgstr ""
-"カメラなどのデバイスから写真・動画をダウンロードしたり，名称変更したりバック"
-"アップしたりします．"
+msgstr "カメラなどのデバイスから写真・動画をダウンロードしたり，名称変更したりバックアップしたりします．"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:2
 msgid "Photo Downloader"
@@ -4237,11 +4754,9 @@ msgstr "写真ダウンローダ"
 #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:5
 msgid ""
-"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;"
-"memory;card;"
-msgstr ""
-"写真;ダウンロード;インポート;動画;ビデオ;RAW;カメラ;電話;スマホ;取得;バック"
-"アップ;メモリ;カード;"
+"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;memory"
+";card;"
+msgstr "写真;ダウンロード;インポート;動画;ビデオ;RAW;カメラ;電話;スマホ;取得;バックアップ;メモリ;カード;"
 
 #: ../data/kde/net.damonlynch.rapid-photo-downloader.desktop.in.h:1
 msgid "Download Photos and Videos with Rapid Photo Downloader"
@@ -4316,6 +4831,7 @@ msgstr "写真と動画を高速写真ダウンローダでダウンロードす
 #~ msgid "Download Progress"
 #~ msgstr "ダウンロードの進行状況"
 
+#, python-format
 #~ msgid "%(device)s did not unmount"
 #~ msgstr "%(device)sはマウント解除されませんでした"
 
@@ -4325,24 +4841,24 @@ msgstr "写真と動画を高速写真ダウンローダでダウンロードす
 #~ msgid ""
 #~ "Do you really want to download from here? On some systems, scanning this "
 #~ "location can take a very long time."
-#~ msgstr ""
-#~ "ここからダウンロードしますか？システムによっては、この場所をスキャンする"
-#~ "と、非常に長い時間がかかります。"
+#~ msgstr "ここからダウンロードしますか？システムによっては、この場所をスキャンすると、非常に長い時間がかかります。"
 
+#, python-format
 #~ msgid "Downloading from %(location)s."
 #~ msgstr "%(location)sからダウンロードしています"
 
+#, python-format
 #~ msgid "No backup device contains a valid folder for backing up %(filetype)s"
-#~ msgstr ""
-#~ "どのバックアップデバイスにも、%(filetype)s をバックアップするのに有効な"
-#~ "フォルダがありません"
+#~ msgstr "どのバックアップデバイスにも、%(filetype)s をバックアップするのに有効なフォルダがありません"
 
 #~ msgid "Download cannot proceed"
 #~ msgstr "ダウンロードを続けることができません"
 
+#, python-format
 #~ msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 #~ msgstr "残りおよそ%(minutes)i分%(seconds)02i秒"
 
+#, python-format
 #~ msgid "About %i seconds remaining"
 #~ msgstr "残りおよそ%i秒"
 
@@ -4355,15 +4871,19 @@ msgstr "写真と動画を高速写真ダウンローダでダウンロードす
 #~ msgid "From"
 #~ msgstr "複写元"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s"
 #~ msgstr "%(total)s個の%(filetypes)s中%(number)s個め"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 #~ msgstr "%(total)s個の%(filetypes)s中%(number)s個め (残り%(remaining)s個)"
 
+#, python-format
 #~ msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
+#, python-format
 #~ msgid ""
 #~ "%(date)s\n"
 #~ "%(time)s"
@@ -4371,6 +4891,7 @@ msgstr "写真と動画を高速写真ダウンローダでダウンロードす
 #~ "%(date)s\n"
 #~ "%(time)s"
 
+#, python-format
 #~ msgid "%(date)s %(time)s"
 #~ msgstr "%(date)s %(time)s"
 
@@ -4398,6 +4919,7 @@ msgstr "写真と動画を高速写真ダウンローダでダウンロードす
 #~ msgid "and"
 #~ msgstr "および"
 
+#, python-format
 #~ msgid "Select a folder containing %(file_types)s"
 #~ msgstr "%(file_types)sのあるフォルダを選択してください"
 
@@ -4407,6 +4929,7 @@ msgstr "写真と動画を高速写真ダウンローダでダウンロードす
 #~ msgid "."
 #~ msgstr "."
 
+#, python-format
 #~ msgid "%(free)s free"
 #~ msgstr "空き容量 %(free)s"
 
@@ -4416,42 +4939,50 @@ msgstr "写真と動画を高速写真ダウンローダでダウンロードす
 #~ msgid "; "
 #~ msgstr "; "
 
+#, python-format
 #~ msgid "(%(file_type)s)"
 #~ msgstr "(%(file_type)s)"
 
+#, python-format
 #~ msgid "%(free)s %(file_type)s"
 #~ msgstr "%(free)s %(file_type)s"
 
+#, python-format
 #~ msgid "Backing up photos and videos to %(path)s"
 #~ msgstr "写真と動画を %(path)s にバックアップしています"
 
+#, python-format
 #~ msgid "Backing up to %(path)s"
 #~ msgstr "%(path)s にバックアップしています"
 
+#, python-format
 #~ msgid "Folder: %s"
 #~ msgstr "フォルダ: %s"
 
+#, python-format
 #~ msgid "%(file_type)s download folder is invalid"
 #~ msgstr "%(file_type)sダウンロードフォルダが無効です"
 
+#, python-format
 #~ msgid "%(file_type)s download folder does not exist"
 #~ msgstr "%(file_type)sのダウンロードフォルダが存在しません"
 
+#, python-format
 #~ msgid "%(file_type)s download folder is not writable"
 #~ msgstr "%(file_type)sダウンロードフォルダが書き込み禁止です"
 
+#, python-format
 #~ msgid "Backing up photos to %(path)s and videos to %(path2)s"
 #~ msgstr "写真を %(path)s に、動画を %(path2)s にバックアップしています"
 
+#, python-format
 #~ msgid "%(freespace)s. %(backuppaths)s."
 #~ msgstr "%(freespace)s. %(backuppaths)s."
 
 #~ msgid ""
 #~ "Error: specify device auto-detection or manually specify a device's path "
 #~ "from which to download, but do not do both."
-#~ msgstr ""
-#~ "エラー: デバイスの自動検出を指定するか、ダウンロードするデバイスのパスを指"
-#~ "定するか、どちらか一つにしてください"
+#~ msgstr "エラー: デバイスの自動検出を指定するか、ダウンロードするデバイスのパスを指定するか、どちらか一つにしてください"
 
 #~ msgid "reset all program settings and preferences and exit"
 #~ msgstr "プログラムの全設定を初期化して終了する"
@@ -4462,34 +4993,33 @@ msgstr "写真と動画を高速写真ダウンローダでダウンロードす
 #~ msgid "list photo and video file extensions the program recognizes and exit"
 #~ msgstr "プログラムが認識する写真・動画ファイルの拡張子を表示して終了する"
 
+#, python-format
 #~ msgid "and %s"
 #~ msgstr "および%s"
 
 #~ msgid "only output errors to the command line"
 #~ msgstr "コマンドラインにエラーのみ出力する"
 
+#, python-format
 #~ msgid ""
 #~ "display program information on the command line as the program runs "
 #~ "(default: %default)"
-#~ msgstr ""
-#~ "プログラム実行時にプログラム情報をコマンドラインに表示(既定値: %default)"
+#~ msgstr "プログラム実行時にプログラム情報をコマンドラインに表示(既定値: %default)"
 
 #~ msgid ""
-#~ "manually specify the PATH of the device from which to download, "
-#~ "overwriting existing program preferences"
-#~ msgstr ""
-#~ "既存のプログラム設定を無視して、ダウンロードするデバイスのパスを手動で指定"
-#~ "する"
+#~ "manually specify the PATH of the device from which to download, overwriting "
+#~ "existing program preferences"
+#~ msgstr "既存のプログラム設定を無視して、ダウンロードするデバイスのパスを手動で指定する"
 
 #~ msgid ""
 #~ "automatically detect devices from which to download, overwriting existing "
 #~ "program preferences"
-#~ msgstr ""
-#~ "既存のプログラム設定を無視して、ダウンロードするデバイスを自動的に検出する"
+#~ msgstr "既存のプログラム設定を無視して、ダウンロードするデバイスを自動的に検出する"
 
 #~ msgid "display debugging information when run from the command line"
 #~ msgstr "コマンドラインから実行時にデバッグ情報を表示する"
 
+#, python-format
 #~ msgid ""
 #~ "%(problem)s\n"
 #~ "File: %(file)s"
@@ -4497,21 +5027,26 @@ msgstr "写真と動画を高速写真ダウンローダでダウンロードす
 #~ "%(problem)s\n"
 #~ "ファイル: %(file)s"
 
+#, python-format
 #~ msgid "Backup %(file_type)s overwritten"
 #~ msgstr "%(file_type)sのバックアップは上書きされました"
 
+#, python-format
 #~ msgid "%(file_type)s not backed up"
 #~ msgstr "%(file_type)sはバックアップされませんでした"
 
+#, python-format
 #~ msgid "Backup of %(file_type)s already exists"
 #~ msgstr "%(file_type)sのバックアップは既に存在します"
 
+#, python-format
 #~ msgid "Destination directory could not be created: %(directory)s\n"
 #~ msgstr "複写先ディレクトリ %(directory)s を作成できませんでした\n"
 
 #~ msgid "Device Detected"
 #~ msgstr "デバイスが検出されました"
 
+#, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
 #~ "Destination: %(destination)s"
@@ -4525,6 +5060,7 @@ msgstr "写真と動画を高速写真ダウンローダでダウンロードす
 #~ msgid "An unknown error occurred"
 #~ msgstr "原因不明のエラーが発生しました"
 
+#, python-format
 #~ msgid "Error: %(inst)s"
 #~ msgstr "エラー: %(inst)s"
 
@@ -4533,9 +5069,7 @@ msgstr "写真と動画を高速写真ダウンローダでダウンロードす
 
 #~ msgid ""
 #~ "Should this device or partition be used to download photos or videos from?"
-#~ msgstr ""
-#~ "写真や動画をダウンロードするのに、このデバイスもしくはパーティションを使用"
-#~ "しますか？"
+#~ msgstr "写真や動画をダウンロードするのに、このデバイスもしくはパーティションを使用しますか？"
 
 #~ msgid "Name + extension"
 #~ msgstr "ファイル名＋拡張子"
@@ -4570,29 +5104,27 @@ msgstr "写真と動画を高速写真ダウンローダでダウンロードす
 #~ msgid "Select a folder in which to backup videos"
 #~ msgstr "動画をバックアップするフォルダを選択してください"
 
+#, 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 ""
-#~ "入力された%(filetype)sサブフォルダ設定は無効なので、使用することができませ"
-#~ "ん。\n"
+#~ "入力された%(filetype)sサブフォルダ設定は無効なので、使用することができません。\n"
 #~ "これらは、その既定値に初期化されます。"
 
 #~ 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>"
+#~ msgstr "<i><b>警告:</b> 名称を生成するのに十分なメタデータがありません。他の命名オプションを使ってください。</i>"
 
 #~ 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>"
+#~ "<i><b>警告:</b> サブフォルダを生成するのに十分なメタデータがありません。他のサブフォルダ命名オプションを使ってください。</i>"
 
+#, python-format
 #~ msgid "<i>Example: %s</i>"
 #~ msgstr "<i>用例: %s</i>"
 
@@ -4605,6 +5137,7 @@ msgstr "写真と動画を高速写真ダウンローダでダウンロードす
 #~ msgid "Invalid regular expression"
 #~ msgstr "無効な正規表現"
 
+#, python-format
 #~ msgid ""
 #~ "The following regular expressions are invalid, and will be removed unless "
 #~ "you correct them:\n"
@@ -4613,45 +5146,54 @@ msgstr "写真と動画を高速写真ダウンローダでダウンロードす
 #~ "下記の正規表現は無効ですので、修正しない限り削除されます：\n"
 #~ "%s"
 
+#, python-format
 #~ msgid ""
-#~ "This regular expression is invalid, and will be removed unless you "
-#~ "correct it:\n"
+#~ "This regular expression is invalid, and will be removed unless you correct "
+#~ "it:\n"
 #~ " %s"
 #~ msgstr ""
 #~ "この正規表現は無効なので、修正しない限り削除されます:\n"
 #~ "%s"
 
+#, python-format
 #~ msgid "Error generating component %s."
 #~ msgstr "要素%sを生成する際のエラー"
 
+#, python-format
 #~ msgid "Date time value %s appears invalid."
 #~ msgstr "日時の値%sは無効のようです。"
 
+#, python-format
 #~ msgid "%(filetype)s metadata cannot be read"
 #~ msgstr "%(filetype)sのメタデータを読み取れません"
 
+#, python-format
 #~ msgid ""
 #~ "%(filetype)s could not be backed up because no suitable backup locations "
 #~ "were found."
-#~ msgstr ""
-#~ "適切なバックアップ場所が見つかりませんでしたので、%(filetype)sをバックアッ"
-#~ "プすることができませんでした。"
+#~ msgstr "適切なバックアップ場所が見つかりませんでしたので、%(filetype)sをバックアップすることができませんでした。"
 
+#, python-format
 #~ msgid "%(filetype)s already exists"
 #~ msgstr "%(filetype)sは既に存在します"
 
+#, python-format
 #~ msgid "An error occurred when copying the %(filetype)s"
 #~ msgstr "%(filetype)sのコピー時にエラーが発生"
 
+#, python-format
 #~ msgid "%(filetype)s %(area)s could not be generated"
 #~ msgstr "%(filetype)s %(area)sを生成することができませんでした"
 
+#, python-format
 #~ msgid "%(filetype)s was already downloaded"
 #~ msgstr "%(filetype)sは既にダウンロードされました"
 
+#, python-format
 #~ msgid "The %(filetype)s did not download correctly"
 #~ msgstr "%(filetype)sは正しくダウンロードされませんでした"
 
+#, python-format
 #~ msgid "Error: %(errorno)s %(strerror)s"
 #~ msgstr "エラー： %(errorno)s %(strerror)s"
 
@@ -4661,124 +5203,133 @@ msgstr "写真と動画を高速写真ダウンローダでダウンロードす
 #~ msgid ""
 #~ "The filename, extension and Exif information indicate it has already been "
 #~ "downloaded."
-#~ msgstr ""
-#~ "ファイル名・拡張子・Exif情報は、このファイルが既にダウンロードされたている"
-#~ "ことを示しています。"
+#~ msgstr "ファイル名・拡張子・Exif情報は、このファイルが既にダウンロードされたていることを示しています。"
 
 #~ msgid ""
 #~ "File verification failed. The downloaded version is different from the "
 #~ "original."
-#~ msgstr ""
-#~ "ファイルの検証に失敗しました。ダウンロードした版は、オリジナルと同一ではあ"
-#~ "りません。"
+#~ msgstr "ファイルの検証に失敗しました。ダウンロードした版は、オリジナルと同一ではありません。"
 
+#, python-format
 #~ msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
 #~ msgstr "既存の%(filetype)sが最後に修正されたのは、%(date)sの%(time)sです。"
 
+#, python-format
 #~ msgid ""
-#~ "The existing %(filetype)s was last modified on %(date)s at %(time)s. "
-#~ "Unique identifier '%(identifier)s' added."
+#~ "The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
+#~ "identifier '%(identifier)s' added."
 #~ msgstr ""
-#~ "既存の%(filetype)sが最後に修正されたのは、%(date)sの%(time)sです。重複しな"
-#~ "い識別子「%(identifier)s」が追記されました。"
+#~ "既存の%(filetype)sが最後に修正されたのは、%(date)sの%(time)sです。重複しない識別子「%(identifier)s」が追記されま"
+#~ "した。"
 
+#, python-format
 #~ msgid "There is no data with which to name the %(filetype)s."
 #~ msgstr "%(filetype)sを命名するためのデータがありません。"
 
+#, python-format
 #~ msgid " It was backed up to %(volume)s"
 #~ msgstr " %(volume)sにバックアップされました"
 
 #~ msgid " It was backed up to these devices: "
 #~ msgstr " 以下のデバイスにバックアップされました： "
 
+#, python-format
 #~ msgid "%s, "
 #~ msgstr "%s, "
 
+#, python-format
 #~ msgid "%(volume)s, "
 #~ msgstr "%(volume)s, "
 
+#, python-format
 #~ msgid "%(volume)s (%(inst)s), "
 #~ msgstr "%(volume)s (%(inst)s), "
 
 #~ msgid "Errors occurred when backing up on the following backup devices: "
-#~ msgstr ""
-#~ "以下のバックアップデバイスににバックアップする際、エラーが発生しました： "
+#~ msgstr "以下のバックアップデバイスににバックアップする際、エラーが発生しました： "
 
+#, python-format
 #~ msgid "An error occurred when backing up on %(volume)s."
 #~ msgstr "%(volume)sにバックアップする際、エラーが発生しました。"
 
+#, python-format
 #~ msgid "Backup already exists on %(volume)s."
 #~ msgstr "%(volume)sには既にバックアップが存在します。"
 
+#, python-format
 #~ msgid "%(volumes)s and %(volume)s."
 #~ msgstr "%(volumes)sおよび%(volume)s。"
 
+#, python-format
 #~ msgid "%(volumes)s and %(volume)s (%(inst)s)."
 #~ msgstr "%(volumes)sおよび%(volume)s (%(inst)s)。"
 
+#, python-format
 #~ msgid ""
 #~ "Photos detected with the same filenames, but taken at different times: "
 #~ "%(details)s"
-#~ msgstr ""
-#~ "同じファイル名を持つ複数の写真が検出されましたが、異なる日時に撮られていま"
-#~ "す： %(details)s"
+#~ msgstr "同じファイル名を持つ複数の写真が検出されましたが、異なる日時に撮られています： %(details)s"
 
+#, python-format
 #~ msgid "An error occurred when backing up on %(volume)s: %(inst)s."
 #~ msgstr "%(volume)sにバックアップする際、エラーが発生しました： %(inst)s。"
 
+#, python-format
 #~ msgid "%(volumes)s and %(final_volume)s."
 #~ msgstr "%(volumes)sおよび%(final_volume)s。"
 
 #~ msgid "Backups overwritten on these devices: "
 #~ msgstr "以下のデバイス所のアックアップは上書きされます： "
 
+#, python-format
 #~ msgid "Backup overwritten on %(volume)s."
 #~ msgstr "%(volume)s上のバックアップは上書きされます。"
 
 #~ msgid "Backups already exist in these locations: "
 #~ msgstr "以下の場所には既にバックアップが存在します： "
 
+#, python-format
 #~ msgid " Furthermore, there was a %(problem)s."
 #~ msgstr " さらに%(problem)sが起こりました。"
 
+#, python-format
 #~ msgid "%(previousproblem)s Additionally, %(newproblem)s"
 #~ msgstr "%(previousproblem)s さらに、%(newproblem)s"
 
+#, python-format
 #~ msgid " Furthermore, there were %(problems)s."
 #~ msgstr " さらに、%(problems)sが起こりました。"
 
+#, python-format
 #~ msgid "An error occurred when creating directories on %(volume)s: %(inst)s."
-#~ msgstr ""
-#~ "%(volume)s上にディレクトリを作成する際、エラーが発生しました: %(inst)s。"
+#~ msgstr "%(volume)s上にディレクトリを作成する際、エラーが発生しました: %(inst)s。"
 
 #~ msgid ""
-#~ "Errors occurred when creating directories on the following backup "
-#~ "devices: "
-#~ msgstr ""
-#~ "以下のバックアップデバイス上にディレクトリを作成する際、エラーが発生しまし"
-#~ "た： "
+#~ "Errors occurred when creating directories on the following backup devices: "
+#~ msgstr "以下のバックアップデバイス上にディレクトリを作成する際、エラーが発生しました： "
 
 #~ msgid "File verification failed on these devices: "
 #~ msgstr "以下のデバイス上でファイル検証に失敗しました： "
 
+#, python-format
 #~ msgid ""
-#~ "File verification failed on %(volume)s. The backed up version is "
-#~ "different from the downloaded version."
-#~ msgstr ""
-#~ "%(volume)s上でファイル検証に失敗しました。バックアップのバージョンは、ダウ"
-#~ "ンロードのバージョンと異なります。"
+#~ "File verification failed on %(volume)s. The backed up version is different "
+#~ "from the downloaded version."
+#~ msgstr "%(volume)s上でファイル検証に失敗しました。バックアップのバージョンは、ダウンロードのバージョンと異なります。"
 
+#, python-format
 #~ msgid "Problem in %s generation"
 #~ msgstr "%sの生成に問題発生"
 
+#, python-format
 #~ msgid "Problems in %s generation"
 #~ msgstr "%sの生成に問題発生"
 
-#~ msgid ""
-#~ "An error occurred when copying the %(filetype)s, but it was backed up"
-#~ msgstr ""
-#~ "%(filetype)sのコピー時にエラーが発生しましたが、バックアップされました"
+#, python-format
+#~ msgid "An error occurred when copying the %(filetype)s, but it was backed up"
+#~ msgstr "%(filetype)sのコピー時にエラーが発生しましたが、バックアップされました"
 
+#, python-format
 #~ msgid "%(filetype)s already exists, but it was backed up"
 #~ msgstr "%(filetype)sは既に存在しますが、バックアップされました"
 
@@ -4794,10 +5345,9 @@ msgstr "写真と動画を高速写真ダウンローダでダウンロードす
 #~ msgid "The following metadata is missing: "
 #~ msgstr "以下のメタデータがありません： "
 
-#~ msgid ""
-#~ "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
-#~ msgstr ""
-#~ "%(missing_metadata_elements)sおよび%(final_missing_metadata_element)s。"
+#, python-format
+#~ msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
+#~ msgstr "%(missing_metadata_elements)sおよび%(final_missing_metadata_element)s。"
 
 #~ msgid "there were errors backing up"
 #~ msgstr "バックアップ中にエラーがありました"
@@ -4808,27 +5358,29 @@ msgstr "写真と動画を高速写真ダウンローダでダウンロードす
 #~ msgid "There were errors backing up"
 #~ msgstr "バックアップ中にエラーがありました"
 
+#, python-format
 #~ msgid "%(previousproblem)s, and %(backinguperror)s"
 #~ msgstr "%(previousproblem)s、および%(backinguperror)s"
 
 #~ msgid "There was an error backing up"
 #~ msgstr "バックアップ中にエラーがありました"
 
+#, python-format
 #~ msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(hour)s時間%(minute)s分%(second)s秒%(subsecond)s"
 
+#, python-format
 #~ msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
 #~ msgstr "走査中です(%(photos)s個の写真と%(videos)s個の動画を検出)..."
 
-#~ msgid ""
-#~ "Photos detected with the same filenames, but taken at different times"
-#~ msgstr ""
-#~ "同じファイル名を持つ複数の写真が検出されましたが、異なる時間に撮影されてい"
-#~ "ます"
+#~ msgid "Photos detected with the same filenames, but taken at different times"
+#~ msgstr "同じファイル名を持つ複数の写真が検出されましたが、異なる時間に撮影されています"
 
+#, python-format
 #~ msgid "Source: %(source)s"
 #~ msgstr "複写元: %(source)s"
 
+#, python-format
 #~ msgid "Path: %s"
 #~ msgstr "パス： %s"
 
@@ -4920,8 +5472,7 @@ msgstr "写真と動画を高速写真ダウンローダでダウンロードす
 #~ msgstr "設定： 高速写真ダウンローダ"
 
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">写真ダウンロードフォルダ</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">写真ダウンロードフォルダ</span>"
 
 #~ msgid "<b>Download Folder</b>"
 #~ msgstr "<b>ダウンロードフォルダ</b>"
@@ -4945,17 +5496,16 @@ msgstr "写真と動画を高速写真ダウンローダでダウンロードす
 #~ msgstr "<i>新規:</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>."
+#~ "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 ""
-#~ "申し訳ありませんが、動画ダウンロード機能は無効にされています。動画をダウン"
-#~ "ロードするには、 python用<i>hachoirメタデータ</i>パッケージか<i>kaaメタ"
-#~ "データ</i>パッケージ、若しくは<i>exiftool</i>を導入してください。"
+#~ "申し訳ありませんが、動画ダウンロード機能は無効にされています。動画をダウンロードするには、 "
+#~ "python用<i>hachoirメタデータ</i>パッケージか<i>kaaメタデータ</i>パッケージ、若しくは<i>exiftool</i>を導入して"
+#~ "ください。"
 
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">動画ダウンロードフォルダ</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">動画ダウンロードフォルダ</span>"
 
 #~ msgid "<b>Example</b>"
 #~ msgstr "<b>例</b>"
@@ -5012,23 +5562,20 @@ msgstr "写真と動画を高速写真ダウンローダでダウンロードす
 #~ msgstr "場所:"
 
 #~ msgid ""
-#~ "If you disable automatic detection, choose the exact location of the "
-#~ "photos and videos."
-#~ msgstr ""
-#~ "自動検出を無効にした場合には，写真と動画の正確な場所を選択してください．"
+#~ "If you disable automatic detection, choose the exact location of the photos "
+#~ "and videos."
+#~ msgstr "自動検出を無効にした場合には，写真と動画の正確な場所を選択してください．"
 
 #~ 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."
+#~ "When this option is enabled, and a potential device is detected, you will be "
+#~ "prompted to determine if it should be scanned or not."
 #~ msgstr ""
-#~ "ポータブル記憶デバイスの自動検出を有効にすると，デバイス全体が走査されま"
-#~ "す．大きなデバイスでは，時間のかかる可能性があります．\n"
+#~ "ポータブル記憶デバイスの自動検出を有効にすると，デバイス全体が走査されます．大きなデバイスでは，時間のかかる可能性があります．\n"
 #~ "\n"
-#~ "このオプションを有効にして，関係ありそうなデバイスが検出されると，走査を行"
-#~ "うかどうかを選択するよう促されます．"
+#~ "このオプションを有効にして，関係ありそうなデバイスが検出されると，走査を行うかどうかを選択するよう促されます．"
 
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Device Options</span>"
 #~ msgstr "<span weight=\"bold\" size=\"x-large\">デバイスオプション</span>"
@@ -5037,12 +5584,10 @@ msgstr "写真と動画を高速写真ダウンローダでダウンロードす
 #~ msgstr "ポータブル記憶デバイスを自動的に検出する"
 
 #~ 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 ""
-#~ "保存パスは，ポータブル記憶デバイスの自動検出が有効なときに，ユーザーが常に"
-#~ "走査するか無視するかを選択したデバイスのパスのことです．"
+#~ "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 "保存パスは，ポータブル記憶デバイスの自動検出が有効なときに，ユーザーが常に走査するか無視するかを選択したデバイスのパスのことです．"
 
 #~ msgid "Remembered Paths"
 #~ msgstr "保存パス"
@@ -5067,11 +5612,9 @@ msgstr "写真と動画を高速写真ダウンローダでダウンロードす
 
 #~ 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 ""
-#~ "写真や動画のデバイスを走査する際，無視したいパスの最後の部分を指定してくだ"
-#~ "さい．以下の値で終わるパスは走査されません．"
+#~ "devices for photos or videos. Any path ending with the values below will not "
+#~ "be scanned."
+#~ msgstr "写真や動画のデバイスを走査する際，無視したいパスの最後の部分を指定してください．以下の値で終わるパスは走査されません．"
 
 #~ msgid "<b>Backup</b>"
 #~ msgstr "<b>バックアップ</b>"
@@ -5095,14 +5638,14 @@ msgstr "写真と動画を高速写真ダウンローダでダウンロードす
 #~ "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>"
+#~ "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 ""
 #~ "デバイス上でバックアップを保管するフォルダを指定してください．  \n"
 #~ "\n"
-#~ "<i>註: これは，デバイスがバックアップに使われるかどうかを判断するのにも使"
-#~ "われます．バックアップ先に用いたい各デバイスには，これらの名前のうちどれか"
-#~ "を持つフォルダを作成してください．</i>"
+#~ "<i>註: "
+#~ "これは，デバイスがバックアップに使われるかどうかを判断するのにも使われます．バックアップ先に用いたい各デバイスには，これらの名前のうちどれかを持つフォルダ"
+#~ "を作成してください．</i>"
 
 #~ msgid "<i>Example:</i>"
 #~ msgstr "<i>例:</i>"
@@ -5123,16 +5666,12 @@ msgstr "写真と動画を高速写真ダウンローダでダウンロードす
 #~ msgstr "<span weight=\"bold\" size=\"x-large\">エラー処理</span>"
 
 #~ msgid "Unmount (\"eject\") device upon download completion"
-#~ msgstr ""
-#~ "ダウンロード完了とともにデバイスのマウントを解除(デバイスを\"取り出す\")"
+#~ msgstr "ダウンロード完了とともにデバイスのマウントを解除(デバイスを\"取り出す\")"
 
 #~ 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 ""
-#~ "同じ名前の写真や動画がダウンロード済みの場合，ファイルのダウンロードをス"
-#~ "キップするか，重複しない識別子を付けるかを選択します．"
+#~ "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 "同じ名前の写真や動画がダウンロード済みの場合，ファイルのダウンロードをスキップするか，重複しない識別子を付けるかを選択します．"
 
 #~ msgid "Performance"
 #~ msgstr "パフォーマンス"
@@ -5143,9 +5682,7 @@ msgstr "写真と動画を高速写真ダウンローダでダウンロードす
 #~ 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 ""
-#~ "バックアップの際，バックアップデバイス上の同名ファイルを上書きするか，その"
-#~ "バックアップをスキップするかを選択します．"
+#~ msgstr "バックアップの際，バックアップデバイス上の同名ファイルを上書きするか，そのバックアップをスキップするかを選択します．"
 
 #~ msgid "Import your photos and videos efficiently and reliably"
 #~ msgstr "あなたの写真や動画を効率的かつ信頼性をもって読み込みます"
@@ -5171,50 +5708,38 @@ msgstr "写真と動画を高速写真ダウンローダでダウンロードす
 #~ msgid ""
 #~ "Choose the download folder. Subfolders for the downloaded videos will be "
 #~ "automatically created in this folder using the structure specified below."
-#~ msgstr ""
-#~ "ダウンロードフォルダを選択してください．このフォルダ中に，ダウンロードした"
-#~ "動画のサブフォルダが，以下で指定した構造で自動生成されます．"
+#~ msgstr "ダウンロードフォルダを選択してください．このフォルダ中に，ダウンロードした動画のサブフォルダが，以下で指定した構造で自動生成されます．"
 
 #~ msgid ""
 #~ "Choose the download folder. Subfolders for the downloaded photos will be "
 #~ "automatically created in this folder using the structure specified below."
-#~ msgstr ""
-#~ "ダウンロードフォルダを選択してください．このフォルダ中に，ダウンロードした"
-#~ "写真のサブフォルダが，以下で指定した構造で自動生成されます．"
+#~ msgstr "ダウンロードフォルダを選択してください．このフォルダ中に，ダウンロードした写真のサブフォルダが，以下で指定した構造で自動生成されます．"
 
 #~ msgid ""
 #~ "Specify the time in 24 hour format at which the <i>Downloads today</i> "
 #~ "sequence number should be reset."
-#~ msgstr ""
-#~ "「<i>本日のダウンロード</i>」の連番を初期化する時刻を，24時間形式で指定し"
-#~ "てください．"
+#~ msgstr "「<i>本日のダウンロード</i>」の連番を初期化する時刻を，24時間形式で指定してください．"
 
 #~ msgid ""
 #~ "Specify whether photo, video and folder names should have any characters "
 #~ "removed that are not allowed by other operating systems."
-#~ msgstr ""
-#~ "他の基本ソフトで使用できない文字を，写真や動画，フォルダ名から削除するかど"
-#~ "うかを指定．"
+#~ msgstr "他の基本ソフトで使用できない文字を，写真や動画，フォルダ名から削除するかどうかを指定．"
 
 #~ msgid ""
 #~ "Devices are from where to download photos and videos, such as cameras, "
 #~ "memory cards or Portable Storage Devices.\n"
 #~ "\n"
-#~ "You can download 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>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>"
+#~ "<i>Downloading directly from cameras is currently an experimental feature. "
+#~ "If downloading directly from your camera works poorly or not at all, try "
+#~ "setting it to PTP mode. If that is not possible, a card reader must be "
+#~ "used.</i>"
 #~ msgstr ""
-#~ "デバイスは，カメラやメモリーカード，ポータブル記憶デバイスのような，写真や"
-#~ "動画をダウンロードする元となるものです．\n"
+#~ "デバイスは，カメラやメモリーカード，ポータブル記憶デバイスのような，写真や動画をダウンロードする元となるものです．\n"
 #~ "\n"
-#~ "同時に複数のデバイスからダウンロードすることもできますし，ハードディスク上"
-#~ "の場所を指定することもできます．\n"
+#~ "同時に複数のデバイスからダウンロードすることもできますし，ハードディスク上の場所を指定することもできます．\n"
 #~ "\n"
-#~ "<i>カメラから直接ダウンロードするのは、今のところ実験的機能です．お使いの"
-#~ "カメラからの直接ダウンロードが，うまく行かなかったり全く動作しないような場"
-#~ "合には、PTPモードに切り替えてみてください．これができなければ，カードリー"
-#~ "ダーなどを使わなくてはなりません．</i>"
+#~ "<i>カメラから直接ダウンロードするのは、今のところ実験的機能です．お使いのカメラからの直接ダウンロードが，うまく行かなかったり全く動作しないような場合に"
+#~ "は、PTPモードに切り替えてみてください．これができなければ，カードリーダーなどを使わなくてはなりません．</i>"
diff --git a/po/kab.po b/po/kab.po
index c711262..e0997b3 100644
--- a/po/kab.po
+++ b/po/kab.po
@@ -7,35 +7,386 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: damonlynch@gmail.com\n"
-"POT-Creation-Date: 2017-07-08 19:16-0500\n"
-"PO-Revision-Date: 2017-07-04 11:06+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2017-09-12 17:01-0400\n"
+"PO-Revision-Date: 2017-09-13 18:44+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: Kabyle <kab@li.org>\n"
-"Language: kab\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-07-05 23:04+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-09-26 22:04+0000\n"
+"X-Generator: Launchpad (build 18463)\n"
+"Language: kab\n"
+
+#: ../install.py:65
+msgid "Rapid Photo Downloader installer"
+msgstr "Amsebdad n umsider n Rapid Photo"
+
+#: ../install.py:66
+msgid "Download and install latest version of Rapid Photo Downloader."
+msgstr "Sider sakin sebded lqem aneggaru n umsider Rapid Photo."
+
+#: ../install.py:236 ../install.py:1732
+msgid "Installer not found:"
+msgstr "Ulac amsebdad:"
+
+#. Translators: do not translate the term tar.gz
+#: ../install.py:240 ../install.py:1736
+msgid "Installer not in tar.gz format:"
+msgstr "Ulac amsebdad s umasal tar.gz:"
+
+#: ../install.py:465
+msgid ""
+"Incorrect folder ownership detected. Changing ownership of and resetting "
+"permissions for"
+msgstr ""
+
+#: ../install.py:540
+msgid "The following command will be run:"
+msgstr ""
+
+#: ../install.py:543 ../install.py:1479 ../install.py:1484
+msgid "sudo may prompt you for the sudo password."
+msgstr ""
+
+#: ../install.py:547
+msgid "Would you like to run the command now?"
+msgstr ""
+
+#: ../install.py:549
+msgid "Answer is not yes, exiting."
+msgstr ""
+
+#: ../install.py:559 ../install.py:751 ../install.py:966
+msgid "Command failed"
+msgstr ""
+
+#: ../install.py:561 ../install.py:752 ../install.py:967
+msgid "Exiting"
+msgstr ""
+
+#: ../install.py:582
+msgid "The Universe repository must be enabled."
+msgstr ""
+
+#: ../install.py:606
+msgid ""
+"Do you want to to uninstall the previous version of Rapid Photo Downloader:"
+msgstr ""
+
+#: ../install.py:715 ../install.py:740
+msgid ""
+"Querying package system to see if an older version of Rapid Photo Downloader "
+"is installed (this may take a while)..."
+msgstr ""
+
+#: ../install.py:726
+msgid ""
+"Unable to query package system. Please check your Internet connection and "
+"try again"
+msgstr ""
+
+#: ../install.py:756
+msgid "Checking if previous version installed with pip..."
+msgstr ""
+
+#: ../install.py:850
+msgid "The following package is unknown on your system: {}\n"
+msgstr ""
+
+#: ../install.py:857 ../install.py:929 ../install.py:974
+msgid ""
+"To continue, some packages required to run the application will be installed."
+msgstr ""
+
+#: ../install.py:886
+msgid "Querying installed and available packages (this may take a while)"
+msgstr ""
+
+#: ../install.py:958
+msgid ""
+"Querying zypper to see if any required packages are already installed (this "
+"may take a while)... "
+msgstr ""
+
+#: ../install.py:1004
+msgid "Query to confirm action at each step."
+msgstr ""
+
+#: ../install.py:1011
+msgid ""
+"When downloading the latest version, install the development version if it "
+"is newer than the stable version."
+msgstr ""
+
+#: ../install.py:1020
+msgid ""
+"Optional tar.gz Rapid Photo Downloader installer archive. If not specified, "
+"the latest version is downloaded from the Internet."
+msgstr ""
+
+#: ../install.py:1043
+msgid ""
+"Do not run the installer in the tar.gz Rapid Photo Downloader installer "
+"archive if it is newer than this version ({}). The default is to run "
+"whichever installer is newer."
+msgstr ""
+
+#: ../install.py:1050
+msgid ""
+"Uninstall Rapid Photo Downloader that was installed with pip, keeping its "
+"dependencies."
+msgstr ""
+
+#: ../install.py:1054
+msgid ""
+"Uninstall the dependencies installed by pip during Rapid Photo Downloader's "
+"installation, and Rapid Photo Downloader itself, then exit."
+msgstr ""
+
+#: ../install.py:1059
+msgid ""
+"Note: this will not uninstall any version of Rapid Photo Downloader "
+"installed by your Linux distribution's package manager."
+msgstr ""
+
+#: ../install.py:1066
+msgid ""
+"Dependencies will only be removed if they are not required by other programs."
+msgstr ""
+
+#: ../install.py:1072
+msgid ""
+"Note: this option will remove the dependencies regardless of whether they "
+"are required by another program pip has installed. Upgrade to pip 9.0 or "
+"above if you want to avoid this behavior. You can do so using the command "
+"'python3 -m pip install pip -U --user'. Also note that any version of Rapid "
+"Photo Downloader installed by your Linux distribution's package manager will "
+"not be uninstalled."
+msgstr ""
+
+#: ../install.py:1122
+msgid "Failed to download versions file"
+msgstr ""
+
+#: ../install.py:1126
+msgid "Got error code {} while accessing versions file"
+msgstr ""
+
+#: ../install.py:1234
+msgid ""
+"Sorry, could not locate installer. Please check your Internet connection and "
+"verify if you can reach https://www.damonlynch.net\n"
+"\n"
+"Exiting.\n"
+msgstr ""
+
+#: ../install.py:1408
+msgid "Installing application requirements..."
+msgstr ""
+
+#: ../install.py:1424
+msgid "Received error code"
+msgstr ""
+
+#: ../install.py:1425
+msgid "Failed to install application requirements: exiting"
+msgstr ""
+
+#: ../install.py:1428
+msgid "Installing application..."
+msgstr ""
+
+#: ../install.py:1441
+msgid "Failed to install application: exiting..."
+msgstr ""
+
+#: ../install.py:1465
+msgid ""
+"You may have to restart the computer to be able to run the program from the "
+"commmand line or application launcher."
+msgstr ""
+
+#: ../install.py:1476
+msgid "Do you want to install the application's man pages?"
+msgstr ""
+
+#: ../install.py:1477
+msgid "They will be installed into {}"
+msgstr ""
+
+#: ../install.py:1478 ../install.py:1483
+msgid "If you uninstall the application, remove these manpages yourself."
+msgstr ""
+
+#: ../install.py:1480
+msgid "Do want to install the man pages?"
+msgstr ""
+
+#: ../install.py:1482
+msgid "Installing man pages into {}"
+msgstr ""
+
+#: ../install.py:1499
+msgid "Failed to create man page directory: exiting"
+msgstr ""
+
+#: ../install.py:1511
+msgid "Failed to copy man page."
+msgstr ""
+
+#: ../install.py:1521
+msgid "(If a segmentation fault occurs at exit, you can ignore it...)"
+msgstr ""
+
+#: ../install.py:1534
+msgid ""
+"The python3 tool pip is required to uninstall a version of Rapid Photo "
+"Downloader that was installed with pip.\n"
+"Cannot continue. Exiting."
+msgstr ""
+
+#: ../install.py:1575
+msgid ""
+"Do not run this installer script as sudo / root user.\n"
+"Run it using the user who will run the program.\n"
+msgstr ""
+
+#: ../install.py:1585 ../install.py:1599
+msgid "Do not include any other command line arguments when specifying"
+msgstr ""
+
+#: ../install.py:1614
+msgid ""
+"Sorry, this installer does not support a custom python installation.\n"
+"Exiting..."
+msgstr ""
+
+#: ../install.py:1620
+msgid "Restarting script using system python..."
+msgstr ""
+
+#: ../install.py:1651
+msgid "Exiting..."
+msgstr ""
+
+#. Translators: do not translate the term python3-apt
+#: ../install.py:1670
+msgid "To continue, the package python3-apt must be installed."
+msgstr ""
+
+#: ../install.py:1689
+msgid ""
+"Install the following packages using your Linux distribution's standard "
+"package manager, and then rerun this installer"
+msgstr ""
 
-#. type: QPushButton
-#: ../raphodo/aboutdialog.py:217
+#: ../install.py:1698
+msgid ""
+"To run this program, programs to assist Python 3 and its package management "
+"must be installed."
+msgstr ""
+
+#. Translators: do not translate the terms Python 3, pip and setuptools
+#: ../install.py:1713
+msgid "Python 3's pip and setuptools must be upgraded for your user."
+msgstr ""
+
+#. Translators: do not translate the term python or requests
+#: ../install.py:1726
+msgid "Installing python requests"
+msgstr ""
+
+#: ../upgrade.py:79
+msgid "Upgrade Rapid Photo Downloader"
+msgstr ""
+
+#: ../upgrade.py:401 ../raphodo/viewutils.py:242
+msgid "&Cancel"
+msgstr ""
+
+#: ../upgrade.py:405
+msgid "&Upgrade"
+msgstr ""
+
+#: ../upgrade.py:410
+#, python-format
+msgid "Click the Upgrade button to upgrade to version %s."
+msgstr ""
+
+#: ../upgrade.py:413
+msgid "Click the Upgrade button to start the upgrade."
+msgstr ""
+
+#: ../upgrade.py:416 ../upgrade.py:422 ../raphodo/viewutils.py:241
+msgid "&Close"
+msgstr ""
+
+#: ../upgrade.py:417
+msgid "&Run"
+msgstr ""
+
+#: ../upgrade.py:447
+msgid "Close Rapid Photo Downloader before running this upgrade"
+msgstr ""
+
+#: ../upgrade.py:450
+msgid "Upgrade running..."
+msgstr ""
+
+#: ../upgrade.py:486
+#, python-format
+msgid ""
+"Successfully upgraded to %s. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:491
+msgid ""
+"Upgrade finished successfully. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:495
+msgid "Upgrade failed. Click Close to exit."
+msgstr ""
+
+#: ../upgrade.py:6967
+#, python-format
+msgid "Upgrading %s..."
+msgstr ""
+
+#: ../upgrade.py:6969
+msgid "Press any key to continue..."
+msgstr ""
+
+#: ../upgrade.py:6982
+msgid "Rapid Photo Downloader upgrade failed"
+msgstr ""
+
+#: ../upgrade.py:6984
+#, python-format
+msgid ""
+"The python package %s could not be updated. The upgrade cannot continue."
+msgstr ""
+
+#: ../raphodo/aboutdialog.py:225
 msgid "Credits"
 msgstr "Ismaden"
 
-#: ../raphodo/backuppanel.py:239
+#: ../raphodo/backuppanel.py:240
 msgid "Backups are not configured"
 msgstr "Aḥraz ur ittuswel ara"
 
-#: ../raphodo/backuppanel.py:241
+#: ../raphodo/backuppanel.py:242
 msgid "No backup devices detected"
 msgstr "Ulac ibenkan n uḥraz yettwafen"
 
-#: ../raphodo/backuppanel.py:243
+#: ../raphodo/backuppanel.py:244
 msgid "Valid backup locations not yet specified"
 msgstr "Idigen n uḥraz imeɣta ur ttwamlen ara yakan"
 
-#: ../raphodo/backuppanel.py:401
+#: ../raphodo/backuppanel.py:404
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
@@ -43,95 +394,104 @@ msgstr ""
 "Aḥraz n teqlafin-ik akked tvidyutin-ik izmer ad yili ɣef des n ibenkan ticki "
 "ttwasidren-d, md. idebṣiyen iquranen izɣarayen."
 
-#: ../raphodo/backuppanel.py:407
+#: ../raphodo/backuppanel.py:412
 msgid "Back up photos and videos when downloading"
 msgstr "Ḥrez tiwlafin akked tvidyutin deg usider"
 
-#: ../raphodo/backuppanel.py:413
+#: ../raphodo/backuppanel.py:418
 msgid "Automatically detect backup devices"
 msgstr "Ṭṭef s wudem awurman ibenkan n uḥraz"
 
-#: ../raphodo/backuppanel.py:417
+#: ../raphodo/backuppanel.py:424
 msgid ""
-"Specify the folder in which backups are stored on the device."
-"<br><br><i>Note: the presence of a folder with this name is used to "
+"Specify the folder in which backups are stored on the "
+"device.<br><br><i>Note: the presence of a folder with this name is used to "
 "determine if 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 folder names. By "
 "adding both folders, the same device can be used to back up both photos and "
 "videos.</i>"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:428
+#: ../raphodo/backuppanel.py:439
 msgid "Photo folder name:"
 msgstr "Isem n ukaram n tewlaft:"
 
-#: ../raphodo/backuppanel.py:433
+#: ../raphodo/backuppanel.py:444
 msgid "Video folder name:"
 msgstr "Isem n ularam n tvidyut:"
 
-#: ../raphodo/backuppanel.py:438 ../raphodo/nameeditor.py:883
+#: ../raphodo/backuppanel.py:449 ../raphodo/nameeditor.py:890
 #: ../raphodo/renamepanel.py:123
 msgid "Example:"
 msgstr "Amedya:"
 
-#: ../raphodo/backuppanel.py:448
-msgid "If you disable automatic detection, choose the exact backup locations."
+#: ../raphodo/backuppanel.py:460
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
 
-#: ../raphodo/backuppanel.py:452
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:468
 msgid "Photo backup location:"
 msgstr "Adig n uḥraz n tewlaft:"
 
-#: ../raphodo/backuppanel.py:454
+#: ../raphodo/backuppanel.py:474
 msgid "Select Photo Backup Location"
 msgstr "Fren adig n uḥraz n tewlaft:"
 
-#: ../raphodo/backuppanel.py:460
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:485
 msgid "Video backup location:"
 msgstr "Adig n uḥraz n tvidyut:"
 
-#: ../raphodo/backuppanel.py:462
+#: ../raphodo/backuppanel.py:491
 msgid "Select Video Backup Location"
 msgstr "Fren Adig n uḥraz n tvidyut:"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:564
+#: ../raphodo/backuppanel.py:595
 msgid "drive1"
 msgstr "ameɣri1"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:567
+#: ../raphodo/backuppanel.py:598
 msgid "drive2"
 msgstr "ameɣri2"
 
-#: ../raphodo/backuppanel.py:628
+#: ../raphodo/backuppanel.py:663
 msgid "Projected Backup Storage Use"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:632
+#: ../raphodo/backuppanel.py:669
 msgid "Backup Options"
 msgstr "Iɣewwaṛen n uḥraz"
 
 #. translators: refers to the video thumbnail file that some
 #. cameras generate -- it has a .THM file extension
-#: ../raphodo/copyfiles.py:476
+#: ../raphodo/copyfiles.py:491
 msgid "video THM"
 msgstr "tavidyut THM"
 
-#: ../raphodo/copyfiles.py:482
+#: ../raphodo/copyfiles.py:497
 msgid "audio"
 msgstr "ameslaw"
 
 #: ../raphodo/destinationdisplay.py:78 ../raphodo/devicedisplay.py:1079
-#: ../raphodo/rpdfile.py:321
+#: ../raphodo/rpdfile.py:342
 #, python-format
 msgid "%(no_photos)s Photos"
 msgstr "%(no_photos)s n tewlafin"
 
 #: ../raphodo/destinationdisplay.py:82 ../raphodo/devicedisplay.py:1081
-#: ../raphodo/rpdfile.py:316
+#: ../raphodo/rpdfile.py:333
 #, python-format
 msgid "%(no_videos)s Videos"
 msgstr "%(no_videos)s n tvidyutin"
@@ -159,15 +519,15 @@ msgid "%(size_free)s free of %(size_total)s"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:190 ../raphodo/devicedisplay.py:993
-#: ../raphodo/rapid.py:1964 ../raphodo/rapid.py:2079 ../raphodo/rapid.py:5753
-#: ../raphodo/rpdfile.py:905
+#: ../raphodo/rapid.py:2023 ../raphodo/rapid.py:2151 ../raphodo/rapid.py:6043
+#: ../raphodo/rpdfile.py:930
 msgid "Photos"
 msgstr "Tiwlafin"
 
 #. translators: the name of the Videos folder
 #: ../raphodo/destinationdisplay.py:191 ../raphodo/devicedisplay.py:994
-#: ../raphodo/rapid.py:1967 ../raphodo/rapid.py:2080 ../raphodo/rapid.py:5754
-#: ../raphodo/rpdfile.py:933 ../raphodo/storage.py:445
+#: ../raphodo/rapid.py:2028 ../raphodo/rapid.py:2152 ../raphodo/rapid.py:6044
+#: ../raphodo/rpdfile.py:958 ../raphodo/storage.py:449
 msgid "Videos"
 msgstr "Tividyutin"
 
@@ -175,7 +535,7 @@ msgstr "Tividyutin"
 msgid "Projected storage use after download"
 msgstr ""
 
-#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:516
+#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:521
 msgid "Custom..."
 msgstr ""
 
@@ -213,57 +573,58 @@ msgstr ""
 msgid "%s full"
 msgstr "%s n taččart"
 
-#: ../raphodo/devices.py:459
+#: ../raphodo/devices.py:463
 msgid "Cameras"
 msgstr "Takamiṛat"
 
-#: ../raphodo/devices.py:460 ../raphodo/devices.py:920
-#: ../raphodo/preferencedialog.py:85 ../raphodo/rapid.py:1927
+#: ../raphodo/devices.py:464 ../raphodo/devices.py:927
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/rapid.py:1979
 msgid "Devices"
 msgstr "Ibenkan"
 
-#: ../raphodo/devices.py:720
+#: ../raphodo/devices.py:724
 #, python-format
 msgid "Downloading from %(device_names)s"
 msgstr "Asider seg %(device_names)s"
 
 #. Translators: e.g. Three Devices
-#: ../raphodo/devices.py:780
+#: ../raphodo/devices.py:784
 #, python-format
 msgid "%(no_devices)s %(device_type)s"
 msgstr "%(no_devices)s %(device_type)s"
 
-#: ../raphodo/devices.py:905 ../raphodo/rapid.py:1764
+#: ../raphodo/devices.py:912 ../raphodo/rapid.py:1807
 msgid "Select Source"
 msgstr "Fren aɣbalu"
 
-#: ../raphodo/devices.py:936 ../raphodo/devices.py:947
+#: ../raphodo/devices.py:943 ../raphodo/devices.py:954
 #, python-format
 msgid "%(device1)s + %(device2)s"
 msgstr "%(device1)s + %(device2)s"
 
 #. Number of cameras e.g. 3 Cameras
-#: ../raphodo/devices.py:958
+#: ../raphodo/devices.py:965
 #, python-format
 msgid "%(no_cameras)s Cameras"
 msgstr "%(no_cameras)s n tkamiratin"
 
-#: ../raphodo/devices.py:963
+#: ../raphodo/devices.py:970
 #, python-format
 msgid "%(no_devices)s Devices"
 msgstr "%(no_devices)s n ibenkan"
 
 #. Translators: two folder names, separated by a plus sign
-#: ../raphodo/devices.py:1258
+#: ../raphodo/devices.py:1265
 #, python-format
 msgid "%s + %s"
 msgstr "%s + %s"
 
-#: ../raphodo/didyouknow.py:44
+#: ../raphodo/didyouknow.py:45
 msgid "Click on a file's checkbox to mark or unmark it for download."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:50
+#: ../raphodo/didyouknow.py:51
 msgid ""
 "Files that have already been downloaded are remembered. You can still mark "
 "previously downloaded files to download again, but they are unchecked by "
@@ -271,34 +632,67 @@ msgid ""
 "files that are yet to be downloaded."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:59
+#: ../raphodo/didyouknow.py:60
 msgid ""
 "If more than one file is selected, they'll all take the mark of the file "
 "whose checkbox was clicked, regardless of whether they previously had a "
 "checkmark or not."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:67
+#: ../raphodo/didyouknow.py:68
 msgid ""
 "Click on a device's checkbox to quickly mark or unmark all its files for "
 "downloading."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:74
+#: ../raphodo/didyouknow.py:75
+msgid ""
+"After a download finishes, an icon replaces the thumbnail's checkbox. The "
+"icon's color indicates whether the download was successful (green), had file "
+"renaming problems (yellow/orange), or failed (red)."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:83
+msgid ""
+"\n"
+"            In case of any problems, a red icon will appear at the bottom of "
+"the window\n"
+"            indicating how many error reports there are. Clicking on it "
+"opens the Error Report \n"
+"            window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:91
+msgid ""
+"\n"
+"            The Error Report window lists any problems encountered before, "
+"during or after the \n"
+"            download. An orange triangle represents a warning, a red circle "
+"indicates a failure, \n"
+"            and a black circle indicates more serious failures. You can "
+"click on the hyperlinks to \n"
+"            open its file or device in a file manager. You can also search "
+"the reports using the \n"
+"            search box in the lower left of the Error Report window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:103
 msgid ""
 "You can simultaneously download from multiple cameras, smartphones, memory "
 "cards, and hard drives&mdash;as many devices as your computer can handle at "
 "one time."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:81
+#: ../raphodo/didyouknow.py:110
 msgid ""
 "The <b>Timeline</b> groups photos and videos based on how much time elapsed "
 "between consecutive shots. Use it to identify photos and videos taken at "
 "different periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:88
+#: ../raphodo/didyouknow.py:117
 msgid ""
 "\n"
 "<p>In the illustration above, the first row of the Timeline is black because "
@@ -310,7 +704,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:99
+#: ../raphodo/didyouknow.py:128
 msgid ""
 "To view photos and videos for a particular time range, use the mouse "
 "(optionally in combination with the <tt>Shift</tt> or <tt>Ctrl</tt> keys) to "
@@ -318,20 +712,20 @@ msgid ""
 "the left side of the main window will be highlighted."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:106
+#: ../raphodo/didyouknow.py:135
 msgid ""
 "A download always includes all files that are checked for download, "
 "including those that are not currently displayed because the Timeline is "
 "being used."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:113
+#: ../raphodo/didyouknow.py:142
 msgid ""
 "You can hide or display the download sources by clicking on the name of the "
 "device you're downloading from at the top left of the program window."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:120
+#: ../raphodo/didyouknow.py:149
 msgid ""
 "\n"
 "          Thumbnails can be sorted using a variety of criteria:\n"
@@ -350,33 +744,33 @@ msgid ""
 "</ol> "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:137
+#: ../raphodo/didyouknow.py:166
 msgid ""
 "One of Rapid Photo Downloader's most useful features is its ability to "
 "automatically generate download subfolders and rename files as it downloads, "
 "using a scheme of your choosing."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:143
+#: ../raphodo/didyouknow.py:172
 msgid ""
 "To specify where you want your files downloaded and how you want them named, "
 "open the appropriate panel on the right-side of the application window: "
 "<b>Destination</b>, <b>Rename</b>, or <b>Job Code</b>."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:150
+#: ../raphodo/didyouknow.py:179
 msgid ""
 "\n"
 "When thinking about your download directory structure, keep in mind two "
 "different types\n"
 "of directory:\n"
 "<ol>\n"
-"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, &quot;"
-"Photos&quot;, or\n"
+"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, "
+"&quot;Photos&quot;, or\n"
 "&quot;Videos&quot;. This directory should already exist on your computer. In "
 "the illustration \n"
-"below, the destination folders are &quot;Pictures&quot; and &quot;"
-"Videos&quot;. The\n"
+"below, the destination folders are &quot;Pictures&quot; and "
+"&quot;Videos&quot;. The\n"
 "name of the destination folder is displayed in the grey bar directly above "
 "the folder tree, \n"
 "with a folder icon to its left and a gear icon to its far right.</li>\n"
@@ -389,7 +783,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:167
+#: ../raphodo/didyouknow.py:196
 msgid ""
 "\n"
 "You can download photos and videos to the same destination folder, or "
@@ -402,14 +796,14 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:177
+#: ../raphodo/didyouknow.py:206
 msgid ""
 "Automatically generated download subfolders can contain further "
 "automatically generated subfolders if need be. A common scheme is to create "
 "a year subfolder and then a series of year-month-day subfolders within it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:186
+#: ../raphodo/didyouknow.py:215
 msgid ""
 "\n"
 "Whenever possible, the program previews the download subfolders of photos "
@@ -427,7 +821,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:201
+#: ../raphodo/didyouknow.py:230
 msgid ""
 "\n"
 "Download subfolder names are typically generated using some or all of the "
@@ -451,7 +845,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:219
+#: ../raphodo/didyouknow.py:248
 msgid ""
 "\n"
 "To automatically create download subfolders as you download, \n"
@@ -461,7 +855,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:227
+#: ../raphodo/didyouknow.py:256
 msgid ""
 "\n"
 "Using the drop-down menu, select a built-in preset or click on <b>Custom</b> "
@@ -471,20 +865,20 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:237
+#: ../raphodo/didyouknow.py:266
 msgid ""
 "It's easy to download raw images into one folder, and jpeg images into "
 "another. Simply use the <b>Filename Extension</b> as part of your download "
 "subfolder generation scheme:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:242
+#: ../raphodo/didyouknow.py:271
 msgid ""
 "This illustration shows a saved custom preset named &quot;My custom "
 "preset&quot;."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:246
+#: ../raphodo/didyouknow.py:275
 msgid ""
 "\n"
 "You do not have to create nested download subfolders. This illustration "
@@ -495,7 +889,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:256
+#: ../raphodo/didyouknow.py:285
 msgid ""
 "\n"
 "Although there are many built-in date/time naming options, you may find that "
@@ -509,7 +903,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:265
+#: ../raphodo/didyouknow.py:294
 msgid ""
 "\n"
 "Read more about all the ways you can generate download subfolder names and "
@@ -519,7 +913,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:273
+#: ../raphodo/didyouknow.py:302
 msgid ""
 "\n"
 "<b>Job Codes</b> let you easily enter text that describes sets of photos and "
@@ -531,7 +925,7 @@ msgid ""
 "&quot;Green Bazaar&quot;: \n"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:282
+#: ../raphodo/didyouknow.py:311
 msgid ""
 "\n"
 "You can apply new or existing Job Codes before you start a download. If "
@@ -542,36 +936,36 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:291
+#: ../raphodo/didyouknow.py:320
 msgid "Look for hints to guide you when working with Job Codes:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:295
+#: ../raphodo/didyouknow.py:324
 msgid ""
 "Hints will vary depending on the context, such as when the mouse is hovering "
 "over a button."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:301
+#: ../raphodo/didyouknow.py:330
 msgid ""
 "\n"
 "When you give your photos and videos unique filenames, you'll never be "
 "confused as to \n"
 "which file is which. Using <b>sequence numbers</b> to make filenames unique "
 "is highly \n"
-"recommended!.\n"
+"recommended!\n"
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:309
+#: ../raphodo/didyouknow.py:338
 msgid ""
 "\n"
 "<p>Four types of sequence values are available to help you assign unique "
 "names to your photos and \n"
 "videos:\n"
 "<ol>\n"
-"<li><b>Downloads today</b>: tracks downloads completed during that day.</"
-"li>\n"
+"<li><b>Downloads today</b>: tracks downloads completed during that "
+"day.</li>\n"
 "<li><b>Stored number</b>: similar to Downloads today, but it is remembered "
 "from the last time the  \n"
 "program was run.</li>\n"
@@ -585,7 +979,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:327
+#: ../raphodo/didyouknow.py:356
 msgid ""
 "\n"
 "The <b>Rename</b> panel allows you to configure file renaming. To rename "
@@ -594,7 +988,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:334
+#: ../raphodo/didyouknow.py:363
 msgid ""
 "\n"
 "<p>The <b>Synchronize RAW + JPEG</b> option is useful if you use the RAW + "
@@ -613,7 +1007,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:348
+#: ../raphodo/didyouknow.py:377
 msgid ""
 "\n"
 "You can have your photos and videos backed up to multiple locations as they "
@@ -624,13 +1018,13 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:356
+#: ../raphodo/didyouknow.py:385
 msgid ""
 "In this example, the drive <b>photobackup</b> does not contain a folder "
 "named <tt>Videos</tt>, so videos will not be backed up to it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:362
+#: ../raphodo/didyouknow.py:391
 msgid ""
 "\n"
 "Several of the program's preferences can be set from the command line, "
@@ -641,7 +1035,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:372
+#: ../raphodo/didyouknow.py:396
+msgid "You can also import program preferences from the older 0.4 version."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:401
 msgid ""
 "\n"
 "Rapid Photo Downloader deals with three types of cache:\n"
@@ -651,8 +1049,8 @@ msgid ""
 "memory cards, and other devices.</li>\n"
 "<li>A <b>temporary cache</b> of files downloaded from a camera, one for "
 "photos and another for \n"
-"videos. They are located in temporary subfolders in the download destination."
-"</li>\n"
+"videos. They are located in temporary subfolders in the download "
+"destination.</li>\n"
 "<li>The <b>desktop's thumbnail cache</b>, in which Rapid Photo Downloader "
 "stores thumbnails of \n"
 "RAW and TIFF photos once they have been downloaded. File browsers like Gnome "
@@ -667,23 +1065,23 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:431
+#: ../raphodo/didyouknow.py:460
 msgid "Tip of the Day"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:439
+#: ../raphodo/didyouknow.py:468
 msgid "Did you know...?"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:466
+#: ../raphodo/didyouknow.py:495
 msgid "Show tips on startup"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:470
+#: ../raphodo/didyouknow.py:499
 msgid "&Next"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:471
+#: ../raphodo/didyouknow.py:500
 msgid "&Previous"
 msgstr ""
 
@@ -790,68 +1188,68 @@ msgstr ""
 msgid "%(days)d days, %(hours)d hours"
 msgstr ""
 
-#: ../raphodo/errorlog.py:65
+#: ../raphodo/errorlog.py:66
 msgid "Find"
 msgstr ""
 
-#: ../raphodo/errorlog.py:135
+#: ../raphodo/errorlog.py:136
 msgid "Error Reports - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/errorlog.py:170
+#: ../raphodo/errorlog.py:171
 msgid "Find in reports"
 msgstr ""
 
-#: ../raphodo/errorlog.py:187
+#: ../raphodo/errorlog.py:188
 msgid "Find the previous occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:192
+#: ../raphodo/errorlog.py:193
 msgid "Find the next occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:194
+#: ../raphodo/errorlog.py:195
 msgid "&Highlight All"
 msgstr ""
 
-#: ../raphodo/errorlog.py:195
+#: ../raphodo/errorlog.py:196
 msgid "Highlight all occurrences of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:196
+#: ../raphodo/errorlog.py:197
 msgid "&Match Case"
 msgstr ""
 
-#: ../raphodo/errorlog.py:197
+#: ../raphodo/errorlog.py:198
 msgid "Search with case sensitivity"
 msgstr ""
 
-#: ../raphodo/errorlog.py:198
+#: ../raphodo/errorlog.py:199
 msgid "&Whole Words"
 msgstr ""
 
-#: ../raphodo/errorlog.py:199
+#: ../raphodo/errorlog.py:200
 msgid "Search whole words only"
 msgstr ""
 
-#: ../raphodo/errorlog.py:209 ../raphodo/errorlog.py:341
+#: ../raphodo/errorlog.py:210 ../raphodo/errorlog.py:345
 #, python-format
 msgid "%s of %s matches"
 msgstr ""
 
-#: ../raphodo/errorlog.py:228
+#: ../raphodo/errorlog.py:232
 msgid "Clear"
 msgstr ""
 
-#: ../raphodo/errorlog.py:328
+#: ../raphodo/errorlog.py:332
 msgid "Phrase not found"
 msgstr ""
 
-#: ../raphodo/errorlog.py:487
+#: ../raphodo/errorlog.py:491
 msgid "Search pending..."
 msgstr ""
 
-#: ../raphodo/errorlog.py:535
+#: ../raphodo/errorlog.py:539
 msgid ""
 "The number of new entries added to the Error Report since it was last open. "
 "Click to open the Error Report."
@@ -865,8 +1263,8 @@ msgstr ""
 #, python-brace-format
 msgid ""
 "<b>A problem occurred in Rapid Photo Downloader</b><br><br>\n"
-"    Please report the problem at <a href=\"{website}\">{website}</a>."
-"<br><br>\n"
+"    Please report the problem at <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
 "    Attach the log file <i>{log_file}</i> to your bug report (click\n"
 "    <a href=\"{log_path}\">here</a> to open the log directory).<br><br>If "
 "the same problem occurs\n"
@@ -887,7 +1285,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1601
+#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1643
 msgid "Open in File Browser..."
 msgstr ""
 
@@ -905,531 +1303,531 @@ msgstr ""
 msgid "%s (location does not exist)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:186
+#: ../raphodo/generatenameconfig.py:190
 msgid "Date time"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:187
+#: ../raphodo/generatenameconfig.py:191
 msgid "Text"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:188 ../raphodo/rapid.py:2053
+#: ../raphodo/generatenameconfig.py:192 ../raphodo/rapid.py:2125
 msgid "Filename"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:189 ../raphodo/preferencedialog.py:488
+#: ../raphodo/generatenameconfig.py:193 ../raphodo/preferencedialog.py:724
 msgid "Metadata"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:190
+#: ../raphodo/generatenameconfig.py:194
 msgid "Sequences"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: ../raphodo/generatenameconfig.py:193
+#: ../raphodo/generatenameconfig.py:197
 msgid "Job code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:194
+#: ../raphodo/generatenameconfig.py:198
 msgid "Image date"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:195
+#: ../raphodo/generatenameconfig.py:199
 msgid "Video date"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:196
+#: ../raphodo/generatenameconfig.py:200
 msgid "Today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:197
+#: ../raphodo/generatenameconfig.py:201
 msgid "Yesterday"
 msgstr ""
 
 #. Translators: Download time is the time and date that the download started (when the
 #. user clicked the Download button)
-#: ../raphodo/generatenameconfig.py:200
+#: ../raphodo/generatenameconfig.py:204
 msgid "Download time"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:203
+#: ../raphodo/generatenameconfig.py:207
 msgid "Name"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:206 ../raphodo/rapid.py:2054
+#: ../raphodo/generatenameconfig.py:210 ../raphodo/rapid.py:2126
 msgid "Extension"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:209
+#: ../raphodo/generatenameconfig.py:213
 msgid "Image number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:210
+#: ../raphodo/generatenameconfig.py:214
 msgid "Video number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:213
+#: ../raphodo/generatenameconfig.py:217
 msgid "Aperture"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:216
+#: ../raphodo/generatenameconfig.py:220
 msgid "ISO"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:219
+#: ../raphodo/generatenameconfig.py:223
 msgid "Exposure time"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:222
+#: ../raphodo/generatenameconfig.py:226
 msgid "Focal length"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:225
+#: ../raphodo/generatenameconfig.py:229
 msgid "Camera make"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:228
+#: ../raphodo/generatenameconfig.py:232
 msgid "Camera model"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:231
+#: ../raphodo/generatenameconfig.py:235
 msgid "Short camera model"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:234
+#: ../raphodo/generatenameconfig.py:238
 msgid "Hyphenated short camera model"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:237
+#: ../raphodo/generatenameconfig.py:241
 msgid "Serial number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:240
+#: ../raphodo/generatenameconfig.py:244
 msgid "Shutter count"
 msgstr ""
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: ../raphodo/generatenameconfig.py:242
+#: ../raphodo/generatenameconfig.py:246
 msgid "File number"
 msgstr ""
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:244
+#: ../raphodo/generatenameconfig.py:248
 msgid "Folder only"
 msgstr ""
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:246
+#: ../raphodo/generatenameconfig.py:250
 msgid "Folder and file"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:249
+#: ../raphodo/generatenameconfig.py:253
 msgid "Owner name"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:250
+#: ../raphodo/generatenameconfig.py:254
 msgid "Codec"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:251
+#: ../raphodo/generatenameconfig.py:255
 msgid "Width"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:252
+#: ../raphodo/generatenameconfig.py:256
 msgid "Height"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:253
+#: ../raphodo/generatenameconfig.py:257
 msgid "Length"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:254
+#: ../raphodo/generatenameconfig.py:258
 msgid "Frames Per Second"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:255
+#: ../raphodo/generatenameconfig.py:259
 msgid "Artist"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:256
+#: ../raphodo/generatenameconfig.py:260
 msgid "Copyright"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:259
+#: ../raphodo/generatenameconfig.py:263
 msgid "Downloads today"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:262
+#: ../raphodo/generatenameconfig.py:266
 msgid "Session number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:265
+#: ../raphodo/generatenameconfig.py:269
 msgid "Subfolder number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:268
+#: ../raphodo/generatenameconfig.py:272
 msgid "Stored number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: ../raphodo/generatenameconfig.py:271
+#: ../raphodo/generatenameconfig.py:275
 msgid "Sequence letter"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:274
+#: ../raphodo/generatenameconfig.py:278
 msgid "All digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:277
+#: ../raphodo/generatenameconfig.py:281
 msgid "Last digit"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:280
+#: ../raphodo/generatenameconfig.py:284
 msgid "Last 2 digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:283
+#: ../raphodo/generatenameconfig.py:287
 msgid "Last 3 digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:286
+#: ../raphodo/generatenameconfig.py:290
 msgid "Last 4 digits"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:289
+#: ../raphodo/generatenameconfig.py:293
 msgid "Original Case"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:292
+#: ../raphodo/generatenameconfig.py:296
 msgid "UPPERCASE"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:295
+#: ../raphodo/generatenameconfig.py:299
 msgid "lowercase"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:296
+#: ../raphodo/generatenameconfig.py:300
 msgid "One digit"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:297
+#: ../raphodo/generatenameconfig.py:301
 msgid "Two digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:298
+#: ../raphodo/generatenameconfig.py:302
 msgid "Three digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:299
+#: ../raphodo/generatenameconfig.py:303
 msgid "Four digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:300
+#: ../raphodo/generatenameconfig.py:304
 msgid "Five digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:301
+#: ../raphodo/generatenameconfig.py:305
 msgid "Six digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:302
+#: ../raphodo/generatenameconfig.py:306
 msgid "Seven digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:305
+#: ../raphodo/generatenameconfig.py:309
 msgid "Subseconds"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:308 ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:312 ../raphodo/generatenameconfig.py:393
 msgid "YYYYMMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:311 ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:315 ../raphodo/generatenameconfig.py:394
 msgid "YYYY-MM-DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:314 ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:318 ../raphodo/generatenameconfig.py:395
 msgid "YYYY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:317
+#: ../raphodo/generatenameconfig.py:321
 msgid "YYMMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:320
+#: ../raphodo/generatenameconfig.py:324
 msgid "YY-MM-DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:323
+#: ../raphodo/generatenameconfig.py:327
 msgid "YY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:326
+#: ../raphodo/generatenameconfig.py:330
 msgid "MMDDYYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:329
+#: ../raphodo/generatenameconfig.py:333
 msgid "MMDDYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:332
+#: ../raphodo/generatenameconfig.py:336
 msgid "MMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:335
+#: ../raphodo/generatenameconfig.py:339
 msgid "DDMMYYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:338
+#: ../raphodo/generatenameconfig.py:342
 msgid "DDMMYY"
 msgstr "DDMMYY"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:341 ../raphodo/generatenameconfig.py:389
-#: ../raphodo/generatenameconfig.py:390 ../raphodo/generatenameconfig.py:391
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:345 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:394 ../raphodo/generatenameconfig.py:395
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:397
 msgid "YYYY"
 msgstr "YYYY"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:344
+#: ../raphodo/generatenameconfig.py:348
 msgid "YY"
 msgstr "YY"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:347
+#: ../raphodo/generatenameconfig.py:351
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:350
+#: ../raphodo/generatenameconfig.py:354
 msgid "DD"
 msgstr "DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:353
+#: ../raphodo/generatenameconfig.py:357
 msgid "Month (full)"
 msgstr "Ayyur (ummid)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:356
+#: ../raphodo/generatenameconfig.py:360
 msgid "Month (abbreviated)"
 msgstr "Ayyur (awezlan)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:359
+#: ../raphodo/generatenameconfig.py:363
 msgid "HHMMSS"
 msgstr "HHMMSS"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:362
+#: ../raphodo/generatenameconfig.py:366
 msgid "HHMM"
 msgstr "HHMM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:365
+#: ../raphodo/generatenameconfig.py:369
 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
-#: ../raphodo/generatenameconfig.py:368
+#: ../raphodo/generatenameconfig.py:372
 msgid "HH-MM"
 msgstr "HH-MM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:371
+#: ../raphodo/generatenameconfig.py:375
 msgid "HH"
 msgstr "HH"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:374
+#: ../raphodo/generatenameconfig.py:378
 msgid "MM (minutes)"
 msgstr "MM (tisdatin)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:377
+#: ../raphodo/generatenameconfig.py:381
 msgid "SS"
 msgstr "SS"
 
-#: ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:393
 msgid "Date"
 msgstr "Azemz"
 
-#: ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:394
 msgid "Date (hyphens)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:395
 msgid "Date (underscores)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:438
-#: ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:442
+#: ../raphodo/generatenameconfig.py:537
 msgid "Date and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392
+#: ../raphodo/generatenameconfig.py:396
 msgid "YYYYMM_Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "Date and Job Code Subfolder"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "YYYYMM"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393 ../raphodo/jobcodepanel.py:198
-#: ../raphodo/nameeditor.py:827 ../raphodo/rapid.py:1809
+#: ../raphodo/generatenameconfig.py:397 ../raphodo/jobcodepanel.py:199
+#: ../raphodo/nameeditor.py:833 ../raphodo/rapid.py:1852
 #: ../raphodo/renamepanel.py:83 ../raphodo/renamepanel.py:241
 msgid "Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:433 ../raphodo/generatenameconfig.py:512
+#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:532
 msgid "Original Filename"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "Date-Time and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "YYYYMMDD-HHMM-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "Date and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "YYYYMMDD-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "Date-Time and Image number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "YYYYMMDD-1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "Date-Time and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "YYYYMMDD-HHMM-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:442 ../raphodo/generatenameconfig.py:537
 msgid "YYYYMMDD-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "Date-Time and Video number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "YYYYMMDD_1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "Resolution"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "YYYYMMDD-HHMM-1-1920x1080"
 msgstr ""
 
@@ -1488,76 +1886,77 @@ msgstr ""
 msgid "&Remember this choice"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:185
+#: ../raphodo/jobcodepanel.py:186
 msgid ""
 "Select photos and videos to be able to apply a new or existing Job Code to "
 "them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:186
-msgid "The new Job Code will be applied to all selected photos and/or videos."
+#: ../raphodo/jobcodepanel.py:187
+msgid ""
+"The new Job Code will be applied to all selected photos and/or videos."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:187
+#: ../raphodo/jobcodepanel.py:188
 msgid ""
 "Click the Apply button to apply the current Job Code to all selected photos "
 "and/or videos. You can also simply double click the Job Code."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:189
+#: ../raphodo/jobcodepanel.py:190
 msgid ""
 "Removing a Job Code removes it only from the list of saved Job Codes, not "
 "from any photos or videos that it may have been applied to."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:191
+#: ../raphodo/jobcodepanel.py:192
 msgid ""
 "If you want to use Job Codes, configure file renaming or destination "
 "subfolder names to use them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:197
+#: ../raphodo/jobcodepanel.py:198
 msgid "Last Used"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:202
+#: ../raphodo/jobcodepanel.py:203
 msgid "Job Code Sort:"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:205 ../raphodo/rapid.py:2061
+#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2133
 msgid "Ascending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2062
+#: ../raphodo/jobcodepanel.py:207 ../raphodo/rapid.py:2134
 msgid "Descending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:216
+#: ../raphodo/jobcodepanel.py:217
 msgid "&New..."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:220
+#: ../raphodo/jobcodepanel.py:221
 msgid "&Apply"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:224
+#: ../raphodo/jobcodepanel.py:225
 msgid "&Remove"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:228 ../raphodo/preferencedialog.py:125
-#: ../raphodo/preferencedialog.py:154 ../raphodo/preferencedialog.py:433
+#: ../raphodo/jobcodepanel.py:229 ../raphodo/preferencedialog.py:200
+#: ../raphodo/preferencedialog.py:229 ../raphodo/preferencedialog.py:531
 msgid "Remove All"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:427
+#: ../raphodo/jobcodepanel.py:428
 msgid "Do you really want to remove all the Job Codes?"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:429
+#: ../raphodo/jobcodepanel.py:430
 msgid "Remove all Job Codes"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:492
+#: ../raphodo/jobcodepanel.py:493
 msgid "Job Codes"
 msgstr ""
 
@@ -1568,42 +1967,58 @@ msgstr ""
 msgid "<i><b>Hint:</b> %(message)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:418 ../raphodo/nameeditor.py:432
+#: ../raphodo/nameeditor.py:423 ../raphodo/nameeditor.py:437
 #, python-format
 msgid "%(description)s - %(elements)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:512
+#: ../raphodo/nameeditor.py:517
 msgid "Save New Custom Preset..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:513
+#: ../raphodo/nameeditor.py:518
 msgid "Remove All Custom Presets..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:559
+#: ../raphodo/nameeditor.py:564
 msgid "(New Custom Preset)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:576
+#: ../raphodo/nameeditor.py:581
 #, python-format
 msgid "%s (edited)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:579 ../raphodo/nameeditor.py:1370
+#: ../raphodo/nameeditor.py:584 ../raphodo/nameeditor.py:1379
 #, python-format
 msgid "Update Custom Preset \"%s\""
 msgstr ""
 
-#: ../raphodo/nameeditor.py:667
+#: ../raphodo/nameeditor.py:672
 msgid "Save New Custom Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:675
+#: ../raphodo/nameeditor.py:680
 msgid "Preset Name:"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:836
+#: ../raphodo/nameeditor.py:799
+msgid "Photo Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:805
+msgid "Video Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:811
+msgid "Photo Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:817
+msgid "Video Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:842
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>There is insufficient data to "
 "fully generate the name. Please use other renaming options.</i>"
@@ -1612,7 +2027,7 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees.
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:846
+#: ../raphodo/nameeditor.py:853
 #, python-format
 msgid "The character</i> %(separator)s <i>creates a new subfolder level."
 msgstr ""
@@ -1620,50 +2035,50 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:851
+#: ../raphodo/nameeditor.py:858
 #, python-format
 msgid ""
 "There is no need start or end with the folder separator </i> "
 "%(separator)s<i>, because it is added automatically."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:859
+#: ../raphodo/nameeditor.py:866
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>Unique filenames may not be "
 "generated. Make filenames unique by using Sequence values.</i>"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:882 ../raphodo/renamepanel.py:121
+#: ../raphodo/nameeditor.py:889 ../raphodo/renamepanel.py:121
 msgid "Preset:"
 msgstr ""
 
 #. Translators: appears in a combobox, e.g. Image Date (YYYY)
-#: ../raphodo/nameeditor.py:959 ../raphodo/nameeditor.py:980
+#: ../raphodo/nameeditor.py:966 ../raphodo/nameeditor.py:987
 #, python-brace-format
 msgid "{choice} ({variant})"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1005 ../raphodo/preferencedialog.py:530
+#: ../raphodo/nameeditor.py:1012 ../raphodo/preferencedialog.py:783
 msgid "Get help online..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1025
+#: ../raphodo/nameeditor.py:1034
 msgid "Insert"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1351
+#: ../raphodo/nameeditor.py:1360
 msgid "Save Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1356
+#: ../raphodo/nameeditor.py:1365
 msgid ""
-"<b>Do you want to save the changes in a new custom preset?</"
-"b><br><br>Creating a custom preset is not required, but can help you keep "
-"organized.<br><br>The changes to the preferences will still be applied "
-"regardless of whether you create a new custom preset or not."
+"<b>Do you want to save the changes in a new custom "
+"preset?</b><br><br>Creating a custom preset is not required, but can help "
+"you keep organized.<br><br>The changes to the preferences will still be "
+"applied regardless of whether you create a new custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1365
+#: ../raphodo/nameeditor.py:1374
 msgid ""
 "<b>Do you want to save the changes in a custom preset?</b><br><br>If you "
 "like, you can create a new custom preset or update the existing custom "
@@ -1671,136 +2086,167 @@ msgid ""
 "regardless of whether you save a custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1372
+#: ../raphodo/nameeditor.py:1381
 msgid "Save New Custom Preset"
 msgstr ""
 
-#: ../raphodo/newversion.py:306
+#: ../raphodo/newversion.py:312
 msgid "Checking for new version..."
 msgstr ""
 
-#: ../raphodo/newversion.py:307
+#: ../raphodo/newversion.py:313
 msgid "You are running the latest version."
 msgstr ""
 
-#: ../raphodo/newversion.py:308
+#: ../raphodo/newversion.py:314
 msgid "Failed to contact the update server."
 msgstr ""
 
-#: ../raphodo/newversion.py:310
+#: ../raphodo/newversion.py:316
 #, python-format
 msgid "A new version of Rapid Photo Downloader (%s) is available."
 msgstr ""
 
-#: ../raphodo/newversion.py:312
+#: ../raphodo/newversion.py:318
 msgid "Do you want to download the new version?"
 msgstr ""
 
-#: ../raphodo/newversion.py:313
+#: ../raphodo/newversion.py:319
 #, python-format
 msgid "Changes in the new release can be viewed <a href=\"%s\">here</a>."
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the s key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:340 ../raphodo/newversion.py:353
+#: ../raphodo/newversion.py:348 ../raphodo/newversion.py:363
 msgid "&Skip this release"
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the o key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:356
+#: ../raphodo/newversion.py:366
 msgid "&Open Download Page"
 msgstr ""
 
-#: ../raphodo/newversion.py:376
+#: ../raphodo/newversion.py:386
 msgid "Rapid Photo Downloader updates"
 msgstr ""
 
 #. Translators: shows how much of a file has been downloaded e.g  123 KB of 1.3 MB
-#: ../raphodo/newversion.py:478
+#: ../raphodo/newversion.py:488
 #, python-format
 msgid "%(downloaded)s of %(total)s"
 msgstr ""
 
-#: ../raphodo/newversion.py:495
+#: ../raphodo/newversion.py:507
 msgid "Downloading..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:76
+#: ../raphodo/preferencedialog.py:86
 msgid "Preferences"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Automation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85 ../raphodo/preferencedialog.py:343
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/preferencedialog.py:428
 msgid "Error Handling"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:109
+msgid "Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:109 ../raphodo/preferencedialog.py:119
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:94
+#: ../raphodo/preferencedialog.py:147
 msgid "Device Scanning"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:96
+#: ../raphodo/preferencedialog.py:148
 msgid "Scan only external devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:98
+#: ../raphodo/preferencedialog.py:150
 msgid ""
 "Scan for photos and videos only on devices that are external to the "
 "computer,\n"
 "including cameras, memory cards, external hard drives, and USB flash drives."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:102
-msgid "Scan non-camera devices lacking a DCIM folder"
+#: ../raphodo/preferencedialog.py:153
+msgid "Scan only specific folders on devices"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:155
+msgid ""
+"Scan for photos and videos only in the folders specified below (except "
+"paths\n"
+"specified in Ignored Paths).\n"
+"\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:161
+msgid "Folders to scan:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:164
+msgid ""
+"Folders at the base level of device file systems that will be scanned\n"
+"for photos and videos."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:167 ../raphodo/preferencedialog.py:219
+msgid "Add..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:104
+#: ../raphodo/preferencedialog.py:169
 msgid ""
-"Scan the entirety of a device for photos and videos, irrespective of whether "
-"it contains a DCIM folder,\n"
-"as opposed to only scanning within a DCIM folder.\n"
+"Add a folder to the list of folders to scan for photos and videos.\n"
 "\n"
-"Changing this setting causes all devices to be scanned again.\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:172 ../raphodo/preferencedialog.py:198
+#: ../raphodo/preferencedialog.py:224 ../raphodo/preferencedialog.py:529
+msgid "Remove"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:174
+msgid ""
+"Remove a folder from the list of folders to scan for photos and videos.\n"
 "\n"
-"Note: With cameras, only the DCIM folder is scanned."
+"Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:116
+#: ../raphodo/preferencedialog.py:191
 msgid "Devices that have been set to automatically ignore or download from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:117
+#: ../raphodo/preferencedialog.py:192
 msgid "Remembered Devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:121
+#: ../raphodo/preferencedialog.py:196
 msgid ""
 "Remove a device from the list of devices to automatically ignore or download "
 "from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:123 ../raphodo/preferencedialog.py:149
-#: ../raphodo/preferencedialog.py:431
-msgid "Remove"
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:127
+#: ../raphodo/preferencedialog.py:202
 msgid ""
 "Clear the list of devices from which to automatically ignore or download "
 "from.\n"
@@ -1808,315 +2254,436 @@ msgid ""
 "Note: Changes take effect when the computer is next scanned for devices."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:140
+#: ../raphodo/preferencedialog.py:215
 msgid "Ignored Paths"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:141
+#: ../raphodo/preferencedialog.py:216
 msgid ""
 "The end part of a path that should never be scanned for photos or videos."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:144
-msgid "Add..."
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:146
+#: ../raphodo/preferencedialog.py:221
 msgid ""
 "Add a path to the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:151
+#: ../raphodo/preferencedialog.py:226
 msgid ""
 "Remove a path from the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:156
+#: ../raphodo/preferencedialog.py:231
 msgid ""
 "Clear the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:164
+#: ../raphodo/preferencedialog.py:239
 msgid ""
-"Use python-style <a href=\"http://damonlynch.net/rapid/documentation/"
-"#regularexpressions\">regular expressions</a>"
+"Use python-style <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">regula"
+"r expressions</a>"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:168
+#: ../raphodo/preferencedialog.py:243
 msgid ""
 "Use regular expressions in the list of ignored paths.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:208
+#: ../raphodo/preferencedialog.py:283
 msgid "Program Automation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:209
+#: ../raphodo/preferencedialog.py:284
 msgid "Start downloading at program startup"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:210
+#: ../raphodo/preferencedialog.py:285
 msgid "Start downloading upon device insertion"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:211
+#: ../raphodo/preferencedialog.py:286
 msgid "Unmount (eject) device upon download completion"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:212
+#: ../raphodo/preferencedialog.py:287
 msgid "Exit program when download completes"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:213
+#: ../raphodo/preferencedialog.py:288
 msgid "Exit program even if download had warnings or errors"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:240
+#: ../raphodo/preferencedialog.py:315
 msgid "Thumbnail Generation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:241
+#: ../raphodo/preferencedialog.py:316
 msgid "Generate thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:242
+#: ../raphodo/preferencedialog.py:318
 msgid "Generate thumbnails to show in the main program window"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:244
+#: ../raphodo/preferencedialog.py:320
 msgid "Cache thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:245
+#: ../raphodo/preferencedialog.py:323
 msgid ""
 "Save thumbnails shown in the main program window in a thumbnail cache unique "
 "to Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:247
+#: ../raphodo/preferencedialog.py:327
 msgid "Generate system thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:248
+#: ../raphodo/preferencedialog.py:330
 msgid ""
 "While downloading, save thumbnails that can be used by desktop file managers "
 "and other programs"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:255
+#: ../raphodo/preferencedialog.py:339
 msgid "Number of CPU cores used to generate thumbnails."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:256
+#: ../raphodo/preferencedialog.py:340
 msgid "CPU cores:"
 msgstr ""
 
 #. Translators: the * acts as an asterisk to denote a reference to an annotation
 #. such as '* Takes effect upon program restart'
-#: ../raphodo/preferencedialog.py:271 ../raphodo/preferencedialog.py:317
+#: ../raphodo/preferencedialog.py:355 ../raphodo/preferencedialog.py:401
 msgid "*"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:294
+#: ../raphodo/preferencedialog.py:378
 msgid "Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:296
+#: ../raphodo/preferencedialog.py:380
 msgid "Calculating..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:302
+#: ../raphodo/preferencedialog.py:386
 msgid "days"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:303
+#: ../raphodo/preferencedialog.py:387
 msgid "forever"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:308
+#: ../raphodo/preferencedialog.py:392
 msgid "Cache size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:310
+#: ../raphodo/preferencedialog.py:394
 msgid "Number of thumbnails:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:312
+#: ../raphodo/preferencedialog.py:396
 msgid "Database size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:314
+#: ../raphodo/preferencedialog.py:398
 msgid "Cache unaccessed thumbnails for:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:322
+#: ../raphodo/preferencedialog.py:406
 msgid "Purge Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:323
+#: ../raphodo/preferencedialog.py:408
 msgid "Optimize Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:336
+#: ../raphodo/preferencedialog.py:421
 msgid "* Takes effect upon program restart"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:346
+#: ../raphodo/preferencedialog.py:431
 msgid "Skip download"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:347
+#: ../raphodo/preferencedialog.py:432
 msgid "Don't download the file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:348
+#: ../raphodo/preferencedialog.py:433
 msgid "Add unique identifier"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:349
+#: ../raphodo/preferencedialog.py:436
 msgid ""
 "Add an identifier like _1 or _2 to the end of the filename, immediately "
 "before the file's extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:355
+#: ../raphodo/preferencedialog.py:444
 msgid "Overwrite"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:356
+#: ../raphodo/preferencedialog.py:445
 msgid "Overwrite the previously backed up file"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:357
+#: ../raphodo/preferencedialog.py:446
 msgid "Skip"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:358
+#: ../raphodo/preferencedialog.py:448
 msgid "Don't overwrite the backup file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:364
+#: ../raphodo/preferencedialog.py:455
 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 identifier:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:378
+#: ../raphodo/preferencedialog.py:464
+msgid ""
+"Using sequence numbers to automatically generate unique filenames is "
+"strongly recommended. Configure file renaming in the Rename panel in the "
+"main window."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:473
 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 ""
 
-#: ../raphodo/preferencedialog.py:398
+#: ../raphodo/preferencedialog.py:494
 msgid "Program Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:399
+#: ../raphodo/preferencedialog.py:495
 msgid "Show a warning when:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:402
+#: ../raphodo/preferencedialog.py:498
 msgid "Downloading files currently not displayed"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:403
+#: ../raphodo/preferencedialog.py:499
 msgid ""
 "Warn when about to download files that are not displayed in the main window."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:405
+#: ../raphodo/preferencedialog.py:501
 msgid "Backup destinations are missing"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:406
-msgid "Warn before starting a download if it is not possible to back up files."
+#: ../raphodo/preferencedialog.py:502
+msgid ""
+"Warn before starting a download if it is not possible to back up files."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:408
+#: ../raphodo/preferencedialog.py:504
 msgid "Program libraries are missing or broken"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:409
+#: ../raphodo/preferencedialog.py:505
 msgid ""
 "Warn if a software library used by Rapid Photo Downloader is missing or not "
 "functioning."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:412
+#: ../raphodo/preferencedialog.py:508
 msgid "Filesystem metadata cannot be set"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:413
+#: ../raphodo/preferencedialog.py:509
 msgid ""
 "Warn if there is an error setting a file's filesystem metadata, such as its "
 "modification time."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:416
+#: ../raphodo/preferencedialog.py:512
 msgid "Encountering unhandled files"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:417
+#: ../raphodo/preferencedialog.py:513
 msgid ""
 "Warn after scanning a device or this computer if there are unrecognized "
 "files that will not be included in the download."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:420
+#: ../raphodo/preferencedialog.py:517
 msgid "Do not warn about unhandled files with extensions:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:424
+#: ../raphodo/preferencedialog.py:522
 msgid ""
 "File extensions are case insensitive and do not need to include the leading "
 "dot."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:427
+#: ../raphodo/preferencedialog.py:525
 msgid "Add"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:428
+#: ../raphodo/preferencedialog.py:526
 msgid ""
 "Add a file extension to the list of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:430
+#: ../raphodo/preferencedialog.py:528
 msgid ""
 "Remove a file extension from the list of unhandled file types to not warn "
 "about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:434
+#: ../raphodo/preferencedialog.py:532
 msgid ""
 "Clear the list of file extensions of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:469
+#: ../raphodo/preferencedialog.py:568
+msgid "Photo and Video Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:571
+msgid "Consolidate files across devices and downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:574
+msgid ""
+"Analyze the results of device scans looking for duplicate files and matching "
+"RAW and JPEG pairs,\n"
+"comparing them across multiple devices and download sessions."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:580
+msgid "Treat matching RAW and JPEG files as:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:581
+msgid "One photo"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:582
+msgid "Two photos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:584
+msgid ""
+"Display matching pairs of RAW and JPEG photos as one photo, and if marked, "
+"download both."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:589
+msgid ""
+"Display matching pairs of RAW and JPEG photos as two different photos. You "
+"can still synchronize their sequence numbers."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:598
+msgid "With matching RAW and JPEG photos:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:600
+msgid "Do not mark JPEG for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:601
+msgid "Do not mark RAW for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:602
+msgid "Mark both for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:609
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"JPEG for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:614
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"RAW for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:619
+msgid ""
+"When matching RAW and JPEG photos are found, automatically mark both for "
+"download."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:625
+msgid ""
+"If you disable file consolidation, choose what to do when a download device "
+"is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:631
+msgid ""
+"When a download device is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:642
+msgid "Clear completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:643
+msgid "Keep displaying completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:644
+msgid "Prompt for what to do"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:649
+msgid ""
+"Automatically clear the display of completed downloads whenever a new "
+"download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:654
+msgid ""
+"Keep displaying completed downloads whenever a new download device is "
+"inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:658
+msgid ""
+"Prompt whether to keep displaying completed downloads or clear them whenever "
+"a new download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:702
 msgid "Version Check"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:470
+#: ../raphodo/preferencedialog.py:703
 msgid "Check for new version at startup"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:471
+#: ../raphodo/preferencedialog.py:705
 msgid "Check for a new version of the program each time the program starts."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:473
+#: ../raphodo/preferencedialog.py:707
 msgid "Include development releases"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:474
+#: ../raphodo/preferencedialog.py:709
 msgid ""
 "Include alpha, beta and other development releases when checking for a new "
 "version of the program.\n"
@@ -2125,11 +2692,11 @@ msgid ""
 "occur."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:489
+#: ../raphodo/preferencedialog.py:725
 msgid "Ignore DNG date/time metadata on MTP devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:490
+#: ../raphodo/preferencedialog.py:727
 msgid ""
 "Ignore date/time metadata in DNG files located on MTP devices, and use the "
 "file's modification time instead.\n"
@@ -2138,70 +2705,86 @@ msgid ""
 "metadata."
 msgstr ""
 
+#: ../raphodo/preferencedialog.py:741
+msgid "Completed Downloads"
+msgstr ""
+
 #. Translators: substituted value is a description for the set of preferences
 #. shown in the preference dialog window, e.g. Devices, Automation, etc.
 #. This string is shown in a tooltip for the "Restore Defaults" button
-#: ../raphodo/preferencedialog.py:710
+#: ../raphodo/preferencedialog.py:1067
 #, python-format
 msgid "Restores default %s preference values"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:832
+#: ../raphodo/preferencedialog.py:1208
 msgid ""
 "Do you want to purge the thumbnail cache? The cache will be purged when the "
 "program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:835
+#: ../raphodo/preferencedialog.py:1212
 msgid "Purge Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:847
+#: ../raphodo/preferencedialog.py:1225
 msgid ""
 "Do you want to optimize the thumbnail cache? The cache will be optimized "
 "when the program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:850
+#: ../raphodo/preferencedialog.py:1229
 msgid "Optimize Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1045
+#: ../raphodo/preferencedialog.py:1481
+msgid "Enter a Folder to Scan"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1482
+msgid "Specify a folder that will be scanned for photos and videos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1483
+msgid "Folder:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1497
 msgid "Enter a Path to Ignore"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1046
+#: ../raphodo/preferencedialog.py:1498
 msgid "Specify a path that will never be scanned for photos or videos"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1047
+#: ../raphodo/preferencedialog.py:1499
 msgid "Path:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1061
+#: ../raphodo/preferencedialog.py:1513
 msgid "Enter a File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1062
+#: ../raphodo/preferencedialog.py:1514
 msgid "Specify a file extension (without the leading dot)"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1063 ../raphodo/renamepanel.py:122
+#: ../raphodo/preferencedialog.py:1515 ../raphodo/renamepanel.py:122
 msgid "Extension:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1078
+#: ../raphodo/preferencedialog.py:1530
 msgid "Invalid File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1079
+#: ../raphodo/preferencedialog.py:1531
 #, python-format
 msgid ""
 "The file extension <b>%s</b> is recognized by Rapid Photo Downloader, so it "
 "makes no sense to warn about its presence."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1081
+#: ../raphodo/preferencedialog.py:1533
 #, python-format
 msgid ""
 "Recognized file types:\n"
@@ -2227,104 +2810,103 @@ msgstr ""
 msgid "Birthday"
 msgstr ""
 
-#: ../raphodo/preferences.py:614
+#: ../raphodo/preferences.py:624
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr ""
 
-#: ../raphodo/preferences.py:617
+#: ../raphodo/preferences.py:627
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr ""
 
-#: ../raphodo/preferences.py:622
+#: ../raphodo/preferences.py:632
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
 
-#. self.setFlat(True)
 #: ../raphodo/primarybutton.py:72
 msgid "Download 8 Photos and 10 Videos"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:86 ../raphodo/problemnotification.py:208
+#: ../raphodo/problemnotification.py:87 ../raphodo/problemnotification.py:209
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:89
+#: ../raphodo/problemnotification.py:90
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:116
+#: ../raphodo/problemnotification.py:117
 #, python-format
 msgid "GPhoto2 Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:124
+#: ../raphodo/problemnotification.py:125
 msgid ""
 "Unable to initialize the camera, probably because another program is using "
 "it. No files were copied from it."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:134
+#: ../raphodo/problemnotification.py:135
 #, python-format
 msgid "Unable to read directory %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:140
+#: ../raphodo/problemnotification.py:141
 #, python-format
 msgid "Unable to access modification time or size from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:146
+#: ../raphodo/problemnotification.py:147
 #, python-format
 msgid "Unable to read file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:152
+#: ../raphodo/problemnotification.py:153
 #, python-format
 msgid "Unable to write file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:158
+#: ../raphodo/problemnotification.py:159
 #, python-format
 msgid "Unable to move file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:164
+#: ../raphodo/problemnotification.py:165
 #, python-format
 msgid "Unable to remove file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:170
+#: ../raphodo/problemnotification.py:171
 #, python-format
 msgid "Unable to copy file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:176
+#: ../raphodo/problemnotification.py:177
 #, python-format
 msgid "Zero length file %s will not be downloaded"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:182
+#: ../raphodo/problemnotification.py:183
 #, python-format
 msgid "Could not determine filesystem modification time for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:188
+#: ../raphodo/problemnotification.py:189
 #, python-format
 msgid "Unable to load metadata from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:194
+#: ../raphodo/problemnotification.py:195
 #, python-format
 msgid ""
 "Unable to load metadata from %(name)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:202
+#: ../raphodo/problemnotification.py:203
 #, python-format
 msgid ""
 "An error occurred setting a file's filesystem metadata on the filesystem %s. "
@@ -2332,212 +2914,212 @@ msgid ""
 "again."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:216
+#: ../raphodo/problemnotification.py:217
 #, python-format
 msgid "Encountered unhandled file %s. It will not be downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:223
+#: ../raphodo/problemnotification.py:224
 #, python-format
 msgid "%(filetype)s %(destination)s already exists."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:234 ../raphodo/problemnotification.py:262
+#: ../raphodo/problemnotification.py:235 ../raphodo/problemnotification.py:263
 #, python-format
 msgid ""
 "The existing %(filetype)s %(destination)s was last modified on %(date)s at "
 "%(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:245
+#: ../raphodo/problemnotification.py:246
 #, python-format
 msgid "The %(filetype)s %(source)s was not downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:273
+#: ../raphodo/problemnotification.py:274
 #, python-format
 msgid "The %(filetype)s %(source)s was downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:282
+#: ../raphodo/problemnotification.py:283
 #, python-format
 msgid "The unique identifier '%s' was added to the filename."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:298
+#: ../raphodo/problemnotification.py:299
 #, python-format
 msgid ""
 "The existing backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:309
+#: ../raphodo/problemnotification.py:310
 #, python-format
 msgid "The %(filetype)s %(source)s was not backed up from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:326
+#: ../raphodo/problemnotification.py:327
 #, python-format
 msgid ""
 "The previous backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:337
+#: ../raphodo/problemnotification.py:338
 #, python-format
 msgid ""
 "The %(filetype)s %(source)s from %(device)s was backed up, overwriting the "
 "previous backup %(filetype)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:356
+#: ../raphodo/problemnotification.py:357
 #, python-format
 msgid ""
 "When synchronizing RAW + JPEG sequence values, a duplicate %(filetype)s "
 "%(file)s was encountered, and was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:366
+#: ../raphodo/problemnotification.py:367
 msgid ""
 "When synchronizing RAW + JPEG sequence values, photos were detected with the "
 "same filenames, but taken at different times:"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:373
+#: ../raphodo/problemnotification.py:374
 #, 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 ""
 
-#: ../raphodo/problemnotification.py:389
+#: ../raphodo/problemnotification.py:390
 #, python-format
 msgid "Unable to finalize the filename for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:424
+#: ../raphodo/problemnotification.py:425
 #, python-format
 msgid ""
 "The filename %(destination)s was not fully generated for %(filetype)s "
 "%(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:433
+#: ../raphodo/problemnotification.py:434
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:439
+#: ../raphodo/problemnotification.py:440
 #, python-format
 msgid "The following metadata is missing: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:445
+#: ../raphodo/problemnotification.py:446
 #, python-format
 msgid "Date/time conversion failed: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:451
+#: ../raphodo/problemnotification.py:452
 msgid ""
 "Could not extract valid date/time metadata or determine the file "
 "modification time."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:457
+#: ../raphodo/problemnotification.py:458
 msgid "Filename does not have an extension."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:460
+#: ../raphodo/problemnotification.py:461
 msgid "Filename does not have a number component."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:464
+#: ../raphodo/problemnotification.py:465
 #, python-format
 msgid "Error generating component %(component)s. Error: %(error)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:477
+#: ../raphodo/problemnotification.py:478
 #, python-format
 msgid ""
 "The download subfolders %(folder)s were only partially generated for "
 "%(filetype)s %(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:486
+#: ../raphodo/problemnotification.py:487
 #, python-format
 msgid ""
 "There is no data with which to generate the %(subfolder_file)s for "
 "%(filename)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:499
+#: ../raphodo/problemnotification.py:500
 #, python-format
 msgid ""
 "Unable to create the %(filetype)s %(destination)s in %(folder)s. The "
 "download file was %(source)s in %(device)s. It was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:514
+#: ../raphodo/problemnotification.py:515
 #, python-format
 msgid "Unable to create the download subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:526
+#: ../raphodo/problemnotification.py:527
 #, python-format
 msgid "Unable to create the backup subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:577
+#: ../raphodo/problemnotification.py:578
 #, python-format
 msgid "Problems scanning %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:584
+#: ../raphodo/problemnotification.py:585
 #, python-format
 msgid "Problems copying from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:591
+#: ../raphodo/problemnotification.py:592
 msgid "Problems while finalizing filenames and generating subfolders"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:598
+#: ../raphodo/problemnotification.py:599
 #, python-format
 msgid "Problems backing up to %s"
 msgstr ""
 
-#. Translators: for example Nov 3 or Dec 31
-#. The start and end dates are on a different day
-#. Translators: for example Nov 3 or Dec 31
-#: ../raphodo/proximity.py:105 ../raphodo/proximity.py:221
-#: ../raphodo/proximity.py:224 ../raphodo/proximity.py:828
+#. Translators: for example Nov 3 2015, 11:25 AM
+#. Translators: for example, Nov 3, 12:15 PM
+#: ../raphodo/proximity.py:188 ../raphodo/proximity.py:213
+#: ../raphodo/proximity.py:236 ../raphodo/proximity.py:239
 #, python-format
-msgid "%(month)s %(numeric_day)s"
+msgid "%(date)s, %(time)s"
 msgstr ""
 
-#. Translators: for example Nov 15 2015
-#. Translators: for example Nov 3 2015
-#: ../raphodo/proximity.py:109 ../raphodo/proximity.py:230
-#: ../raphodo/proximity.py:231 ../raphodo/proximity.py:831
+#: ../raphodo/proximity.py:204
 #, python-format
-msgid "%(date)s %(year)s"
+msgid "%(starttime)s - %(endtime)s"
 msgstr ""
 
-#. Translators: for example Nov 3 2015, 11:25 AM
-#. Translators: for example, Nov 3, 12:15 PM
-#: ../raphodo/proximity.py:197 ../raphodo/proximity.py:215
-#: ../raphodo/proximity.py:234 ../raphodo/proximity.py:236
+#. The start and end dates are on a different day
+#. Translators: for example Nov 3 or Dec 31
+#: ../raphodo/proximity.py:221 ../raphodo/proximity.py:225
+#: ../raphodo/proximity.py:980 ../raphodo/timeutils.py:105
 #, python-format
-msgid "%(date)s, %(time)s"
+msgid "%(month)s %(numeric_day)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:209
+#. Translators: for example Nov 3 2015
+#. Translators: for example Nov 2 2015
+#. Translators: for example Nov 15 2015
+#: ../raphodo/proximity.py:232 ../raphodo/proximity.py:233
+#: ../raphodo/proximity.py:985 ../raphodo/timeutils.py:110
 #, python-format
-msgid "%(starttime)s - %(endtime)s"
+msgid "%(date)s %(year)s"
 msgstr ""
 
 #. Translators: for example, Nov 3, 12:15 PM - Nov 4, 1:00 AM
-#: ../raphodo/proximity.py:241
+#: ../raphodo/proximity.py:245
 #, python-format
 msgid "%(earlier_time)s - %(later_time)s"
 msgstr ""
@@ -2546,25 +3128,25 @@ msgstr ""
 #. Nov 3 2012, 12:15 PM -
 #. Nov 4 2012, 1:00 AM
 #. (please keep the line break signified by \n)
-#: ../raphodo/proximity.py:248
+#: ../raphodo/proximity.py:253
 #, python-format
 msgid ""
 "%(earlier_time)s -\n"
 "%(later_time)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:359
+#: ../raphodo/proximity.py:382
 #, python-format
 msgid "%(month)s  %(year)s"
 msgstr ""
 
 #. Translators: for example Nov 2015
-#: ../raphodo/proximity.py:833
+#: ../raphodo/proximity.py:987
 #, python-format
 msgid "%(month)s %(year)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:1344
+#: ../raphodo/proximity.py:1595
 msgid ""
 "The time elapsed between consecutive photos and videos that is used to build "
 "the Timeline"
@@ -2574,47 +3156,47 @@ msgstr ""
 #. Replace the very last character (after the d) with the correct
 #. localized value, keeping everything else. In other words, change
 #. only the m character.
-#: ../raphodo/proximity.py:1406
+#: ../raphodo/proximity.py:1652
 #, python-format
 msgid "%(minutes)dm"
 msgstr ""
 
 #. Translators: i.e. "1.5h", which is short for 1.5 hours.
 #. Replace the entire string with the correct localized value
-#: ../raphodo/proximity.py:1410
+#: ../raphodo/proximity.py:1656
 msgid "1.5h"
 msgstr "1.5sr"
 
 #. Translators: e.g. "5h", which is short for 5 hours.
 #. Replace the very last character (after the d) with the correct localized value,
 #. keeping everything else. In other words, change only the h character.
-#: ../raphodo/proximity.py:1415
+#: ../raphodo/proximity.py:1661
 #, python-format
 msgid "%(hours)dh"
 msgstr "%(hours)dsr"
 
-#: ../raphodo/proximity.py:1461
+#: ../raphodo/proximity.py:1710
 msgid ""
 "The Timeline groups photos and videos based on how much time elapsed between "
 "consecutive shots. Use it to identify photos and videos taken at different "
 "periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/proximity.py:1464
+#: ../raphodo/proximity.py:1715
 msgid ""
 "Use the slider (below) to adjust the time elapsed between consecutive shots "
 "that is used to build the Timeline."
 msgstr ""
 
-#: ../raphodo/proximity.py:1466
+#: ../raphodo/proximity.py:1718
 msgid "Timeline build pending..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1467
+#: ../raphodo/proximity.py:1719
 msgid "Timeline is building..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1468
+#: ../raphodo/proximity.py:1721
 msgid ""
 "The Timeline needs to be rebuilt because the file modification time does not "
 "match the time a shot was taken for one or more shots.<br><br>The Timeline "
@@ -2626,61 +3208,61 @@ msgid ""
 "downloading, which is when the metadata is read."
 msgstr ""
 
-#: ../raphodo/rapid.py:485 ../raphodo/rapid.py:2461 ../raphodo/rapid.py:3728
-#: ../raphodo/rapid.py:3846 ../raphodo/rapid.py:3850 ../raphodo/rapid.py:3870
-#: ../raphodo/rapid.py:3874 ../raphodo/rapid.py:3998 ../raphodo/rapid.py:4007
-#: ../raphodo/rapid.py:4495 ../raphodo/rapid.py:4888 ../raphodo/rapid.py:5722
-#: ../raphodo/rememberthisdialog.py:97
+#: ../raphodo/rapid.py:493 ../raphodo/rapid.py:2555 ../raphodo/rapid.py:3934
+#: ../raphodo/rapid.py:4065 ../raphodo/rapid.py:4069 ../raphodo/rapid.py:4092
+#: ../raphodo/rapid.py:4096 ../raphodo/rapid.py:4226 ../raphodo/rapid.py:4237
+#: ../raphodo/rapid.py:4743 ../raphodo/rapid.py:5195 ../raphodo/rapid.py:5997
+#: ../raphodo/rememberthisdialog.py:99
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:3
 msgid "Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:1100
+#: ../raphodo/rapid.py:1131
 msgid ""
 "<b>ExifTool has a problem</b><br><br> Rapid Photo Downloader uses ExifTool "
 "to get metadata from videos and photos. The program will run without it, but "
 "installing it is <b>highly</b> recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1110 ../raphodo/rapid.py:1130
+#: ../raphodo/rapid.py:1141 ../raphodo/rapid.py:1161
 msgid "Problem with libmediainfo"
 msgstr ""
 
-#: ../raphodo/rapid.py:1119
+#: ../raphodo/rapid.py:1150
 msgid ""
 "<b>The library libmediainfo appears to be missing</b><br><br> Rapid Photo "
 "Downloader uses libmediainfo to get the date and time a video was shot. The "
 "program will run  without it, but installing it is recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1417
+#: ../raphodo/rapid.py:1448
 msgid "Download failed"
 msgstr "Asider ur yeddi ara"
 
-#: ../raphodo/rapid.py:1419
+#: ../raphodo/rapid.py:1450
 msgid ""
 "Sorry, the download of the new version of Rapid Photo Downloader failed."
 msgstr ""
 
-#: ../raphodo/rapid.py:1425
+#: ../raphodo/rapid.py:1457
 msgid ""
 "The new version was successfully downloaded. Do you want to close Rapid "
 "Photo Downloader and install it now?"
 msgstr ""
 
-#: ../raphodo/rapid.py:1428
+#: ../raphodo/rapid.py:1461
 msgid "Update Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:1432
+#: ../raphodo/rapid.py:1465
 msgid "Install"
 msgstr "Sebded"
 
-#: ../raphodo/rapid.py:1450
+#: ../raphodo/rapid.py:1483
 msgid "New version saved"
 msgstr ""
 
-#: ../raphodo/rapid.py:1451
+#: ../raphodo/rapid.py:1485
 #, python-format
 msgid ""
 "The tar file and installer script are saved at:\n"
@@ -2688,163 +3270,163 @@ msgid ""
 " %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:1468
+#: ../raphodo/rapid.py:1502
 msgid "Upgrade failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1469
+#: ../raphodo/rapid.py:1505
 msgid ""
 "Sorry, upgrading Rapid Photo Downloader failed because there was an error "
 "opening the installer."
 msgstr ""
 
-#: ../raphodo/rapid.py:1667 ../raphodo/rapid.py:2331
+#: ../raphodo/rapid.py:1709 ../raphodo/rapid.py:2425
 msgid "Download"
 msgstr "Sider"
 
-#: ../raphodo/rapid.py:1671
+#: ../raphodo/rapid.py:1713
 msgid "&Refresh..."
 msgstr "&Smiren..."
 
-#: ../raphodo/rapid.py:1675
+#: ../raphodo/rapid.py:1717
 msgid "&Preferences"
 msgstr "&Ismenyifen"
 
-#: ../raphodo/rapid.py:1679
+#: ../raphodo/rapid.py:1721
 msgid "&Quit"
 msgstr ""
 
-#: ../raphodo/rapid.py:1683
+#: ../raphodo/rapid.py:1725
 msgid "Error &Reports"
 msgstr ""
 
-#: ../raphodo/rapid.py:1687
+#: ../raphodo/rapid.py:1729
 msgid "Clear Completed Downloads"
 msgstr ""
 
-#: ../raphodo/rapid.py:1691
+#: ../raphodo/rapid.py:1733
 msgid "Get Help Online..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1695
+#: ../raphodo/rapid.py:1737
 msgid "&Tip of the Day..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1699
+#: ../raphodo/rapid.py:1741
 msgid "Report a Problem..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1703
+#: ../raphodo/rapid.py:1745
 msgid "Make a Donation..."
 msgstr "Mudd tawsa..."
 
-#: ../raphodo/rapid.py:1707
+#: ../raphodo/rapid.py:1749
 msgid "Translate this Application..."
 msgstr "Suqel asnas-agi..."
 
-#: ../raphodo/rapid.py:1711
+#: ../raphodo/rapid.py:1753
 msgid "&About..."
 msgstr "&Ɣef..."
 
-#: ../raphodo/rapid.py:1715
+#: ../raphodo/rapid.py:1757
 msgid "Check for Updates..."
 msgstr "Senqed ileqman..."
 
-#: ../raphodo/rapid.py:1797
+#: ../raphodo/rapid.py:1840
 msgid "Timeline"
 msgstr ""
 
-#: ../raphodo/rapid.py:1807
+#: ../raphodo/rapid.py:1850
 msgid "Destination"
 msgstr "Taniɣert"
 
-#: ../raphodo/rapid.py:1808
+#: ../raphodo/rapid.py:1851
 msgid "Rename"
 msgstr "Snifel isem"
 
-#: ../raphodo/rapid.py:1810
+#: ../raphodo/rapid.py:1853
 msgid "Back Up"
 msgstr ""
 
 #. Devices Header and View
-#: ../raphodo/rapid.py:1926
+#: ../raphodo/rapid.py:1977
 msgid ""
 "Turn on or off the use of devices attached to this computer as download "
 "sources"
 msgstr ""
 
 #. This Computer Header and View
-#: ../raphodo/rapid.py:1940
+#: ../raphodo/rapid.py:1994
 msgid ""
 "Turn on or off the use of a folder on this computer as a download source"
 msgstr ""
 
-#: ../raphodo/rapid.py:1941
+#: ../raphodo/rapid.py:1996
 msgid "This Computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:1952
+#: ../raphodo/rapid.py:2009
 msgid "Select a source folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:1975
+#: ../raphodo/rapid.py:2038
 msgid "Projected Storage Use"
 msgstr ""
 
-#: ../raphodo/rapid.py:1989 ../raphodo/rapid.py:1997
+#: ../raphodo/rapid.py:2056 ../raphodo/rapid.py:2068
 msgid "Select a destination folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:2045
+#: ../raphodo/rapid.py:2117
 msgid "All"
 msgstr ""
 
-#: ../raphodo/rapid.py:2046
+#: ../raphodo/rapid.py:2118
 msgid "New"
 msgstr ""
 
-#: ../raphodo/rapid.py:2048
+#: ../raphodo/rapid.py:2120
 msgid "Show:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2051
+#: ../raphodo/rapid.py:2123
 msgid "Modification Time"
 msgstr ""
 
-#: ../raphodo/rapid.py:2052
+#: ../raphodo/rapid.py:2124
 msgid "Checked State"
 msgstr ""
 
-#: ../raphodo/rapid.py:2055
+#: ../raphodo/rapid.py:2127
 msgid "File Type"
 msgstr ""
 
-#: ../raphodo/rapid.py:2056
+#: ../raphodo/rapid.py:2128
 msgid "Device"
 msgstr ""
 
-#: ../raphodo/rapid.py:2058
+#: ../raphodo/rapid.py:2130
 msgid "Sort:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2069
+#: ../raphodo/rapid.py:2141
 msgid "Select All:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2311
+#: ../raphodo/rapid.py:2405
 #, python-format
 msgid "Download %(files)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2327
+#: ../raphodo/rapid.py:2421
 msgid "Resume Download"
 msgstr ""
 
-#: ../raphodo/rapid.py:2329
+#: ../raphodo/rapid.py:2423
 msgid "Pause"
 msgstr ""
 
-#: ../raphodo/rapid.py:2417
+#: ../raphodo/rapid.py:2511
 #, python-brace-format
 msgid ""
 "Please report the problem at <a href=\"{website}\">{website}</a>.<br><br>\n"
@@ -2853,11 +3435,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/rapid.py:2431
+#: ../raphodo/rapid.py:2525
 msgid "Thank you for reporting a problem in Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:2529
+#: ../raphodo/rapid.py:2624
 #, python-format
 msgid ""
 "<b>Changing This Computer source path</b><br><br>Do you really want to "
@@ -2866,30 +3448,29 @@ msgid ""
 "from This Computer will be cancelled."
 msgstr ""
 
-#: ../raphodo/rapid.py:2595
+#: ../raphodo/rapid.py:2694
 msgid "You cannot change the download destination while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:2604
+#: ../raphodo/rapid.py:2704
 #, python-format
 msgid ""
 "<b>Confirm Download Destination</b><br><br>Are you sure you want to set the "
 "%(file_type)s download destination to %(path)s?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2682
+#: ../raphodo/rapid.py:2785
 msgid ""
+"\n"
 "<b>Downloading all files</b><br><br>\n"
-"                    A download always includes all files that are checked "
-"for download,\n"
-"                    including those that are not currently displayed because "
-"the Timeline\n"
-"                    is being used or because only new files are being shown."
-"<br><br>\n"
-"                    Do you want to proceed with the download?"
+"A download always includes all files that are checked for download,\n"
+"including those that are not currently displayed because the Timeline\n"
+"is being used or because only new files are being shown.<br><br>\n"
+"Do you want to proceed with the download?\n"
+"                        "
 msgstr ""
 
-#: ../raphodo/rapid.py:2820
+#: ../raphodo/rapid.py:2937
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -2897,206 +3478,200 @@ msgid ""
 "%(folder2)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2824
+#: ../raphodo/rapid.py:2940
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
 "%s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2827
+#: ../raphodo/rapid.py:2943
 msgid "Download Failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:2828
+#: ../raphodo/rapid.py:2944
 msgid "The download cannot proceed."
 msgstr ""
 
-#: ../raphodo/rapid.py:2842
+#: ../raphodo/rapid.py:2962
 msgid ""
 "Photos and videos will not be backed up because there is nowhere to back "
 "them up. Do you still want to start the download?"
 msgstr ""
 
-#. Translators: filetype will be replaced with 'photos' or 'videos'
-#: ../raphodo/rapid.py:2847 ../raphodo/rapid.py:2854
+#: ../raphodo/rapid.py:2969 ../raphodo/rapid.py:2979
 #, python-format
 msgid ""
 "No backup device exists for backing up %(filetype)s. Do you still want to "
 "start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2848 ../raphodo/rpdfile.py:228
+#: ../raphodo/rapid.py:2971 ../raphodo/rpdfile.py:228
 msgid "photos"
 msgstr ""
 
-#: ../raphodo/rapid.py:2855 ../raphodo/rpdfile.py:223
+#: ../raphodo/rapid.py:2981 ../raphodo/rpdfile.py:223
 msgid "videos"
 msgstr ""
 
-#: ../raphodo/rapid.py:2861
+#: ../raphodo/rapid.py:2989
 msgid ""
 "<b>The photo and video backup destinations do not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2869 ../raphodo/rapid.py:2876
+#: ../raphodo/rapid.py:2999 ../raphodo/rapid.py:3008
 #, python-format
 msgid ""
 "<b>The %(filetype)s backup destination does not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2871 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:818
+#: ../raphodo/rapid.py:3001 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:843
 msgid "photo"
 msgstr ""
 
-#: ../raphodo/rapid.py:2878 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:858
+#: ../raphodo/rapid.py:3010 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:883
 msgid "video"
 msgstr ""
 
-#: ../raphodo/rapid.py:2886
+#: ../raphodo/rapid.py:3018
 msgid "Backup problem"
 msgstr ""
 
-#. Translators - in the middle is a unicode em dash - please retain it
-#. This string is displayed in the status bar when the download is running
-#: ../raphodo/rapid.py:3571
+#: ../raphodo/rapid.py:3756
 #, python-format
 msgid "%(downloading_from)s — %(time_left)s left (%(speed)s)"
 msgstr ""
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3640
+#: ../raphodo/rapid.py:3828
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr ""
 
-#. Translators: e.g. 2 videos failed to download
-#: ../raphodo/rapid.py:3645
+#: ../raphodo/rapid.py:3836
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr ""
 
-#: ../raphodo/rapid.py:3650 ../raphodo/rapid.py:3723
+#: ../raphodo/rapid.py:3842 ../raphodo/rapid.py:3927
 msgid "warnings"
 msgstr ""
 
-#: ../raphodo/rapid.py:3679
+#: ../raphodo/rapid.py:3873
 msgid "All downloads complete"
 msgstr ""
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3686 ../raphodo/rapid.py:3695 ../raphodo/rapid.py:3704
-#: ../raphodo/rapid.py:3713 ../raphodo/rapid.py:3721
+#: ../raphodo/rapid.py:3881 ../raphodo/rapid.py:3892 ../raphodo/rapid.py:3903
+#: ../raphodo/rapid.py:3914 ../raphodo/rapid.py:3924
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3688 ../raphodo/rapid.py:3706
+#: ../raphodo/rapid.py:3884 ../raphodo/rapid.py:3906
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr ""
 
-#: ../raphodo/rapid.py:3697 ../raphodo/rapid.py:3715
+#: ../raphodo/rapid.py:3895 ../raphodo/rapid.py:3917
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr ""
 
-#: ../raphodo/rapid.py:3742
+#: ../raphodo/rapid.py:3950
 msgid "1 failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:3744
+#: ../raphodo/rapid.py:3952
 #, python-format
 msgid "%d failures"
 msgstr ""
 
-#: ../raphodo/rapid.py:3749
+#: ../raphodo/rapid.py:3957
 msgid "1 warning"
 msgstr ""
 
-#: ../raphodo/rapid.py:3751
+#: ../raphodo/rapid.py:3959
 #, python-format
 msgid "%d warnings"
 msgstr ""
 
-#: ../raphodo/rapid.py:3771
+#: ../raphodo/rapid.py:3981
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3774
+#: ../raphodo/rapid.py:3985
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3779
+#: ../raphodo/rapid.py:3989
 #, python-format
 msgid "No files downloaded — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3781
+#: ../raphodo/rapid.py:3991
 msgid "No files downloaded"
 msgstr ""
 
-#: ../raphodo/rapid.py:3805
+#: ../raphodo/rapid.py:4021
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3809
+#: ../raphodo/rapid.py:4026
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3812
+#: ../raphodo/rapid.py:4031
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3820
+#: ../raphodo/rapid.py:4039
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3833
+#: ../raphodo/rapid.py:4052
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3837
+#: ../raphodo/rapid.py:4056
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3841
+#: ../raphodo/rapid.py:4060
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices"
 msgstr ""
 
-#: ../raphodo/rapid.py:3867
+#: ../raphodo/rapid.py:4087
 msgid "The Destination subfolders and Timeline have been rebuilt"
 msgstr ""
 
-#: ../raphodo/rapid.py:3922
+#: ../raphodo/rapid.py:4144
 msgid "Program preferences are invalid"
 msgstr ""
 
-#: ../raphodo/rapid.py:3999
+#: ../raphodo/rapid.py:4228
 #, python-format
 msgid ""
 "<b>All files on the %(camera)s are inaccessible</b>.<br><br>It may be locked "
@@ -3106,179 +3681,205 @@ msgid ""
 "ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4008
+#: ../raphodo/rapid.py:4239
 #, python-format
 msgid ""
-"<b>The %(camera)s appears to be in use by another application.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again.<br><br>Alternatively, you can ignore this "
-"device."
+"<b>The %(camera)s appears to be in use by another "
+"application.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again.<br><br>Alternatively, you "
+"can ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4019
+#: ../raphodo/rapid.py:4250
 msgid "&Try Again"
 msgstr ""
 
-#: ../raphodo/rapid.py:4020
+#: ../raphodo/rapid.py:4251
 msgid "&Ignore This Device"
 msgstr ""
 
-#: ../raphodo/rapid.py:4086
+#: ../raphodo/rapid.py:4323
 #, python-format
 msgid "Sorry, an unexpected problem occurred while scanning %s."
 msgstr ""
 
-#: ../raphodo/rapid.py:4087
+#: ../raphodo/rapid.py:4324
 msgid "Unfortunately you cannot download from this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4091
+#: ../raphodo/rapid.py:4328
 msgid ""
 "A possible workaround for the problem might be downloading from the camera's "
 "memory card using a card reader."
 msgstr ""
 
-#: ../raphodo/rapid.py:4096
+#: ../raphodo/rapid.py:4333
 msgid "Device scan failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:4472
+#: ../raphodo/rapid.py:4720
 #, python-format
 msgid ""
-"<b>The %(camera)s cannot be scanned because it cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again."
+"<b>The %(camera)s cannot be scanned because it cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again."
 msgstr ""
 
-#: ../raphodo/rapid.py:4496
+#: ../raphodo/rapid.py:4745
 #, python-format
 msgid ""
-"<b>The download cannot start because the %(camera)s cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again, and choose which files you want to "
-"download from it."
+"<b>The download cannot start because the %(camera)s cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again, and choose which files "
+"you want to download from it."
 msgstr ""
 
-#: ../raphodo/rapid.py:4635
+#: ../raphodo/rapid.py:4842
+msgid "Completed Downloads Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4844
+#, python-format
+msgid "%s whose download have completed are displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4846
+msgid "Do you want to clear the completed downloads?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4848
+msgid "Completed Download Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4850
+#, python-format
+msgid "%s whose download has completed is displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4852
+msgid "Do you want to clear the completed download?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4933
 #, python-format
 msgid ""
 "Do you want to download photos and videos from the device <i>%(device)s</i>?"
 msgstr ""
 
-#: ../raphodo/rapid.py:4877
+#: ../raphodo/rapid.py:5183
 #, python-format
 msgid "<b>Do you want to ignore the %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4879
+#: ../raphodo/rapid.py:5186
 msgid ""
 "All cameras, phones and tablets with the same model name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:4883
+#: ../raphodo/rapid.py:5190
 #, python-format
 msgid ""
 "<b>Do you want to ignore the device %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4885
+#: ../raphodo/rapid.py:5192
 msgid "Any device with the same name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:5178
+#: ../raphodo/rapid.py:5492
 #, python-format
 msgid "Downloading from %(location)s on This Computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5180
+#: ../raphodo/rapid.py:5496
 msgid ""
 "Do you really want to download from here?<br><br>On some systems, scanning "
 "this location can take a very long time."
 msgstr ""
 
-#: ../raphodo/rapid.py:5224
+#: ../raphodo/rapid.py:5537
 #, python-format
 msgid "Generating thumbnails for %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5227
+#: ../raphodo/rapid.py:5540
 #, python-format
 msgid "Scanning %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5237
+#: ../raphodo/rapid.py:5551
 #, python-format
 msgid ""
 "%(number)s of %(available files)s checked for download (%(hidden)s hidden)"
 msgstr ""
 
-#: ../raphodo/rapid.py:5243
+#: ../raphodo/rapid.py:5559
 #, python-format
 msgid "%(number)s of %(available files)s checked for download"
 msgstr ""
 
-#: ../raphodo/rapid.py:5494
+#: ../raphodo/rapid.py:5764
 msgid "Display program information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5496
+#: ../raphodo/rapid.py:5766
 msgid "Display debugging information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5499
+#: ../raphodo/rapid.py:5769
 msgid "List photo and video file extensions the program recognizes and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5502
+#: ../raphodo/rapid.py:5772
 msgid "Turn on or off the the renaming of photos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5504
+#: ../raphodo/rapid.py:5774
 msgid "turn on or off the the renaming of videos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5506
+#: ../raphodo/rapid.py:5776
 msgid ""
 "Turn on or off the automatic detection of devices from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5510
+#: ../raphodo/rapid.py:5780
 msgid "Turn on or off downloading from this computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5512 ../raphodo/rapid.py:5515 ../raphodo/rapid.py:5518
-#: ../raphodo/rapid.py:5539 ../raphodo/rapid.py:5543
+#: ../raphodo/rapid.py:5782 ../raphodo/rapid.py:5785 ../raphodo/rapid.py:5788
+#: ../raphodo/rapid.py:5809 ../raphodo/rapid.py:5813
 msgid "PATH"
 msgstr ""
 
-#: ../raphodo/rapid.py:5513
+#: ../raphodo/rapid.py:5783
 msgid "The PATH on this computer from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5516
+#: ../raphodo/rapid.py:5786
 msgid "The PATH where photos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5519
+#: ../raphodo/rapid.py:5789
 msgid "The PATH where videos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5521
+#: ../raphodo/rapid.py:5791
 msgid "Turn on or off the backing up of photos and videos while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:5525
+#: ../raphodo/rapid.py:5795
 msgid "Turn on or off the automatic detection of backup devices."
 msgstr ""
 
-#: ../raphodo/rapid.py:5527 ../raphodo/rapid.py:5533
+#: ../raphodo/rapid.py:5797 ../raphodo/rapid.py:5803
 msgid "FOLDER"
 msgstr ""
 
-#: ../raphodo/rapid.py:5528
+#: ../raphodo/rapid.py:5798
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected photo "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3286,7 +3887,7 @@ msgid ""
 "photos up to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5534
+#: ../raphodo/rapid.py:5804
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected video "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3294,115 +3895,124 @@ msgid ""
 "up videos to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5540
+#: ../raphodo/rapid.py:5810
 msgid ""
 "The PATH where photos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5544
+#: ../raphodo/rapid.py:5814
 msgid ""
 "The PATH where videos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5547
+#: ../raphodo/rapid.py:5817
 #, python-format
 msgid "Ignore photos with the following extensions: %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5551
-msgid "Turn on or off starting downloads as soon as the program itself starts."
+#: ../raphodo/rapid.py:5821
+msgid ""
+"Turn on or off starting downloads as soon as the program itself starts."
 msgstr ""
 
-#: ../raphodo/rapid.py:5554
+#: ../raphodo/rapid.py:5824
 msgid "Turn on or off starting downloads as soon as a device is inserted."
 msgstr ""
 
-#: ../raphodo/rapid.py:5557
+#: ../raphodo/rapid.py:5827
 msgid ""
 "Turn on or off use of the Rapid Photo Downloader Thumbnail Cache. Turning it "
 "off does not delete existing cache contents."
 msgstr ""
 
-#: ../raphodo/rapid.py:5561
+#: ../raphodo/rapid.py:5831
 msgid ""
 "Delete all thumbnails in the Rapid Photo Downloader Thumbnail Cache, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5565
+#: ../raphodo/rapid.py:5835
 msgid "Forget which files have been previously downloaded, and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5568
+#: ../raphodo/rapid.py:5838
 msgid ""
 "Import preferences from an old program version and exit. Requires the "
 "command line program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5571
+#: ../raphodo/rapid.py:5841
 msgid ""
 "Reset all program settings to their default values, delete all thumbnails in "
 "the Thumbnail cache, forget which files have been previously downloaded, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5575
+#: ../raphodo/rapid.py:5845
 msgid "Include gphoto2 debugging information in log files."
 msgstr ""
 
-#: ../raphodo/rapid.py:5579
+#: ../raphodo/rapid.py:5849
 msgid "Print information to the terminal about attached cameras and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5640
+#: ../raphodo/rapid.py:5911
 msgid ""
 "To import preferences from the old version of Rapid Photo Downloader, you "
 "must install the program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5649
+#: ../raphodo/rapid.py:5920
 msgid "No prior program preferences detected: exiting"
 msgstr ""
 
-#: ../raphodo/rapid.py:5652
+#: ../raphodo/rapid.py:5923
 #, python-format
 msgid "Importing preferences from Rapid Photo Downloader %(version)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5714
+#: ../raphodo/rapid.py:5989
 #, python-format
-msgid "Do you want to copy the stored sequence number, which has the value %d?"
+msgid ""
+"Do you want to copy the stored sequence number, which has the value %d?"
 msgstr ""
 
-#: ../raphodo/rapid.py:5726
+#: ../raphodo/rapid.py:6000
 msgid "Program aborting."
 msgstr ""
 
-#: ../raphodo/rapid.py:5736
+#: ../raphodo/rapid.py:6010
 msgid "Never run this program as the sudo / root user."
 msgstr ""
 
-#: ../raphodo/rapid.py:5740
+#: ../raphodo/rapid.py:6014
 msgid "You must install ExifTool to run Rapid Photo Downloader."
 msgstr ""
 
-#: ../raphodo/rapid.py:5794
+#: ../raphodo/rapid.py:6026
+msgid ""
+"Rapid Photo Downloader is installed in multiple locations.\n"
+"\n"
+"Uninstall all copies except the version you want to run."
+msgstr ""
+
+#: ../raphodo/rapid.py:6083
 msgid ""
 "When specifying a path on the command line, do not also specify an\n"
 "option for device auto detection or a path on \"This Computer\"."
 msgstr ""
 
-#: ../raphodo/rapid.py:5950
+#: ../raphodo/rapid.py:6243
 msgid "All settings and caches have been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5958
+#: ../raphodo/rapid.py:6251
 msgid "Thumbnail Cache has been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5964
+#: ../raphodo/rapid.py:6257
 msgid "Remembered files have been forgotten"
 msgstr ""
 
@@ -3418,15 +4028,15 @@ msgstr ""
 msgid "&Don't warn me again about missing or broken program libraries"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:546
+#: ../raphodo/renameandmovefile.py:554
 msgid "subfolder and filename"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:548
+#: ../raphodo/renameandmovefile.py:556
 msgid "filename"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:550
+#: ../raphodo/renameandmovefile.py:558
 msgid "subfolder"
 msgstr ""
 
@@ -3506,160 +4116,237 @@ msgstr ""
 msgid "photos or videos"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:306
+#: ../raphodo/rpdfile.py:315
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:318
+#. translators: natural language expression signifying a single video
+#: ../raphodo/rpdfile.py:337
+msgid "a video"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:339
 msgid "1 Video"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:323
+#. translators: natural language expression signifying a single photo
+#: ../raphodo/rpdfile.py:346
+msgid "a photo"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:348
 msgid "1 Photo"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:803
+#: ../raphodo/rpdfile.py:828
 #, python-format
 msgid "%(path)s on %(camera)s"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:819
+#: ../raphodo/rpdfile.py:844
 msgid "Photo"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:859
+#: ../raphodo/rpdfile.py:884
 msgid "Video"
 msgstr ""
 
-#: ../raphodo/storage.py:138
+#: ../raphodo/storage.py:141
 msgid "File system root"
 msgstr ""
 
 #. translators: the name of the Pictures folder
-#: ../raphodo/storage.py:433
+#: ../raphodo/storage.py:437
 msgid "Pictures"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:426
+#: ../raphodo/thumbnaildisplay.py:432
 #, python-format
 msgid "Taken on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:431
+#: ../raphodo/thumbnaildisplay.py:439
 #, python-format
 msgid "Modified on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:437 ../raphodo/thumbnaildisplay.py:466
+#: ../raphodo/thumbnaildisplay.py:447 ../raphodo/thumbnaildisplay.py:481
 #, python-format
 msgid "%(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:451
+#: ../raphodo/thumbnaildisplay.py:464
 #, python-format
 msgid "Memory cards: %s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:457
+#: ../raphodo/thumbnaildisplay.py:468
+#, python-format
+msgid "Memory card: %s"
+msgstr ""
+
+#: ../raphodo/thumbnaildisplay.py:473
 msgid "Downloaded as:"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:472
+#: ../raphodo/thumbnaildisplay.py:489
 #, python-format
 msgid "<br><br>Previous download:<br>%(filename)s<br>%(path)s<br>%(date)s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:1603
+#: ../raphodo/thumbnaildisplay.py:1645
 msgid "Copy Path"
 msgstr ""
 
+#. Translators: these values are file size suffixes like B representing bytes, KB representing
+#. kilobytes, etc.
+#: ../raphodo/utilities.py:170
+msgid "B"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "KB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "MB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "GB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "TB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "PB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "EB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "ZB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "YB"
+msgstr ""
+
 #. two things in a list e.g. "device1 and device2"
-#: ../raphodo/utilities.py:391
+#: ../raphodo/utilities.py:394
 #, python-format
 msgid "%(first_item)s and %(last_item)s"
 msgstr ""
 
-#: ../raphodo/utilities.py:464
+#: ../raphodo/utilities.py:468
 msgid "one"
 msgstr ""
 
-#: ../raphodo/utilities.py:465
+#: ../raphodo/utilities.py:469
 msgid "two"
 msgstr ""
 
-#: ../raphodo/utilities.py:466
+#: ../raphodo/utilities.py:470
 msgid "three"
 msgstr ""
 
-#: ../raphodo/utilities.py:467
+#: ../raphodo/utilities.py:471
 msgid "four"
 msgstr ""
 
-#: ../raphodo/utilities.py:468
+#: ../raphodo/utilities.py:472
 msgid "five"
 msgstr ""
 
-#: ../raphodo/utilities.py:469
+#: ../raphodo/utilities.py:473
 msgid "six"
 msgstr ""
 
-#: ../raphodo/utilities.py:470
+#: ../raphodo/utilities.py:474
 msgid "seven"
 msgstr ""
 
-#: ../raphodo/utilities.py:471
+#: ../raphodo/utilities.py:475
 msgid "eight"
 msgstr ""
 
-#: ../raphodo/utilities.py:472
+#: ../raphodo/utilities.py:476
 msgid "nine"
 msgstr ""
 
-#: ../raphodo/utilities.py:473
+#: ../raphodo/utilities.py:477
 msgid "ten"
 msgstr ""
 
-#: ../raphodo/utilities.py:474
+#: ../raphodo/utilities.py:478
 msgid "eleven"
 msgstr ""
 
-#: ../raphodo/utilities.py:475
+#: ../raphodo/utilities.py:479
 msgid "twelve"
 msgstr ""
 
-#: ../raphodo/utilities.py:476
+#: ../raphodo/utilities.py:480
 msgid "thirteen"
 msgstr "mraw krad"
 
-#: ../raphodo/utilities.py:477
+#: ../raphodo/utilities.py:481
 msgid "fourteen"
 msgstr "mraw kuẓ"
 
-#: ../raphodo/utilities.py:478
+#: ../raphodo/utilities.py:482
 msgid "fifteen"
 msgstr "mraw semmus"
 
-#: ../raphodo/utilities.py:479
+#: ../raphodo/utilities.py:483
 msgid "sixteen"
 msgstr "mraw sḍis"
 
-#: ../raphodo/utilities.py:480
+#: ../raphodo/utilities.py:484
 msgid "seventeen"
 msgstr "mraw sa"
 
-#: ../raphodo/utilities.py:481
+#: ../raphodo/utilities.py:485
 msgid "eighteen"
 msgstr "mraw ṭam"
 
-#: ../raphodo/utilities.py:482
+#: ../raphodo/utilities.py:486
 msgid "ninenteen"
 msgstr "mraw tza"
 
-#: ../raphodo/utilities.py:483
+#: ../raphodo/utilities.py:487
 msgid "twenty"
 msgstr "sin imrawen"
 
+#: ../raphodo/viewutils.py:240
+msgid "&OK"
+msgstr ""
+
+#: ../raphodo/viewutils.py:243
+msgid "&Save"
+msgstr ""
+
+#: ../raphodo/viewutils.py:244
+msgid "&Help"
+msgstr ""
+
+#: ../raphodo/viewutils.py:245
+msgid "Restore Defaults"
+msgstr ""
+
+#: ../raphodo/viewutils.py:246
+msgid "&Yes"
+msgstr ""
+
+#: ../raphodo/viewutils.py:247
+msgid "&No"
+msgstr ""
+
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:1
 msgid ""
 "Rapid Photo Downloader imports photos and videos from cameras, phones, "
@@ -3713,8 +4400,8 @@ msgstr ""
 #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:5
 msgid ""
-"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;"
-"memory;card;"
+"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;memory"
+";card;"
 msgstr ""
 
 #: ../data/kde/net.damonlynch.rapid-photo-downloader.desktop.in.h:1
diff --git a/po/nb.po b/po/nb.po
index f8767f2..2ee24c9 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,133 +7,550 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: damonlynch@gmail.com\n"
-"POT-Creation-Date: 2017-07-08 19:16-0500\n"
-"PO-Revision-Date: 2017-07-04 11:06+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2017-09-12 17:01-0400\n"
+"PO-Revision-Date: 2017-09-13 18:36+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
-"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-07-05 23:04+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-09-26 22:04+0000\n"
+"X-Generator: Launchpad (build 18463)\n"
+"Language: nb\n"
+
+#: ../install.py:65
+msgid "Rapid Photo Downloader installer"
+msgstr ""
+
+#: ../install.py:66
+msgid "Download and install latest version of Rapid Photo Downloader."
+msgstr "Last ned og installer siste versjon av Rapid Photo Downloader."
+
+#: ../install.py:236 ../install.py:1732
+msgid "Installer not found:"
+msgstr "Fant ikke installasjonsfil:"
+
+#. Translators: do not translate the term tar.gz
+#: ../install.py:240 ../install.py:1736
+msgid "Installer not in tar.gz format:"
+msgstr "Installasjonsfilen er ikke i formatet tar.gz:"
+
+#: ../install.py:465
+msgid ""
+"Incorrect folder ownership detected. Changing ownership of and resetting "
+"permissions for"
+msgstr ""
+"Oppdaget feil eier av mappe. Endrer eierskap av og tilbakestiller "
+"tillatelser for"
+
+#: ../install.py:540
+msgid "The following command will be run:"
+msgstr "Følgende kommando vil bli kjørt:"
+
+#: ../install.py:543 ../install.py:1479 ../install.py:1484
+msgid "sudo may prompt you for the sudo password."
+msgstr "du kan bli forespurt om ditt sudo passord."
+
+#: ../install.py:547
+msgid "Would you like to run the command now?"
+msgstr "Vil du kjøre kommandoen nå?"
+
+#: ../install.py:549
+msgid "Answer is not yes, exiting."
+msgstr "Svaret er ikke ja, avslutter."
+
+#: ../install.py:559 ../install.py:751 ../install.py:966
+msgid "Command failed"
+msgstr "Klarte ikke å kjøre kommandoen"
+
+#: ../install.py:561 ../install.py:752 ../install.py:967
+msgid "Exiting"
+msgstr "Avslutter"
+
+#: ../install.py:582
+msgid "The Universe repository must be enabled."
+msgstr "Pakkekilden «Universe» må være aktivert."
+
+#: ../install.py:606
+msgid ""
+"Do you want to to uninstall the previous version of Rapid Photo Downloader:"
+msgstr "Vil du avinstallere den forrige versjonen av Rapid Photo Downloader:"
+
+#: ../install.py:715 ../install.py:740
+msgid ""
+"Querying package system to see if an older version of Rapid Photo Downloader "
+"is installed (this may take a while)..."
+msgstr ""
+"Kontrollerer pakkesystemet for å se om en eldre versjon av Rapid Photo "
+"Downloader er installert (dette kan ta en stund) ..."
+
+#: ../install.py:726
+msgid ""
+"Unable to query package system. Please check your Internet connection and "
+"try again"
+msgstr ""
+"Klarte ikke å kontrollere pakkesystemet. Kontroller at du er tilkoblet "
+"Internett og prøv igjen"
+
+#: ../install.py:756
+msgid "Checking if previous version installed with pip..."
+msgstr "Kontrollerer om forrige versjon var installert med pip ..."
+
+#: ../install.py:850
+msgid "The following package is unknown on your system: {}\n"
+msgstr "Følgende pakke er ukjent på systemet ditt: {}\n"
+
+#: ../install.py:857 ../install.py:929 ../install.py:974
+msgid ""
+"To continue, some packages required to run the application will be installed."
+msgstr ""
+"For å fortsette vil noen pakker som kreves for å kjøre programmet bli "
+"installert."
+
+#: ../install.py:886
+msgid "Querying installed and available packages (this may take a while)"
+msgstr ""
+"Kontrollerer installerte og tilgjengelige pakker (dette kan ta en stund)"
+
+#: ../install.py:958
+msgid ""
+"Querying zypper to see if any required packages are already installed (this "
+"may take a while)... "
+msgstr ""
+"Forespør zypper for å se om noen nødvendige pakker allerede er installert "
+"(dette kan ta en stund) ... "
+
+#: ../install.py:1004
+msgid "Query to confirm action at each step."
+msgstr "Spør om å bekrefte handling for hvert trinn."
+
+#: ../install.py:1011
+msgid ""
+"When downloading the latest version, install the development version if it "
+"is newer than the stable version."
+msgstr ""
+"Ved nedlasting av den seneste versjonen velg å installere utviklingsversjon "
+"hvis den er nyere enn den stabile versjonen.."
+
+#: ../install.py:1020
+msgid ""
+"Optional tar.gz Rapid Photo Downloader installer archive. If not specified, "
+"the latest version is downloaded from the Internet."
+msgstr ""
+"Valgfritt tar.gz installasjonsarkiv. Om ikke spesifisert, lastes den nyeste "
+"versjonen ned fra Internett."
+
+#: ../install.py:1043
+msgid ""
+"Do not run the installer in the tar.gz Rapid Photo Downloader installer "
+"archive if it is newer than this version ({}). The default is to run "
+"whichever installer is newer."
+msgstr ""
+"Ikke kjør installasjonsfilen i tar.gz-arkivet for Rapid Photo Downloader om "
+"den er nyere enn denne versjonen ({}). Standard er å installere seneste "
+"versjon."
+
+#: ../install.py:1050
+msgid ""
+"Uninstall Rapid Photo Downloader that was installed with pip, keeping its "
+"dependencies."
+msgstr ""
+"Avinstaller Rapid Photo Downloader som ble installert av pip, men behold "
+"avhengighetene."
+
+#: ../install.py:1054
+msgid ""
+"Uninstall the dependencies installed by pip during Rapid Photo Downloader's "
+"installation, and Rapid Photo Downloader itself, then exit."
+msgstr ""
+"Avinstallere Rapid Photo Downloader og avhengighetene installert av pip, "
+"avslutt deretter."
+
+#: ../install.py:1059
+msgid ""
+"Note: this will not uninstall any version of Rapid Photo Downloader "
+"installed by your Linux distribution's package manager."
+msgstr ""
+"Merk: Dette vil ikke fjerne eventuelle versjoner av Rapid Photo Downloader "
+"som er installert med pakkebehandleren i din Linux-distribusjon."
+
+#: ../install.py:1066
+msgid ""
+"Dependencies will only be removed if they are not required by other programs."
+msgstr "Avhengigheter vil kun fjernes om de ikke kreves av andre programmer."
+
+#: ../install.py:1072
+msgid ""
+"Note: this option will remove the dependencies regardless of whether they "
+"are required by another program pip has installed. Upgrade to pip 9.0 or "
+"above if you want to avoid this behavior. You can do so using the command "
+"'python3 -m pip install pip -U --user'. Also note that any version of Rapid "
+"Photo Downloader installed by your Linux distribution's package manager will "
+"not be uninstalled."
+msgstr ""
+"Merk: Dette valget fjerner avhengigheter uansett om de kreves av et annet "
+"program pip har installert. Oppgrader til pip 9.0 eller senere for å unngå "
+"dette. Du kan oppgradere med kommandoen «python3 -m pip install pip -U --"
+"user». Også merk at eventuelle versjoner av Rapid Photo Downloader som er "
+"installert av pakkebehandleren i din Linux-distribusjon vil ikke bli fjernet."
+
+#: ../install.py:1122
+msgid "Failed to download versions file"
+msgstr "Klarte ikke å laste ned versjonsfilen"
+
+#: ../install.py:1126
+msgid "Got error code {} while accessing versions file"
+msgstr "Fikk feilkode {} ved henting av versjonsfilen"
+
+#: ../install.py:1234
+msgid ""
+"Sorry, could not locate installer. Please check your Internet connection and "
+"verify if you can reach https://www.damonlynch.net\n"
+"\n"
+"Exiting.\n"
+msgstr ""
+"Klarte ikke å finne installasjonsfilen. Kontroller at du er tilkoblet "
+"internett og se om du kan åpne nettsiden https://www.damonlynch.net\n"
+"\n"
+"Avslutter.\n"
+
+#: ../install.py:1408
+msgid "Installing application requirements..."
+msgstr "Installerer programkrav ..."
+
+#: ../install.py:1424
+msgid "Received error code"
+msgstr ""
+
+#: ../install.py:1425
+msgid "Failed to install application requirements: exiting"
+msgstr "Klarte ikke å installere programkrav; avslutter"
+
+#: ../install.py:1428
+msgid "Installing application..."
+msgstr "Installerer programmet ..."
+
+#: ../install.py:1441
+msgid "Failed to install application: exiting..."
+msgstr "Klarte ikke å installere programmer; avslutter ..."
 
-#. type: QPushButton
-#: ../raphodo/aboutdialog.py:217
+#: ../install.py:1465
+msgid ""
+"You may have to restart the computer to be able to run the program from the "
+"commmand line or application launcher."
+msgstr ""
+"Du må kanskje starte datamaskinen på nytt for å kunne kjøre programmet fra "
+"kommandolinjen eller programstarteren."
+
+#: ../install.py:1476
+msgid "Do you want to install the application's man pages?"
+msgstr "Vil du installere manualsider for programmet?"
+
+#: ../install.py:1477
+msgid "They will be installed into {}"
+msgstr "De vil bli installert til {}"
+
+#: ../install.py:1478 ../install.py:1483
+msgid "If you uninstall the application, remove these manpages yourself."
+msgstr "Hvis du avinstallerer programmet, må du fjerne manualsidene manuelt."
+
+#: ../install.py:1480
+msgid "Do want to install the man pages?"
+msgstr "Vil du installere manualsidene?"
+
+#: ../install.py:1482
+msgid "Installing man pages into {}"
+msgstr "Installerer manualsidene til {}"
+
+#: ../install.py:1499
+msgid "Failed to create man page directory: exiting"
+msgstr "Kunne ikke opprette mappe for manualsider: avslutter"
+
+#: ../install.py:1511
+msgid "Failed to copy man page."
+msgstr "Klarte ikke å kopiere manualsidene."
+
+#: ../install.py:1521
+msgid "(If a segmentation fault occurs at exit, you can ignore it...)"
+msgstr ""
+
+#: ../install.py:1534
+msgid ""
+"The python3 tool pip is required to uninstall a version of Rapid Photo "
+"Downloader that was installed with pip.\n"
+"Cannot continue. Exiting."
+msgstr ""
+"Python 3 verktøyet pip kreves for å avinstallere en versjon av Rapid Photo "
+"Downloader som var installert med pip.\n"
+"Kan ikke fortsette. Avslutter."
+
+#: ../install.py:1575
+msgid ""
+"Do not run this installer script as sudo / root user.\n"
+"Run it using the user who will run the program.\n"
+msgstr ""
+"Ikke kjør installasjonsskriptet som sudo / root-bruker.\n"
+"Kjør det som brukeren som skal bruke programmet.\n"
+
+#: ../install.py:1585 ../install.py:1599
+msgid "Do not include any other command line arguments when specifying"
+msgstr "Ikke ta med noen andre kommandolinjeparametre når du angir"
+
+#: ../install.py:1614
+msgid ""
+"Sorry, this installer does not support a custom python installation.\n"
+"Exiting..."
+msgstr ""
+"Installasjonsprogrammet støtter ikke å bruke en tilpasset python-"
+"installasjon.\n"
+"Avslutter ..."
+
+#: ../install.py:1620
+msgid "Restarting script using system python..."
+msgstr ""
+
+#: ../install.py:1651
+msgid "Exiting..."
+msgstr "Avslutter …"
+
+#. Translators: do not translate the term python3-apt
+#: ../install.py:1670
+msgid "To continue, the package python3-apt must be installed."
+msgstr "For å fortsette må pakken python3-apt være installert."
+
+#: ../install.py:1689
+msgid ""
+"Install the following packages using your Linux distribution's standard "
+"package manager, and then rerun this installer"
+msgstr ""
+"Installer følgende pakker med din Linux-distribusjons standard "
+"pakkebehandler, kjør deretter dette installasjonsprogrammet på nytt"
+
+#: ../install.py:1698
+msgid ""
+"To run this program, programs to assist Python 3 and its package management "
+"must be installed."
+msgstr ""
+"For å kjøre dette programmet må programmer som støtter pakkebehandling for "
+"Python 3 installeres."
+
+#. Translators: do not translate the terms Python 3, pip and setuptools
+#: ../install.py:1713
+msgid "Python 3's pip and setuptools must be upgraded for your user."
+msgstr ""
+"Python 3 verktøyene pip og setuptools må oppgraderes for brukeren din."
+
+#. Translators: do not translate the term python or requests
+#: ../install.py:1726
+msgid "Installing python requests"
+msgstr "Installerer python requests"
+
+#: ../upgrade.py:79
+msgid "Upgrade Rapid Photo Downloader"
+msgstr "Oppgrader Rapid Photo Downloader"
+
+#: ../upgrade.py:401 ../raphodo/viewutils.py:242
+msgid "&Cancel"
+msgstr ""
+
+#: ../upgrade.py:405
+msgid "&Upgrade"
+msgstr "&Oppgrader"
+
+#: ../upgrade.py:410
+#, python-format
+msgid "Click the Upgrade button to upgrade to version %s."
+msgstr "Klikk oppgrader-knappen for å oppgradere til versjon %s."
+
+#: ../upgrade.py:413
+msgid "Click the Upgrade button to start the upgrade."
+msgstr "Klikk på oppgrader-knappen for å starte oppgraderingen."
+
+#: ../upgrade.py:416 ../upgrade.py:422 ../raphodo/viewutils.py:241
+msgid "&Close"
+msgstr "&Lukk"
+
+#: ../upgrade.py:417
+msgid "&Run"
+msgstr "&Kjør"
+
+#: ../upgrade.py:447
+msgid "Close Rapid Photo Downloader before running this upgrade"
+msgstr "Lukk Rapid Photo Downloader før du oppgraderer"
+
+#: ../upgrade.py:450
+msgid "Upgrade running..."
+msgstr "Oppgraderer …"
+
+#: ../upgrade.py:486
+#, python-format
+msgid ""
+"Successfully upgraded to %s. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+"Oppgradert til %s. Klikk lukk for å avslutte, eller kjør for å starte "
+"programmet."
+
+#: ../upgrade.py:491
+msgid ""
+"Upgrade finished successfully. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+"Oppgradering fullført. Klikk lukk for å avslutte, eller kjør for å starte "
+"programmet."
+
+#: ../upgrade.py:495
+msgid "Upgrade failed. Click Close to exit."
+msgstr "Oppgradering mislyktes. Klikk lukk for å avslutte."
+
+#: ../upgrade.py:6967
+#, python-format
+msgid "Upgrading %s..."
+msgstr ""
+
+#: ../upgrade.py:6969
+msgid "Press any key to continue..."
+msgstr ""
+
+#: ../upgrade.py:6982
+msgid "Rapid Photo Downloader upgrade failed"
+msgstr ""
+
+#: ../upgrade.py:6984
+#, python-format
+msgid ""
+"The python package %s could not be updated. The upgrade cannot continue."
+msgstr ""
+
+#: ../raphodo/aboutdialog.py:225
 msgid "Credits"
 msgstr "Medvirkende"
 
-#: ../raphodo/backuppanel.py:239
+#: ../raphodo/backuppanel.py:240
 msgid "Backups are not configured"
 msgstr "Sikkerhetskopiering er ikke konfigurert"
 
-#: ../raphodo/backuppanel.py:241
+#: ../raphodo/backuppanel.py:242
 msgid "No backup devices detected"
 msgstr "Fant ingen enheter for sikkerhetskopiering"
 
-#: ../raphodo/backuppanel.py:243
+#: ../raphodo/backuppanel.py:244
 msgid "Valid backup locations not yet specified"
-msgstr ""
+msgstr "Ingen gyldige steder for sikkerhetskopier er angitt"
 
-#: ../raphodo/backuppanel.py:401
+#: ../raphodo/backuppanel.py:404
 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 sikkerhetskopiere dine bilder og videoer til flere steder etter hvert "
+"Du kan ta sikkerhetskopi av bilder og videoer til flere steder etter hvert "
 "som de lastes ned, f.eks. til eksterne harddisker."
 
-#: ../raphodo/backuppanel.py:407
+#: ../raphodo/backuppanel.py:412
 msgid "Back up photos and videos when downloading"
 msgstr "Ta sikkerhetskopi av bilder og video ved nedlasting"
 
-#: ../raphodo/backuppanel.py:413
+#: ../raphodo/backuppanel.py:418
 msgid "Automatically detect backup devices"
 msgstr "Oppdag enheter for sikkerhetskopiering automatisk"
 
-#: ../raphodo/backuppanel.py:417
+#: ../raphodo/backuppanel.py:424
 msgid ""
-"Specify the folder in which backups are stored on the device."
-"<br><br><i>Note: the presence of a folder with this name is used to "
+"Specify the folder in which backups are stored on the "
+"device.<br><br><i>Note: the presence of a folder with this name is used to "
 "determine if 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 folder names. By "
 "adding both folders, the same device can be used to back up both photos and "
 "videos.</i>"
 msgstr ""
+"Angi mappen hvor sikkerhetskopier skal lagres på enheten.<br>br><i>Merk: "
+"Tilstedeværelsen av en mappe med dette navnet avgjør om enheten skal brukes "
+"til sikkerhetskopieringer. For hver enhet du vil sikkerhetskopiere til lager "
+"du en mappe med et av disse mappenavnene. Ved å legge til begge mappene kan "
+"samme enheten brukes til å sikkerhetskopiere både bilder og videoer.</i>"
 
-#: ../raphodo/backuppanel.py:428
+#: ../raphodo/backuppanel.py:439
 msgid "Photo folder name:"
-msgstr ""
+msgstr "Navn på bildemappen:"
 
-#: ../raphodo/backuppanel.py:433
+#: ../raphodo/backuppanel.py:444
 msgid "Video folder name:"
-msgstr ""
+msgstr "Navn på videomappen:"
 
-#: ../raphodo/backuppanel.py:438 ../raphodo/nameeditor.py:883
+#: ../raphodo/backuppanel.py:449 ../raphodo/nameeditor.py:890
 #: ../raphodo/renamepanel.py:123
 msgid "Example:"
 msgstr "Eksempel:"
 
-#: ../raphodo/backuppanel.py:448
-msgid "If you disable automatic detection, choose the exact backup locations."
+#: ../raphodo/backuppanel.py:460
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
 "Om du skrur av automatisk oppdaging, må du angi plasseringer for "
 "sikkerhetskopier."
 
-#: ../raphodo/backuppanel.py:452
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:468
 msgid "Photo backup location:"
 msgstr "Skkerhetskopier bilder til:"
 
-#: ../raphodo/backuppanel.py:454
+#: ../raphodo/backuppanel.py:474
 msgid "Select Photo Backup Location"
-msgstr ""
+msgstr "Velg sted for sikkerhetskopi av bilder"
 
-#: ../raphodo/backuppanel.py:460
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:485
 msgid "Video backup location:"
 msgstr "Skkerhetskopier videoer til:"
 
-#: ../raphodo/backuppanel.py:462
+#: ../raphodo/backuppanel.py:491
 msgid "Select Video Backup Location"
-msgstr ""
+msgstr "Velg sted for sikkerhetskopi av videoer"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:564
+#: ../raphodo/backuppanel.py:595
 msgid "drive1"
 msgstr "lagringsenhet1"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:567
+#: ../raphodo/backuppanel.py:598
 msgid "drive2"
 msgstr "lagringsenhet2"
 
-#: ../raphodo/backuppanel.py:628
+#: ../raphodo/backuppanel.py:663
 msgid "Projected Backup Storage Use"
 msgstr "Anslått lagringsbruk for sikkerhetskopiering."
 
-#: ../raphodo/backuppanel.py:632
+#: ../raphodo/backuppanel.py:669
 msgid "Backup Options"
 msgstr "Alternativer for sikkerhetskopiering"
 
 #. translators: refers to the video thumbnail file that some
 #. cameras generate -- it has a .THM file extension
-#: ../raphodo/copyfiles.py:476
+#: ../raphodo/copyfiles.py:491
 msgid "video THM"
-msgstr ""
+msgstr "video THM"
 
-#: ../raphodo/copyfiles.py:482
+#: ../raphodo/copyfiles.py:497
 msgid "audio"
 msgstr "lyd"
 
 #: ../raphodo/destinationdisplay.py:78 ../raphodo/devicedisplay.py:1079
-#: ../raphodo/rpdfile.py:321
+#: ../raphodo/rpdfile.py:342
 #, python-format
 msgid "%(no_photos)s Photos"
 msgstr "%(no_photos)s Bilder"
 
 #: ../raphodo/destinationdisplay.py:82 ../raphodo/devicedisplay.py:1081
-#: ../raphodo/rpdfile.py:316
+#: ../raphodo/rpdfile.py:333
 #, python-format
 msgid "%(no_videos)s Videos"
 msgstr "%(no_videos)s Videoer"
@@ -144,7 +561,7 @@ msgstr "Brukt"
 
 #: ../raphodo/destinationdisplay.py:93
 msgid "Excess"
-msgstr ""
+msgstr "Overflødig"
 
 #: ../raphodo/destinationdisplay.py:102
 msgid "Device size unknown"
@@ -153,7 +570,7 @@ msgstr "Ukjent enhetsstørrelse"
 #: ../raphodo/destinationdisplay.py:112
 #, python-format
 msgid "No space free on %(size_total)s device"
-msgstr ""
+msgstr "Ingen ledig plass på %(size_total)s enhet"
 
 #: ../raphodo/destinationdisplay.py:119
 #, python-format
@@ -161,15 +578,15 @@ msgid "%(size_free)s free of %(size_total)s"
 msgstr "%(size_free)s ledig av %(size_total)s"
 
 #: ../raphodo/destinationdisplay.py:190 ../raphodo/devicedisplay.py:993
-#: ../raphodo/rapid.py:1964 ../raphodo/rapid.py:2079 ../raphodo/rapid.py:5753
-#: ../raphodo/rpdfile.py:905
+#: ../raphodo/rapid.py:2023 ../raphodo/rapid.py:2151 ../raphodo/rapid.py:6043
+#: ../raphodo/rpdfile.py:930
 msgid "Photos"
 msgstr "Bilder"
 
 #. translators: the name of the Videos folder
 #: ../raphodo/destinationdisplay.py:191 ../raphodo/devicedisplay.py:994
-#: ../raphodo/rapid.py:1967 ../raphodo/rapid.py:2080 ../raphodo/rapid.py:5754
-#: ../raphodo/rpdfile.py:933 ../raphodo/storage.py:445
+#: ../raphodo/rapid.py:2028 ../raphodo/rapid.py:2152 ../raphodo/rapid.py:6044
+#: ../raphodo/rpdfile.py:958 ../raphodo/storage.py:449
 msgid "Videos"
 msgstr "Videoklipp"
 
@@ -177,17 +594,17 @@ msgstr "Videoklipp"
 msgid "Projected storage use after download"
 msgstr "Anslått lagringsbruk etter nedlasting"
 
-#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:516
+#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:521
 msgid "Custom..."
 msgstr "Tilpasset …"
 
 #: ../raphodo/destinationdisplay.py:678
 msgid "Configure photo subfolder creation"
-msgstr ""
+msgstr "Konfigurer oppretting av bildeundermapper"
 
 #: ../raphodo/destinationdisplay.py:680
 msgid "Configure video subfolder creation"
-msgstr ""
+msgstr "Konfigurer oppretting av videoundermapper"
 
 #: ../raphodo/devicedisplay.py:983
 msgid "Other"
@@ -195,7 +612,7 @@ msgstr "Annet"
 
 #: ../raphodo/devicedisplay.py:984
 msgid "Probing device..."
-msgstr ""
+msgstr "Undersøker enhet ..."
 
 #: ../raphodo/devicedisplay.py:1000
 msgid "Temporarily ignore this device"
@@ -207,7 +624,7 @@ msgstr "Ignorer denne enheten permanent"
 
 #: ../raphodo/devicedisplay.py:1004
 msgid "Rescan"
-msgstr ""
+msgstr "Skann på nytt"
 
 #. Translators: percentage full e.g. 75% full
 #: ../raphodo/devicedisplay.py:1093
@@ -215,59 +632,60 @@ msgstr ""
 msgid "%s full"
 msgstr "%s full"
 
-#: ../raphodo/devices.py:459
+#: ../raphodo/devices.py:463
 msgid "Cameras"
 msgstr "Kameraer"
 
-#: ../raphodo/devices.py:460 ../raphodo/devices.py:920
-#: ../raphodo/preferencedialog.py:85 ../raphodo/rapid.py:1927
+#: ../raphodo/devices.py:464 ../raphodo/devices.py:927
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/rapid.py:1979
 msgid "Devices"
 msgstr "Enheter"
 
-#: ../raphodo/devices.py:720
+#: ../raphodo/devices.py:724
 #, python-format
 msgid "Downloading from %(device_names)s"
 msgstr "Laster ned fra %(device_names)s"
 
 #. Translators: e.g. Three Devices
-#: ../raphodo/devices.py:780
+#: ../raphodo/devices.py:784
 #, python-format
 msgid "%(no_devices)s %(device_type)s"
 msgstr "%(no_devices)s %(device_type)s"
 
-#: ../raphodo/devices.py:905 ../raphodo/rapid.py:1764
+#: ../raphodo/devices.py:912 ../raphodo/rapid.py:1807
 msgid "Select Source"
 msgstr "Velg kilde"
 
-#: ../raphodo/devices.py:936 ../raphodo/devices.py:947
+#: ../raphodo/devices.py:943 ../raphodo/devices.py:954
 #, python-format
 msgid "%(device1)s + %(device2)s"
 msgstr "%(device1)s + %(device2)s"
 
 #. Number of cameras e.g. 3 Cameras
-#: ../raphodo/devices.py:958
+#: ../raphodo/devices.py:965
 #, python-format
 msgid "%(no_cameras)s Cameras"
 msgstr "%(no_cameras)s kameraer"
 
-#: ../raphodo/devices.py:963
+#: ../raphodo/devices.py:970
 #, python-format
 msgid "%(no_devices)s Devices"
 msgstr "%(no_devices)s enheter"
 
 #. Translators: two folder names, separated by a plus sign
-#: ../raphodo/devices.py:1258
+#: ../raphodo/devices.py:1265
 #, python-format
 msgid "%s + %s"
 msgstr "%s + %s"
 
-#: ../raphodo/didyouknow.py:44
+#: ../raphodo/didyouknow.py:45
 msgid "Click on a file's checkbox to mark or unmark it for download."
 msgstr ""
 "Klikk i avkryssingsboksen for en fil for å merke eller avmerke den for "
 "nedlasting"
 
-#: ../raphodo/didyouknow.py:50
+#: ../raphodo/didyouknow.py:51
 msgid ""
 "Files that have already been downloaded are remembered. You can still mark "
 "previously downloaded files to download again, but they are unchecked by "
@@ -279,14 +697,17 @@ msgstr ""
 "som standard, og deres miniatyrbilder er dimmet slik at du kan skille dem "
 "fra filer som ennå ikke er lastet ned."
 
-#: ../raphodo/didyouknow.py:59
+#: ../raphodo/didyouknow.py:60
 msgid ""
 "If more than one file is selected, they'll all take the mark of the file "
 "whose checkbox was clicked, regardless of whether they previously had a "
 "checkmark or not."
 msgstr ""
+"Hvis mer enn en fil er valgt, vil de alle få merket til filen hvis "
+"avkryssingsboks ble klikket, uavhengig av om de tidligere hadde et merke "
+"eller ikke."
 
-#: ../raphodo/didyouknow.py:67
+#: ../raphodo/didyouknow.py:68
 msgid ""
 "Click on a device's checkbox to quickly mark or unmark all its files for "
 "downloading."
@@ -294,7 +715,62 @@ msgstr ""
 "Klikk i avkryssingsruten for en enhet for å raskt merke eller avmerke alle "
 "dens filer for nedlasting."
 
-#: ../raphodo/didyouknow.py:74
+#: ../raphodo/didyouknow.py:75
+msgid ""
+"After a download finishes, an icon replaces the thumbnail's checkbox. The "
+"icon's color indicates whether the download was successful (green), had file "
+"renaming problems (yellow/orange), or failed (red)."
+msgstr ""
+"Etter en nedlasting vil et ikon erstatte avkryssingsboksen for "
+"miniatyrbildet. Ikonets farge indikerer om nedlastingen var vellykket "
+"(grønn), om det var et problem ved navngiving (gul/oransje), eller mislyktes "
+"(rød)."
+
+#: ../raphodo/didyouknow.py:83
+msgid ""
+"\n"
+"            In case of any problems, a red icon will appear at the bottom of "
+"the window\n"
+"            indicating how many error reports there are. Clicking on it "
+"opens the Error Report \n"
+"            window.\n"
+"            "
+msgstr ""
+"\n"
+"            Om det oppstår problemer vil et rødt ikon vises nederst i "
+"vinduet som indikerer\n"
+"            hvor mange feilmeldinger som finnes. Klikk på ikonet for å åpne "
+"vinduet for \n"
+"            feilmeldinger.\n"
+"            "
+
+#: ../raphodo/didyouknow.py:91
+msgid ""
+"\n"
+"            The Error Report window lists any problems encountered before, "
+"during or after the \n"
+"            download. An orange triangle represents a warning, a red circle "
+"indicates a failure, \n"
+"            and a black circle indicates more serious failures. You can "
+"click on the hyperlinks to \n"
+"            open its file or device in a file manager. You can also search "
+"the reports using the \n"
+"            search box in the lower left of the Error Report window.\n"
+"            "
+msgstr ""
+"\n"
+"            Feilmeldingsvinduet viser eventuelle problemer som oppstod før, "
+"under, eller etter \n"
+"            nedlastingen. En oransje trekant representerer en advarsel, en "
+"rød sirkel indikerer en \n"
+"            feil, og en svart sirkel indikerer mer alvorlige feil. Du kan "
+"klikke på lenkene for å åpne \n"
+"            filen eller enheten i filbehandleren. Du kan også søke i "
+"rapportene ved å bruke \n"
+"            søkefeltet nede til venstre i feilmeldingsvinduet.\n"
+"            "
+
+#: ../raphodo/didyouknow.py:103
 msgid ""
 "You can simultaneously download from multiple cameras, smartphones, memory "
 "cards, and hard drives&mdash;as many devices as your computer can handle at "
@@ -303,14 +779,17 @@ msgstr ""
 "Du kan laste ned fra flere kameraer, smarttelefoner, minnekort og harddisker "
 "samtidig&mdash;så mange enheter som datamaskinen kan håndtere på en gang."
 
-#: ../raphodo/didyouknow.py:81
+#: ../raphodo/didyouknow.py:110
 msgid ""
 "The <b>Timeline</b> groups photos and videos based on how much time elapsed "
 "between consecutive shots. Use it to identify photos and videos taken at "
 "different periods in a single day or over consecutive days."
 msgstr ""
+"<b>Tidslinjen</b> grupperer bilder og videoer basert på hvor mye tid som er "
+"gått mellom påfølgende bilder og videoer. Bruk den for å finne bilder og "
+"videoer tatt på ulike perioder i løpet av samme dag eller over flere dager."
 
-#: ../raphodo/didyouknow.py:88
+#: ../raphodo/didyouknow.py:117
 msgid ""
 "\n"
 "<p>In the illustration above, the first row of the Timeline is black because "
@@ -321,8 +800,16 @@ msgid ""
 "the Timeline:</p>\n"
 "            "
 msgstr ""
+"\n"
+"<p>I illustrasjonen ovenfor er den første raden i tidslinjen svart fordi "
+"alle filene på \n"
+"denne datoen har blitt lastet ned tidligere.</p>\n"
+"<p>Tidslinjens glidebryter justerer tidsrommet mellom bildene som brukes for "
+"å lage \n"
+"tidslinjen:</p>\n"
+"            "
 
-#: ../raphodo/didyouknow.py:99
+#: ../raphodo/didyouknow.py:128
 msgid ""
 "To view photos and videos for a particular time range, use the mouse "
 "(optionally in combination with the <tt>Shift</tt> or <tt>Ctrl</tt> keys) to "
@@ -334,14 +821,14 @@ msgstr ""
 "for å velge tidsintervaller. Når et tidsrom er valgt vil tidslinjeknappen "
 "til venstre i hovedvinduet bli uthevet."
 
-#: ../raphodo/didyouknow.py:106
+#: ../raphodo/didyouknow.py:135
 msgid ""
 "A download always includes all files that are checked for download, "
 "including those that are not currently displayed because the Timeline is "
 "being used."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:113
+#: ../raphodo/didyouknow.py:142
 msgid ""
 "You can hide or display the download sources by clicking on the name of the "
 "device you're downloading from at the top left of the program window."
@@ -349,7 +836,7 @@ msgstr ""
 "Du kan skjule eller vise nedlastingskildene ved å klikke på navnet på "
 "enheten du laster ned fra øverst til venstre i programvinduet."
 
-#: ../raphodo/didyouknow.py:120
+#: ../raphodo/didyouknow.py:149
 msgid ""
 "\n"
 "          Thumbnails can be sorted using a variety of criteria:\n"
@@ -368,7 +855,7 @@ msgid ""
 "</ol> "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:137
+#: ../raphodo/didyouknow.py:166
 msgid ""
 "One of Rapid Photo Downloader's most useful features is its ability to "
 "automatically generate download subfolders and rename files as it downloads, "
@@ -378,26 +865,26 @@ msgstr ""
 "å automatisk generere nedlastingsundermapper og å endre filnavn under "
 "nedlasting, ved å bruke en organisering som passer deg."
 
-#: ../raphodo/didyouknow.py:143
+#: ../raphodo/didyouknow.py:172
 msgid ""
 "To specify where you want your files downloaded and how you want them named, "
 "open the appropriate panel on the right-side of the application window: "
 "<b>Destination</b>, <b>Rename</b>, or <b>Job Code</b>."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:150
+#: ../raphodo/didyouknow.py:179
 msgid ""
 "\n"
 "When thinking about your download directory structure, keep in mind two "
 "different types\n"
 "of directory:\n"
 "<ol>\n"
-"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, &quot;"
-"Photos&quot;, or\n"
+"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, "
+"&quot;Photos&quot;, or\n"
 "&quot;Videos&quot;. This directory should already exist on your computer. In "
 "the illustration \n"
-"below, the destination folders are &quot;Pictures&quot; and &quot;"
-"Videos&quot;. The\n"
+"below, the destination folders are &quot;Pictures&quot; and "
+"&quot;Videos&quot;. The\n"
 "name of the destination folder is displayed in the grey bar directly above "
 "the folder tree, \n"
 "with a folder icon to its left and a gear icon to its far right.</li>\n"
@@ -410,7 +897,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:167
+#: ../raphodo/didyouknow.py:196
 msgid ""
 "\n"
 "You can download photos and videos to the same destination folder, or "
@@ -423,7 +910,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:177
+#: ../raphodo/didyouknow.py:206
 msgid ""
 "Automatically generated download subfolders can contain further "
 "automatically generated subfolders if need be. A common scheme is to create "
@@ -434,7 +921,7 @@ msgstr ""
 "lage en årsundermappe og deretter en serie undermapper med år-måned-dag "
 "under denne."
 
-#: ../raphodo/didyouknow.py:186
+#: ../raphodo/didyouknow.py:215
 msgid ""
 "\n"
 "Whenever possible, the program previews the download subfolders of photos "
@@ -452,7 +939,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:201
+#: ../raphodo/didyouknow.py:230
 msgid ""
 "\n"
 "Download subfolder names are typically generated using some or all of the "
@@ -479,23 +966,23 @@ msgstr ""
 "Nedlastingsundermappers navn generes vanligvis ved hjelp av noen eller alle "
 "følgende elementer:\n"
 "<ol>\n"
-"<li><b>Metadata</b>, inkluderer veldig ofte datoen bildet eller videoen var "
-"opprettet, men kan \n"
+"<li><b>Metadata</b>, inkluderer veldig ofte datoen for når bildet eller "
+"videoen var tatt, men kan \n"
 "også \n"
 "inkludere kameraets modellnavn og serienummer, eller filtype som f.eks. JPG "
 "eller CR2.</li>\n"
-"<li>En <b>oppdragskode</b>, som er fri tekst du angir ved nedlasting, slik "
-"som\n"
+"<li>Et <b>oppdragsnavn</b>, som er valgfri tekst du angir ved nedlasting, "
+"for eksempel\n"
 "navnet på et sted eller en begivenhet.</li>\n"
 "<li><b>Tekst</b> som du vil at skal vises hver gang, f.eks. en bindestrek "
 "eller et mellomrom.</li>\n"
 "</ol>\n"
-"Ved å navngi undermapper med år, etterfulgt av måned og dag i et numerisk "
+"Ved å navngi undermapper med år, etterfulgt av måned og dag i numerisk "
 "format er det \n"
 "enkelt å sortere dem i en filbehandler, derfor er dette standardvalget:\n"
 "            "
 
-#: ../raphodo/didyouknow.py:219
+#: ../raphodo/didyouknow.py:248
 msgid ""
 "\n"
 "To automatically create download subfolders as you download, \n"
@@ -511,7 +998,7 @@ msgstr ""
 "Klikk på tannhjulet for å få frem en nedfellsmeny:            \n"
 "            "
 
-#: ../raphodo/didyouknow.py:227
+#: ../raphodo/didyouknow.py:256
 msgid ""
 "\n"
 "Using the drop-down menu, select a built-in preset or click on <b>Custom</b> "
@@ -521,21 +1008,21 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:237
+#: ../raphodo/didyouknow.py:266
 msgid ""
 "It's easy to download raw images into one folder, and jpeg images into "
 "another. Simply use the <b>Filename Extension</b> as part of your download "
 "subfolder generation scheme:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:242
+#: ../raphodo/didyouknow.py:271
 msgid ""
 "This illustration shows a saved custom preset named &quot;My custom "
 "preset&quot;."
 msgstr ""
 "Denne illustrasjonen viser et tilpasset forvalg kalt «My custom preset»."
 
-#: ../raphodo/didyouknow.py:246
+#: ../raphodo/didyouknow.py:275
 msgid ""
 "\n"
 "You do not have to create nested download subfolders. This illustration "
@@ -546,7 +1033,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:256
+#: ../raphodo/didyouknow.py:285
 msgid ""
 "\n"
 "Although there are many built-in date/time naming options, you may find that "
@@ -560,7 +1047,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:265
+#: ../raphodo/didyouknow.py:294
 msgid ""
 "\n"
 "Read more about all the ways you can generate download subfolder names and "
@@ -570,7 +1057,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:273
+#: ../raphodo/didyouknow.py:302
 msgid ""
 "\n"
 "<b>Job Codes</b> let you easily enter text that describes sets of photos and "
@@ -582,7 +1069,7 @@ msgid ""
 "&quot;Green Bazaar&quot;: \n"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:282
+#: ../raphodo/didyouknow.py:311
 msgid ""
 "\n"
 "You can apply new or existing Job Codes before you start a download. If "
@@ -593,11 +1080,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:291
+#: ../raphodo/didyouknow.py:320
 msgid "Look for hints to guide you when working with Job Codes:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:295
+#: ../raphodo/didyouknow.py:324
 msgid ""
 "Hints will vary depending on the context, such as when the mouse is hovering "
 "over a button."
@@ -605,26 +1092,26 @@ msgstr ""
 "Hintene vil variere avhengig av konteksten, for eksempel når musepekeren "
 "holdes over en knapp."
 
-#: ../raphodo/didyouknow.py:301
+#: ../raphodo/didyouknow.py:330
 msgid ""
 "\n"
 "When you give your photos and videos unique filenames, you'll never be "
 "confused as to \n"
 "which file is which. Using <b>sequence numbers</b> to make filenames unique "
 "is highly \n"
-"recommended!.\n"
+"recommended!\n"
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:309
+#: ../raphodo/didyouknow.py:338
 msgid ""
 "\n"
 "<p>Four types of sequence values are available to help you assign unique "
 "names to your photos and \n"
 "videos:\n"
 "<ol>\n"
-"<li><b>Downloads today</b>: tracks downloads completed during that day.</"
-"li>\n"
+"<li><b>Downloads today</b>: tracks downloads completed during that "
+"day.</li>\n"
 "<li><b>Stored number</b>: similar to Downloads today, but it is remembered "
 "from the last time the  \n"
 "program was run.</li>\n"
@@ -638,7 +1125,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:327
+#: ../raphodo/didyouknow.py:356
 msgid ""
 "\n"
 "The <b>Rename</b> panel allows you to configure file renaming. To rename "
@@ -649,11 +1136,11 @@ msgstr ""
 "\n"
 "Panelet <b>Endre navn</b> lar deg konfigurere endring av filnavn. For å gi "
 "nytt navn til filene dine, kan du velge \n"
-"blant eksisterende forvalg for endring av navn eller lage ditt eget "
-"forvalg.              \n"
+"blant eksisterende forvalg for endring av navn eller lage ditt eget forvalg. "
+"             \n"
 "            "
 
-#: ../raphodo/didyouknow.py:334
+#: ../raphodo/didyouknow.py:363
 msgid ""
 "\n"
 "<p>The <b>Synchronize RAW + JPEG</b> option is useful if you use the RAW + "
@@ -672,7 +1159,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:348
+#: ../raphodo/didyouknow.py:377
 msgid ""
 "\n"
 "You can have your photos and videos backed up to multiple locations as they "
@@ -683,13 +1170,13 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:356
+#: ../raphodo/didyouknow.py:385
 msgid ""
 "In this example, the drive <b>photobackup</b> does not contain a folder "
 "named <tt>Videos</tt>, so videos will not be backed up to it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:362
+#: ../raphodo/didyouknow.py:391
 msgid ""
 "\n"
 "Several of the program's preferences can be set from the command line, "
@@ -700,7 +1187,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:372
+#: ../raphodo/didyouknow.py:396
+msgid "You can also import program preferences from the older 0.4 version."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:401
 msgid ""
 "\n"
 "Rapid Photo Downloader deals with three types of cache:\n"
@@ -710,8 +1201,8 @@ msgid ""
 "memory cards, and other devices.</li>\n"
 "<li>A <b>temporary cache</b> of files downloaded from a camera, one for "
 "photos and another for \n"
-"videos. They are located in temporary subfolders in the download destination."
-"</li>\n"
+"videos. They are located in temporary subfolders in the download "
+"destination.</li>\n"
 "<li>The <b>desktop's thumbnail cache</b>, in which Rapid Photo Downloader "
 "stores thumbnails of \n"
 "RAW and TIFF photos once they have been downloaded. File browsers like Gnome "
@@ -726,23 +1217,23 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:431
+#: ../raphodo/didyouknow.py:460
 msgid "Tip of the Day"
 msgstr "Dagens tips"
 
-#: ../raphodo/didyouknow.py:439
+#: ../raphodo/didyouknow.py:468
 msgid "Did you know...?"
 msgstr "Visste du at... ?"
 
-#: ../raphodo/didyouknow.py:466
+#: ../raphodo/didyouknow.py:495
 msgid "Show tips on startup"
 msgstr "Vis tips ved oppstart"
 
-#: ../raphodo/didyouknow.py:470
+#: ../raphodo/didyouknow.py:499
 msgid "&Next"
 msgstr "&Neste"
 
-#: ../raphodo/didyouknow.py:471
+#: ../raphodo/didyouknow.py:500
 msgid "&Previous"
 msgstr "&Forrige"
 
@@ -849,72 +1340,74 @@ msgstr "%d dager, 1 time"
 msgid "%(days)d days, %(hours)d hours"
 msgstr "%(days)d dager, %(hours)d timer"
 
-#: ../raphodo/errorlog.py:65
+#: ../raphodo/errorlog.py:66
 msgid "Find"
 msgstr "Finn"
 
-#: ../raphodo/errorlog.py:135
+#: ../raphodo/errorlog.py:136
 msgid "Error Reports - Rapid Photo Downloader"
-msgstr "Feilrapporter - Rapid Photo Downloader"
+msgstr "Feilmeldinger - Rapid Photo Downloader"
 
-#: ../raphodo/errorlog.py:170
+#: ../raphodo/errorlog.py:171
 msgid "Find in reports"
 msgstr "Finn i rapporter"
 
-#: ../raphodo/errorlog.py:187
+#: ../raphodo/errorlog.py:188
 msgid "Find the previous occurrence of the phrase"
 msgstr "Finn den forrige forekomsten av uttrykket"
 
-#: ../raphodo/errorlog.py:192
+#: ../raphodo/errorlog.py:193
 msgid "Find the next occurrence of the phrase"
 msgstr "Finn den neste forekomsten av uttrykket"
 
-#: ../raphodo/errorlog.py:194
+#: ../raphodo/errorlog.py:195
 msgid "&Highlight All"
 msgstr "&Utheve alt"
 
-#: ../raphodo/errorlog.py:195
+#: ../raphodo/errorlog.py:196
 msgid "Highlight all occurrences of the phrase"
 msgstr "Utheve alle forekomstene av uttrykket"
 
-#: ../raphodo/errorlog.py:196
+#: ../raphodo/errorlog.py:197
 msgid "&Match Case"
 msgstr ""
 
-#: ../raphodo/errorlog.py:197
+#: ../raphodo/errorlog.py:198
 msgid "Search with case sensitivity"
 msgstr "Skill mellom store/små bokstaver"
 
-#: ../raphodo/errorlog.py:198
+#: ../raphodo/errorlog.py:199
 msgid "&Whole Words"
 msgstr "&Hele ord"
 
-#: ../raphodo/errorlog.py:199
+#: ../raphodo/errorlog.py:200
 msgid "Search whole words only"
 msgstr "Søk kun etter hele ord"
 
-#: ../raphodo/errorlog.py:209 ../raphodo/errorlog.py:341
+#: ../raphodo/errorlog.py:210 ../raphodo/errorlog.py:345
 #, python-format
 msgid "%s of %s matches"
 msgstr "%s av %s treff"
 
-#: ../raphodo/errorlog.py:228
+#: ../raphodo/errorlog.py:232
 msgid "Clear"
 msgstr "Fjern"
 
-#: ../raphodo/errorlog.py:328
+#: ../raphodo/errorlog.py:332
 msgid "Phrase not found"
 msgstr "Fant ikke uttrykket"
 
-#: ../raphodo/errorlog.py:487
+#: ../raphodo/errorlog.py:491
 msgid "Search pending..."
 msgstr ""
 
-#: ../raphodo/errorlog.py:535
+#: ../raphodo/errorlog.py:539
 msgid ""
 "The number of new entries added to the Error Report since it was last open. "
 "Click to open the Error Report."
 msgstr ""
+"Antall nye oppføringer lagt til i feilmeldingsvinduet siden det sist ble "
+"åpnet. Klikk for å åpne feilmeldinger."
 
 #: ../raphodo/excepthook.py:77
 msgid "Problem in Rapid Photo Downloader"
@@ -924,8 +1417,8 @@ msgstr "Problem i Rapid Photo Downloader"
 #, python-brace-format
 msgid ""
 "<b>A problem occurred in Rapid Photo Downloader</b><br><br>\n"
-"    Please report the problem at <a href=\"{website}\">{website}</a>."
-"<br><br>\n"
+"    Please report the problem at <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
 "    Attach the log file <i>{log_file}</i> to your bug report (click\n"
 "    <a href=\"{log_path}\">here</a> to open the log directory).<br><br>If "
 "the same problem occurs\n"
@@ -933,8 +1426,8 @@ msgid ""
 "    "
 msgstr ""
 "<b>Det oppstod en feil i Rapid Photo Downloader</b><br><br>\n"
-"    Vennligst rapporter feilen på <a href=\"{website}\">{website}</a>."
-"<br><br>\n"
+"    Vennligst rapporter feilen på <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
 "    Legg til loggfilen som et vedlegg <i>{log_file}</i> i feilrapporten din "
 "(trykk\n"
 "    <a href=\"{log_path}\">her</a> for å åpne loggmappen).<br><br>Om den "
@@ -960,7 +1453,7 @@ msgstr ""
 "    Legg ved loggfilen i feilrapporten din, funnet i {log_path}\n"
 "\n"
 
-#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1601
+#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1643
 msgid "Open in File Browser..."
 msgstr ""
 
@@ -978,708 +1471,730 @@ msgstr "Andre …"
 msgid "%s (location does not exist)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:186
+#: ../raphodo/generatenameconfig.py:190
 msgid "Date time"
 msgstr "Dato tid"
 
-#: ../raphodo/generatenameconfig.py:187
+#: ../raphodo/generatenameconfig.py:191
 msgid "Text"
 msgstr "Tekst"
 
-#: ../raphodo/generatenameconfig.py:188 ../raphodo/rapid.py:2053
+#: ../raphodo/generatenameconfig.py:192 ../raphodo/rapid.py:2125
 msgid "Filename"
 msgstr "Filnavn"
 
-#: ../raphodo/generatenameconfig.py:189 ../raphodo/preferencedialog.py:488
+#: ../raphodo/generatenameconfig.py:193 ../raphodo/preferencedialog.py:724
 msgid "Metadata"
 msgstr "Metadata"
 
-#: ../raphodo/generatenameconfig.py:190
+#: ../raphodo/generatenameconfig.py:194
 msgid "Sequences"
 msgstr "Sekvenser"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: ../raphodo/generatenameconfig.py:193
+#: ../raphodo/generatenameconfig.py:197
 msgid "Job code"
-msgstr "Oppdragskode"
+msgstr "Oppdragsnavn"
 
-#: ../raphodo/generatenameconfig.py:194
+#: ../raphodo/generatenameconfig.py:198
 msgid "Image date"
 msgstr "Bilde dato"
 
-#: ../raphodo/generatenameconfig.py:195
+#: ../raphodo/generatenameconfig.py:199
 msgid "Video date"
 msgstr "Video dato"
 
-#: ../raphodo/generatenameconfig.py:196
+#: ../raphodo/generatenameconfig.py:200
 msgid "Today"
 msgstr "I dag"
 
-#: ../raphodo/generatenameconfig.py:197
+#: ../raphodo/generatenameconfig.py:201
 msgid "Yesterday"
 msgstr "I går"
 
 #. Translators: Download time is the time and date that the download started (when the
 #. user clicked the Download button)
-#: ../raphodo/generatenameconfig.py:200
+#: ../raphodo/generatenameconfig.py:204
 msgid "Download time"
 msgstr "Nedlastet"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:203
+#: ../raphodo/generatenameconfig.py:207
 msgid "Name"
 msgstr "Filnavn"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:206 ../raphodo/rapid.py:2054
+#: ../raphodo/generatenameconfig.py:210 ../raphodo/rapid.py:2126
 msgid "Extension"
 msgstr "Filtype"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:209
+#: ../raphodo/generatenameconfig.py:213
 msgid "Image number"
 msgstr "Bildenummer"
 
-#: ../raphodo/generatenameconfig.py:210
+#: ../raphodo/generatenameconfig.py:214
 msgid "Video number"
 msgstr "Videonummer"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:213
+#: ../raphodo/generatenameconfig.py:217
 msgid "Aperture"
 msgstr "Blender"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:216
+#: ../raphodo/generatenameconfig.py:220
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:219
+#: ../raphodo/generatenameconfig.py:223
 msgid "Exposure time"
 msgstr "Eksponeringstid"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:222
+#: ../raphodo/generatenameconfig.py:226
 msgid "Focal length"
 msgstr "Brennvidde"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:225
+#: ../raphodo/generatenameconfig.py:229
 msgid "Camera make"
 msgstr "Kameraprodusent"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:228
+#: ../raphodo/generatenameconfig.py:232
 msgid "Camera model"
 msgstr "Kameramodell"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:231
+#: ../raphodo/generatenameconfig.py:235
 msgid "Short camera model"
 msgstr "Forkortet kameramodell"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:234
+#: ../raphodo/generatenameconfig.py:238
 msgid "Hyphenated short camera model"
 msgstr "Forkortet kameramodell med prefiks"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:237
+#: ../raphodo/generatenameconfig.py:241
 msgid "Serial number"
 msgstr "Serienummer"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:240
+#: ../raphodo/generatenameconfig.py:244
 msgid "Shutter count"
 msgstr "Eksponeringsteller"
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: ../raphodo/generatenameconfig.py:242
+#: ../raphodo/generatenameconfig.py:246
 msgid "File number"
 msgstr "Filnummer"
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:244
+#: ../raphodo/generatenameconfig.py:248
 msgid "Folder only"
 msgstr "Bare mappe"
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:246
+#: ../raphodo/generatenameconfig.py:250
 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
-#: ../raphodo/generatenameconfig.py:249
+#: ../raphodo/generatenameconfig.py:253
 msgid "Owner name"
 msgstr "Eiernavn"
 
-#: ../raphodo/generatenameconfig.py:250
+#: ../raphodo/generatenameconfig.py:254
 msgid "Codec"
 msgstr "Kodek"
 
-#: ../raphodo/generatenameconfig.py:251
+#: ../raphodo/generatenameconfig.py:255
 msgid "Width"
 msgstr "Bredde"
 
-#: ../raphodo/generatenameconfig.py:252
+#: ../raphodo/generatenameconfig.py:256
 msgid "Height"
 msgstr "Høyde"
 
-#: ../raphodo/generatenameconfig.py:253
+#: ../raphodo/generatenameconfig.py:257
 msgid "Length"
 msgstr "Lengde"
 
-#: ../raphodo/generatenameconfig.py:254
+#: ../raphodo/generatenameconfig.py:258
 msgid "Frames Per Second"
 msgstr "Bilder per sekund"
 
-#: ../raphodo/generatenameconfig.py:255
+#: ../raphodo/generatenameconfig.py:259
 msgid "Artist"
 msgstr "Kunstner"
 
-#: ../raphodo/generatenameconfig.py:256
+#: ../raphodo/generatenameconfig.py:260
 msgid "Copyright"
 msgstr "Opphavsrett"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:259
+#: ../raphodo/generatenameconfig.py:263
 msgid "Downloads today"
 msgstr "Nedlastinger i dag"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:262
+#: ../raphodo/generatenameconfig.py:266
 msgid "Session number"
 msgstr "Øktnummer"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:265
+#: ../raphodo/generatenameconfig.py:269
 msgid "Subfolder number"
 msgstr "Undermappe nummer"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:268
+#: ../raphodo/generatenameconfig.py:272
 msgid "Stored number"
 msgstr "Antall lagrede"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: ../raphodo/generatenameconfig.py:271
+#: ../raphodo/generatenameconfig.py:275
 msgid "Sequence letter"
 msgstr "Sekvensbokstav"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:274
+#: ../raphodo/generatenameconfig.py:278
 msgid "All digits"
 msgstr "Alle tall"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:277
+#: ../raphodo/generatenameconfig.py:281
 msgid "Last digit"
 msgstr "Siste tall"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:280
+#: ../raphodo/generatenameconfig.py:284
 msgid "Last 2 digits"
 msgstr "Siste 2 tall"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:283
+#: ../raphodo/generatenameconfig.py:287
 msgid "Last 3 digits"
 msgstr "Siste 3 tall"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:286
+#: ../raphodo/generatenameconfig.py:290
 msgid "Last 4 digits"
 msgstr "Siste 4 tall"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:289
+#: ../raphodo/generatenameconfig.py:293
 msgid "Original Case"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:292
+#: ../raphodo/generatenameconfig.py:296
 msgid "UPPERCASE"
 msgstr "STORE BOKSTAVER"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:295
+#: ../raphodo/generatenameconfig.py:299
 msgid "lowercase"
 msgstr "små bokstaver"
 
-#: ../raphodo/generatenameconfig.py:296
+#: ../raphodo/generatenameconfig.py:300
 msgid "One digit"
 msgstr "Ett tall"
 
-#: ../raphodo/generatenameconfig.py:297
+#: ../raphodo/generatenameconfig.py:301
 msgid "Two digits"
 msgstr "To tall"
 
-#: ../raphodo/generatenameconfig.py:298
+#: ../raphodo/generatenameconfig.py:302
 msgid "Three digits"
 msgstr "Tre tall"
 
-#: ../raphodo/generatenameconfig.py:299
+#: ../raphodo/generatenameconfig.py:303
 msgid "Four digits"
 msgstr "Fire tall"
 
-#: ../raphodo/generatenameconfig.py:300
+#: ../raphodo/generatenameconfig.py:304
 msgid "Five digits"
 msgstr "Fem Tall"
 
-#: ../raphodo/generatenameconfig.py:301
+#: ../raphodo/generatenameconfig.py:305
 msgid "Six digits"
 msgstr "Seks tall"
 
-#: ../raphodo/generatenameconfig.py:302
+#: ../raphodo/generatenameconfig.py:306
 msgid "Seven digits"
 msgstr "Syv tall"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:305
+#: ../raphodo/generatenameconfig.py:309
 msgid "Subseconds"
 msgstr "Delsekunder"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:308 ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:312 ../raphodo/generatenameconfig.py:393
 msgid "YYYYMMDD"
 msgstr "ÅÅÅÅMMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:311 ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:315 ../raphodo/generatenameconfig.py:394
 msgid "YYYY-MM-DD"
 msgstr "ÅÅÅÅ-MM-DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:314 ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:318 ../raphodo/generatenameconfig.py:395
 msgid "YYYY_MM_DD"
 msgstr "ÅÅÅÅ_MM_DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:317
+#: ../raphodo/generatenameconfig.py:321
 msgid "YYMMDD"
 msgstr "ÅÅMMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:320
+#: ../raphodo/generatenameconfig.py:324
 msgid "YY-MM-DD"
 msgstr "ÅÅ-MM-DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:323
+#: ../raphodo/generatenameconfig.py:327
 msgid "YY_MM_DD"
 msgstr "ÅÅ_MM_DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:326
+#: ../raphodo/generatenameconfig.py:330
 msgid "MMDDYYYY"
 msgstr "MMDDÅÅÅÅ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:329
+#: ../raphodo/generatenameconfig.py:333
 msgid "MMDDYY"
 msgstr "MMDDÅÅ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:332
+#: ../raphodo/generatenameconfig.py:336
 msgid "MMDD"
 msgstr "MMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:335
+#: ../raphodo/generatenameconfig.py:339
 msgid "DDMMYYYY"
 msgstr "DDMMÅÅÅÅ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:338
+#: ../raphodo/generatenameconfig.py:342
 msgid "DDMMYY"
 msgstr "DDMMÅÅ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:341 ../raphodo/generatenameconfig.py:389
-#: ../raphodo/generatenameconfig.py:390 ../raphodo/generatenameconfig.py:391
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:345 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:394 ../raphodo/generatenameconfig.py:395
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:397
 msgid "YYYY"
 msgstr "YYYY"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:344
+#: ../raphodo/generatenameconfig.py:348
 msgid "YY"
 msgstr "ÅÅ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:347
+#: ../raphodo/generatenameconfig.py:351
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:350
+#: ../raphodo/generatenameconfig.py:354
 msgid "DD"
 msgstr "DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:353
+#: ../raphodo/generatenameconfig.py:357
 msgid "Month (full)"
 msgstr "Måned (full)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:356
+#: ../raphodo/generatenameconfig.py:360
 msgid "Month (abbreviated)"
 msgstr "Måned (kort)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:359
+#: ../raphodo/generatenameconfig.py:363
 msgid "HHMMSS"
 msgstr "TTMMSS"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:362
+#: ../raphodo/generatenameconfig.py:366
 msgid "HHMM"
 msgstr "TTMM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:365
+#: ../raphodo/generatenameconfig.py:369
 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
-#: ../raphodo/generatenameconfig.py:368
+#: ../raphodo/generatenameconfig.py:372
 msgid "HH-MM"
 msgstr "TT-MM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:371
+#: ../raphodo/generatenameconfig.py:375
 msgid "HH"
 msgstr "TT"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:374
+#: ../raphodo/generatenameconfig.py:378
 msgid "MM (minutes)"
 msgstr "MM (minutter)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:377
+#: ../raphodo/generatenameconfig.py:381
 msgid "SS"
 msgstr "SS"
 
-#: ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:393
 msgid "Date"
 msgstr "Dato"
 
-#: ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:394
 msgid "Date (hyphens)"
 msgstr "Dato (bindestreker)"
 
-#: ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:395
 msgid "Date (underscores)"
 msgstr "Dato (understreker)"
 
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:438
-#: ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:442
+#: ../raphodo/generatenameconfig.py:537
 msgid "Date and Job Code"
-msgstr "Dato og oppdragskode"
+msgstr "Dato og oppdragsnavn"
 
-#: ../raphodo/generatenameconfig.py:392
+#: ../raphodo/generatenameconfig.py:396
 msgid "YYYYMM_Job Code"
-msgstr "ÅÅÅÅMM_Oppdragskode"
+msgstr "ÅÅÅÅMM_Oppdragsnavn"
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "Date and Job Code Subfolder"
-msgstr "Dato og oppdragskode undermapper"
+msgstr "Dato og oppdragsnavn-undermapper"
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "YYYYMM"
 msgstr "ÅÅÅÅMM"
 
-#: ../raphodo/generatenameconfig.py:393 ../raphodo/jobcodepanel.py:198
-#: ../raphodo/nameeditor.py:827 ../raphodo/rapid.py:1809
+#: ../raphodo/generatenameconfig.py:397 ../raphodo/jobcodepanel.py:199
+#: ../raphodo/nameeditor.py:833 ../raphodo/rapid.py:1852
 #: ../raphodo/renamepanel.py:83 ../raphodo/renamepanel.py:241
 msgid "Job Code"
-msgstr "Oppdragskode"
+msgstr "Oppdragsnavn"
 
-#: ../raphodo/generatenameconfig.py:433 ../raphodo/generatenameconfig.py:512
+#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:532
 msgid "Original Filename"
-msgstr ""
+msgstr "Opprinnelig filnavn"
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "Date-Time and Downloads today"
-msgstr ""
+msgstr "Dato-tid og nedlastinger i dag"
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "YYYYMMDD-HHMM-1"
 msgstr "ÅÅÅÅMMDD-TTMM-1"
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "Date and Downloads today"
 msgstr "Dato og nedlastinger i dag"
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "YYYYMMDD-1"
 msgstr "ÅÅÅÅMMDD-1"
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "Date-Time and Image number"
 msgstr "Dato-Tid og bildenummer"
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "YYYYMMDD-1234"
 msgstr "ÅÅMMDD-1234"
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "Date-Time and Job Code"
-msgstr "Dato-Tid og oppdragskode"
+msgstr "Dato-Tid og oppdragsnavn"
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "YYYYMMDD-HHMM-Job Code-1"
-msgstr "ÅÅÅÅMMDD-TTMM-Oppdragskode-1"
+msgstr "ÅÅÅÅMMDD-TTMM-Oppdragsnavn-1"
 
-#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:442 ../raphodo/generatenameconfig.py:537
 msgid "YYYYMMDD-Job Code-1"
-msgstr "ÅÅÅÅMMDD-Oppdragskode-1"
+msgstr "ÅÅÅÅMMDD-Oppdragsnavn-1"
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "Date-Time and Video number"
 msgstr "Dato-Tid og videonummer"
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "YYYYMMDD_1234"
 msgstr "ÅÅÅÅMMDD_1234"
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "Resolution"
 msgstr "Oppløsning"
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "YYYYMMDD-HHMM-1-1920x1080"
 msgstr "ÅÅÅÅMM-TTMM-1-1920x1080"
 
 #: ../raphodo/jobcodepanel.py:64
 msgid "Enter a new Job Code, or select a previous one"
-msgstr "Angi en ny oppdragskode, eller velg en tidligere en"
+msgstr "Angi et nytt oppdragsnavn, eller velg et du har brukt tidligere"
 
 #. Translators: the value substituted will be something like '1 photo'.
 #: ../raphodo/jobcodepanel.py:70
 #, python-format
 msgid "The Job Code will be applied to %s that does not yet have a Job Code."
-msgstr "Oppdragskoden vil bli brukt på %s som ennå ikke har en oppdragskode."
+msgstr ""
+"Oppdragsnavnet vil bli brukt på %s som ennå ikke har et oppdragsnavn."
 
 #. Translators: the value substituted will be something like '85 photos and 5
 #. videos'.
 #: ../raphodo/jobcodepanel.py:75
 #, python-format
 msgid "The Job Code will be applied to %s that do not yet have a Job Code."
-msgstr "Oppdragskoden vil bli brukt på %s som ennå ikke har en oppdragskode."
+msgstr ""
+"Oppdragsnavnet vil bli brukt på %s som ennå ikke har et oppdragsnavn."
 
 #: ../raphodo/jobcodepanel.py:78
 msgid "Apply Job Code to Download"
-msgstr ""
+msgstr "Bruk oppdragsnavn på nedlastingen"
 
 #: ../raphodo/jobcodepanel.py:80
 msgid "Enter a new Job Code"
-msgstr "Angi en ny oppdragskode"
+msgstr "Angi et nytt oppdragnavn."
 
 #: ../raphodo/jobcodepanel.py:86
 msgid "The new Job Code will not be applied to any photos or videos."
-msgstr "Den nye oppdragskoden vil ikke bli brukt på noen bilder eller videoer."
+msgstr ""
+"Det nye oppdragsnavnet vil ikke bli brukt på noen bilder eller videoer."
 
 #. Translators: the value substituted will be something like '100 photos and 5
 #. videos'.
 #: ../raphodo/jobcodepanel.py:92
 #, python-format
 msgid "The new Job Code will <b>not</b> be applied to %s."
-msgstr "Den nye oppdragskoden vil <b>ikke</b> bli brukt på %s."
+msgstr "Det nye oppdragsnavnet vil <b>ikke</b> bli brukt på %s."
 
 #. Translators: the value substituted will be something like '100 photos and 5
 #. videos'.
 #: ../raphodo/jobcodepanel.py:97
 #, python-format
 msgid "The new Job Code will be applied to %s."
-msgstr "Den nye oppdragskoden vil bli brukt på %s."
+msgstr "Det nye oppdragsnavnet vil bli brukt på %s."
 
 #: ../raphodo/jobcodepanel.py:99
 msgid "New Job Code"
-msgstr "Ny oppdragskode"
+msgstr "Nytt oppdragsnavn"
 
 #: ../raphodo/jobcodepanel.py:134
 msgid "&Job Code:"
-msgstr "&Oppdragskode:"
+msgstr "&Oppdragsnavn:"
 
 #: ../raphodo/jobcodepanel.py:136 ../raphodo/rememberthisdialog.py:68
 msgid "&Remember this choice"
 msgstr "&Husk dette valget"
 
-#: ../raphodo/jobcodepanel.py:185
+#: ../raphodo/jobcodepanel.py:186
 msgid ""
 "Select photos and videos to be able to apply a new or existing Job Code to "
 "them."
 msgstr ""
-"Velg bilder og videoer for å kunne bruke en ny eller eksisterende "
-"oppdragskode for dem."
+"Velg bilder og videoer for å kunne bruke et nytt eller eksisterende "
+"oppdragsnavn på dem."
 
-#: ../raphodo/jobcodepanel.py:186
-msgid "The new Job Code will be applied to all selected photos and/or videos."
+#: ../raphodo/jobcodepanel.py:187
+msgid ""
+"The new Job Code will be applied to all selected photos and/or videos."
 msgstr ""
-"Den nye oppdragskoden vil bli brukt på alle valgte bilder og/eller videoer."
+"Det nye oppdragsnavnet vil bli brukt på alle valgte bilder og/eller videoer."
 
-#: ../raphodo/jobcodepanel.py:187
+#: ../raphodo/jobcodepanel.py:188
 msgid ""
 "Click the Apply button to apply the current Job Code to all selected photos "
 "and/or videos. You can also simply double click the Job Code."
 msgstr ""
+"Klikk på bruk-knappen for å bruke gjeldende jobbnavn på alle valgte bilder "
+"og/eller videoer. Du kan også bare dobbeltklikke på jobbnavnet."
 
-#: ../raphodo/jobcodepanel.py:189
+#: ../raphodo/jobcodepanel.py:190
 msgid ""
 "Removing a Job Code removes it only from the list of saved Job Codes, not "
 "from any photos or videos that it may have been applied to."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:191
+#: ../raphodo/jobcodepanel.py:192
 msgid ""
 "If you want to use Job Codes, configure file renaming or destination "
 "subfolder names to use them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:197
+#: ../raphodo/jobcodepanel.py:198
 msgid "Last Used"
 msgstr "Sist brukt"
 
-#: ../raphodo/jobcodepanel.py:202
+#: ../raphodo/jobcodepanel.py:203
 msgid "Job Code Sort:"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:205 ../raphodo/rapid.py:2061
+#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2133
 msgid "Ascending"
 msgstr "Stigende"
 
-#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2062
+#: ../raphodo/jobcodepanel.py:207 ../raphodo/rapid.py:2134
 msgid "Descending"
 msgstr "Synkende"
 
-#: ../raphodo/jobcodepanel.py:216
+#: ../raphodo/jobcodepanel.py:217
 msgid "&New..."
 msgstr "&Ny ..."
 
-#: ../raphodo/jobcodepanel.py:220
+#: ../raphodo/jobcodepanel.py:221
 msgid "&Apply"
 msgstr "&Bruk"
 
-#: ../raphodo/jobcodepanel.py:224
+#: ../raphodo/jobcodepanel.py:225
 msgid "&Remove"
 msgstr "&Fjern"
 
-#: ../raphodo/jobcodepanel.py:228 ../raphodo/preferencedialog.py:125
-#: ../raphodo/preferencedialog.py:154 ../raphodo/preferencedialog.py:433
+#: ../raphodo/jobcodepanel.py:229 ../raphodo/preferencedialog.py:200
+#: ../raphodo/preferencedialog.py:229 ../raphodo/preferencedialog.py:531
 msgid "Remove All"
 msgstr "Fjern alle"
 
-#: ../raphodo/jobcodepanel.py:427
+#: ../raphodo/jobcodepanel.py:428
 msgid "Do you really want to remove all the Job Codes?"
-msgstr "Vil du virkelig fjerne alle oppdragskodene?"
+msgstr "Vil du virkelig fjerne alle oppdragsnavnene?"
 
-#: ../raphodo/jobcodepanel.py:429
+#: ../raphodo/jobcodepanel.py:430
 msgid "Remove all Job Codes"
-msgstr "Fjern alle oppdragskoder"
+msgstr "Fjern alle oppdragsnavn"
 
-#: ../raphodo/jobcodepanel.py:492
+#: ../raphodo/jobcodepanel.py:493
 msgid "Job Codes"
-msgstr "Oppdragskode"
+msgstr "Oppdragsnavn"
 
 #. 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
 #: ../raphodo/messagewidget.py:65
 #, python-format
 msgid "<i><b>Hint:</b> %(message)s"
-msgstr ""
+msgstr "<i><b>Hint:</b> %(message)s"
 
-#: ../raphodo/nameeditor.py:418 ../raphodo/nameeditor.py:432
+#: ../raphodo/nameeditor.py:423 ../raphodo/nameeditor.py:437
 #, python-format
 msgid "%(description)s - %(elements)s"
-msgstr ""
+msgstr "%(description)s - %(elements)s"
 
-#: ../raphodo/nameeditor.py:512
+#: ../raphodo/nameeditor.py:517
 msgid "Save New Custom Preset..."
 msgstr "Lagre nytt tilpasset forvalg ..."
 
-#: ../raphodo/nameeditor.py:513
+#: ../raphodo/nameeditor.py:518
 msgid "Remove All Custom Presets..."
 msgstr "Fjern alle tilpassede forvalg ..."
 
-#: ../raphodo/nameeditor.py:559
+#: ../raphodo/nameeditor.py:564
 msgid "(New Custom Preset)"
 msgstr "(Nytt tilpasset forvalg)"
 
-#: ../raphodo/nameeditor.py:576
+#: ../raphodo/nameeditor.py:581
 #, python-format
 msgid "%s (edited)"
 msgstr "%s (redigert)"
 
-#: ../raphodo/nameeditor.py:579 ../raphodo/nameeditor.py:1370
+#: ../raphodo/nameeditor.py:584 ../raphodo/nameeditor.py:1379
 #, python-format
 msgid "Update Custom Preset \"%s\""
 msgstr "Oppdater tilpasset forvalg «%s»"
 
-#: ../raphodo/nameeditor.py:667
+#: ../raphodo/nameeditor.py:672
 msgid "Save New Custom Preset - Rapid Photo Downloader"
 msgstr "Lagre nytt tilpasset forvalg - Rapid Photo Downloader"
 
-#: ../raphodo/nameeditor.py:675
+#: ../raphodo/nameeditor.py:680
 msgid "Preset Name:"
 msgstr "Navn:"
 
-#: ../raphodo/nameeditor.py:836
+#: ../raphodo/nameeditor.py:799
+msgid "Photo Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:805
+msgid "Video Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:811
+msgid "Photo Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:817
+msgid "Video Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:842
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>There is insufficient data to "
 "fully generate the name. Please use other renaming options.</i>"
@@ -1691,7 +2206,7 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees.
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:846
+#: ../raphodo/nameeditor.py:853
 #, python-format
 msgid "The character</i> %(separator)s <i>creates a new subfolder level."
 msgstr ""
@@ -1699,54 +2214,54 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:851
+#: ../raphodo/nameeditor.py:858
 #, python-format
 msgid ""
 "There is no need start or end with the folder separator </i> "
 "%(separator)s<i>, because it is added automatically."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:859
+#: ../raphodo/nameeditor.py:866
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>Unique filenames may not be "
 "generated. Make filenames unique by using Sequence values.</i>"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:882 ../raphodo/renamepanel.py:121
+#: ../raphodo/nameeditor.py:889 ../raphodo/renamepanel.py:121
 msgid "Preset:"
 msgstr "Forvalg:"
 
 #. Translators: appears in a combobox, e.g. Image Date (YYYY)
-#: ../raphodo/nameeditor.py:959 ../raphodo/nameeditor.py:980
+#: ../raphodo/nameeditor.py:966 ../raphodo/nameeditor.py:987
 #, python-brace-format
 msgid "{choice} ({variant})"
 msgstr "{choice} ({variant})"
 
-#: ../raphodo/nameeditor.py:1005 ../raphodo/preferencedialog.py:530
+#: ../raphodo/nameeditor.py:1012 ../raphodo/preferencedialog.py:783
 msgid "Get help online..."
 msgstr "Få hjelp på nettet …"
 
-#: ../raphodo/nameeditor.py:1025
+#: ../raphodo/nameeditor.py:1034
 msgid "Insert"
 msgstr "Sett inn"
 
-#: ../raphodo/nameeditor.py:1351
+#: ../raphodo/nameeditor.py:1360
 msgid "Save Preset - Rapid Photo Downloader"
 msgstr "Lagre forvalg - Rapid Photo Downloader"
 
-#: ../raphodo/nameeditor.py:1356
+#: ../raphodo/nameeditor.py:1365
 msgid ""
-"<b>Do you want to save the changes in a new custom preset?</"
-"b><br><br>Creating a custom preset is not required, but can help you keep "
-"organized.<br><br>The changes to the preferences will still be applied "
-"regardless of whether you create a new custom preset or not."
+"<b>Do you want to save the changes in a new custom "
+"preset?</b><br><br>Creating a custom preset is not required, but can help "
+"you keep organized.<br><br>The changes to the preferences will still be "
+"applied regardless of whether you create a new custom preset or not."
 msgstr ""
 "<b>Vil du lagre endringene som et nytt tilpasset forvalg?</b><br><br>Å "
 "opprette et tilpasset forvalg er ikke påkrevd, men det kan hjelpe deg med å "
 "holde orden. <br><br>De endrede innstillingene vil bli brukt uavhengig av om "
 "du lagrer dem som et nytt tilpasset forvalg eller ikke."
 
-#: ../raphodo/nameeditor.py:1365
+#: ../raphodo/nameeditor.py:1374
 msgid ""
 "<b>Do you want to save the changes in a custom preset?</b><br><br>If you "
 "like, you can create a new custom preset or update the existing custom "
@@ -1758,136 +2273,169 @@ msgstr ""
 "<br><br>De endrede innstillingene vil bli brukt uavhengig av om du lagrer "
 "dem som et nytt tilpasset forvalg eller ikke."
 
-#: ../raphodo/nameeditor.py:1372
+#: ../raphodo/nameeditor.py:1381
 msgid "Save New Custom Preset"
 msgstr "Lagre nytt tilpasset forvalg"
 
-#: ../raphodo/newversion.py:306
+#: ../raphodo/newversion.py:312
 msgid "Checking for new version..."
 msgstr "Ser etter ny versjon ..."
 
-#: ../raphodo/newversion.py:307
+#: ../raphodo/newversion.py:313
 msgid "You are running the latest version."
 msgstr "Du kjører den seneste versjonen."
 
-#: ../raphodo/newversion.py:308
+#: ../raphodo/newversion.py:314
 msgid "Failed to contact the update server."
 msgstr "Kunne ikke kontakte oppdateringstjeneren."
 
-#: ../raphodo/newversion.py:310
+#: ../raphodo/newversion.py:316
 #, python-format
 msgid "A new version of Rapid Photo Downloader (%s) is available."
 msgstr "En ny versjon av Rapid Photo Downloader (%s) er tilgjengelig."
 
-#: ../raphodo/newversion.py:312
+#: ../raphodo/newversion.py:318
 msgid "Do you want to download the new version?"
 msgstr "Vil du laste ned den nye versjonen?"
 
-#: ../raphodo/newversion.py:313
+#: ../raphodo/newversion.py:319
 #, python-format
 msgid "Changes in the new release can be viewed <a href=\"%s\">here</a>."
 msgstr "Endringer i den nye utgivelsen kan leses <a href=\"%s\">her</a>."
 
 #. Translators: this text appears in a button - the & sets the s key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:340 ../raphodo/newversion.py:353
+#: ../raphodo/newversion.py:348 ../raphodo/newversion.py:363
 msgid "&Skip this release"
 msgstr "&Hopp over denne utgivelsen"
 
 #. Translators: this text appears in a button - the & sets the o key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:356
+#: ../raphodo/newversion.py:366
 msgid "&Open Download Page"
 msgstr "&Åpne nedlastingssiden"
 
-#: ../raphodo/newversion.py:376
+#: ../raphodo/newversion.py:386
 msgid "Rapid Photo Downloader updates"
 msgstr ""
 
 #. Translators: shows how much of a file has been downloaded e.g  123 KB of 1.3 MB
-#: ../raphodo/newversion.py:478
+#: ../raphodo/newversion.py:488
 #, python-format
 msgid "%(downloaded)s of %(total)s"
 msgstr "%(downloaded)s av %(total)s"
 
-#: ../raphodo/newversion.py:495
+#: ../raphodo/newversion.py:507
 msgid "Downloading..."
 msgstr "Laster ned …"
 
-#: ../raphodo/preferencedialog.py:76
+#: ../raphodo/preferencedialog.py:86
 msgid "Preferences"
 msgstr "Innstillinger"
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Automation"
 msgstr "Automatisering"
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Thumbnails"
 msgstr "Miniatyrbilder"
 
-#: ../raphodo/preferencedialog.py:85 ../raphodo/preferencedialog.py:343
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/preferencedialog.py:428
 msgid "Error Handling"
 msgstr "Feilhåndtering"
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Warnings"
 msgstr "Advarsler"
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:109
+msgid "Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:109 ../raphodo/preferencedialog.py:119
 msgid "Miscellaneous"
 msgstr "Diverse"
 
-#: ../raphodo/preferencedialog.py:94
+#: ../raphodo/preferencedialog.py:147
 msgid "Device Scanning"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:96
+#: ../raphodo/preferencedialog.py:148
 msgid "Scan only external devices"
-msgstr ""
+msgstr "Skann kun eksterne enheter"
 
-#: ../raphodo/preferencedialog.py:98
+#: ../raphodo/preferencedialog.py:150
 msgid ""
 "Scan for photos and videos only on devices that are external to the "
 "computer,\n"
 "including cameras, memory cards, external hard drives, and USB flash drives."
 msgstr ""
+"Skann etter bilder og videoer kun på eksterne enheter, inkludert\n"
+"kameraer, minnekort, eksterne harddisker og USB-minnepinner."
 
-#: ../raphodo/preferencedialog.py:102
-msgid "Scan non-camera devices lacking a DCIM folder"
+#: ../raphodo/preferencedialog.py:153
+msgid "Scan only specific folders on devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:104
+#: ../raphodo/preferencedialog.py:155
 msgid ""
-"Scan the entirety of a device for photos and videos, irrespective of whether "
-"it contains a DCIM folder,\n"
-"as opposed to only scanning within a DCIM folder.\n"
+"Scan for photos and videos only in the folders specified below (except "
+"paths\n"
+"specified in Ignored Paths).\n"
 "\n"
-"Changing this setting causes all devices to be scanned again.\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:161
+msgid "Folders to scan:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:164
+msgid ""
+"Folders at the base level of device file systems that will be scanned\n"
+"for photos and videos."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:167 ../raphodo/preferencedialog.py:219
+msgid "Add..."
+msgstr "Legg til …"
+
+#: ../raphodo/preferencedialog.py:169
+msgid ""
+"Add a folder to the list of folders to scan for photos and videos.\n"
 "\n"
-"Note: With cameras, only the DCIM folder is scanned."
+"Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:116
+#: ../raphodo/preferencedialog.py:172 ../raphodo/preferencedialog.py:198
+#: ../raphodo/preferencedialog.py:224 ../raphodo/preferencedialog.py:529
+msgid "Remove"
+msgstr "Fjern"
+
+#: ../raphodo/preferencedialog.py:174
+msgid ""
+"Remove a folder from the list of folders to scan for photos and videos.\n"
+"\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:191
 msgid "Devices that have been set to automatically ignore or download from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:117
+#: ../raphodo/preferencedialog.py:192
 msgid "Remembered Devices"
-msgstr ""
+msgstr "Husk enheter"
 
-#: ../raphodo/preferencedialog.py:121
+#: ../raphodo/preferencedialog.py:196
 msgid ""
 "Remove a device from the list of devices to automatically ignore or download "
 "from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:123 ../raphodo/preferencedialog.py:149
-#: ../raphodo/preferencedialog.py:431
-msgid "Remove"
-msgstr "Fjern"
-
-#: ../raphodo/preferencedialog.py:127
+#: ../raphodo/preferencedialog.py:202
 msgid ""
 "Clear the list of devices from which to automatically ignore or download "
 "from.\n"
@@ -1895,94 +2443,91 @@ msgid ""
 "Note: Changes take effect when the computer is next scanned for devices."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:140
+#: ../raphodo/preferencedialog.py:215
 msgid "Ignored Paths"
 msgstr "Ignorerte stier"
 
-#: ../raphodo/preferencedialog.py:141
+#: ../raphodo/preferencedialog.py:216
 msgid ""
 "The end part of a path that should never be scanned for photos or videos."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:144
-msgid "Add..."
-msgstr "Legg til …"
-
-#: ../raphodo/preferencedialog.py:146
+#: ../raphodo/preferencedialog.py:221
 msgid ""
 "Add a path to the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:151
+#: ../raphodo/preferencedialog.py:226
 msgid ""
 "Remove a path from the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:156
+#: ../raphodo/preferencedialog.py:231
 msgid ""
 "Clear the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:164
+#: ../raphodo/preferencedialog.py:239
 msgid ""
-"Use python-style <a href=\"http://damonlynch.net/rapid/documentation/"
-"#regularexpressions\">regular expressions</a>"
+"Use python-style <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">regula"
+"r expressions</a>"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:168
+#: ../raphodo/preferencedialog.py:243
 msgid ""
 "Use regular expressions in the list of ignored paths.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:208
+#: ../raphodo/preferencedialog.py:283
 msgid "Program Automation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:209
+#: ../raphodo/preferencedialog.py:284
 msgid "Start downloading at program startup"
 msgstr "Start nedlasting når programmet starter"
 
-#: ../raphodo/preferencedialog.py:210
+#: ../raphodo/preferencedialog.py:285
 msgid "Start downloading upon device insertion"
 msgstr "Start nedlasting når enheter settes inn"
 
-#: ../raphodo/preferencedialog.py:211
+#: ../raphodo/preferencedialog.py:286
 msgid "Unmount (eject) device upon download completion"
 msgstr "Avmonter (løs ut) enheten etter fullført nedlasting"
 
-#: ../raphodo/preferencedialog.py:212
+#: ../raphodo/preferencedialog.py:287
 msgid "Exit program when download completes"
 msgstr "Avslutt programmet når nedlastingen er ferdig"
 
-#: ../raphodo/preferencedialog.py:213
+#: ../raphodo/preferencedialog.py:288
 msgid "Exit program even if download had warnings or errors"
 msgstr "Avslutt programmet selv om nedlastingen hadde feil eller advarsler"
 
-#: ../raphodo/preferencedialog.py:240
+#: ../raphodo/preferencedialog.py:315
 msgid "Thumbnail Generation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:241
+#: ../raphodo/preferencedialog.py:316
 msgid "Generate thumbnails"
 msgstr "Generer miniatyrbilder"
 
-#: ../raphodo/preferencedialog.py:242
+#: ../raphodo/preferencedialog.py:318
 msgid "Generate thumbnails to show in the main program window"
 msgstr "Generer miniatyrbilder som vil vises i hovedvinduet"
 
-#: ../raphodo/preferencedialog.py:244
+#: ../raphodo/preferencedialog.py:320
 msgid "Cache thumbnails"
 msgstr "Hurtiglagre miniatyrbilder"
 
-#: ../raphodo/preferencedialog.py:245
+#: ../raphodo/preferencedialog.py:323
 msgid ""
 "Save thumbnails shown in the main program window in a thumbnail cache unique "
 "to Rapid Photo Downloader"
@@ -1990,109 +2535,109 @@ msgstr ""
 "Lagre miniatyrbilder vist i hovedprogramvinduet i et hurtiglager unikt for "
 "Rapid Photo Downloader"
 
-#: ../raphodo/preferencedialog.py:247
+#: ../raphodo/preferencedialog.py:327
 msgid "Generate system thumbnails"
 msgstr "Generer system miniatyrbilder"
 
-#: ../raphodo/preferencedialog.py:248
+#: ../raphodo/preferencedialog.py:330
 msgid ""
 "While downloading, save thumbnails that can be used by desktop file managers "
 "and other programs"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:255
+#: ../raphodo/preferencedialog.py:339
 msgid "Number of CPU cores used to generate thumbnails."
 msgstr "Antall CPU-kjerner som skal brukes  for å generere miniatyrbilder."
 
-#: ../raphodo/preferencedialog.py:256
+#: ../raphodo/preferencedialog.py:340
 msgid "CPU cores:"
 msgstr "CPU-kjerner:"
 
 #. Translators: the * acts as an asterisk to denote a reference to an annotation
 #. such as '* Takes effect upon program restart'
-#: ../raphodo/preferencedialog.py:271 ../raphodo/preferencedialog.py:317
+#: ../raphodo/preferencedialog.py:355 ../raphodo/preferencedialog.py:401
 msgid "*"
 msgstr "*"
 
-#: ../raphodo/preferencedialog.py:294
+#: ../raphodo/preferencedialog.py:378
 msgid "Thumbnail Cache"
 msgstr "Hurtiglager for miniatyrbilder"
 
-#: ../raphodo/preferencedialog.py:296
+#: ../raphodo/preferencedialog.py:380
 msgid "Calculating..."
 msgstr "Beregner …"
 
-#: ../raphodo/preferencedialog.py:302
+#: ../raphodo/preferencedialog.py:386
 msgid "days"
 msgstr "dager"
 
-#: ../raphodo/preferencedialog.py:303
+#: ../raphodo/preferencedialog.py:387
 msgid "forever"
 msgstr "alltid"
 
-#: ../raphodo/preferencedialog.py:308
+#: ../raphodo/preferencedialog.py:392
 msgid "Cache size:"
 msgstr "Hurtiglagerets størrelse:"
 
-#: ../raphodo/preferencedialog.py:310
+#: ../raphodo/preferencedialog.py:394
 msgid "Number of thumbnails:"
 msgstr "Antall miniatyrbilder:"
 
-#: ../raphodo/preferencedialog.py:312
+#: ../raphodo/preferencedialog.py:396
 msgid "Database size:"
 msgstr "Databasestørrelse:"
 
-#: ../raphodo/preferencedialog.py:314
+#: ../raphodo/preferencedialog.py:398
 msgid "Cache unaccessed thumbnails for:"
 msgstr "Hurtiglagre utilgjengelige miniatyrbilder i:"
 
-#: ../raphodo/preferencedialog.py:322
+#: ../raphodo/preferencedialog.py:406
 msgid "Purge Cache..."
 msgstr "Rens hurtiglager ..."
 
-#: ../raphodo/preferencedialog.py:323
+#: ../raphodo/preferencedialog.py:408
 msgid "Optimize Cache..."
 msgstr "Optimaliser hurtiglager ..."
 
-#: ../raphodo/preferencedialog.py:336
+#: ../raphodo/preferencedialog.py:421
 msgid "* Takes effect upon program restart"
 msgstr "* Tar effekt etter programmet startes på nytt"
 
-#: ../raphodo/preferencedialog.py:346
+#: ../raphodo/preferencedialog.py:431
 msgid "Skip download"
 msgstr "Hopp over nedlasting"
 
-#: ../raphodo/preferencedialog.py:347
+#: ../raphodo/preferencedialog.py:432
 msgid "Don't download the file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:348
+#: ../raphodo/preferencedialog.py:433
 msgid "Add unique identifier"
 msgstr "Legg til unik identifikator"
 
-#: ../raphodo/preferencedialog.py:349
+#: ../raphodo/preferencedialog.py:436
 msgid ""
 "Add an identifier like _1 or _2 to the end of the filename, immediately "
 "before the file's extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:355
+#: ../raphodo/preferencedialog.py:444
 msgid "Overwrite"
 msgstr "Overskriv"
 
-#: ../raphodo/preferencedialog.py:356
+#: ../raphodo/preferencedialog.py:445
 msgid "Overwrite the previously backed up file"
 msgstr "Overskriv den tidligere sikkerhetskopierte filen"
 
-#: ../raphodo/preferencedialog.py:357
+#: ../raphodo/preferencedialog.py:446
 msgid "Skip"
 msgstr "Hopp over"
 
-#: ../raphodo/preferencedialog.py:358
+#: ../raphodo/preferencedialog.py:448
 msgid "Don't overwrite the backup file, and issue an error message"
 msgstr "Ikke overskriv den sikkerhetskopierte filen, og gi en feilmelding"
 
-#: ../raphodo/preferencedialog.py:364
+#: ../raphodo/preferencedialog.py:455
 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 identifier:"
@@ -2101,7 +2646,14 @@ msgstr ""
 "identifikator når et bilde eller en video med samme navn allerede er lastet "
 "ned:"
 
-#: ../raphodo/preferencedialog.py:378
+#: ../raphodo/preferencedialog.py:464
+msgid ""
+"Using sequence numbers to automatically generate unique filenames is "
+"strongly recommended. Configure file renaming in the Rename panel in the "
+"main window."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:473
 msgid ""
 "When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up:"
@@ -2109,38 +2661,40 @@ msgstr ""
 "Velg om du skal overskrive en fil på sikkerhetskopienheten som har samme "
 "navn når du sikkerhetskopierer, eller hoppe over sikkerhetskopiering:"
 
-#: ../raphodo/preferencedialog.py:398
+#: ../raphodo/preferencedialog.py:494
 msgid "Program Warnings"
 msgstr "Programadvarsler"
 
-#: ../raphodo/preferencedialog.py:399
+#: ../raphodo/preferencedialog.py:495
 msgid "Show a warning when:"
 msgstr "Vis en advarsel når:"
 
-#: ../raphodo/preferencedialog.py:402
+#: ../raphodo/preferencedialog.py:498
 msgid "Downloading files currently not displayed"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:403
+#: ../raphodo/preferencedialog.py:499
 msgid ""
 "Warn when about to download files that are not displayed in the main window."
-msgstr "Advar når du skal til å laste ned filer som ikke vises i hovedvinduet."
+msgstr ""
+"Advar når du skal til å laste ned filer som ikke vises i hovedvinduet."
 
-#: ../raphodo/preferencedialog.py:405
+#: ../raphodo/preferencedialog.py:501
 msgid "Backup destinations are missing"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:406
-msgid "Warn before starting a download if it is not possible to back up files."
+#: ../raphodo/preferencedialog.py:502
+msgid ""
+"Warn before starting a download if it is not possible to back up files."
 msgstr ""
 "Advar før du starter en nedlasting hvis det ikke er mulig å "
 "sikkerhetskopiere filer."
 
-#: ../raphodo/preferencedialog.py:408
+#: ../raphodo/preferencedialog.py:504
 msgid "Program libraries are missing or broken"
 msgstr "Programbiblioteker mangler eller er skadet"
 
-#: ../raphodo/preferencedialog.py:409
+#: ../raphodo/preferencedialog.py:505
 msgid ""
 "Warn if a software library used by Rapid Photo Downloader is missing or not "
 "functioning."
@@ -2148,11 +2702,11 @@ msgstr ""
 "Advar om et programvarebibliotek som brukes av Rapid Photo Downloader "
 "mangler eller ikke fungerer."
 
-#: ../raphodo/preferencedialog.py:412
+#: ../raphodo/preferencedialog.py:508
 msgid "Filesystem metadata cannot be set"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:413
+#: ../raphodo/preferencedialog.py:509
 msgid ""
 "Warn if there is an error setting a file's filesystem metadata, such as its "
 "modification time."
@@ -2160,11 +2714,11 @@ msgstr ""
 "Advar om det oppstår en feil ved å angi metadata for en fil, slik som filens "
 "endringstidspunkt."
 
-#: ../raphodo/preferencedialog.py:416
+#: ../raphodo/preferencedialog.py:512
 msgid "Encountering unhandled files"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:417
+#: ../raphodo/preferencedialog.py:513
 msgid ""
 "Warn after scanning a device or this computer if there are unrecognized "
 "files that will not be included in the download."
@@ -2172,28 +2726,28 @@ msgstr ""
 "Advar etter skanning av en enhet eller denne datamaskinen om det finnes "
 "ukjente filer som ikke vil bli inkludert under nedlastingen."
 
-#: ../raphodo/preferencedialog.py:420
+#: ../raphodo/preferencedialog.py:517
 msgid "Do not warn about unhandled files with extensions:"
 msgstr "Ikke advar om ubehandlede filer av filtypene:"
 
-#: ../raphodo/preferencedialog.py:424
+#: ../raphodo/preferencedialog.py:522
 msgid ""
 "File extensions are case insensitive and do not need to include the leading "
 "dot."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:427
+#: ../raphodo/preferencedialog.py:525
 msgid "Add"
 msgstr "Legg til"
 
-#: ../raphodo/preferencedialog.py:428
+#: ../raphodo/preferencedialog.py:526
 msgid ""
 "Add a file extension to the list of unhandled file types to not warn about."
 msgstr ""
 "Legg til filtyper i listen over ubehandlede filtyper det ikke skal advares "
 "om."
 
-#: ../raphodo/preferencedialog.py:430
+#: ../raphodo/preferencedialog.py:528
 msgid ""
 "Remove a file extension from the list of unhandled file types to not warn "
 "about."
@@ -2201,28 +2755,144 @@ msgstr ""
 "Fjern en filtype fra listen over ubehandlede filtyper det ikke skal advares "
 "om."
 
-#: ../raphodo/preferencedialog.py:434
+#: ../raphodo/preferencedialog.py:532
 msgid ""
 "Clear the list of file extensions of unhandled file types to not warn about."
 msgstr "Tøm hele listen over ubehandlede filtyper det ikke skal advares om."
 
-#: ../raphodo/preferencedialog.py:469
+#: ../raphodo/preferencedialog.py:568
+msgid "Photo and Video Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:571
+msgid "Consolidate files across devices and downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:574
+msgid ""
+"Analyze the results of device scans looking for duplicate files and matching "
+"RAW and JPEG pairs,\n"
+"comparing them across multiple devices and download sessions."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:580
+msgid "Treat matching RAW and JPEG files as:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:581
+msgid "One photo"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:582
+msgid "Two photos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:584
+msgid ""
+"Display matching pairs of RAW and JPEG photos as one photo, and if marked, "
+"download both."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:589
+msgid ""
+"Display matching pairs of RAW and JPEG photos as two different photos. You "
+"can still synchronize their sequence numbers."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:598
+msgid "With matching RAW and JPEG photos:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:600
+msgid "Do not mark JPEG for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:601
+msgid "Do not mark RAW for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:602
+msgid "Mark both for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:609
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"JPEG for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:614
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"RAW for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:619
+msgid ""
+"When matching RAW and JPEG photos are found, automatically mark both for "
+"download."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:625
+msgid ""
+"If you disable file consolidation, choose what to do when a download device "
+"is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:631
+msgid ""
+"When a download device is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:642
+msgid "Clear completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:643
+msgid "Keep displaying completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:644
+msgid "Prompt for what to do"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:649
+msgid ""
+"Automatically clear the display of completed downloads whenever a new "
+"download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:654
+msgid ""
+"Keep displaying completed downloads whenever a new download device is "
+"inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:658
+msgid ""
+"Prompt whether to keep displaying completed downloads or clear them whenever "
+"a new download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:702
 msgid "Version Check"
 msgstr "Kontroller versjon"
 
-#: ../raphodo/preferencedialog.py:470
+#: ../raphodo/preferencedialog.py:703
 msgid "Check for new version at startup"
 msgstr "Se etter ny versjon ved oppstart"
 
-#: ../raphodo/preferencedialog.py:471
+#: ../raphodo/preferencedialog.py:705
 msgid "Check for a new version of the program each time the program starts."
 msgstr "Se etter en ny versjon av programmet hver gang programmet starter."
 
-#: ../raphodo/preferencedialog.py:473
+#: ../raphodo/preferencedialog.py:707
 msgid "Include development releases"
 msgstr "Inkluder utviklingsutgivelser"
 
-#: ../raphodo/preferencedialog.py:474
+#: ../raphodo/preferencedialog.py:709
 msgid ""
 "Include alpha, beta and other development releases when checking for a new "
 "version of the program.\n"
@@ -2236,11 +2906,11 @@ msgstr ""
 "Hvis du for øyeblikket kjører en utviklingsversjon, vil dette alltid "
 "forekomme."
 
-#: ../raphodo/preferencedialog.py:489
+#: ../raphodo/preferencedialog.py:725
 msgid "Ignore DNG date/time metadata on MTP devices"
 msgstr "Ignorer DNG dato/tid metadata på MTP enheter."
 
-#: ../raphodo/preferencedialog.py:490
+#: ../raphodo/preferencedialog.py:727
 msgid ""
 "Ignore date/time metadata in DNG files located on MTP devices, and use the "
 "file's modification time instead.\n"
@@ -2254,15 +2924,19 @@ msgstr ""
 "Nyttig for enheter som oppretter feil DNG-metadata, slik som noen telefoner "
 "og nettbrett."
 
+#: ../raphodo/preferencedialog.py:741
+msgid "Completed Downloads"
+msgstr ""
+
 #. Translators: substituted value is a description for the set of preferences
 #. shown in the preference dialog window, e.g. Devices, Automation, etc.
 #. This string is shown in a tooltip for the "Restore Defaults" button
-#: ../raphodo/preferencedialog.py:710
+#: ../raphodo/preferencedialog.py:1067
 #, python-format
 msgid "Restores default %s preference values"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:832
+#: ../raphodo/preferencedialog.py:1208
 msgid ""
 "Do you want to purge the thumbnail cache? The cache will be purged when the "
 "program is next started."
@@ -2270,11 +2944,11 @@ msgstr ""
 "Vil du rense hurtiglageret? Hurtiglageret blir renset neste gang programmet "
 "startes."
 
-#: ../raphodo/preferencedialog.py:835
+#: ../raphodo/preferencedialog.py:1212
 msgid "Purge Thumbnail Cache"
 msgstr "Rens hurtiglager for miniatyrbilder"
 
-#: ../raphodo/preferencedialog.py:847
+#: ../raphodo/preferencedialog.py:1225
 msgid ""
 "Do you want to optimize the thumbnail cache? The cache will be optimized "
 "when the program is next started."
@@ -2282,39 +2956,51 @@ msgstr ""
 "Vil du optimalisere hurtiglageret? Hurtiglageret vil bli optimalisert neste "
 "gang programmet startes."
 
-#: ../raphodo/preferencedialog.py:850
+#: ../raphodo/preferencedialog.py:1229
 msgid "Optimize Thumbnail Cache"
 msgstr "Optimaliser hurtiglager for miniatyrbilder"
 
-#: ../raphodo/preferencedialog.py:1045
+#: ../raphodo/preferencedialog.py:1481
+msgid "Enter a Folder to Scan"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1482
+msgid "Specify a folder that will be scanned for photos and videos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1483
+msgid "Folder:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1497
 msgid "Enter a Path to Ignore"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1046
+#: ../raphodo/preferencedialog.py:1498
 msgid "Specify a path that will never be scanned for photos or videos"
 msgstr "Angi en sti som aldri skal skannes for bilder eller videoer"
 
-#: ../raphodo/preferencedialog.py:1047
+#: ../raphodo/preferencedialog.py:1499
 msgid "Path:"
 msgstr "Sti:"
 
-#: ../raphodo/preferencedialog.py:1061
+#: ../raphodo/preferencedialog.py:1513
 msgid "Enter a File Extension"
 msgstr "Angi en filtype"
 
-#: ../raphodo/preferencedialog.py:1062
+#: ../raphodo/preferencedialog.py:1514
 msgid "Specify a file extension (without the leading dot)"
 msgstr "Angi en filtype (uten punktum)"
 
-#: ../raphodo/preferencedialog.py:1063 ../raphodo/renamepanel.py:122
+#: ../raphodo/preferencedialog.py:1515 ../raphodo/renamepanel.py:122
 msgid "Extension:"
 msgstr "Filtype:"
 
-#: ../raphodo/preferencedialog.py:1078
+#: ../raphodo/preferencedialog.py:1530
 msgid "Invalid File Extension"
 msgstr "Ugyldig filtype"
 
-#: ../raphodo/preferencedialog.py:1079
+#: ../raphodo/preferencedialog.py:1531
 #, python-format
 msgid ""
 "The file extension <b>%s</b> is recognized by Rapid Photo Downloader, so it "
@@ -2323,7 +3009,7 @@ msgstr ""
 "Filtypen <b>%s</b> gjenkjennes av Rapid Photo Downloader, så det gir ikke "
 "mening å advare om dens tilstedeværelse."
 
-#: ../raphodo/preferencedialog.py:1081
+#: ../raphodo/preferencedialog.py:1533
 #, python-format
 msgid ""
 "Recognized file types:\n"
@@ -2362,104 +3048,103 @@ msgstr "Bryllup"
 msgid "Birthday"
 msgstr "Fødselsdag"
 
-#: ../raphodo/preferences.py:614
+#: ../raphodo/preferences.py:624
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Innstillinger for undermapper bør ikke starte med %s"
 
-#: ../raphodo/preferences.py:617
+#: ../raphodo/preferences.py:627
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Innstillinger for undermapper bør ikke slutte med %s"
 
-#: ../raphodo/preferences.py:622
+#: ../raphodo/preferences.py:632
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr "Innstillinger for undermapper bør ikke ha to %s etter hverandre"
 
-#. self.setFlat(True)
 #: ../raphodo/primarybutton.py:72
 msgid "Download 8 Photos and 10 Videos"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:86 ../raphodo/problemnotification.py:208
+#: ../raphodo/problemnotification.py:87 ../raphodo/problemnotification.py:209
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:89
+#: ../raphodo/problemnotification.py:90
 #, python-format
 msgid "Error: %s"
 msgstr "Feil: %s"
 
-#: ../raphodo/problemnotification.py:116
+#: ../raphodo/problemnotification.py:117
 #, python-format
 msgid "GPhoto2 Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:124
+#: ../raphodo/problemnotification.py:125
 msgid ""
 "Unable to initialize the camera, probably because another program is using "
 "it. No files were copied from it."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:134
+#: ../raphodo/problemnotification.py:135
 #, python-format
 msgid "Unable to read directory %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:140
+#: ../raphodo/problemnotification.py:141
 #, python-format
 msgid "Unable to access modification time or size from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:146
+#: ../raphodo/problemnotification.py:147
 #, python-format
 msgid "Unable to read file %s"
 msgstr "Kan ikke lese filen %s"
 
-#: ../raphodo/problemnotification.py:152
+#: ../raphodo/problemnotification.py:153
 #, python-format
 msgid "Unable to write file %s"
 msgstr "Kan ikke skrive filen %s"
 
-#: ../raphodo/problemnotification.py:158
+#: ../raphodo/problemnotification.py:159
 #, python-format
 msgid "Unable to move file %s"
 msgstr "Kan ikke flytte filen %s"
 
-#: ../raphodo/problemnotification.py:164
+#: ../raphodo/problemnotification.py:165
 #, python-format
 msgid "Unable to remove file %s"
 msgstr "Kan ikke fjerne filen %s"
 
-#: ../raphodo/problemnotification.py:170
+#: ../raphodo/problemnotification.py:171
 #, python-format
 msgid "Unable to copy file %s"
 msgstr "Kan ikke kopiere filen %s"
 
-#: ../raphodo/problemnotification.py:176
+#: ../raphodo/problemnotification.py:177
 #, python-format
 msgid "Zero length file %s will not be downloaded"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:182
+#: ../raphodo/problemnotification.py:183
 #, python-format
 msgid "Could not determine filesystem modification time for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:188
+#: ../raphodo/problemnotification.py:189
 #, python-format
 msgid "Unable to load metadata from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:194
+#: ../raphodo/problemnotification.py:195
 #, python-format
 msgid ""
 "Unable to load metadata from %(name)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:202
+#: ../raphodo/problemnotification.py:203
 #, python-format
 msgid ""
 "An error occurred setting a file's filesystem metadata on the filesystem %s. "
@@ -2467,78 +3152,78 @@ msgid ""
 "again."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:216
+#: ../raphodo/problemnotification.py:217
 #, python-format
 msgid "Encountered unhandled file %s. It will not be downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:223
+#: ../raphodo/problemnotification.py:224
 #, python-format
 msgid "%(filetype)s %(destination)s already exists."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:234 ../raphodo/problemnotification.py:262
+#: ../raphodo/problemnotification.py:235 ../raphodo/problemnotification.py:263
 #, python-format
 msgid ""
 "The existing %(filetype)s %(destination)s was last modified on %(date)s at "
 "%(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:245
+#: ../raphodo/problemnotification.py:246
 #, python-format
 msgid "The %(filetype)s %(source)s was not downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:273
+#: ../raphodo/problemnotification.py:274
 #, python-format
 msgid "The %(filetype)s %(source)s was downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:282
+#: ../raphodo/problemnotification.py:283
 #, python-format
 msgid "The unique identifier '%s' was added to the filename."
 msgstr "Den unike identifikatoren «%s» ble lagt til filnavnet."
 
-#: ../raphodo/problemnotification.py:298
+#: ../raphodo/problemnotification.py:299
 #, python-format
 msgid ""
 "The existing backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:309
+#: ../raphodo/problemnotification.py:310
 #, python-format
 msgid "The %(filetype)s %(source)s was not backed up from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:326
+#: ../raphodo/problemnotification.py:327
 #, python-format
 msgid ""
 "The previous backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:337
+#: ../raphodo/problemnotification.py:338
 #, python-format
 msgid ""
 "The %(filetype)s %(source)s from %(device)s was backed up, overwriting the "
 "previous backup %(filetype)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:356
+#: ../raphodo/problemnotification.py:357
 #, python-format
 msgid ""
 "When synchronizing RAW + JPEG sequence values, a duplicate %(filetype)s "
 "%(file)s was encountered, and was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:366
+#: ../raphodo/problemnotification.py:367
 msgid ""
 "When synchronizing RAW + JPEG sequence values, photos were detected with the "
 "same filenames, but taken at different times:"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:373
+#: ../raphodo/problemnotification.py:374
 #, python-format
 msgid ""
 "%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
@@ -2547,134 +3232,134 @@ msgstr ""
 "%(image1)s ble tatt den %(image1_date)s klokken %(image1_time)s, og "
 "%(image2)s den %(image2_date)s klokken %(image2_time)s."
 
-#: ../raphodo/problemnotification.py:389
+#: ../raphodo/problemnotification.py:390
 #, python-format
 msgid "Unable to finalize the filename for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:424
+#: ../raphodo/problemnotification.py:425
 #, python-format
 msgid ""
 "The filename %(destination)s was not fully generated for %(filetype)s "
 "%(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:433
+#: ../raphodo/problemnotification.py:434
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr "%(type)s metadata mangler."
 
-#: ../raphodo/problemnotification.py:439
+#: ../raphodo/problemnotification.py:440
 #, python-format
 msgid "The following metadata is missing: %s."
 msgstr "Følgende metadata mangler: %s."
 
-#: ../raphodo/problemnotification.py:445
+#: ../raphodo/problemnotification.py:446
 #, python-format
 msgid "Date/time conversion failed: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:451
+#: ../raphodo/problemnotification.py:452
 msgid ""
 "Could not extract valid date/time metadata or determine the file "
 "modification time."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:457
+#: ../raphodo/problemnotification.py:458
 msgid "Filename does not have an extension."
 msgstr "Filnavnet mangler filtype."
 
-#: ../raphodo/problemnotification.py:460
+#: ../raphodo/problemnotification.py:461
 msgid "Filename does not have a number component."
 msgstr "Filnavnet mangler nummerdelen."
 
-#: ../raphodo/problemnotification.py:464
+#: ../raphodo/problemnotification.py:465
 #, python-format
 msgid "Error generating component %(component)s. Error: %(error)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:477
+#: ../raphodo/problemnotification.py:478
 #, python-format
 msgid ""
 "The download subfolders %(folder)s were only partially generated for "
 "%(filetype)s %(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:486
+#: ../raphodo/problemnotification.py:487
 #, python-format
 msgid ""
 "There is no data with which to generate the %(subfolder_file)s for "
 "%(filename)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:499
+#: ../raphodo/problemnotification.py:500
 #, python-format
 msgid ""
 "Unable to create the %(filetype)s %(destination)s in %(folder)s. The "
 "download file was %(source)s in %(device)s. It was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:514
+#: ../raphodo/problemnotification.py:515
 #, python-format
 msgid "Unable to create the download subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:526
+#: ../raphodo/problemnotification.py:527
 #, python-format
 msgid "Unable to create the backup subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:577
+#: ../raphodo/problemnotification.py:578
 #, python-format
 msgid "Problems scanning %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:584
+#: ../raphodo/problemnotification.py:585
 #, python-format
 msgid "Problems copying from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:591
+#: ../raphodo/problemnotification.py:592
 msgid "Problems while finalizing filenames and generating subfolders"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:598
+#: ../raphodo/problemnotification.py:599
 #, python-format
 msgid "Problems backing up to %s"
 msgstr "Problemer med sikkerhetskopiering til %s"
 
-#. Translators: for example Nov 3 or Dec 31
-#. The start and end dates are on a different day
-#. Translators: for example Nov 3 or Dec 31
-#: ../raphodo/proximity.py:105 ../raphodo/proximity.py:221
-#: ../raphodo/proximity.py:224 ../raphodo/proximity.py:828
+#. Translators: for example Nov 3 2015, 11:25 AM
+#. Translators: for example, Nov 3, 12:15 PM
+#: ../raphodo/proximity.py:188 ../raphodo/proximity.py:213
+#: ../raphodo/proximity.py:236 ../raphodo/proximity.py:239
 #, python-format
-msgid "%(month)s %(numeric_day)s"
+msgid "%(date)s, %(time)s"
 msgstr ""
 
-#. Translators: for example Nov 15 2015
-#. Translators: for example Nov 3 2015
-#: ../raphodo/proximity.py:109 ../raphodo/proximity.py:230
-#: ../raphodo/proximity.py:231 ../raphodo/proximity.py:831
+#: ../raphodo/proximity.py:204
 #, python-format
-msgid "%(date)s %(year)s"
+msgid "%(starttime)s - %(endtime)s"
 msgstr ""
 
-#. Translators: for example Nov 3 2015, 11:25 AM
-#. Translators: for example, Nov 3, 12:15 PM
-#: ../raphodo/proximity.py:197 ../raphodo/proximity.py:215
-#: ../raphodo/proximity.py:234 ../raphodo/proximity.py:236
+#. The start and end dates are on a different day
+#. Translators: for example Nov 3 or Dec 31
+#: ../raphodo/proximity.py:221 ../raphodo/proximity.py:225
+#: ../raphodo/proximity.py:980 ../raphodo/timeutils.py:105
 #, python-format
-msgid "%(date)s, %(time)s"
+msgid "%(month)s %(numeric_day)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:209
+#. Translators: for example Nov 3 2015
+#. Translators: for example Nov 2 2015
+#. Translators: for example Nov 15 2015
+#: ../raphodo/proximity.py:232 ../raphodo/proximity.py:233
+#: ../raphodo/proximity.py:985 ../raphodo/timeutils.py:110
 #, python-format
-msgid "%(starttime)s - %(endtime)s"
+msgid "%(date)s %(year)s"
 msgstr ""
 
 #. Translators: for example, Nov 3, 12:15 PM - Nov 4, 1:00 AM
-#: ../raphodo/proximity.py:241
+#: ../raphodo/proximity.py:245
 #, python-format
 msgid "%(earlier_time)s - %(later_time)s"
 msgstr "%(earlier_time)s - %(later_time)s"
@@ -2683,7 +3368,7 @@ msgstr "%(earlier_time)s - %(later_time)s"
 #. Nov 3 2012, 12:15 PM -
 #. Nov 4 2012, 1:00 AM
 #. (please keep the line break signified by \n)
-#: ../raphodo/proximity.py:248
+#: ../raphodo/proximity.py:253
 #, python-format
 msgid ""
 "%(earlier_time)s -\n"
@@ -2692,18 +3377,18 @@ msgstr ""
 "%(earlier_time)s -\n"
 "%(later_time)s"
 
-#: ../raphodo/proximity.py:359
+#: ../raphodo/proximity.py:382
 #, python-format
 msgid "%(month)s  %(year)s"
 msgstr "%(month)s  %(year)s"
 
 #. Translators: for example Nov 2015
-#: ../raphodo/proximity.py:833
+#: ../raphodo/proximity.py:987
 #, python-format
 msgid "%(month)s %(year)s"
 msgstr "%(month)s %(year)s"
 
-#: ../raphodo/proximity.py:1344
+#: ../raphodo/proximity.py:1595
 msgid ""
 "The time elapsed between consecutive photos and videos that is used to build "
 "the Timeline"
@@ -2713,47 +3398,47 @@ msgstr ""
 #. Replace the very last character (after the d) with the correct
 #. localized value, keeping everything else. In other words, change
 #. only the m character.
-#: ../raphodo/proximity.py:1406
+#: ../raphodo/proximity.py:1652
 #, python-format
 msgid "%(minutes)dm"
 msgstr "%(minutes)dm"
 
 #. Translators: i.e. "1.5h", which is short for 1.5 hours.
 #. Replace the entire string with the correct localized value
-#: ../raphodo/proximity.py:1410
+#: ../raphodo/proximity.py:1656
 msgid "1.5h"
 msgstr "1.5t"
 
 #. Translators: e.g. "5h", which is short for 5 hours.
 #. Replace the very last character (after the d) with the correct localized value,
 #. keeping everything else. In other words, change only the h character.
-#: ../raphodo/proximity.py:1415
+#: ../raphodo/proximity.py:1661
 #, python-format
 msgid "%(hours)dh"
 msgstr "%(hours)dt"
 
-#: ../raphodo/proximity.py:1461
+#: ../raphodo/proximity.py:1710
 msgid ""
 "The Timeline groups photos and videos based on how much time elapsed between "
 "consecutive shots. Use it to identify photos and videos taken at different "
 "periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/proximity.py:1464
+#: ../raphodo/proximity.py:1715
 msgid ""
 "Use the slider (below) to adjust the time elapsed between consecutive shots "
 "that is used to build the Timeline."
 msgstr ""
 
-#: ../raphodo/proximity.py:1466
+#: ../raphodo/proximity.py:1718
 msgid "Timeline build pending..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1467
+#: ../raphodo/proximity.py:1719
 msgid "Timeline is building..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1468
+#: ../raphodo/proximity.py:1721
 msgid ""
 "The Timeline needs to be rebuilt because the file modification time does not "
 "match the time a shot was taken for one or more shots.<br><br>The Timeline "
@@ -2765,16 +3450,16 @@ msgid ""
 "downloading, which is when the metadata is read."
 msgstr ""
 
-#: ../raphodo/rapid.py:485 ../raphodo/rapid.py:2461 ../raphodo/rapid.py:3728
-#: ../raphodo/rapid.py:3846 ../raphodo/rapid.py:3850 ../raphodo/rapid.py:3870
-#: ../raphodo/rapid.py:3874 ../raphodo/rapid.py:3998 ../raphodo/rapid.py:4007
-#: ../raphodo/rapid.py:4495 ../raphodo/rapid.py:4888 ../raphodo/rapid.py:5722
-#: ../raphodo/rememberthisdialog.py:97
+#: ../raphodo/rapid.py:493 ../raphodo/rapid.py:2555 ../raphodo/rapid.py:3934
+#: ../raphodo/rapid.py:4065 ../raphodo/rapid.py:4069 ../raphodo/rapid.py:4092
+#: ../raphodo/rapid.py:4096 ../raphodo/rapid.py:4226 ../raphodo/rapid.py:4237
+#: ../raphodo/rapid.py:4743 ../raphodo/rapid.py:5195 ../raphodo/rapid.py:5997
+#: ../raphodo/rememberthisdialog.py:99
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:3
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: ../raphodo/rapid.py:1100
+#: ../raphodo/rapid.py:1131
 msgid ""
 "<b>ExifTool has a problem</b><br><br> Rapid Photo Downloader uses ExifTool "
 "to get metadata from videos and photos. The program will run without it, but "
@@ -2784,29 +3469,29 @@ msgstr ""
 "ExifTool for å trekke ut metadata fra videoer og bilder. Programmet vil "
 "kunne kjøre uten det, men å installere det er <b>sterkt</b> anbefalt."
 
-#: ../raphodo/rapid.py:1110 ../raphodo/rapid.py:1130
+#: ../raphodo/rapid.py:1141 ../raphodo/rapid.py:1161
 msgid "Problem with libmediainfo"
 msgstr ""
 
-#: ../raphodo/rapid.py:1119
+#: ../raphodo/rapid.py:1150
 msgid ""
 "<b>The library libmediainfo appears to be missing</b><br><br> Rapid Photo "
 "Downloader uses libmediainfo to get the date and time a video was shot. The "
 "program will run  without it, but installing it is recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1417
+#: ../raphodo/rapid.py:1448
 msgid "Download failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1419
+#: ../raphodo/rapid.py:1450
 msgid ""
 "Sorry, the download of the new version of Rapid Photo Downloader failed."
 msgstr ""
 "Dessverre, nedlastingen av den nye versjonen av Rapid Photo Downloader "
 "mislyktes."
 
-#: ../raphodo/rapid.py:1425
+#: ../raphodo/rapid.py:1457
 msgid ""
 "The new version was successfully downloaded. Do you want to close Rapid "
 "Photo Downloader and install it now?"
@@ -2814,19 +3499,19 @@ msgstr ""
 "Den nye versjonen ble lastet ned. Vil du lukke Rapid Photo Downloader og "
 "installere den nå?"
 
-#: ../raphodo/rapid.py:1428
+#: ../raphodo/rapid.py:1461
 msgid "Update Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:1432
+#: ../raphodo/rapid.py:1465
 msgid "Install"
 msgstr "Installer"
 
-#: ../raphodo/rapid.py:1450
+#: ../raphodo/rapid.py:1483
 msgid "New version saved"
 msgstr "Ny versjon lagret"
 
-#: ../raphodo/rapid.py:1451
+#: ../raphodo/rapid.py:1485
 #, python-format
 msgid ""
 "The tar file and installer script are saved at:\n"
@@ -2834,163 +3519,163 @@ msgid ""
 " %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:1468
+#: ../raphodo/rapid.py:1502
 msgid "Upgrade failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1469
+#: ../raphodo/rapid.py:1505
 msgid ""
 "Sorry, upgrading Rapid Photo Downloader failed because there was an error "
 "opening the installer."
 msgstr ""
 
-#: ../raphodo/rapid.py:1667 ../raphodo/rapid.py:2331
+#: ../raphodo/rapid.py:1709 ../raphodo/rapid.py:2425
 msgid "Download"
 msgstr "Last ned"
 
-#: ../raphodo/rapid.py:1671
+#: ../raphodo/rapid.py:1713
 msgid "&Refresh..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1675
+#: ../raphodo/rapid.py:1717
 msgid "&Preferences"
 msgstr "&Innstillinger"
 
-#: ../raphodo/rapid.py:1679
+#: ../raphodo/rapid.py:1721
 msgid "&Quit"
 msgstr "&Avslutt"
 
-#: ../raphodo/rapid.py:1683
+#: ../raphodo/rapid.py:1725
 msgid "Error &Reports"
 msgstr ""
 
-#: ../raphodo/rapid.py:1687
+#: ../raphodo/rapid.py:1729
 msgid "Clear Completed Downloads"
 msgstr "Fjern fullførte nedlastinger"
 
-#: ../raphodo/rapid.py:1691
+#: ../raphodo/rapid.py:1733
 msgid "Get Help Online..."
 msgstr "Få hjelp på Internett ..."
 
-#: ../raphodo/rapid.py:1695
+#: ../raphodo/rapid.py:1737
 msgid "&Tip of the Day..."
 msgstr "&Dagens tips ..."
 
-#: ../raphodo/rapid.py:1699
+#: ../raphodo/rapid.py:1741
 msgid "Report a Problem..."
 msgstr "Rapporter et problem ..."
 
-#: ../raphodo/rapid.py:1703
+#: ../raphodo/rapid.py:1745
 msgid "Make a Donation..."
 msgstr "Gi en donasjon ..."
 
-#: ../raphodo/rapid.py:1707
+#: ../raphodo/rapid.py:1749
 msgid "Translate this Application..."
 msgstr "Oversett dette programmet …"
 
-#: ../raphodo/rapid.py:1711
+#: ../raphodo/rapid.py:1753
 msgid "&About..."
 msgstr "&Om ..."
 
-#: ../raphodo/rapid.py:1715
+#: ../raphodo/rapid.py:1757
 msgid "Check for Updates..."
 msgstr "Se etter oppdateringer ..."
 
-#: ../raphodo/rapid.py:1797
+#: ../raphodo/rapid.py:1840
 msgid "Timeline"
 msgstr "Tidslinje"
 
-#: ../raphodo/rapid.py:1807
+#: ../raphodo/rapid.py:1850
 msgid "Destination"
 msgstr ""
 
-#: ../raphodo/rapid.py:1808
+#: ../raphodo/rapid.py:1851
 msgid "Rename"
 msgstr "Endre navn"
 
-#: ../raphodo/rapid.py:1810
+#: ../raphodo/rapid.py:1853
 msgid "Back Up"
 msgstr "Sikkerhetskopiering"
 
 #. Devices Header and View
-#: ../raphodo/rapid.py:1926
+#: ../raphodo/rapid.py:1977
 msgid ""
 "Turn on or off the use of devices attached to this computer as download "
 "sources"
 msgstr ""
 
 #. This Computer Header and View
-#: ../raphodo/rapid.py:1940
+#: ../raphodo/rapid.py:1994
 msgid ""
 "Turn on or off the use of a folder on this computer as a download source"
 msgstr ""
 
-#: ../raphodo/rapid.py:1941
+#: ../raphodo/rapid.py:1996
 msgid "This Computer"
 msgstr "Denne datamaskinen"
 
-#: ../raphodo/rapid.py:1952
+#: ../raphodo/rapid.py:2009
 msgid "Select a source folder"
 msgstr "Velg en kildemappe"
 
-#: ../raphodo/rapid.py:1975
+#: ../raphodo/rapid.py:2038
 msgid "Projected Storage Use"
 msgstr ""
 
-#: ../raphodo/rapid.py:1989 ../raphodo/rapid.py:1997
+#: ../raphodo/rapid.py:2056 ../raphodo/rapid.py:2068
 msgid "Select a destination folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:2045
+#: ../raphodo/rapid.py:2117
 msgid "All"
 msgstr "Alle"
 
-#: ../raphodo/rapid.py:2046
+#: ../raphodo/rapid.py:2118
 msgid "New"
 msgstr "Ny"
 
-#: ../raphodo/rapid.py:2048
+#: ../raphodo/rapid.py:2120
 msgid "Show:"
 msgstr "Vis:"
 
-#: ../raphodo/rapid.py:2051
+#: ../raphodo/rapid.py:2123
 msgid "Modification Time"
 msgstr ""
 
-#: ../raphodo/rapid.py:2052
+#: ../raphodo/rapid.py:2124
 msgid "Checked State"
 msgstr ""
 
-#: ../raphodo/rapid.py:2055
+#: ../raphodo/rapid.py:2127
 msgid "File Type"
 msgstr "Filtype"
 
-#: ../raphodo/rapid.py:2056
+#: ../raphodo/rapid.py:2128
 msgid "Device"
 msgstr "Enhet"
 
-#: ../raphodo/rapid.py:2058
+#: ../raphodo/rapid.py:2130
 msgid "Sort:"
 msgstr "Sorter:"
 
-#: ../raphodo/rapid.py:2069
+#: ../raphodo/rapid.py:2141
 msgid "Select All:"
 msgstr "Velg alle:"
 
-#: ../raphodo/rapid.py:2311
+#: ../raphodo/rapid.py:2405
 #, python-format
 msgid "Download %(files)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2327
+#: ../raphodo/rapid.py:2421
 msgid "Resume Download"
 msgstr "Fortsett nedlasting"
 
-#: ../raphodo/rapid.py:2329
+#: ../raphodo/rapid.py:2423
 msgid "Pause"
 msgstr "Pause"
 
-#: ../raphodo/rapid.py:2417
+#: ../raphodo/rapid.py:2511
 #, python-brace-format
 msgid ""
 "Please report the problem at <a href=\"{website}\">{website}</a>.<br><br>\n"
@@ -2998,17 +3683,17 @@ msgid ""
 "            <a href=\"{log_path}\">here</a> to open the log directory).\n"
 "            "
 msgstr ""
-"Vennligst rapporter problemet på <a href=\"{website}\">{website}</a>."
-"<br><br>\n"
+"Vennligst rapporter problemet på <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
 "            Legg ved loggfilen <i>{log_file}</i> i feilrapporten din (trykk\n"
 "            <a href=\"{log_path}\">her</a> for å åpne loggmappen).\n"
 "            "
 
-#: ../raphodo/rapid.py:2431
+#: ../raphodo/rapid.py:2525
 msgid "Thank you for reporting a problem in Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:2529
+#: ../raphodo/rapid.py:2624
 #, python-format
 msgid ""
 "<b>Changing This Computer source path</b><br><br>Do you really want to "
@@ -3017,30 +3702,29 @@ msgid ""
 "from This Computer will be cancelled."
 msgstr ""
 
-#: ../raphodo/rapid.py:2595
+#: ../raphodo/rapid.py:2694
 msgid "You cannot change the download destination while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:2604
+#: ../raphodo/rapid.py:2704
 #, python-format
 msgid ""
 "<b>Confirm Download Destination</b><br><br>Are you sure you want to set the "
 "%(file_type)s download destination to %(path)s?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2682
+#: ../raphodo/rapid.py:2785
 msgid ""
+"\n"
 "<b>Downloading all files</b><br><br>\n"
-"                    A download always includes all files that are checked "
-"for download,\n"
-"                    including those that are not currently displayed because "
-"the Timeline\n"
-"                    is being used or because only new files are being shown."
-"<br><br>\n"
-"                    Do you want to proceed with the download?"
+"A download always includes all files that are checked for download,\n"
+"including those that are not currently displayed because the Timeline\n"
+"is being used or because only new files are being shown.<br><br>\n"
+"Do you want to proceed with the download?\n"
+"                        "
 msgstr ""
 
-#: ../raphodo/rapid.py:2820
+#: ../raphodo/rapid.py:2937
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -3051,7 +3735,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: ../raphodo/rapid.py:2824
+#: ../raphodo/rapid.py:2940
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -3060,199 +3744,193 @@ msgstr ""
 "Denne mappen for nedlasting er ugyldig:\n"
 "%s"
 
-#: ../raphodo/rapid.py:2827
+#: ../raphodo/rapid.py:2943
 msgid "Download Failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:2828
+#: ../raphodo/rapid.py:2944
 msgid "The download cannot proceed."
 msgstr ""
 
-#: ../raphodo/rapid.py:2842
+#: ../raphodo/rapid.py:2962
 msgid ""
 "Photos and videos will not be backed up because there is nowhere to back "
 "them up. Do you still want to start the download?"
 msgstr ""
 
-#. Translators: filetype will be replaced with 'photos' or 'videos'
-#: ../raphodo/rapid.py:2847 ../raphodo/rapid.py:2854
+#: ../raphodo/rapid.py:2969 ../raphodo/rapid.py:2979
 #, python-format
 msgid ""
 "No backup device exists for backing up %(filetype)s. Do you still want to "
 "start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2848 ../raphodo/rpdfile.py:228
+#: ../raphodo/rapid.py:2971 ../raphodo/rpdfile.py:228
 msgid "photos"
 msgstr "bilder"
 
-#: ../raphodo/rapid.py:2855 ../raphodo/rpdfile.py:223
+#: ../raphodo/rapid.py:2981 ../raphodo/rpdfile.py:223
 msgid "videos"
 msgstr "videoklipp"
 
-#: ../raphodo/rapid.py:2861
+#: ../raphodo/rapid.py:2989
 msgid ""
 "<b>The photo and video backup destinations do not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2869 ../raphodo/rapid.py:2876
+#: ../raphodo/rapid.py:2999 ../raphodo/rapid.py:3008
 #, python-format
 msgid ""
 "<b>The %(filetype)s backup destination does not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2871 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:818
+#: ../raphodo/rapid.py:3001 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:843
 msgid "photo"
 msgstr "bilde"
 
-#: ../raphodo/rapid.py:2878 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:858
+#: ../raphodo/rapid.py:3010 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:883
 msgid "video"
 msgstr "video"
 
-#: ../raphodo/rapid.py:2886
+#: ../raphodo/rapid.py:3018
 msgid "Backup problem"
 msgstr ""
 
-#. Translators - in the middle is a unicode em dash - please retain it
-#. This string is displayed in the status bar when the download is running
-#: ../raphodo/rapid.py:3571
+#: ../raphodo/rapid.py:3756
 #, python-format
 msgid "%(downloading_from)s — %(time_left)s left (%(speed)s)"
 msgstr ""
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3640
+#: ../raphodo/rapid.py:3828
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s nedlastet"
 
-#. Translators: e.g. 2 videos failed to download
-#: ../raphodo/rapid.py:3645
+#: ../raphodo/rapid.py:3836
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "Klarte ikke a laste ned %(noFiles)s %(filetypes)s"
 
-#: ../raphodo/rapid.py:3650 ../raphodo/rapid.py:3723
+#: ../raphodo/rapid.py:3842 ../raphodo/rapid.py:3927
 msgid "warnings"
 msgstr "advarsler"
 
-#: ../raphodo/rapid.py:3679
+#: ../raphodo/rapid.py:3873
 msgid "All downloads complete"
 msgstr "Ferdig med nedlasting"
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3686 ../raphodo/rapid.py:3695 ../raphodo/rapid.py:3704
-#: ../raphodo/rapid.py:3713 ../raphodo/rapid.py:3721
+#: ../raphodo/rapid.py:3881 ../raphodo/rapid.py:3892 ../raphodo/rapid.py:3903
+#: ../raphodo/rapid.py:3914 ../raphodo/rapid.py:3924
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: ../raphodo/rapid.py:3688 ../raphodo/rapid.py:3706
+#: ../raphodo/rapid.py:3884 ../raphodo/rapid.py:3906
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s lastet ned"
 
-#: ../raphodo/rapid.py:3697 ../raphodo/rapid.py:3715
+#: ../raphodo/rapid.py:3895 ../raphodo/rapid.py:3917
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "Klarte ikke å laste ned %(filetype)s"
 
-#: ../raphodo/rapid.py:3742
+#: ../raphodo/rapid.py:3950
 msgid "1 failure"
 msgstr "1 feil"
 
-#: ../raphodo/rapid.py:3744
+#: ../raphodo/rapid.py:3952
 #, python-format
 msgid "%d failures"
 msgstr "%d feil"
 
-#: ../raphodo/rapid.py:3749
+#: ../raphodo/rapid.py:3957
 msgid "1 warning"
 msgstr "1 advarsel"
 
-#: ../raphodo/rapid.py:3751
+#: ../raphodo/rapid.py:3959
 #, python-format
 msgid "%d warnings"
 msgstr "%d advarsler"
 
-#: ../raphodo/rapid.py:3771
+#: ../raphodo/rapid.py:3981
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3774
+#: ../raphodo/rapid.py:3985
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3779
+#: ../raphodo/rapid.py:3989
 #, python-format
 msgid "No files downloaded — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3781
+#: ../raphodo/rapid.py:3991
 msgid "No files downloaded"
 msgstr ""
 
-#: ../raphodo/rapid.py:3805
+#: ../raphodo/rapid.py:4021
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3809
+#: ../raphodo/rapid.py:4026
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3812
+#: ../raphodo/rapid.py:4031
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3820
+#: ../raphodo/rapid.py:4039
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3833
+#: ../raphodo/rapid.py:4052
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3837
+#: ../raphodo/rapid.py:4056
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3841
+#: ../raphodo/rapid.py:4060
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices"
 msgstr ""
 
-#: ../raphodo/rapid.py:3867
+#: ../raphodo/rapid.py:4087
 msgid "The Destination subfolders and Timeline have been rebuilt"
 msgstr ""
 
-#: ../raphodo/rapid.py:3922
+#: ../raphodo/rapid.py:4144
 msgid "Program preferences are invalid"
 msgstr "Programinnstillingene er ugyldige"
 
-#: ../raphodo/rapid.py:3999
+#: ../raphodo/rapid.py:4228
 #, python-format
 msgid ""
 "<b>All files on the %(camera)s are inaccessible</b>.<br><br>It may be locked "
@@ -3262,179 +3940,205 @@ msgid ""
 "ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4008
+#: ../raphodo/rapid.py:4239
 #, python-format
 msgid ""
-"<b>The %(camera)s appears to be in use by another application.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again.<br><br>Alternatively, you can ignore this "
-"device."
+"<b>The %(camera)s appears to be in use by another "
+"application.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again.<br><br>Alternatively, you "
+"can ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4019
+#: ../raphodo/rapid.py:4250
 msgid "&Try Again"
 msgstr "&Prøv på nytt"
 
-#: ../raphodo/rapid.py:4020
+#: ../raphodo/rapid.py:4251
 msgid "&Ignore This Device"
 msgstr "&Ignorer denne enheten"
 
-#: ../raphodo/rapid.py:4086
+#: ../raphodo/rapid.py:4323
 #, python-format
 msgid "Sorry, an unexpected problem occurred while scanning %s."
 msgstr ""
 
-#: ../raphodo/rapid.py:4087
+#: ../raphodo/rapid.py:4324
 msgid "Unfortunately you cannot download from this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4091
+#: ../raphodo/rapid.py:4328
 msgid ""
 "A possible workaround for the problem might be downloading from the camera's "
 "memory card using a card reader."
 msgstr ""
 
-#: ../raphodo/rapid.py:4096
+#: ../raphodo/rapid.py:4333
 msgid "Device scan failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:4472
+#: ../raphodo/rapid.py:4720
 #, python-format
 msgid ""
-"<b>The %(camera)s cannot be scanned because it cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again."
+"<b>The %(camera)s cannot be scanned because it cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again."
 msgstr ""
 
-#: ../raphodo/rapid.py:4496
+#: ../raphodo/rapid.py:4745
 #, python-format
 msgid ""
-"<b>The download cannot start because the %(camera)s cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again, and choose which files you want to "
-"download from it."
+"<b>The download cannot start because the %(camera)s cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again, and choose which files "
+"you want to download from it."
+msgstr ""
+
+#: ../raphodo/rapid.py:4842
+msgid "Completed Downloads Present"
 msgstr ""
 
-#: ../raphodo/rapid.py:4635
+#: ../raphodo/rapid.py:4844
+#, python-format
+msgid "%s whose download have completed are displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4846
+msgid "Do you want to clear the completed downloads?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4848
+msgid "Completed Download Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4850
+#, python-format
+msgid "%s whose download has completed is displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4852
+msgid "Do you want to clear the completed download?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4933
 #, python-format
 msgid ""
 "Do you want to download photos and videos from the device <i>%(device)s</i>?"
 msgstr ""
 
-#: ../raphodo/rapid.py:4877
+#: ../raphodo/rapid.py:5183
 #, python-format
 msgid "<b>Do you want to ignore the %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4879
+#: ../raphodo/rapid.py:5186
 msgid ""
 "All cameras, phones and tablets with the same model name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:4883
+#: ../raphodo/rapid.py:5190
 #, python-format
 msgid ""
 "<b>Do you want to ignore the device %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4885
+#: ../raphodo/rapid.py:5192
 msgid "Any device with the same name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:5178
+#: ../raphodo/rapid.py:5492
 #, python-format
 msgid "Downloading from %(location)s on This Computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5180
+#: ../raphodo/rapid.py:5496
 msgid ""
 "Do you really want to download from here?<br><br>On some systems, scanning "
 "this location can take a very long time."
 msgstr ""
 
-#: ../raphodo/rapid.py:5224
+#: ../raphodo/rapid.py:5537
 #, python-format
 msgid "Generating thumbnails for %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5227
+#: ../raphodo/rapid.py:5540
 #, python-format
 msgid "Scanning %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5237
+#: ../raphodo/rapid.py:5551
 #, python-format
 msgid ""
 "%(number)s of %(available files)s checked for download (%(hidden)s hidden)"
 msgstr ""
 
-#: ../raphodo/rapid.py:5243
+#: ../raphodo/rapid.py:5559
 #, python-format
 msgid "%(number)s of %(available files)s checked for download"
 msgstr ""
 
-#: ../raphodo/rapid.py:5494
+#: ../raphodo/rapid.py:5764
 msgid "Display program information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5496
+#: ../raphodo/rapid.py:5766
 msgid "Display debugging information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5499
+#: ../raphodo/rapid.py:5769
 msgid "List photo and video file extensions the program recognizes and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5502
+#: ../raphodo/rapid.py:5772
 msgid "Turn on or off the the renaming of photos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5504
+#: ../raphodo/rapid.py:5774
 msgid "turn on or off the the renaming of videos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5506
+#: ../raphodo/rapid.py:5776
 msgid ""
 "Turn on or off the automatic detection of devices from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5510
+#: ../raphodo/rapid.py:5780
 msgid "Turn on or off downloading from this computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5512 ../raphodo/rapid.py:5515 ../raphodo/rapid.py:5518
-#: ../raphodo/rapid.py:5539 ../raphodo/rapid.py:5543
+#: ../raphodo/rapid.py:5782 ../raphodo/rapid.py:5785 ../raphodo/rapid.py:5788
+#: ../raphodo/rapid.py:5809 ../raphodo/rapid.py:5813
 msgid "PATH"
 msgstr ""
 
-#: ../raphodo/rapid.py:5513
+#: ../raphodo/rapid.py:5783
 msgid "The PATH on this computer from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5516
+#: ../raphodo/rapid.py:5786
 msgid "The PATH where photos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5519
+#: ../raphodo/rapid.py:5789
 msgid "The PATH where videos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5521
+#: ../raphodo/rapid.py:5791
 msgid "Turn on or off the backing up of photos and videos while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:5525
+#: ../raphodo/rapid.py:5795
 msgid "Turn on or off the automatic detection of backup devices."
 msgstr ""
 
-#: ../raphodo/rapid.py:5527 ../raphodo/rapid.py:5533
+#: ../raphodo/rapid.py:5797 ../raphodo/rapid.py:5803
 msgid "FOLDER"
 msgstr "MAPPE"
 
-#: ../raphodo/rapid.py:5528
+#: ../raphodo/rapid.py:5798
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected photo "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3442,7 +4146,7 @@ msgid ""
 "photos up to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5534
+#: ../raphodo/rapid.py:5804
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected video "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3450,48 +4154,49 @@ msgid ""
 "up videos to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5540
+#: ../raphodo/rapid.py:5810
 msgid ""
 "The PATH where photos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5544
+#: ../raphodo/rapid.py:5814
 msgid ""
 "The PATH where videos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5547
+#: ../raphodo/rapid.py:5817
 #, python-format
 msgid "Ignore photos with the following extensions: %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5551
-msgid "Turn on or off starting downloads as soon as the program itself starts."
+#: ../raphodo/rapid.py:5821
+msgid ""
+"Turn on or off starting downloads as soon as the program itself starts."
 msgstr ""
 
-#: ../raphodo/rapid.py:5554
+#: ../raphodo/rapid.py:5824
 msgid "Turn on or off starting downloads as soon as a device is inserted."
 msgstr "Slå på eller av nedlasting straks en enhet settes inn."
 
-#: ../raphodo/rapid.py:5557
+#: ../raphodo/rapid.py:5827
 msgid ""
 "Turn on or off use of the Rapid Photo Downloader Thumbnail Cache. Turning it "
 "off does not delete existing cache contents."
 msgstr ""
 
-#: ../raphodo/rapid.py:5561
+#: ../raphodo/rapid.py:5831
 msgid ""
 "Delete all thumbnails in the Rapid Photo Downloader Thumbnail Cache, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5565
+#: ../raphodo/rapid.py:5835
 msgid "Forget which files have been previously downloaded, and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5568
+#: ../raphodo/rapid.py:5838
 msgid ""
 "Import preferences from an old program version and exit. Requires the "
 "command line program gconftool-2."
@@ -3499,22 +4204,22 @@ msgstr ""
 "Importer innstillinger fra en eldre programversjon og avslutt. Krever "
 "kommandolinjeprogrammet gconftool-2."
 
-#: ../raphodo/rapid.py:5571
+#: ../raphodo/rapid.py:5841
 msgid ""
 "Reset all program settings to their default values, delete all thumbnails in "
 "the Thumbnail cache, forget which files have been previously downloaded, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5575
+#: ../raphodo/rapid.py:5845
 msgid "Include gphoto2 debugging information in log files."
 msgstr ""
 
-#: ../raphodo/rapid.py:5579
+#: ../raphodo/rapid.py:5849
 msgid "Print information to the terminal about attached cameras and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5640
+#: ../raphodo/rapid.py:5911
 msgid ""
 "To import preferences from the old version of Rapid Photo Downloader, you "
 "must install the program gconftool-2."
@@ -3522,47 +4227,55 @@ msgstr ""
 "For å kunne importere innstillinger fra den eldre versjonen av Rapid Photo "
 "Downloader, kreves det at du installerer programmet gconftool-2."
 
-#: ../raphodo/rapid.py:5649
+#: ../raphodo/rapid.py:5920
 msgid "No prior program preferences detected: exiting"
 msgstr ""
 
-#: ../raphodo/rapid.py:5652
+#: ../raphodo/rapid.py:5923
 #, python-format
 msgid "Importing preferences from Rapid Photo Downloader %(version)s"
 msgstr "Importerer innstillinger fra Rapid Photo Downloader %(version)s"
 
-#: ../raphodo/rapid.py:5714
+#: ../raphodo/rapid.py:5989
 #, python-format
-msgid "Do you want to copy the stored sequence number, which has the value %d?"
+msgid ""
+"Do you want to copy the stored sequence number, which has the value %d?"
 msgstr ""
 
-#: ../raphodo/rapid.py:5726
+#: ../raphodo/rapid.py:6000
 msgid "Program aborting."
 msgstr ""
 
-#: ../raphodo/rapid.py:5736
+#: ../raphodo/rapid.py:6010
 msgid "Never run this program as the sudo / root user."
 msgstr ""
 
-#: ../raphodo/rapid.py:5740
+#: ../raphodo/rapid.py:6014
 msgid "You must install ExifTool to run Rapid Photo Downloader."
 msgstr ""
 
-#: ../raphodo/rapid.py:5794
+#: ../raphodo/rapid.py:6026
+msgid ""
+"Rapid Photo Downloader is installed in multiple locations.\n"
+"\n"
+"Uninstall all copies except the version you want to run."
+msgstr ""
+
+#: ../raphodo/rapid.py:6083
 msgid ""
 "When specifying a path on the command line, do not also specify an\n"
 "option for device auto detection or a path on \"This Computer\"."
 msgstr ""
 
-#: ../raphodo/rapid.py:5950
+#: ../raphodo/rapid.py:6243
 msgid "All settings and caches have been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5958
+#: ../raphodo/rapid.py:6251
 msgid "Thumbnail Cache has been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5964
+#: ../raphodo/rapid.py:6257
 msgid "Remembered files have been forgotten"
 msgstr ""
 
@@ -3578,15 +4291,15 @@ msgstr "&Ikke advare meg om dette igjen"
 msgid "&Don't warn me again about missing or broken program libraries"
 msgstr "&Ikke advare meg igjen om manglende eller skadede programbiblioteker"
 
-#: ../raphodo/renameandmovefile.py:546
+#: ../raphodo/renameandmovefile.py:554
 msgid "subfolder and filename"
 msgstr "undermappe og filnavn"
 
-#: ../raphodo/renameandmovefile.py:548
+#: ../raphodo/renameandmovefile.py:556
 msgid "filename"
 msgstr "filnavn"
 
-#: ../raphodo/renameandmovefile.py:550
+#: ../raphodo/renameandmovefile.py:558
 msgid "subfolder"
 msgstr "undermappe"
 
@@ -3666,160 +4379,237 @@ msgstr "bilder og videoer"
 msgid "photos or videos"
 msgstr "bilder eller video"
 
-#: ../raphodo/rpdfile.py:306
+#: ../raphodo/rpdfile.py:315
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: ../raphodo/rpdfile.py:318
+#. translators: natural language expression signifying a single video
+#: ../raphodo/rpdfile.py:337
+msgid "a video"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:339
 msgid "1 Video"
 msgstr "1 video"
 
-#: ../raphodo/rpdfile.py:323
+#. translators: natural language expression signifying a single photo
+#: ../raphodo/rpdfile.py:346
+msgid "a photo"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:348
 msgid "1 Photo"
 msgstr "1 bilde"
 
-#: ../raphodo/rpdfile.py:803
+#: ../raphodo/rpdfile.py:828
 #, python-format
 msgid "%(path)s on %(camera)s"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:819
+#: ../raphodo/rpdfile.py:844
 msgid "Photo"
 msgstr "Bilde"
 
-#: ../raphodo/rpdfile.py:859
+#: ../raphodo/rpdfile.py:884
 msgid "Video"
 msgstr "Videoklipp"
 
-#: ../raphodo/storage.py:138
+#: ../raphodo/storage.py:141
 msgid "File system root"
 msgstr ""
 
 #. translators: the name of the Pictures folder
-#: ../raphodo/storage.py:433
+#: ../raphodo/storage.py:437
 msgid "Pictures"
 msgstr "Bilder"
 
-#: ../raphodo/thumbnaildisplay.py:426
+#: ../raphodo/thumbnaildisplay.py:432
 #, python-format
 msgid "Taken on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:431
+#: ../raphodo/thumbnaildisplay.py:439
 #, python-format
 msgid "Modified on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:437 ../raphodo/thumbnaildisplay.py:466
+#: ../raphodo/thumbnaildisplay.py:447 ../raphodo/thumbnaildisplay.py:481
 #, python-format
 msgid "%(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:451
+#: ../raphodo/thumbnaildisplay.py:464
 #, python-format
 msgid "Memory cards: %s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:457
+#: ../raphodo/thumbnaildisplay.py:468
+#, python-format
+msgid "Memory card: %s"
+msgstr ""
+
+#: ../raphodo/thumbnaildisplay.py:473
 msgid "Downloaded as:"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:472
+#: ../raphodo/thumbnaildisplay.py:489
 #, python-format
 msgid "<br><br>Previous download:<br>%(filename)s<br>%(path)s<br>%(date)s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:1603
+#: ../raphodo/thumbnaildisplay.py:1645
 msgid "Copy Path"
 msgstr ""
 
+#. Translators: these values are file size suffixes like B representing bytes, KB representing
+#. kilobytes, etc.
+#: ../raphodo/utilities.py:170
+msgid "B"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "KB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "MB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "GB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "TB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "PB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "EB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "ZB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "YB"
+msgstr ""
+
 #. two things in a list e.g. "device1 and device2"
-#: ../raphodo/utilities.py:391
+#: ../raphodo/utilities.py:394
 #, python-format
 msgid "%(first_item)s and %(last_item)s"
 msgstr ""
 
-#: ../raphodo/utilities.py:464
+#: ../raphodo/utilities.py:468
 msgid "one"
 msgstr "én"
 
-#: ../raphodo/utilities.py:465
+#: ../raphodo/utilities.py:469
 msgid "two"
 msgstr "to"
 
-#: ../raphodo/utilities.py:466
+#: ../raphodo/utilities.py:470
 msgid "three"
 msgstr "tre"
 
-#: ../raphodo/utilities.py:467
+#: ../raphodo/utilities.py:471
 msgid "four"
 msgstr "fire"
 
-#: ../raphodo/utilities.py:468
+#: ../raphodo/utilities.py:472
 msgid "five"
 msgstr "fem"
 
-#: ../raphodo/utilities.py:469
+#: ../raphodo/utilities.py:473
 msgid "six"
 msgstr "seks"
 
-#: ../raphodo/utilities.py:470
+#: ../raphodo/utilities.py:474
 msgid "seven"
 msgstr "syv"
 
-#: ../raphodo/utilities.py:471
+#: ../raphodo/utilities.py:475
 msgid "eight"
 msgstr "åtte"
 
-#: ../raphodo/utilities.py:472
+#: ../raphodo/utilities.py:476
 msgid "nine"
 msgstr "ni"
 
-#: ../raphodo/utilities.py:473
+#: ../raphodo/utilities.py:477
 msgid "ten"
 msgstr "ti"
 
-#: ../raphodo/utilities.py:474
+#: ../raphodo/utilities.py:478
 msgid "eleven"
 msgstr "elleve"
 
-#: ../raphodo/utilities.py:475
+#: ../raphodo/utilities.py:479
 msgid "twelve"
 msgstr "tolv"
 
-#: ../raphodo/utilities.py:476
+#: ../raphodo/utilities.py:480
 msgid "thirteen"
 msgstr "tretten"
 
-#: ../raphodo/utilities.py:477
+#: ../raphodo/utilities.py:481
 msgid "fourteen"
 msgstr "fjorten"
 
-#: ../raphodo/utilities.py:478
+#: ../raphodo/utilities.py:482
 msgid "fifteen"
 msgstr "femten"
 
-#: ../raphodo/utilities.py:479
+#: ../raphodo/utilities.py:483
 msgid "sixteen"
 msgstr "seksten"
 
-#: ../raphodo/utilities.py:480
+#: ../raphodo/utilities.py:484
 msgid "seventeen"
 msgstr "sytten"
 
-#: ../raphodo/utilities.py:481
+#: ../raphodo/utilities.py:485
 msgid "eighteen"
 msgstr "atten"
 
-#: ../raphodo/utilities.py:482
+#: ../raphodo/utilities.py:486
 msgid "ninenteen"
 msgstr "nitten"
 
-#: ../raphodo/utilities.py:483
+#: ../raphodo/utilities.py:487
 msgid "twenty"
 msgstr "tjue"
 
+#: ../raphodo/viewutils.py:240
+msgid "&OK"
+msgstr ""
+
+#: ../raphodo/viewutils.py:243
+msgid "&Save"
+msgstr ""
+
+#: ../raphodo/viewutils.py:244
+msgid "&Help"
+msgstr ""
+
+#: ../raphodo/viewutils.py:245
+msgid "Restore Defaults"
+msgstr ""
+
+#: ../raphodo/viewutils.py:246
+msgid "&Yes"
+msgstr ""
+
+#: ../raphodo/viewutils.py:247
+msgid "&No"
+msgstr ""
+
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:1
 msgid ""
 "Rapid Photo Downloader imports photos and videos from cameras, phones, "
@@ -3875,8 +4665,8 @@ msgstr ""
 #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:5
 msgid ""
-"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;"
-"memory;card;"
+"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;memory"
+";card;"
 msgstr ""
 
 #: ../data/kde/net.damonlynch.rapid-photo-downloader.desktop.in.h:1
@@ -3946,6 +4736,7 @@ msgstr ""
 #~ msgid "Select a folder to download videos to"
 #~ msgstr "Velg katalog for å laste inn video"
 
+#, python-format
 #~ msgid "Select a folder containing %(file_types)s"
 #~ msgstr "Velg katalog med %(file_types)r"
 
@@ -3970,6 +4761,7 @@ msgstr ""
 #~ msgid "About 1 second remaining"
 #~ msgstr "Rundt 1 sekund igjen"
 
+#, python-format
 #~ msgid "and %s"
 #~ msgstr "og %s"
 
@@ -3991,9 +4783,11 @@ msgstr ""
 #~ msgid "Photo Folders"
 #~ msgstr "Foto mapper"
 
+#, python-format
 #~ msgid "%(device)s did not unmount"
 #~ msgstr "%(device)s ble ikke utløst"
 
+#, python-format
 #~ msgid "Downloading from %(location)s."
 #~ msgstr "Laster ned fra %(location)s."
 
@@ -4006,15 +4800,18 @@ msgstr ""
 #~ msgid "scanning..."
 #~ msgstr "søker..."
 
+#, python-format
 #~ msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 #~ msgstr "Omtrent %(minutes)i minutter og %(seconds)02i sekunder igjen"
 
+#, python-format
 #~ msgid "About %i seconds remaining"
 #~ msgstr "Omtrent %i sekunder igjen"
 
 #~ msgid "Download cannot proceed"
 #~ msgstr "Kan ikke fortsette nedlasting"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 #~ msgstr "%(number)s av %(total)s %(filetypes)s (%(remaining)s igjen)"
 
@@ -4042,6 +4839,7 @@ msgstr ""
 #~ msgid "Using backup devices"
 #~ msgstr "Bruker sikkerhetskopierings enheter"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s"
 #~ msgstr "%(number)s av %(total)s %(filetypes)s"
 
@@ -4054,36 +4852,47 @@ msgstr ""
 #~ msgid "."
 #~ msgstr "."
 
+#, python-format
 #~ msgid "(%(file_type)s)"
 #~ msgstr "(%(file_type)s)"
 
+#, python-format
 #~ msgid "%(free)s %(file_type)s"
 #~ msgstr "%(free)s %(file_type)s"
 
+#, python-format
 #~ msgid "%(free)s free"
 #~ msgstr "%(free)s tilgjengelig"
 
+#, python-format
 #~ msgid "Backing up photos and videos to %(path)s"
 #~ msgstr "Sikkerhetskopierer bilder og video til %(path)s"
 
+#, python-format
 #~ msgid "Backing up to %(path)s"
 #~ msgstr "Sikkerhetskopierer til %(path)s"
 
+#, 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"
 
+#, python-format
 #~ msgid "%(file_type)s download folder is not writable"
 #~ msgstr "Nedlastingsmappen til %(file_type)s er ikke skrivbar"
 
+#, python-format
 #~ msgid "Folder: %s"
 #~ msgstr "Mappe: %s"
 
+#, python-format
 #~ msgid "%(file_type)s download folder is invalid"
 #~ msgstr "Nedlastingsmappe til %(file_type)s er ugyldig"
 
+#, python-format
 #~ msgid "%(file_type)s download folder does not exist"
 #~ msgstr "Nedlastningsmappe til %(file_type)s finnes ikke"
 
+#, python-format
 #~ msgid ""
 #~ "display program information on the command line as the program runs "
 #~ "(default: %default)"
@@ -4091,6 +4900,7 @@ msgstr ""
 #~ "vis programinformasjon på kommandolinjen når programmet kjører (standard: "
 #~ "%default)"
 
+#, python-format
 #~ msgid "%(freespace)s. %(backuppaths)s."
 #~ msgstr "%(freespace)s. %(backuppaths)s."
 
@@ -4098,19 +4908,21 @@ msgstr ""
 #~ "When backing up, choose whether to overwrite a file on the backup device "
 #~ "that has the same name, or skip backing it up."
 #~ msgstr ""
-#~ "Under sikkerhetskopiering, velg om du vil overskrive eller hoppe over "
-#~ "filer med samme navn på sikkerhetskopierings enheten."
+#~ "Under sikkerhetskopiering, velg om du vil overskrive eller hoppe over filer "
+#~ "med samme navn på sikkerhetskopierings enheten."
 
 #~ msgid ""
 #~ "Do you really want to download from here? On some systems, scanning this "
 #~ "location can take a very long time."
 #~ msgstr ""
-#~ "Vil du virkelig laste ned fra denne posisjonen ? På noen system kan det "
-#~ "ta lang tid å søke igjennom filene."
+#~ "Vil du virkelig laste ned fra denne posisjonen ? På noen system kan det ta "
+#~ "lang tid å søke igjennom filene."
 
+#, python-format
 #~ msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
+#, python-format
 #~ msgid ""
 #~ "%(date)s\n"
 #~ "%(time)s"
@@ -4118,6 +4930,7 @@ msgstr ""
 #~ "%(date)s\n"
 #~ "%(time)s"
 
+#, python-format
 #~ msgid "%(date)s %(time)s"
 #~ msgstr "%(date)s %(time)s"
 
@@ -4133,6 +4946,7 @@ msgstr ""
 #~ msgid "MB/s"
 #~ msgstr "MB/s"
 
+#, python-format
 #~ msgid ""
 #~ "%(problem)s\n"
 #~ "File: %(file)s"
@@ -4144,15 +4958,18 @@ msgstr ""
 #~ msgstr ""
 #~ "vis hvilke bilde- og videofiltyper programmet gjenkjenner, og avslutt"
 
+#, python-format
 #~ msgid "Destination directory could not be created: %(directory)s\n"
 #~ msgstr "Klarte ikke å opprette målmappen %(directory)s\n"
 
 #~ msgid "only output errors to the command line"
 #~ msgstr "vis bare feil på kommandolinjen"
 
+#, python-format
 #~ msgid "Error: %(inst)s"
 #~ msgstr "Feil: %(inst)s"
 
+#, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
 #~ "Destination: %(destination)s"
@@ -4213,12 +5030,13 @@ msgstr ""
 #~ "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 #~ "name. Please use other renaming options.</i>"
 #~ msgstr ""
-#~ "<i><b>Advarsel:</b> Det er ikke nok metadata til å generere navnet fullt "
-#~ "ut. Bruk andre alternativer for omdøping av navn.</i>"
+#~ "<i><b>Advarsel:</b> Det er ikke nok metadata til å generere navnet fullt ut. "
+#~ "Bruk andre alternativer for omdøping av navn.</i>"
 
 #~ msgid "Invalid regular expression"
 #~ msgstr "Ugyldig regulært uttrykk"
 
+#, python-format
 #~ msgid "<i>Example: %s</i>"
 #~ msgstr "<i>Eksempel: %s</i>"
 
@@ -4228,65 +5046,80 @@ msgstr ""
 #~ msgid "externaldrive2"
 #~ msgstr "eksterndisk2"
 
+#, python-format
 #~ msgid "%(filetype)s was already downloaded"
 #~ msgstr "%(filetype)s er allerede lastet ned"
 
+#, python-format
 #~ msgid "%(volumes)s and %(final_volume)s."
 #~ msgstr "%(volumes)s og %(final_volume)s."
 
+#, python-format
 #~ msgid "%s, "
 #~ msgstr "%s, "
 
+#, python-format
 #~ msgid "%(volume)s, "
 #~ msgstr "%(volume)s, "
 
+#, python-format
 #~ msgid "%(volume)s (%(inst)s), "
 #~ msgstr "%(volume)s (%(inst)s), "
 
+#, python-format
 #~ msgid "%(volumes)s and %(volume)s."
 #~ msgstr "%(volumes)s og %(volume)s."
 
+#, python-format
 #~ msgid "%(volumes)s and %(volume)s (%(inst)s)."
 #~ msgstr "%(volumes)s og %(volume)s (%(inst)s)."
 
 #~ msgid "The following metadata is missing: "
 #~ msgstr "Følgende metadata mangler: "
 
-#~ msgid ""
-#~ "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
-#~ msgstr ""
-#~ "%(missing_metadata_elements)s og %(final_missing_metadata_element)s."
+#, python-format
+#~ msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
+#~ msgstr "%(missing_metadata_elements)s og %(final_missing_metadata_element)s."
 
+#, python-format
 #~ msgid " Furthermore, there was a %(problem)s."
 #~ msgstr " Dessuten, var det ett %(problem)s."
 
+#, python-format
 #~ msgid "%(previousproblem)s Additionally, %(newproblem)s"
 #~ msgstr "%(previousproblem)s i tillegg, %(newproblem)s"
 
+#, python-format
 #~ msgid " Furthermore, there were %(problems)s."
 #~ msgstr " Dessuten, var det %(problems)s."
 
+#, python-format
 #~ msgid "Problem in %s generation"
 #~ msgstr "Problem ved oppretting av %s"
 
+#, python-format
 #~ msgid "Problems in %s generation"
 #~ msgstr "Problemer ved oppretting av %s"
 
 #~ msgid "Multiple problems were encountered"
 #~ msgstr "Flere feil oppstod"
 
+#, python-format
 #~ msgid "Source: %(source)s"
 #~ msgstr "Kilde: %(source)s"
 
+#, python-format
 #~ msgid "%(previousproblem)s, and %(backinguperror)s"
 #~ msgstr "%(previousproblem)s, og %(backinguperror)s"
 
 #~ msgid "_File"
 #~ msgstr "_Fil"
 
+#, python-format
 #~ msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
+#, python-format
 #~ msgid "Path: %s"
 #~ msgstr "Filbane: %s"
 
@@ -4336,8 +5169,7 @@ msgstr ""
 #~ msgstr "_Merk alle"
 
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Bildenedlastingsmapper</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Bildenedlastingsmapper</span>"
 
 #~ msgid "Preferences: Rapid Photo Downloader"
 #~ msgstr "Innstillinger: Rapid Photo Downloader"
@@ -4367,8 +5199,7 @@ msgstr ""
 #~ msgstr "Nedlastingsmappe:"
 
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Videonedlastingsmapper</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Videonedlastingsmapper</span>"
 
 #~ msgid "Video Folders"
 #~ msgstr "Videomapper"
@@ -4437,46 +5268,49 @@ msgstr ""
 #~ msgstr "Lag miniatyrbilder (tregere)"
 
 #~ 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."
+#~ "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 ""
-#~ "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."
+#~ "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."
 
+#, python-format
 #~ msgid ""
 #~ "The following regular expressions are invalid, and will be removed unless "
 #~ "you correct them:\n"
 #~ " %s"
 #~ msgstr ""
-#~ "De følgende regulære uttrykkene er ugyldige, og vil bli fjernet om du "
-#~ "ikke endrer dem:\n"
+#~ "De følgende regulære uttrykkene er ugyldige, og vil bli fjernet om du ikke "
+#~ "endrer dem:\n"
 #~ "%s"
 
+#, python-format
 #~ msgid ""
-#~ "This regular expression is invalid, and will be removed unless you "
-#~ "correct it:\n"
+#~ "This regular expression is invalid, and will be removed unless you correct "
+#~ "it:\n"
 #~ " %s"
 #~ msgstr ""
 #~ "Dette regulære uttrykket er ugyldig, og vil bli fjernet om du ikke retter "
 #~ "det:\n"
 #~ " %s"
 
+#, 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 ""
-#~ "Innstillingene til %(filetype)s undermappe er ugyldige og kan ikke "
-#~ "brukes.\n"
+#~ "Innstillingene til %(filetype)s undermappe er ugyldige og kan ikke brukes.\n"
 #~ "De vil bli satt tilbake til standard verdier."
 
+#, python-format
 #~ msgid "Date time value %s appears invalid."
 #~ msgstr "Dato tidsverdien %s fremstår som ugyldig."
 
 #~ msgid "Remove all Ignored Paths?"
 #~ msgstr "Fjern alle undertrykte filbaner?"
 
+#, python-format
 #~ msgid ""
 #~ "%(filetype)s could not be backed up because no suitable backup locations "
 #~ "were found."
@@ -4484,39 +5318,49 @@ msgstr ""
 #~ "%(filetype)s could not be backed up because no suitable backup locations "
 #~ "were found."
 
+#, python-format
 #~ msgid "%(filetype)s already exists"
 #~ msgstr "%(filetype)s finnes allerede"
 
+#, python-format
 #~ msgid "%(filetype)s metadata cannot be read"
 #~ msgstr "%(filetype)s metadata kan ikke leses"
 
+#, python-format
 #~ msgid "Error generating component %s."
 #~ msgstr "Feil ved oppretting av %s-komponenten."
 
+#, python-format
 #~ msgid "An error occurred when copying the %(filetype)s"
 #~ msgstr "En feil oppstod ved kopiering av %(filetype)s"
 
+#, python-format
 #~ msgid "%(filetype)s %(area)s could not be generated"
 #~ msgstr "%(filetype)s %(area)s kunne ikke opprettes"
 
 #~ msgid "Errors occurred when backing up on the following backup devices: "
 #~ msgstr "Flere feil oppstod ved sikkerhetskopiering til følgende enheter: "
 
+#, python-format
 #~ msgid "An error occurred when backing up on %(volume)s."
 #~ msgstr "En feil oppstod ved sikkerhetskopiering til %(volume)s."
 
+#, python-format
 #~ msgid "Backup already exists on %(volume)s."
 #~ msgstr "Sikkerhetskopi finnes allerede på %(volume)s."
 
+#, 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."
 
+#, python-format
 #~ msgid "Error: %(errorno)s %(strerror)s"
 #~ msgstr "Feil: %(errorno)s %(strerror)s"
 
 #~ msgid "The metadata might be corrupt."
 #~ msgstr "Metadataen kan være korrupt."
 
+#, python-format
 #~ msgid " It was backed up to %(volume)s"
 #~ msgstr " Det ble sikkerhetskopiert til %(volume)s"
 
@@ -4526,20 +5370,21 @@ msgstr ""
 #~ msgid "Backups overwritten on these devices: "
 #~ msgstr "Sikkerhetskopier overskrevet på  disse enhetene: "
 
+#, python-format
 #~ msgid "Backup overwritten on %(volume)s."
 #~ msgstr "Sikkerhetskopi overskrevet på %(volume)s."
 
 #~ msgid "Backups already exist in these locations: "
 #~ msgstr "Sikkerhetskopier finnes allerede i disse plasseringene: "
 
+#, python-format
 #~ msgid "%(filetype)s already exists, but it was backed up"
 #~ msgstr "%(filetype)s finnes allerede, men den ble sikkerhetskopiert"
 
-#~ msgid ""
-#~ "An error occurred when copying the %(filetype)s, but it was backed up"
+#, 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"
+#~ "En feil oppstod ved kopiering av %(filetype)s, men den ble sikkerhetskopiert"
 
 #~ msgid "Problems in subfolder and filename generation"
 #~ msgstr "Flere problemer ved oppretting av undermapper og filnavn"
@@ -4547,12 +5392,12 @@ msgstr ""
 #~ msgid "Problem in subfolder and filename generation"
 #~ msgstr "Problem ved oppretting av undermappe og filnavn"
 
+#, 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."
 
 #~ msgid ""
-#~ "Errors occurred when creating directories on the following backup "
-#~ "devices: "
+#~ "Errors occurred when creating directories on the following backup devices: "
 #~ msgstr ""
 #~ "Flere feil oppstod ved oppretting av mapper på følgende enheter for "
 #~ "sikkerhetskopi: "
@@ -4579,9 +5424,9 @@ msgstr ""
 #~ msgstr "_Gi en donasjon..."
 
 #~ 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>."
+#~ "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 ""
 #~ "Beklager, funksjon for nedlasting av video deaktivert. For å laste ned "
 #~ "video, vær vennlig å installer enten <i>hachoir metadata</i> og <i>kaa "
@@ -4608,8 +5453,7 @@ msgstr ""
 
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
 #~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Alternativer for å gi nytt navn</"
-#~ "span>"
+#~ "<span weight=\"bold\" size=\"x-large\">Alternativer for å gi nytt navn</span>"
 
 #~ msgid "<b>Sequence Numbers</b>"
 #~ msgstr "<b>Sekvensnummre</b>"
@@ -4621,11 +5465,11 @@ msgstr ""
 #~ msgstr "Alternativer for gi nytt navn"
 
 #~ msgid ""
-#~ "If you disable automatic detection, choose the exact location of the "
-#~ "photos and videos."
+#~ "If you disable automatic detection, choose the exact location of the photos "
+#~ "and videos."
 #~ msgstr ""
-#~ "Om du skrur av automatisk oppdaging, velg eksakt plassering der bildene "
-#~ "og video er."
+#~ "Om du skrur av automatisk oppdaging, velg eksakt plassering der bildene og "
+#~ "video er."
 
 #~ msgid "Automatically detect Portable Storage Devices"
 #~ msgstr "Oppdag flyttbare lagringsenheter automatisk"
@@ -4639,6 +5483,7 @@ msgstr ""
 #~ msgid "<b>Program Automation</b>"
 #~ msgstr "<b>Automatisering</b>"
 
+#, python-format
 #~ msgid "There is no data with which to name the %(filetype)s."
 #~ msgstr "Mangler data for å navngi %(filetype)s."
 
@@ -4658,6 +5503,7 @@ msgstr ""
 #~ "opprettet i denne mappen etter de valg du har gjort for "
 #~ "nedlastingsundermapper."
 
+#, python-format
 #~ msgid ""
 #~ "Photos detected with the same filenames, but taken at different times: "
 #~ "%(details)s"
@@ -4668,10 +5514,8 @@ msgstr ""
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
 #~ msgstr "<span weight=\"bold\" size=\"x-large\">Diverse</span>"
 
-#~ msgid ""
-#~ "Photos detected with the same filenames, but taken at different times"
-#~ msgstr ""
-#~ "Bilder funnet med samme filnavn, men tatt ved forskjellige tidspunkt"
+#~ msgid "Photos detected with the same filenames, but taken at different times"
+#~ msgstr "Bilder funnet med samme filnavn, men tatt ved forskjellige tidspunkt"
 
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
 #~ msgstr "<span weight=\"bold\" size=\"x-large\">Jobbnavn</span>"
diff --git a/po/nl.po b/po/nl.po
index 075db97..f497038 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,35 +7,450 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: damonlynch@gmail.com\n"
-"POT-Creation-Date: 2017-07-08 19:16-0500\n"
-"PO-Revision-Date: 2017-07-04 11:06+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2017-09-12 17:01-0400\n"
+"PO-Revision-Date: 2017-09-17 18:38+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: 2017-07-05 23:04+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-09-26 22:04+0000\n"
+"X-Generator: Launchpad (build 18463)\n"
+"Language: nl\n"
+
+#: ../install.py:65
+msgid "Rapid Photo Downloader installer"
+msgstr "Rapid Photo Downloader installeerprogramma"
+
+#: ../install.py:66
+msgid "Download and install latest version of Rapid Photo Downloader."
+msgstr ""
+"Download en installeer  de laatste versie van Rapid Photo Downloader."
+
+#: ../install.py:236 ../install.py:1732
+msgid "Installer not found:"
+msgstr "Installeerprogramma niet gevonden:"
+
+#. Translators: do not translate the term tar.gz
+#: ../install.py:240 ../install.py:1736
+msgid "Installer not in tar.gz format:"
+msgstr "Installeerprogramma niet in tar.gz formaat:"
+
+#: ../install.py:465
+msgid ""
+"Incorrect folder ownership detected. Changing ownership of and resetting "
+"permissions for"
+msgstr ""
+"Eigenaar van de map niet correct. Veranderen van eigenaar en  aanpassen van "
+"rechten voor"
+
+#: ../install.py:540
+msgid "The following command will be run:"
+msgstr "De volgende opdracht zal uitgevoerd worden:"
+
+#: ../install.py:543 ../install.py:1479 ../install.py:1484
+msgid "sudo may prompt you for the sudo password."
+msgstr "sudo kan je om je sudo wachtwoord vragen."
+
+#: ../install.py:547
+msgid "Would you like to run the command now?"
+msgstr "Wens je de opdracht nu uit te voeren?"
+
+#: ../install.py:549
+msgid "Answer is not yes, exiting."
+msgstr "Het antwoord was niet  ja, het programma wordt verlaten."
+
+#: ../install.py:559 ../install.py:751 ../install.py:966
+msgid "Command failed"
+msgstr "Opdracht mislukt"
+
+#: ../install.py:561 ../install.py:752 ../install.py:967
+msgid "Exiting"
+msgstr "Afsluiten"
+
+#: ../install.py:582
+msgid "The Universe repository must be enabled."
+msgstr "De Universe softwarebron moet geactiveerd zijn."
+
+#: ../install.py:606
+msgid ""
+"Do you want to to uninstall the previous version of Rapid Photo Downloader:"
+msgstr "Wens je de vorige versie van Rapid Photo Downloader te verwijderen:"
+
+#: ../install.py:715 ../install.py:740
+msgid ""
+"Querying package system to see if an older version of Rapid Photo Downloader "
+"is installed (this may take a while)..."
+msgstr ""
+"Het pakketsysteem wordt nagegaan om te zien of een vorige geïnstalleerde "
+"versie van Rapid Photo Downloader geïnstalleerd is (kan een poosje duren...)"
+
+#: ../install.py:726
+msgid ""
+"Unable to query package system. Please check your Internet connection and "
+"try again"
+msgstr ""
+"Kan het pakketsysteem niet ondervragen. Controleer je internetverbinding en "
+"probeer opnieuw."
+
+#: ../install.py:756
+msgid "Checking if previous version installed with pip..."
+msgstr "Nagaan of de vorige versie via pip werd geïnstalleerd..."
+
+#: ../install.py:850
+msgid "The following package is unknown on your system: {}\n"
+msgstr "Het volgende pakket is niet gekend binnen je systeem: {}\n"
+
+#: ../install.py:857 ../install.py:929 ../install.py:974
+msgid ""
+"To continue, some packages required to run the application will be installed."
+msgstr "Om verder te gaan worden bepaalde vereiste pakketten geïnstalleerd."
+
+#: ../install.py:886
+msgid "Querying installed and available packages (this may take a while)"
+msgstr ""
+"Geïnstalleerde en beschikbare pakketten worden overlopen (kan een poosje "
+"duren)"
+
+#: ../install.py:958
+msgid ""
+"Querying zypper to see if any required packages are already installed (this "
+"may take a while)... "
+msgstr ""
+"Zypper wordt overlopen om te zien of er vereiste pakketten zijn die al "
+"geïnstalleerd zijn (kan een poosje duren) "
+
+#: ../install.py:1004
+msgid "Query to confirm action at each step."
+msgstr "Vraag om iedere stap te bevestigen."
+
+#: ../install.py:1011
+msgid ""
+"When downloading the latest version, install the development version if it "
+"is newer than the stable version."
+msgstr ""
+"Bij het installeren van de laatste versie, de ontwikkelversie installeren "
+"als die recenter is dan de stabiele versie."
+
+#: ../install.py:1020
+msgid ""
+"Optional tar.gz Rapid Photo Downloader installer archive. If not specified, "
+"the latest version is downloaded from the Internet."
+msgstr ""
+"Optioneel tar.gz Rapid Photo Downloader installer archief. Indien niet "
+"gespecificeerd wordt de laatste versie van het Internet gedownload."
+
+#: ../install.py:1043
+msgid ""
+"Do not run the installer in the tar.gz Rapid Photo Downloader installer "
+"archive if it is newer than this version ({}). The default is to run "
+"whichever installer is newer."
+msgstr ""
+"Start de installatie niet in de tar.gz Rapid Photo Downloader installeerder "
+"archief als die nieuwer is dan deze versie ({}). Standaard wordt de meest "
+"recentste gestart."
+
+#: ../install.py:1050
+msgid ""
+"Uninstall Rapid Photo Downloader that was installed with pip, keeping its "
+"dependencies."
+msgstr ""
+"Verwijder Rapid Photo Downloader die via pip geïnstalleerd was, maar behoudt "
+"de afhankelijkheden."
+
+#: ../install.py:1054
+msgid ""
+"Uninstall the dependencies installed by pip during Rapid Photo Downloader's "
+"installation, and Rapid Photo Downloader itself, then exit."
+msgstr ""
+"Verwijder de afhankelijkheden die via pip geïnstalleerd waren gedurende de "
+"Rapid Photo Downloader's installatii samen met Rapid Photo Downloaderen en "
+"stop vervolgens het programma."
+
+#: ../install.py:1059
+msgid ""
+"Note: this will not uninstall any version of Rapid Photo Downloader "
+"installed by your Linux distribution's package manager."
+msgstr ""
+"Noot: dit zal geen enkele versie van Rapid Photo Downloader verwijderen "
+"welke via je Linux distributie pakkettenbeheer geïnstalleerd was."
+
+#: ../install.py:1066
+msgid ""
+"Dependencies will only be removed if they are not required by other programs."
+msgstr ""
+"Enkel afhankelijkheden die niet door andere programma's nodig zijn worden "
+"verwijderd."
+
+#: ../install.py:1072
+msgid ""
+"Note: this option will remove the dependencies regardless of whether they "
+"are required by another program pip has installed. Upgrade to pip 9.0 or "
+"above if you want to avoid this behavior. You can do so using the command "
+"'python3 -m pip install pip -U --user'. Also note that any version of Rapid "
+"Photo Downloader installed by your Linux distribution's package manager will "
+"not be uninstalled."
+msgstr ""
+"Noot: deze optie zal de afhankelijkheden verwijderen ongeacht of ze vereist "
+"zijn voor een ander programma dat pip geïnstalleerd heeft. Werkt pip bij tot "
+"versie 0.9 als je dat gedrag wil vermijden. Je kan dat doen via het commando "
+"'python3 -m pip install pip -U --user'. Noteer ook dat elke versie van Rapid "
+"Photo Downloader geïnstalleerd door het softwarebeheer van je distro niet "
+"verwijderd zal worden."
+
+#: ../install.py:1122
+msgid "Failed to download versions file"
+msgstr "Kon het versiebestand niet downloaden"
+
+#: ../install.py:1126
+msgid "Got error code {} while accessing versions file"
+msgstr "Fout code {} tijdens benaderen van het versie bestand"
+
+#: ../install.py:1234
+msgid ""
+"Sorry, could not locate installer. Please check your Internet connection and "
+"verify if you can reach https://www.damonlynch.net\n"
+"\n"
+"Exiting.\n"
+msgstr ""
+"Sorry, kon het installeerprogramma niet vinden. Controller je Internet "
+"verbinding en kijk of je https://www.damonlynch.net\n"
+"kan bereiken.\n"
+"\n"
+"Programma wordt gestopt..\n"
+
+#: ../install.py:1408
+msgid "Installing application requirements..."
+msgstr "Vereisten voor de applicatie aan het installeren..."
+
+#: ../install.py:1424
+msgid "Received error code"
+msgstr "Foutcode ontvangen"
+
+#: ../install.py:1425
+msgid "Failed to install application requirements: exiting"
+msgstr ""
+"Kon de applicatie vereisten niet installeren: Programma wordt gestopt."
+
+#: ../install.py:1428
+msgid "Installing application..."
+msgstr "Applicatie aan het installeren..."
+
+#: ../install.py:1441
+msgid "Failed to install application: exiting..."
+msgstr "Kan de applicatie niet installeren. Programma wordt gestopt."
+
+#: ../install.py:1465
+msgid ""
+"You may have to restart the computer to be able to run the program from the "
+"commmand line or application launcher."
+msgstr ""
+"Je moet mogelijks je computer herstarten om het programma vanaf de "
+"commandolijn of vanuit het menu te starten."
+
+#: ../install.py:1476
+msgid "Do you want to install the application's man pages?"
+msgstr "Wens je de man-pagina's voor het programma te installeren?"
+
+#: ../install.py:1477
+msgid "They will be installed into {}"
+msgstr "Ze worden geïnstalleerd in {}"
+
+#: ../install.py:1478 ../install.py:1483
+msgid "If you uninstall the application, remove these manpages yourself."
+msgstr ""
+"Je moet de man-pagina's zelf verwijderen als je het programma deïnstalleert."
+
+#: ../install.py:1480
+msgid "Do want to install the man pages?"
+msgstr "Wens je de man pages te installeren?"
+
+#: ../install.py:1482
+msgid "Installing man pages into {}"
+msgstr "Man pages worden geïnstalleerd in {}"
+
+#: ../install.py:1499
+msgid "Failed to create man page directory: exiting"
+msgstr ""
+"Kon de folder voor de man-pagina's niet aanmaken. Programma wordt gestopt"
+
+#: ../install.py:1511
+msgid "Failed to copy man page."
+msgstr "Kon man page niet kopiëren."
+
+#: ../install.py:1521
+msgid "(If a segmentation fault occurs at exit, you can ignore it...)"
+msgstr ""
+"(Als er zich een segmentatiefout voordoet op het einde, kan je deze "
+"negeren...)"
+
+#: ../install.py:1534
+msgid ""
+"The python3 tool pip is required to uninstall a version of Rapid Photo "
+"Downloader that was installed with pip.\n"
+"Cannot continue. Exiting."
+msgstr ""
+"Het python3 programma pip is vereist om een versie van Rapid Photo "
+"Downloader te verwijderen dat via pip geïnstalleerd werd.\n"
+"Kan niet verder gaan. Programma wordt gestopt."
+
+#: ../install.py:1575
+msgid ""
+"Do not run this installer script as sudo / root user.\n"
+"Run it using the user who will run the program.\n"
+msgstr ""
+"Start het installatiescript niet als sudo / root gebruiker.\n"
+"Start het script als gewone gebruiker die het programma zal gebruiken.\n"
+
+#: ../install.py:1585 ../install.py:1599
+msgid "Do not include any other command line arguments when specifying"
+msgstr "Geef geen extra commandolijn argumenten mee bij het specificeren"
+
+#: ../install.py:1614
+msgid ""
+"Sorry, this installer does not support a custom python installation.\n"
+"Exiting..."
+msgstr ""
+"Sorry, dit installeerprogramma ondersteund geen aangepaste python "
+"installatie.\n"
+"Programma wordt verlaten..."
+
+#: ../install.py:1620
+msgid "Restarting script using system python..."
+msgstr "Script herstarten via systeem python..."
+
+#: ../install.py:1651
+msgid "Exiting..."
+msgstr "Afsluiten..."
+
+#. Translators: do not translate the term python3-apt
+#: ../install.py:1670
+msgid "To continue, the package python3-apt must be installed."
+msgstr "Om verder te gaan moet het pakket python3-apt geïnstalleerd worden"
+
+#: ../install.py:1689
+msgid ""
+"Install the following packages using your Linux distribution's standard "
+"package manager, and then rerun this installer"
+msgstr ""
+"Installeer volgende pakketten via je Linux standaard pakkettenbeheer, en kom "
+"dan terug naar de installer."
+
+#: ../install.py:1698
+msgid ""
+"To run this program, programs to assist Python 3 and its package management "
+"must be installed."
+msgstr ""
+"Om dit programma te draaien moeten er programma's om Python3 en zijn "
+"pakkettenbeheer geïnstalleerd worden."
+
+#. Translators: do not translate the terms Python 3, pip and setuptools
+#: ../install.py:1713
+msgid "Python 3's pip and setuptools must be upgraded for your user."
+msgstr ""
+"Python 3's pip en setuptools moeten bijgewerkt worden voor je gebruiker."
+
+#. Translators: do not translate the term python or requests
+#: ../install.py:1726
+msgid "Installing python requests"
+msgstr "Python requests aan het installeren"
+
+#: ../upgrade.py:79
+msgid "Upgrade Rapid Photo Downloader"
+msgstr "Opwaarderen Rapid Photo Downloader"
+
+#: ../upgrade.py:401 ../raphodo/viewutils.py:242
+msgid "&Cancel"
+msgstr "&Annuleer"
+
+#: ../upgrade.py:405
+msgid "&Upgrade"
+msgstr "&Opwaarderen"
+
+#: ../upgrade.py:410
+#, python-format
+msgid "Click the Upgrade button to upgrade to version %s."
+msgstr "Klik de Opwaarderen knop om naar versie %s op te waarderen."
+
+#: ../upgrade.py:413
+msgid "Click the Upgrade button to start the upgrade."
+msgstr "Klik de Opwaardeer knop om het opwaarderen te starten."
+
+#: ../upgrade.py:416 ../upgrade.py:422 ../raphodo/viewutils.py:241
+msgid "&Close"
+msgstr "&Afsluiten"
+
+#: ../upgrade.py:417
+msgid "&Run"
+msgstr "&Uitvoeren"
+
+#: ../upgrade.py:447
+msgid "Close Rapid Photo Downloader before running this upgrade"
+msgstr "Sluit Rapid Photo Downloader af alvorens het opwaarderen te starten."
+
+#: ../upgrade.py:450
+msgid "Upgrade running..."
+msgstr "Opwaardering lopende..."
 
-#. type: QPushButton
-#: ../raphodo/aboutdialog.py:217
+#: ../upgrade.py:486
+#, python-format
+msgid ""
+"Successfully upgraded to %s. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+"Met succes naar %s opgewaardeerd. Klik op Sluiten om af te sluiten, of op "
+"Uitvoeren om het programma te starten."
+
+#: ../upgrade.py:491
+msgid ""
+"Upgrade finished successfully. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+"Opwaarderen met succes afgerond. Klik op Sluiten om af te sluiten, of op "
+"Uitvoeren om het programma te starten."
+
+#: ../upgrade.py:495
+msgid "Upgrade failed. Click Close to exit."
+msgstr "Opwaardering mislukt. Klik op Sluiten om af te sluiten."
+
+#: ../upgrade.py:6967
+#, python-format
+msgid "Upgrading %s..."
+msgstr "Bezig met opwaarderen van %s ..."
+
+#: ../upgrade.py:6969
+msgid "Press any key to continue..."
+msgstr "Druk op een toets om verder te gaan..."
+
+#: ../upgrade.py:6982
+msgid "Rapid Photo Downloader upgrade failed"
+msgstr "Rapid Photo Downloader bijwerken mislukt"
+
+#: ../upgrade.py:6984
+#, python-format
+msgid ""
+"The python package %s could not be updated. The upgrade cannot continue."
+msgstr ""
+"Het python pakket %s kon niet bijgewerkt worden. Opwaarderen wordt "
+"afgebroken."
+
+#: ../raphodo/aboutdialog.py:225
 msgid "Credits"
 msgstr "Met dank aan"
 
-#: ../raphodo/backuppanel.py:239
+#: ../raphodo/backuppanel.py:240
 msgid "Backups are not configured"
 msgstr "Back-ups zijn niet geconfigureerd"
 
-#: ../raphodo/backuppanel.py:241
+#: ../raphodo/backuppanel.py:242
 msgid "No backup devices detected"
-msgstr "Geen backup apparaat gedetecteerd"
+msgstr "Geen back-up apparaat gedetecteerd"
 
-#: ../raphodo/backuppanel.py:243
+#: ../raphodo/backuppanel.py:244
 msgid "Valid backup locations not yet specified"
-msgstr "Gevalideerde back-up locaties nog niet gespecifieerd"
+msgstr "Geldige back-up locaties nog niet gespecificeerd"
 
-#: ../raphodo/backuppanel.py:401
+#: ../raphodo/backuppanel.py:404
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
@@ -43,97 +458,112 @@ msgstr ""
 "Je kan je foto's en video's naar meerdere locaties backuppen terwijl ze "
 "gedownload worden, bv. externe harde schijven."
 
-#: ../raphodo/backuppanel.py:407
+#: ../raphodo/backuppanel.py:412
 msgid "Back up photos and videos when downloading"
-msgstr "Backup foto's en video's gedurende het downloaden"
+msgstr "Back-up foto's en video's gedurende het downloaden"
 
-#: ../raphodo/backuppanel.py:413
+#: ../raphodo/backuppanel.py:418
 msgid "Automatically detect backup devices"
-msgstr "Automatisch detecteren van backup apparaten"
+msgstr "Automatisch detecteren van back-up apparaten"
 
-#: ../raphodo/backuppanel.py:417
+#: ../raphodo/backuppanel.py:424
 msgid ""
-"Specify the folder in which backups are stored on the device."
-"<br><br><i>Note: the presence of a folder with this name is used to "
+"Specify the folder in which backups are stored on the "
+"device.<br><br><i>Note: the presence of a folder with this name is used to "
 "determine if 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 folder names. By "
 "adding both folders, the same device can be used to back up both photos and "
 "videos.</i>"
 msgstr ""
+"Geef de folder op in dewelke back-ups bewaard worden op dit "
+"apparaat.<br><br><i>Noot: de aanwezigheid van een folder met die naam "
+"bepaalt of dat apparaat voor back-ups gebruikt zal worden. Voor ieder "
+"apparaat waar je naar toe wenst te backuppen, moet je een folder aanmaken "
+"met één van die foldernamen. Door beide folders toe te voegen, kan hetzelfde "
+"apparaat gebruikt worden om zowel foto's als video's te backuppen."
 
-#: ../raphodo/backuppanel.py:428
+#: ../raphodo/backuppanel.py:439
 msgid "Photo folder name:"
 msgstr "Foto folder naam:"
 
-#: ../raphodo/backuppanel.py:433
+#: ../raphodo/backuppanel.py:444
 msgid "Video folder name:"
 msgstr "Video folder naam:"
 
-#: ../raphodo/backuppanel.py:438 ../raphodo/nameeditor.py:883
+#: ../raphodo/backuppanel.py:449 ../raphodo/nameeditor.py:890
 #: ../raphodo/renamepanel.py:123
 msgid "Example:"
 msgstr "Voorbeeld:"
 
-#: ../raphodo/backuppanel.py:448
-msgid "If you disable automatic detection, choose the exact backup locations."
+#: ../raphodo/backuppanel.py:460
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
-"Als je de automatische herkenning uitzet, moet je een exacte backup locatie "
+"Als je de automatische herkenning uitzet, moet je een exacte back-up locatie "
 "ingeven."
 
-#: ../raphodo/backuppanel.py:452
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:468
 msgid "Photo backup location:"
-msgstr "Foto backup locatie:"
+msgstr "Foto back-up locatie:"
 
-#: ../raphodo/backuppanel.py:454
+#: ../raphodo/backuppanel.py:474
 msgid "Select Photo Backup Location"
 msgstr "Selecter Foto Back-up Locatie"
 
-#: ../raphodo/backuppanel.py:460
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:485
 msgid "Video backup location:"
-msgstr "Video backup locatie:"
+msgstr "Video back-up locatie:"
 
-#: ../raphodo/backuppanel.py:462
+#: ../raphodo/backuppanel.py:491
 msgid "Select Video Backup Location"
 msgstr "Selecteer Video Back-up Locatie"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:564
+#: ../raphodo/backuppanel.py:595
 msgid "drive1"
 msgstr "apparaat1"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:567
+#: ../raphodo/backuppanel.py:598
 msgid "drive2"
 msgstr "apparaat2"
 
-#: ../raphodo/backuppanel.py:628
+#: ../raphodo/backuppanel.py:663
 msgid "Projected Backup Storage Use"
-msgstr "Vermoedelijke Back-up Opslag gebruik"
+msgstr "Vermoedelijke ruimte nodig op Back-up Opslag"
 
-#: ../raphodo/backuppanel.py:632
+#: ../raphodo/backuppanel.py:669
 msgid "Backup Options"
 msgstr "Back-up Opties"
 
 #. translators: refers to the video thumbnail file that some
 #. cameras generate -- it has a .THM file extension
-#: ../raphodo/copyfiles.py:476
+#: ../raphodo/copyfiles.py:491
 msgid "video THM"
 msgstr "video THM"
 
-#: ../raphodo/copyfiles.py:482
+#: ../raphodo/copyfiles.py:497
 msgid "audio"
 msgstr "audio"
 
 #: ../raphodo/destinationdisplay.py:78 ../raphodo/devicedisplay.py:1079
-#: ../raphodo/rpdfile.py:321
+#: ../raphodo/rpdfile.py:342
 #, python-format
 msgid "%(no_photos)s Photos"
 msgstr "%(no_photos)s Foto's"
 
 #: ../raphodo/destinationdisplay.py:82 ../raphodo/devicedisplay.py:1081
-#: ../raphodo/rpdfile.py:316
+#: ../raphodo/rpdfile.py:333
 #, python-format
 msgid "%(no_videos)s Videos"
 msgstr "%(no_videos)s Video's"
@@ -161,23 +591,23 @@ msgid "%(size_free)s free of %(size_total)s"
 msgstr "%(size_free)s vrij van %(size_total)s"
 
 #: ../raphodo/destinationdisplay.py:190 ../raphodo/devicedisplay.py:993
-#: ../raphodo/rapid.py:1964 ../raphodo/rapid.py:2079 ../raphodo/rapid.py:5753
-#: ../raphodo/rpdfile.py:905
+#: ../raphodo/rapid.py:2023 ../raphodo/rapid.py:2151 ../raphodo/rapid.py:6043
+#: ../raphodo/rpdfile.py:930
 msgid "Photos"
 msgstr "Foto’s"
 
 #. translators: the name of the Videos folder
 #: ../raphodo/destinationdisplay.py:191 ../raphodo/devicedisplay.py:994
-#: ../raphodo/rapid.py:1967 ../raphodo/rapid.py:2080 ../raphodo/rapid.py:5754
-#: ../raphodo/rpdfile.py:933 ../raphodo/storage.py:445
+#: ../raphodo/rapid.py:2028 ../raphodo/rapid.py:2152 ../raphodo/rapid.py:6044
+#: ../raphodo/rpdfile.py:958 ../raphodo/storage.py:449
 msgid "Videos"
 msgstr "Video's"
 
 #: ../raphodo/destinationdisplay.py:192
 msgid "Projected storage use after download"
-msgstr "Vermoedelije gebruikte opslag na download"
+msgstr "Vermoedelijke vrije ruimte na download"
 
-#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:516
+#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:521
 msgid "Custom..."
 msgstr "Aangepast…"
 
@@ -207,7 +637,7 @@ msgstr "Apparaat definitief negeren"
 
 #: ../raphodo/devicedisplay.py:1004
 msgid "Rescan"
-msgstr "Opnieuw scannen"
+msgstr "Herscannen"
 
 #. Translators: percentage full e.g. 75% full
 #: ../raphodo/devicedisplay.py:1093
@@ -215,94 +645,165 @@ msgstr "Opnieuw scannen"
 msgid "%s full"
 msgstr "%s vol"
 
-#: ../raphodo/devices.py:459
+#: ../raphodo/devices.py:463
 msgid "Cameras"
 msgstr "Camera's"
 
-#: ../raphodo/devices.py:460 ../raphodo/devices.py:920
-#: ../raphodo/preferencedialog.py:85 ../raphodo/rapid.py:1927
+#: ../raphodo/devices.py:464 ../raphodo/devices.py:927
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/rapid.py:1979
 msgid "Devices"
 msgstr "Apparaten"
 
-#: ../raphodo/devices.py:720
+#: ../raphodo/devices.py:724
 #, python-format
 msgid "Downloading from %(device_names)s"
 msgstr "Downloaden van %(device_names)s"
 
 #. Translators: e.g. Three Devices
-#: ../raphodo/devices.py:780
+#: ../raphodo/devices.py:784
 #, python-format
 msgid "%(no_devices)s %(device_type)s"
 msgstr "%(no_devices)s %(device_type)s"
 
-#: ../raphodo/devices.py:905 ../raphodo/rapid.py:1764
+#: ../raphodo/devices.py:912 ../raphodo/rapid.py:1807
 msgid "Select Source"
 msgstr "Selecteer bron"
 
-#: ../raphodo/devices.py:936 ../raphodo/devices.py:947
+#: ../raphodo/devices.py:943 ../raphodo/devices.py:954
 #, python-format
 msgid "%(device1)s + %(device2)s"
 msgstr "%(device1)s + %(device2)s"
 
 #. Number of cameras e.g. 3 Cameras
-#: ../raphodo/devices.py:958
+#: ../raphodo/devices.py:965
 #, python-format
 msgid "%(no_cameras)s Cameras"
 msgstr "%(no_cameras)s Camera's"
 
-#: ../raphodo/devices.py:963
+#: ../raphodo/devices.py:970
 #, python-format
 msgid "%(no_devices)s Devices"
 msgstr "%(no_devices)s Apparaten"
 
 #. Translators: two folder names, separated by a plus sign
-#: ../raphodo/devices.py:1258
+#: ../raphodo/devices.py:1265
 #, python-format
 msgid "%s + %s"
 msgstr "%s + %s"
 
-#: ../raphodo/didyouknow.py:44
+#: ../raphodo/didyouknow.py:45
 msgid "Click on a file's checkbox to mark or unmark it for download."
 msgstr ""
 "Klik op de checkbox van het bestand om het wel of niet voor download te "
 "markeren."
 
-#: ../raphodo/didyouknow.py:50
+#: ../raphodo/didyouknow.py:51
 msgid ""
 "Files that have already been downloaded are remembered. You can still mark "
 "previously downloaded files to download again, but they are unchecked by "
 "default, and their thumbnails are dimmed so you can differentiate them from "
 "files that are yet to be downloaded."
 msgstr ""
+"Bestanden die al gedownload werden, worden bijgehouden. Je kan nog altijd "
+"bestanden die reeds gedownload werden opnieuw markeren voor download, maar "
+"standaard zijn deze niet aangevinkt en hun miniatuur is gedimd zodat je ze "
+"kan onderscheiden van deze die nog gedownload moeten worden."
 
-#: ../raphodo/didyouknow.py:59
+#: ../raphodo/didyouknow.py:60
 msgid ""
 "If more than one file is selected, they'll all take the mark of the file "
 "whose checkbox was clicked, regardless of whether they previously had a "
 "checkmark or not."
 msgstr ""
+"Als meer dan één bestand gemarkeerd is, nemen ze allemaal het merkteken over "
+"van deze waarvan de checkbox werd aangeklikt, ongeacht of ze voordien reeds "
+"aangevinkt waren of niet."
 
-#: ../raphodo/didyouknow.py:67
+#: ../raphodo/didyouknow.py:68
 msgid ""
 "Click on a device's checkbox to quickly mark or unmark all its files for "
 "downloading."
 msgstr ""
+"Klik op de checkmark van een apparaat om snel alle bestanden voor download "
+"te markeren of omgekeerd."
+
+#: ../raphodo/didyouknow.py:75
+msgid ""
+"After a download finishes, an icon replaces the thumbnail's checkbox. The "
+"icon's color indicates whether the download was successful (green), had file "
+"renaming problems (yellow/orange), or failed (red)."
+msgstr ""
+"Op het einde van een download, vervang een miniatuur de checkbox. De kleur "
+"van de miniatuur geeft aan of de download geslaagd (groen) was, met "
+"hernoemingsproblemen te doen had (geel/oranje), of mislukte (rood)"
 
-#: ../raphodo/didyouknow.py:74
+#: ../raphodo/didyouknow.py:83
+msgid ""
+"\n"
+"            In case of any problems, a red icon will appear at the bottom of "
+"the window\n"
+"            indicating how many error reports there are. Clicking on it "
+"opens the Error Report \n"
+"            window.\n"
+"            "
+msgstr ""
+"\n"
+"            Bij problemen zal een rood icoontje verschijnen onderaan het "
+"venster\n"
+"            dat zal aangeven hoeveel fouten er zijn. Klikken op het "
+"icoontje, opent de Fout Rapportage. \n"
+"            venster.\n"
+"            "
+
+#: ../raphodo/didyouknow.py:91
+msgid ""
+"\n"
+"            The Error Report window lists any problems encountered before, "
+"during or after the \n"
+"            download. An orange triangle represents a warning, a red circle "
+"indicates a failure, \n"
+"            and a black circle indicates more serious failures. You can "
+"click on the hyperlinks to \n"
+"            open its file or device in a file manager. You can also search "
+"the reports using the \n"
+"            search box in the lower left of the Error Report window.\n"
+"            "
+msgstr ""
+"\n"
+"            Het fout rapportage venster vertoont elk probleem voorafgaand, "
+"gedurende of na de  \n"
+"            download. Een oranje driehoek betekent een verwittiging, een "
+"rode cirkel een falen, \n"
+"            en een zwarte cirkel ergere fouten.Je kan op de hyperlinks "
+"klikken om \n"
+"            het bestand of apparaat te openen in een bestandsbeheerder Je "
+"kan ook de rapporten doorzoeken \n"
+"            via het zoekveld links onder in het Fout Rapportage Venster.\n"
+"            "
+
+#: ../raphodo/didyouknow.py:103
 msgid ""
 "You can simultaneously download from multiple cameras, smartphones, memory "
 "cards, and hard drives&mdash;as many devices as your computer can handle at "
 "one time."
 msgstr ""
+"Je kan simultaan van meerdere camera's, smartphones, geheugenkaarten en "
+"harde schijven downloaden&mdash;zoveel apparaten als je computer simultaan "
+"aankan."
 
-#: ../raphodo/didyouknow.py:81
+#: ../raphodo/didyouknow.py:110
 msgid ""
 "The <b>Timeline</b> groups photos and videos based on how much time elapsed "
 "between consecutive shots. Use it to identify photos and videos taken at "
 "different periods in a single day or over consecutive days."
 msgstr ""
+"De <b>Tijdslijn</b> groepeert foto's en video's op basis van de verlopen "
+"tijd tussen twee opeenvolgende shoots. Gebruik het om foto's en video's te "
+"vinden, genomen op verschillende tijdstippen gedurende dezelfde dag, of over "
+"opeenvolgende dagen."
 
-#: ../raphodo/didyouknow.py:88
+#: ../raphodo/didyouknow.py:117
 msgid ""
 "\n"
 "<p>In the illustration above, the first row of the Timeline is black because "
@@ -313,29 +814,46 @@ msgid ""
 "the Timeline:</p>\n"
 "            "
 msgstr ""
+"\n"
+"<p>In de afbeelding hierboven is de eeste rij van de Tijdslijn zwart omdat "
+"alle bestanden op  \n"
+"die dag reeds gedownload waren.</p>\n"
+"<p>De Tijdslijn schuiver past de verlopen tijd  tussen opeenvolgende shots "
+"voor het maken van de  \n"
+"de Tijdslijn aan:</p>\n"
+"            "
 
-#: ../raphodo/didyouknow.py:99
+#: ../raphodo/didyouknow.py:128
 msgid ""
 "To view photos and videos for a particular time range, use the mouse "
 "(optionally in combination with the <tt>Shift</tt> or <tt>Ctrl</tt> keys) to "
 "select time periods. When a time range is selected, the Timeline button on "
 "the left side of the main window will be highlighted."
 msgstr ""
+"Om foto's en video's voor een specifieke periode te zien, gebruik je de muis "
+"(eventueel in combinatie met de <tt>Shift</tt> of <tt>Ctrl</tt> toetsen)  om "
+"een periode te selecteren. Wanneer een periode geselecteerd is zal de "
+"Tijdslijn knop aan de linker kant van het hoofdvenster oplichten."
 
-#: ../raphodo/didyouknow.py:106
+#: ../raphodo/didyouknow.py:135
 msgid ""
 "A download always includes all files that are checked for download, "
 "including those that are not currently displayed because the Timeline is "
 "being used."
 msgstr ""
+"Een download bevat altijd all bestanden die aangevinkt werden voor download, "
+"ook deze die op dat moment niet zichtbaar zijn omdat de Tijdslijn gebruikt "
+"wordt."
 
-#: ../raphodo/didyouknow.py:113
+#: ../raphodo/didyouknow.py:142
 msgid ""
 "You can hide or display the download sources by clicking on the name of the "
 "device you're downloading from at the top left of the program window."
 msgstr ""
+"Je kan de download bronnen verbergen of niet door te klikken op het apparaat "
+"waarvan je downloadt, linksboven in het programma venster."
 
-#: ../raphodo/didyouknow.py:120
+#: ../raphodo/didyouknow.py:149
 msgid ""
 "\n"
 "          Thumbnails can be sorted using a variety of criteria:\n"
@@ -353,34 +871,57 @@ msgid ""
 "downloaded from.</li>\n"
 "</ol> "
 msgstr ""
+"\n"
+"          Miniaturen kunnen geordend worden volgen volgende criteria:\n"
+"<ol>\n"
+"<li><b>Wijzigingstijd:</b> wanneer het bestand het laats gewijzigd werd "
+"volgens de metagegevens (indien \n"
+" beschikbaar) of volgens het bestandssysteem (als back-up).</li>\n"
+"<li><b>Aanvink status:</b> indien het bestand gemarkeerd is voor "
+"download.</li>\n"
+"<li><b>Bestandsnaam:</b> de volledige bestandsnaam, inclusief de "
+"extensie.</li>\n"
+"<li><b>Extensie:</b> de extensie van het bestand. Gebruik dit om jpeg en RAW "
+"afbeeldingen te groeperen  \n"
+"bijvoorbeeld.</li>\n"
+"<li><b>Bestandstype:</b> foto of video.</li>\n"
+"<li><b>Apparaat:</b> naam van het apparaat waarvan de foto's en video's "
+"gedownload worden..</li>\n"
+"</ol> "
 
-#: ../raphodo/didyouknow.py:137
+#: ../raphodo/didyouknow.py:166
 msgid ""
 "One of Rapid Photo Downloader's most useful features is its ability to "
 "automatically generate download subfolders and rename files as it downloads, "
 "using a scheme of your choosing."
 msgstr ""
+"Eén van Rapid Downloader's meest interessante mogelijkheden is om "
+"automatisch sub-folders aan te maken en bestanden te hernoemen gedurende de "
+"download, gebruik maken van een eigen schema."
 
-#: ../raphodo/didyouknow.py:143
+#: ../raphodo/didyouknow.py:172
 msgid ""
 "To specify where you want your files downloaded and how you want them named, "
 "open the appropriate panel on the right-side of the application window: "
 "<b>Destination</b>, <b>Rename</b>, or <b>Job Code</b>."
 msgstr ""
+"Om aan te geven waar je de gedownloade bestanden wil hebben en hoe ze "
+"genoemd moeten worden, open het corresponderende paneel aan de rechter zijde "
+"van het scherm: <b>Bestemming</b>, <b>Hernoemen</b> of <b>Job Code</b>."
 
-#: ../raphodo/didyouknow.py:150
+#: ../raphodo/didyouknow.py:179
 msgid ""
 "\n"
 "When thinking about your download directory structure, keep in mind two "
 "different types\n"
 "of directory:\n"
 "<ol>\n"
-"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, &quot;"
-"Photos&quot;, or\n"
+"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, "
+"&quot;Photos&quot;, or\n"
 "&quot;Videos&quot;. This directory should already exist on your computer. In "
 "the illustration \n"
-"below, the destination folders are &quot;Pictures&quot; and &quot;"
-"Videos&quot;. The\n"
+"below, the destination folders are &quot;Pictures&quot; and "
+"&quot;Videos&quot;. The\n"
 "name of the destination folder is displayed in the grey bar directly above "
 "the folder tree, \n"
 "with a folder icon to its left and a gear icon to its far right.</li>\n"
@@ -392,8 +933,29 @@ msgid ""
 "</ol>\n"
 "            "
 msgstr ""
+"\n"
+"Bij het bedenken van je download directory structuur hou rekening met twee "
+"verschillende types\n"
+"van directories:\n"
+"<ol>\n"
+"<li>De <b>bestemmingsfolder</b>, e.g. &quot;Afbeeldingen&quot;, "
+"&quot;Foto's&quot;, of\n"
+"&quot;Video'ss&quot;. Deze folders zouden reeds moeten bestaan op je "
+"computer. In de afbeelding \n"
+"hieronder zijn de bestemmingsfolders &quot;Pictures&quot; and "
+"&quot;Videos&quot;. De \n"
+"naam van de bestemmingsfolder is vertoond in de grijze balk direct boven de "
+"folderstructuur, \n"
+"met een folder icoon links en een tandiel icoon helemaal rechts.</li>\n"
+"<li>De <b>download subfolders</b>, zijn folders die automatisch zullen "
+"aangemaakt worden \n"
+"door Rapid Photo Downloader. Ze moetenniet noodzakelijkreeds bestaan opje "
+"computer,maar het kan geen kwaad.\n"
+"Ze zullen aangemaakt worden onder de bestemmingsfolder.</li>\n"
+"</ol>\n"
+"            "
 
-#: ../raphodo/didyouknow.py:167
+#: ../raphodo/didyouknow.py:196
 msgid ""
 "\n"
 "You can download photos and videos to the same destination folder, or "
@@ -405,15 +967,27 @@ msgid ""
 "type.            \n"
 "            "
 msgstr ""
+"\n"
+"Je kan foto's en video's downloaden naar dezelfde bestemmingsfolder of een "
+"verschillende  \n"
+"bepalen voor elk. Hetzelfde geldt voor de sub-folders voor foto's en video's "
+"&mdash;download foto's \n"
+"en video's naar dezelfde sub-folders of gebruik een verschillende folder "
+"voor ieder \n"
+"type.            \n"
+"            "
 
-#: ../raphodo/didyouknow.py:177
+#: ../raphodo/didyouknow.py:206
 msgid ""
 "Automatically generated download subfolders can contain further "
 "automatically generated subfolders if need be. A common scheme is to create "
 "a year subfolder and then a series of year-month-day subfolders within it."
 msgstr ""
+"Automatisch aangemaakte download sub-folders kunnen extra automatisch "
+"aangemaakte sub-folders bevatten indien nodig. Een klassiek schema is om een "
+"jaar sub-folder en een reeks van maand-dag sub-folder daaronder te hebben."
 
-#: ../raphodo/didyouknow.py:186
+#: ../raphodo/didyouknow.py:215
 msgid ""
 "\n"
 "Whenever possible, the program previews the download subfolders of photos "
@@ -430,8 +1004,22 @@ msgid ""
 "</ol>\n"
 "            "
 msgstr ""
+"\n"
+"Telkens wanneer mogelijk zal het programma de download subfolders van de te "
+"downloaden foto's en video's  vooraf scannen:\n"
+"<ol>\n"
+"<li>De bestemmingsfolder structuur toont de reeds aanwezige download sub-"
+"folders op je computer (deze in  \n"
+"    een normaal, niet-italic font), en de sub-folders die aangemaakt zullen "
+"worden tijdens de download \n"
+"    (deze met de namen in italics).</li>\n"
+"<li>De folderstructuur toont tevens in welke subfolders de bestanden "
+"gedownload zullen worden(deze in zwart  \n"
+"    gekleurd).</li>\n"
+"</ol>\n"
+"            "
 
-#: ../raphodo/didyouknow.py:201
+#: ../raphodo/didyouknow.py:230
 msgid ""
 "\n"
 "Download subfolder names are typically generated using some or all of the "
@@ -454,8 +1042,28 @@ msgid ""
 "option:\n"
 "            "
 msgstr ""
+"\n"
+"Download sub-folder namen worden meestal aangemaakt door sommige of alle "
+"onderstaande elementen:\n"
+"<ol>\n"
+"<li><b>Bestand metagegevens</b>, bevatten meestal de datum wanneer de foto "
+"of video werd aangemaakt, maar kunnen \n"
+"ook \n"
+"de camera model naam, camera serienummer, of bestandsextensie bv. JPG of CR2 "
+"bevatten.</li>\n"
+"<li>Een <b>Job Code</b>, is vrije tekst die je meegeeft wanneer de download "
+"plaats grijpt zoals de \n"
+"naam van een evenement of een locatie.</li>\n"
+"<li><b>Tekst</b> die je iedere keer wenst te zien verschijnen zoals een "
+"streepje of een spatie.</li>\n"
+"</ol>\n"
+"Sub-folders benoemen met het jaar, gevolgd door de maand en tenslotte de dag "
+"in numeriek formaat maakt  \n"
+"het makkelijk om alles gesorteerd te houden in je bestandsbeheerder. Daarom "
+"is het de standaard optie:\n"
+"            "
 
-#: ../raphodo/didyouknow.py:219
+#: ../raphodo/didyouknow.py:248
 msgid ""
 "\n"
 "To automatically create download subfolders as you download, \n"
@@ -464,8 +1072,15 @@ msgid ""
 "the gear icon to bring up a drop-down menu:            \n"
 "            "
 msgstr ""
+"\n"
+"Om automatisch download sub-folders aan te maken tijdens de download, \n"
+"kan je gebruik maken van één van de reeds voorziene instellingen van Rapid "
+"Photo Downloader of een eigen \n"
+"instelling aanmaken. Klik op het raderwieltje icoon om het drop-down menu te "
+"openen:            \n"
+"            "
 
-#: ../raphodo/didyouknow.py:227
+#: ../raphodo/didyouknow.py:256
 msgid ""
 "\n"
 "Using the drop-down menu, select a built-in preset or click on <b>Custom</b> "
@@ -474,21 +1089,32 @@ msgid ""
 "Generation Editor:             \n"
 "            "
 msgstr ""
+"\n"
+"Via het drop-down menu kan je een reeds voorziene instellingen gebruiken of "
+"klik op <b>Aangepast</b> om je eigen \n"
+"schema aan te maken. Je kan je eigen schema aanmaken via de Foto of Video "
+"Subfolder Generation Editor:             \n"
+"            "
 
-#: ../raphodo/didyouknow.py:237
+#: ../raphodo/didyouknow.py:266
 msgid ""
 "It's easy to download raw images into one folder, and jpeg images into "
 "another. Simply use the <b>Filename Extension</b> as part of your download "
 "subfolder generation scheme:"
 msgstr ""
+"Het is gemakkelijk om raw afbeeldingen in één folder en jpeg afbeeldingen in "
+"een andere folder te downloaden. Gebruik simpelweg de <b>Bestandsnaam "
+"Extensie</b> als onderdeel van je download sub-folder aanmaak schema:"
 
-#: ../raphodo/didyouknow.py:242
+#: ../raphodo/didyouknow.py:271
 msgid ""
 "This illustration shows a saved custom preset named &quot;My custom "
 "preset&quot;."
 msgstr ""
+"De afbeelding vertoont een opgeslagen eigen instelling genaamd &quot;My "
+"custom preset&quot;."
 
-#: ../raphodo/didyouknow.py:246
+#: ../raphodo/didyouknow.py:275
 msgid ""
 "\n"
 "You do not have to create nested download subfolders. This illustration "
@@ -498,8 +1124,14 @@ msgid ""
 "Job Code:\n"
 "            "
 msgstr ""
+"\n"
+"Je moet geen geneste download sub-folders aanmaken. De afbeelding toont \n"
+"de aanmaak van de download sub-folder die enkel de datum van de fotoshoot en "
+"een \n"
+"Job Code bevat:\n"
+"            "
 
-#: ../raphodo/didyouknow.py:256
+#: ../raphodo/didyouknow.py:285
 msgid ""
 "\n"
 "Although there are many built-in date/time naming options, you may find that "
@@ -512,8 +1144,18 @@ msgid ""
 "circle around the hyphen):\n"
 "            "
 msgstr ""
+"\n"
+"Alhoewel er reeds veel datum/tijd combinaties zijn, kan het zijn dat je iets "
+"anders wil. \n"
+"Het is geen probleem om je eigen combinaties te maken. Je kan de datum/tijd "
+"keuzes combineren om \n"
+"nieuwe combinaties aan te maken. Stel dat je een datum formaat wil aanmaken "
+"die het jaar (YYYY), een streepje, \n"
+"en de maand (MM) in volgend formaat YYYY-MM. Dat kan je doen als volgt "
+"(noteer de rode cirkel rond het streepje):\n"
+"            "
 
-#: ../raphodo/didyouknow.py:265
+#: ../raphodo/didyouknow.py:294
 msgid ""
 "\n"
 "Read more about all the ways you can generate download subfolder names and "
@@ -522,8 +1164,14 @@ msgid ""
 "documentation</a>.\n"
 "            "
 msgstr ""
+"\n"
+"Lees meer over alle mogelijkheden om download sub-folders en bestandsnamen "
+"aan te maken in de <a \n"
+"href=\"http://damonlynch.net/rapid/documentation/#renamedateandtime\">online "
+"documentatie</a>.\n"
+"            "
 
-#: ../raphodo/didyouknow.py:273
+#: ../raphodo/didyouknow.py:302
 msgid ""
 "\n"
 "<b>Job Codes</b> let you easily enter text that describes sets of photos and "
@@ -534,8 +1182,16 @@ msgid ""
 "the Job Code \n"
 "&quot;Green Bazaar&quot;: \n"
 msgstr ""
+"\n"
+"<b>Job Codes</b> laten je toe om tekst in te geven die je set foto's en "
+"video's beschrijven. Je kan\n"
+"ze gebruiken in sub-folder en bestandsnamen. In deze afbeelding van enkele "
+"bestanden, hebben bepaalde bestanden de Job Code\n"
+"&quot;Street&quot;gekregen en de geselecteerde bestanden staan op het punt "
+"de Job Code \n"
+"&quot;Green Bazaar&quot; te krijgen: \n"
 
-#: ../raphodo/didyouknow.py:282
+#: ../raphodo/didyouknow.py:311
 msgid ""
 "\n"
 "You can apply new or existing Job Codes before you start a download. If "
@@ -545,37 +1201,53 @@ msgid ""
 "a Job Code for them before the download begins.\n"
 "            "
 msgstr ""
+"\n"
+"Je kan nieuwe of bestaande Job Codes toepassen alvorens een download te "
+"starten. Als er \n"
+"bestanden in de download zijn die nog geen Job Code toegewezen hebben, zal "
+"je gevraagd worden \n"
+"om een Job Code voor hen toe te voegen, alvorens de download begint.\n"
+"            "
 
-#: ../raphodo/didyouknow.py:291
+#: ../raphodo/didyouknow.py:320
 msgid "Look for hints to guide you when working with Job Codes:"
-msgstr ""
+msgstr "Kijk voor tips om je te begeleiden bij het werken met Job Codes:"
 
-#: ../raphodo/didyouknow.py:295
+#: ../raphodo/didyouknow.py:324
 msgid ""
 "Hints will vary depending on the context, such as when the mouse is hovering "
 "over a button."
 msgstr ""
+"Tips zullen variëren op basis van de context, net zoals je met een muis over "
+"een knop beweegt."
 
-#: ../raphodo/didyouknow.py:301
+#: ../raphodo/didyouknow.py:330
 msgid ""
 "\n"
 "When you give your photos and videos unique filenames, you'll never be "
 "confused as to \n"
 "which file is which. Using <b>sequence numbers</b> to make filenames unique "
 "is highly \n"
-"recommended!.\n"
+"recommended!\n"
 "            "
 msgstr ""
+"\n"
+"Wanneer je foto's en video's unieke bestandsnamen geeft, zal het heel "
+"duidelijk zijn  \n"
+"met welk bestand je te doen hebt. Het gebruik  van  <b>volgnummers </b> om "
+"bestanden\n"
+"uniek te maken wordt ten stelligste aangeraden\n"
+"            "
 
-#: ../raphodo/didyouknow.py:309
+#: ../raphodo/didyouknow.py:338
 msgid ""
 "\n"
 "<p>Four types of sequence values are available to help you assign unique "
 "names to your photos and \n"
 "videos:\n"
 "<ol>\n"
-"<li><b>Downloads today</b>: tracks downloads completed during that day.</"
-"li>\n"
+"<li><b>Downloads today</b>: tracks downloads completed during that "
+"day.</li>\n"
 "<li><b>Stored number</b>: similar to Downloads today, but it is remembered "
 "from the last time the  \n"
 "program was run.</li>\n"
@@ -588,8 +1260,26 @@ msgid ""
 "documentation</a>.</p>\n"
 "            "
 msgstr ""
+"\n"
+"<p>Vier types van volgnummers zijn beschikbaar om je te helpen unieke namen "
+"toe te kennen aan foto's \n"
+"en video's:\n"
+"<ol>\n"
+"<li><b>Downloads vandaag</b>: downloads gedurende de dag afgewerkt.</li>\n"
+"<li><b>Opgeslagen nummer</b>: identiek aan Downloads vandaag, maar wel vanaf "
+"de laatste keer dat het \n"
+"programma gestart werd.</li>\n"
+"<li><b>Sessie nummer</b>: wordt iedere keer gereset als het programma "
+"start.</li>\n"
+"<li><b>Volgorde letter</b>: zoals sessie nummer maar dan met letters.</li>\n"
+"</ol></p>\n"
+"<p>\n"
+"Lees meer over volgnummers in de <a \n"
+"href=\"http://damonlynch.net/rapid/documentation/#sequencenumbers\">online "
+"documentatie</a>.</p>\n"
+"            "
 
-#: ../raphodo/didyouknow.py:327
+#: ../raphodo/didyouknow.py:356
 msgid ""
 "\n"
 "The <b>Rename</b> panel allows you to configure file renaming. To rename "
@@ -597,8 +1287,14 @@ msgid ""
 "from among existing renaming presets or define your own.              \n"
 "            "
 msgstr ""
+"\n"
+"Het <b>Hernoem</b> paneel laat je toe de bestandshernoeming in te stellen. "
+"Om bestanden te hernoemen \n"
+"kan je kiezen tussen bestaande instellingen of je eigen instelling aanmaken. "
+"             \n"
+"            "
 
-#: ../raphodo/didyouknow.py:334
+#: ../raphodo/didyouknow.py:363
 msgid ""
 "\n"
 "<p>The <b>Synchronize RAW + JPEG</b> option is useful if you use the RAW + "
@@ -616,8 +1312,23 @@ msgid ""
 "documentation</a>.</p>\n"
 "            "
 msgstr ""
+"\n"
+"<p>De <b>RAW + JPEG synchronisatie</b> optie is nuttig als je de RAW + JPEG "
+"optie van je \n"
+"camera gebruikt en je volgnummers in bestandshernoeming gebruikt. Na "
+"aanzetten van deze optie\n"
+"zal het programma de passende paren van RAW en JPEG foto's detecteren en "
+"zodra gedetecteerd,\n"
+"hetzelfde volgnummer toekennen aan beide fotonamen. Daarnaast zullen de "
+"volgordes \n"
+"bijgewerkt worden als was het één foto.</p>\n"
+"<p>\n"
+"Lees meer over bestanden hernoemen in de  <a \n"
+"href=\"http://damonlynch.net/rapid/documentation/#rename\">online "
+"documentation</a>.</p>\n"
+"            "
 
-#: ../raphodo/didyouknow.py:348
+#: ../raphodo/didyouknow.py:377
 msgid ""
 "\n"
 "You can have your photos and videos backed up to multiple locations as they "
@@ -627,14 +1338,24 @@ msgid ""
 "backup locations specified.\n"
 "            "
 msgstr ""
+"\n"
+"Je kan foto's en video's naar meerdere locaties backuppen tijdens de "
+"download zoals\n"
+"externe harde schijven of netwerk shares. Back-up apparaten kunnen "
+"automatisch gedetecteerd worden of je kan\n"
+"je eigen back-up locaties meegeven.\n"
+"            "
 
-#: ../raphodo/didyouknow.py:356
+#: ../raphodo/didyouknow.py:385
 msgid ""
 "In this example, the drive <b>photobackup</b> does not contain a folder "
 "named <tt>Videos</tt>, so videos will not be backed up to it."
 msgstr ""
+"In dit voorbeeld, bevat de schijf <b>photobackup</b> geen folder genaamd "
+"<tt>Videos</tt> en bijgevolg zullen er geen video's naar toe gebackupped "
+"worden."
 
-#: ../raphodo/didyouknow.py:362
+#: ../raphodo/didyouknow.py:391
 msgid ""
 "\n"
 "Several of the program's preferences can be set from the command line, "
@@ -644,8 +1365,19 @@ msgid ""
 "default state, and caches and remembered files cleared.            \n"
 "            "
 msgstr ""
+"\n"
+"Diverse voorkeuren van het programma kunnen vanaf de commandolijn worden "
+"ingesteld, waaronder download  \n"
+"bronnen, bestemming en back-ups. Tevens kunnen instellingen herzet worden "
+"naar hun \n"
+"standaard waardes en caches en bijgehouden bestanden gewist.            \n"
+"            "
 
-#: ../raphodo/didyouknow.py:372
+#: ../raphodo/didyouknow.py:396
+msgid "You can also import program preferences from the older 0.4 version."
+msgstr "Ja kan ook programma voorkeuren van de oudere versie 0.4 importeren."
+
+#: ../raphodo/didyouknow.py:401
 msgid ""
 "\n"
 "Rapid Photo Downloader deals with three types of cache:\n"
@@ -655,8 +1387,8 @@ msgid ""
 "memory cards, and other devices.</li>\n"
 "<li>A <b>temporary cache</b> of files downloaded from a camera, one for "
 "photos and another for \n"
-"videos. They are located in temporary subfolders in the download destination."
-"</li>\n"
+"videos. They are located in temporary subfolders in the download "
+"destination.</li>\n"
 "<li>The <b>desktop's thumbnail cache</b>, in which Rapid Photo Downloader "
 "stores thumbnails of \n"
 "RAW and TIFF photos once they have been downloaded. File browsers like Gnome "
@@ -670,26 +1402,49 @@ msgid ""
 "documentation</a>.\n"
 "            "
 msgstr ""
+"\n"
+"Rapid Photo Downloader werkt met drie types van cache:\n"
+"<ol>\n"
+"<li>Een <b>miniaturencache</b> waar het enig doel is om de miniaturen van de "
+"bestanden van je camera, \n"
+"geheugenkaarten en andere apparaten op te slaan,.</li>\n"
+"<li>Een <b>tijdelijke cache</b> van bestanden gedownload van een camera, één "
+"voor foto's en een andere voor  \n"
+"video's. Je kan ze vinden in de tijdelijke sub-folders in de download "
+"bestemming.</li>\n"
+"<li>De <b>bureaublad miniaturen cache</b>, in dewelke Rapid Photo Downloader "
+"de miniaturen opslaat van  \n"
+"RAW en TIFF foto's zodra deze gedownload zijn. Bestandsbeheerders zoals "
+"Gnome Files gebruiken deze cache \n"
+"eveneens, wat betekent dat ze ook de miniaturen voor deze bestanden zullen "
+"tonen. \n"
+"</li>\n"
+"</ol>\n"
+"Lees meer over deze caches en hun effect op de download performantie in de "
+"<a \n"
+"href=\"http://damonlynch.net/rapid/documentation/#caches\">online "
+"documentatie</a>.\n"
+"            "
 
-#: ../raphodo/didyouknow.py:431
+#: ../raphodo/didyouknow.py:460
 msgid "Tip of the Day"
-msgstr ""
+msgstr "Tip van de dag"
 
-#: ../raphodo/didyouknow.py:439
+#: ../raphodo/didyouknow.py:468
 msgid "Did you know...?"
-msgstr ""
+msgstr "Wist je dat...?"
 
-#: ../raphodo/didyouknow.py:466
+#: ../raphodo/didyouknow.py:495
 msgid "Show tips on startup"
-msgstr ""
+msgstr "Toon tips bij het starten"
 
-#: ../raphodo/didyouknow.py:470
+#: ../raphodo/didyouknow.py:499
 msgid "&Next"
-msgstr ""
+msgstr "Volge&nde"
 
-#: ../raphodo/didyouknow.py:471
+#: ../raphodo/didyouknow.py:500
 msgid "&Previous"
-msgstr ""
+msgstr "&Vorige"
 
 #: ../raphodo/downloadtracker.py:402
 msgid "MB/sec"
@@ -794,68 +1549,68 @@ msgstr "%d dagen, 1 uur"
 msgid "%(days)d days, %(hours)d hours"
 msgstr "%(days)d dagen, %(hours)d uren"
 
-#: ../raphodo/errorlog.py:65
+#: ../raphodo/errorlog.py:66
 msgid "Find"
 msgstr "Zoek"
 
-#: ../raphodo/errorlog.py:135
+#: ../raphodo/errorlog.py:136
 msgid "Error Reports - Rapid Photo Downloader"
 msgstr "Fout Rapportage - Rapid Photo Downloader"
 
-#: ../raphodo/errorlog.py:170
+#: ../raphodo/errorlog.py:171
 msgid "Find in reports"
 msgstr "Vind in rapporten"
 
-#: ../raphodo/errorlog.py:187
+#: ../raphodo/errorlog.py:188
 msgid "Find the previous occurrence of the phrase"
-msgstr "Het vorige voorkomen van de tekst zoeken"
+msgstr "Vorige overeenkomende tekenreeks zoeken"
 
-#: ../raphodo/errorlog.py:192
+#: ../raphodo/errorlog.py:193
 msgid "Find the next occurrence of the phrase"
-msgstr "Het volgende voorkomen van de tekst zoeken"
+msgstr "Volgende overeenkomende tekenreeks zoeken"
 
-#: ../raphodo/errorlog.py:194
+#: ../raphodo/errorlog.py:195
 msgid "&Highlight All"
 msgstr "Alles accentueren"
 
-#: ../raphodo/errorlog.py:195
+#: ../raphodo/errorlog.py:196
 msgid "Highlight all occurrences of the phrase"
-msgstr "All voorkomende zinnen accentueren"
+msgstr "Alle overeenkomende tekenreeksen accentueren"
 
-#: ../raphodo/errorlog.py:196
+#: ../raphodo/errorlog.py:197
 msgid "&Match Case"
 msgstr "&Hoofdletter overeenkomst"
 
-#: ../raphodo/errorlog.py:197
+#: ../raphodo/errorlog.py:198
 msgid "Search with case sensitivity"
 msgstr "Zoeken met hoofdletter gevoeligheid"
 
-#: ../raphodo/errorlog.py:198
+#: ../raphodo/errorlog.py:199
 msgid "&Whole Words"
 msgstr "&Volledige woorden"
 
-#: ../raphodo/errorlog.py:199
+#: ../raphodo/errorlog.py:200
 msgid "Search whole words only"
 msgstr "Zoek enkel op volledige woorden"
 
-#: ../raphodo/errorlog.py:209 ../raphodo/errorlog.py:341
+#: ../raphodo/errorlog.py:210 ../raphodo/errorlog.py:345
 #, python-format
 msgid "%s of %s matches"
 msgstr "%s van %s gevonden resultaten"
 
-#: ../raphodo/errorlog.py:228
+#: ../raphodo/errorlog.py:232
 msgid "Clear"
 msgstr "Wissen"
 
-#: ../raphodo/errorlog.py:328
+#: ../raphodo/errorlog.py:332
 msgid "Phrase not found"
 msgstr "Uitdrukking niet gevonden"
 
-#: ../raphodo/errorlog.py:487
+#: ../raphodo/errorlog.py:491
 msgid "Search pending..."
 msgstr "Zoeken in afwachting..."
 
-#: ../raphodo/errorlog.py:535
+#: ../raphodo/errorlog.py:539
 msgid ""
 "The number of new entries added to the Error Report since it was last open. "
 "Click to open the Error Report."
@@ -871,8 +1626,8 @@ msgstr "Probleem in Rapid Photo Downloader"
 #, python-brace-format
 msgid ""
 "<b>A problem occurred in Rapid Photo Downloader</b><br><br>\n"
-"    Please report the problem at <a href=\"{website}\">{website}</a>."
-"<br><br>\n"
+"    Please report the problem at <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
 "    Attach the log file <i>{log_file}</i> to your bug report (click\n"
 "    <a href=\"{log_path}\">here</a> to open the log directory).<br><br>If "
 "the same problem occurs\n"
@@ -880,8 +1635,8 @@ msgid ""
 "    "
 msgstr ""
 "<b>Er werd een probleem vastgesteld in Rapid Photo Downloader</b><br><br>\n"
-"    Gelieve het probleem te melden op <a href=\"{website}\">{website}</a>."
-"<br><br>\n"
+"    Gelieve het probleem te melden op <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
 "    Voeg het logbestand <i>{log_file}</i> toe aan je foutenrapportage (klik\n"
 "    <a href=\"{log_path}\">hier</a> om de log folder te openen).<br><br>Als "
 "dezelfde fout opnieuw gebeurt \n"
@@ -907,561 +1662,562 @@ msgstr ""
 "{log_path}\n"
 "\n"
 
-#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1601
+#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1643
 msgid "Open in File Browser..."
 msgstr "Open in Bestandsbeheerder..."
 
 #: ../raphodo/foldercombo.py:120
 msgid "File System"
-msgstr ""
+msgstr "Bestandssysteem"
 
 #: ../raphodo/foldercombo.py:157
 msgid "Other..."
-msgstr ""
+msgstr "Overig..."
 
 #. Translators: indicate in combobox that a path does not exist
 #: ../raphodo/foldercombo.py:235
 #, python-format
 msgid "%s (location does not exist)"
-msgstr ""
+msgstr "%s (locatie bestaat niet)"
 
-#: ../raphodo/generatenameconfig.py:186
+#: ../raphodo/generatenameconfig.py:190
 msgid "Date time"
 msgstr "Datum tijd"
 
-#: ../raphodo/generatenameconfig.py:187
+#: ../raphodo/generatenameconfig.py:191
 msgid "Text"
 msgstr "Tekst"
 
-#: ../raphodo/generatenameconfig.py:188 ../raphodo/rapid.py:2053
+#: ../raphodo/generatenameconfig.py:192 ../raphodo/rapid.py:2125
 msgid "Filename"
 msgstr "Bestandsnaam"
 
-#: ../raphodo/generatenameconfig.py:189 ../raphodo/preferencedialog.py:488
+#: ../raphodo/generatenameconfig.py:193 ../raphodo/preferencedialog.py:724
 msgid "Metadata"
 msgstr "Metagegevens"
 
-#: ../raphodo/generatenameconfig.py:190
+#: ../raphodo/generatenameconfig.py:194
 msgid "Sequences"
 msgstr "Reeksen"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: ../raphodo/generatenameconfig.py:193
+#: ../raphodo/generatenameconfig.py:197
 msgid "Job code"
 msgstr "Job code"
 
-#: ../raphodo/generatenameconfig.py:194
+#: ../raphodo/generatenameconfig.py:198
 msgid "Image date"
 msgstr "Afbeeldingsdatum"
 
-#: ../raphodo/generatenameconfig.py:195
+#: ../raphodo/generatenameconfig.py:199
 msgid "Video date"
 msgstr "Videodatum"
 
-#: ../raphodo/generatenameconfig.py:196
+#: ../raphodo/generatenameconfig.py:200
 msgid "Today"
 msgstr "Vandaag"
 
-#: ../raphodo/generatenameconfig.py:197
+#: ../raphodo/generatenameconfig.py:201
 msgid "Yesterday"
 msgstr "Gisteren"
 
 #. Translators: Download time is the time and date that the download started (when the
 #. user clicked the Download button)
-#: ../raphodo/generatenameconfig.py:200
+#: ../raphodo/generatenameconfig.py:204
 msgid "Download time"
 msgstr "Download tijd"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:203
+#: ../raphodo/generatenameconfig.py:207
 msgid "Name"
 msgstr "Naam"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:206 ../raphodo/rapid.py:2054
+#: ../raphodo/generatenameconfig.py:210 ../raphodo/rapid.py:2126
 msgid "Extension"
-msgstr "Extentie"
+msgstr "Extensie"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:209
+#: ../raphodo/generatenameconfig.py:213
 msgid "Image number"
 msgstr "Afbeeldingsnummer"
 
-#: ../raphodo/generatenameconfig.py:210
+#: ../raphodo/generatenameconfig.py:214
 msgid "Video number"
 msgstr "Videonummer"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:213
+#: ../raphodo/generatenameconfig.py:217
 msgid "Aperture"
 msgstr "Diafragma"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:216
+#: ../raphodo/generatenameconfig.py:220
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:219
+#: ../raphodo/generatenameconfig.py:223
 msgid "Exposure time"
 msgstr "Belichtingstijd"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:222
+#: ../raphodo/generatenameconfig.py:226
 msgid "Focal length"
 msgstr "Brandpuntafstand"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:225
+#: ../raphodo/generatenameconfig.py:229
 msgid "Camera make"
 msgstr "Camera merk"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:228
+#: ../raphodo/generatenameconfig.py:232
 msgid "Camera model"
 msgstr "Camera model"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:231
+#: ../raphodo/generatenameconfig.py:235
 msgid "Short camera model"
 msgstr "Camera model (kort)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:234
+#: ../raphodo/generatenameconfig.py:238
 msgid "Hyphenated short camera model"
-msgstr "Camera model (kort na koppelteken)"
+msgstr "Camera model met extra info na -"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:237
+#: ../raphodo/generatenameconfig.py:241
 msgid "Serial number"
-msgstr "Serie nummer"
+msgstr "Serienummer"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:240
+#: ../raphodo/generatenameconfig.py:244
 msgid "Shutter count"
 msgstr "Sluiterteller"
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: ../raphodo/generatenameconfig.py:242
+#: ../raphodo/generatenameconfig.py:246
 msgid "File number"
 msgstr "Bestandsnummer"
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:244
+#: ../raphodo/generatenameconfig.py:248
 msgid "Folder only"
-msgstr "Enkel mapgedeelte"
+msgstr "Enkel folder"
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:246
+#: ../raphodo/generatenameconfig.py:250
 msgid "Folder and file"
-msgstr "Map en bestand"
+msgstr "Folder en bestand"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:249
+#: ../raphodo/generatenameconfig.py:253
 msgid "Owner name"
 msgstr "Naam eigenaar"
 
-#: ../raphodo/generatenameconfig.py:250
+#: ../raphodo/generatenameconfig.py:254
 msgid "Codec"
 msgstr "Codec"
 
-#: ../raphodo/generatenameconfig.py:251
+#: ../raphodo/generatenameconfig.py:255
 msgid "Width"
 msgstr "Breedte"
 
-#: ../raphodo/generatenameconfig.py:252
+#: ../raphodo/generatenameconfig.py:256
 msgid "Height"
 msgstr "Hoogte"
 
-#: ../raphodo/generatenameconfig.py:253
+#: ../raphodo/generatenameconfig.py:257
 msgid "Length"
 msgstr "Lengte"
 
-#: ../raphodo/generatenameconfig.py:254
+#: ../raphodo/generatenameconfig.py:258
 msgid "Frames Per Second"
-msgstr "Beelden per seconde"
+msgstr "Frames per seconde"
 
-#: ../raphodo/generatenameconfig.py:255
+#: ../raphodo/generatenameconfig.py:259
 msgid "Artist"
 msgstr "Artiest"
 
-#: ../raphodo/generatenameconfig.py:256
+#: ../raphodo/generatenameconfig.py:260
 msgid "Copyright"
-msgstr "Copyright"
+msgstr "Auteursrecht"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:259
+#: ../raphodo/generatenameconfig.py:263
 msgid "Downloads today"
 msgstr "Downloads vandaag"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:262
+#: ../raphodo/generatenameconfig.py:266
 msgid "Session number"
-msgstr "Sessie nummer"
+msgstr "Sessienummer"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:265
+#: ../raphodo/generatenameconfig.py:269
 msgid "Subfolder number"
-msgstr "Submap nummer"
+msgstr "Subfoldernummer"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:268
+#: ../raphodo/generatenameconfig.py:272
 msgid "Stored number"
 msgstr "Opgeslagen nummer"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: ../raphodo/generatenameconfig.py:271
+#: ../raphodo/generatenameconfig.py:275
 msgid "Sequence letter"
 msgstr "Vervolg letter"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:274
+#: ../raphodo/generatenameconfig.py:278
 msgid "All digits"
 msgstr "Alle cijfers"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:277
+#: ../raphodo/generatenameconfig.py:281
 msgid "Last digit"
 msgstr "Laatste cijfer"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:280
+#: ../raphodo/generatenameconfig.py:284
 msgid "Last 2 digits"
 msgstr "Laatste 2 cijfers"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:283
+#: ../raphodo/generatenameconfig.py:287
 msgid "Last 3 digits"
 msgstr "Laatste 3 cijfers"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:286
+#: ../raphodo/generatenameconfig.py:290
 msgid "Last 4 digits"
 msgstr "Laatste 4 cijfers"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:289
+#: ../raphodo/generatenameconfig.py:293
 msgid "Original Case"
 msgstr "Oorspronkelijke hoofdletterstatus"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:292
+#: ../raphodo/generatenameconfig.py:296
 msgid "UPPERCASE"
 msgstr "HOOFDLETTER"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:295
+#: ../raphodo/generatenameconfig.py:299
 msgid "lowercase"
-msgstr "gewone letters"
+msgstr "kleine letters"
 
-#: ../raphodo/generatenameconfig.py:296
+#: ../raphodo/generatenameconfig.py:300
 msgid "One digit"
 msgstr "Eén cijfer"
 
-#: ../raphodo/generatenameconfig.py:297
+#: ../raphodo/generatenameconfig.py:301
 msgid "Two digits"
 msgstr "Twee cijfers"
 
-#: ../raphodo/generatenameconfig.py:298
+#: ../raphodo/generatenameconfig.py:302
 msgid "Three digits"
 msgstr "Drie cijfers"
 
-#: ../raphodo/generatenameconfig.py:299
+#: ../raphodo/generatenameconfig.py:303
 msgid "Four digits"
 msgstr "Vier cijfers"
 
-#: ../raphodo/generatenameconfig.py:300
+#: ../raphodo/generatenameconfig.py:304
 msgid "Five digits"
 msgstr "Vijf cijfers"
 
-#: ../raphodo/generatenameconfig.py:301
+#: ../raphodo/generatenameconfig.py:305
 msgid "Six digits"
 msgstr "Zes cijfers"
 
-#: ../raphodo/generatenameconfig.py:302
+#: ../raphodo/generatenameconfig.py:306
 msgid "Seven digits"
 msgstr "Zeven cijfers"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:305
+#: ../raphodo/generatenameconfig.py:309
 msgid "Subseconds"
 msgstr "Subseconden"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:308 ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:312 ../raphodo/generatenameconfig.py:393
 msgid "YYYYMMDD"
 msgstr "JJJJMMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:311 ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:315 ../raphodo/generatenameconfig.py:394
 msgid "YYYY-MM-DD"
 msgstr "JJJJ-MM-DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:314 ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:318 ../raphodo/generatenameconfig.py:395
 msgid "YYYY_MM_DD"
-msgstr "YYYY_MM_DD"
+msgstr "JJJJ_MM_DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:317
+#: ../raphodo/generatenameconfig.py:321
 msgid "YYMMDD"
 msgstr "JJMMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:320
+#: ../raphodo/generatenameconfig.py:324
 msgid "YY-MM-DD"
 msgstr "JJ-MM-DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:323
+#: ../raphodo/generatenameconfig.py:327
 msgid "YY_MM_DD"
-msgstr "YY_MM_DD"
+msgstr "JJ_MM_DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:326
+#: ../raphodo/generatenameconfig.py:330
 msgid "MMDDYYYY"
 msgstr "MMDDJJJJ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:329
+#: ../raphodo/generatenameconfig.py:333
 msgid "MMDDYY"
 msgstr "MMDDJJ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:332
+#: ../raphodo/generatenameconfig.py:336
 msgid "MMDD"
 msgstr "MMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:335
+#: ../raphodo/generatenameconfig.py:339
 msgid "DDMMYYYY"
 msgstr "DDMMJJJJ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:338
+#: ../raphodo/generatenameconfig.py:342
 msgid "DDMMYY"
 msgstr "DDMMJJ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:341 ../raphodo/generatenameconfig.py:389
-#: ../raphodo/generatenameconfig.py:390 ../raphodo/generatenameconfig.py:391
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:345 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:394 ../raphodo/generatenameconfig.py:395
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:397
 msgid "YYYY"
 msgstr "JJJJ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:344
+#: ../raphodo/generatenameconfig.py:348
 msgid "YY"
 msgstr "JJ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:347
+#: ../raphodo/generatenameconfig.py:351
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:350
+#: ../raphodo/generatenameconfig.py:354
 msgid "DD"
 msgstr "DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:353
+#: ../raphodo/generatenameconfig.py:357
 msgid "Month (full)"
 msgstr "Maand (volledig)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:356
+#: ../raphodo/generatenameconfig.py:360
 msgid "Month (abbreviated)"
 msgstr "Maand (kort)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:359
+#: ../raphodo/generatenameconfig.py:363
 msgid "HHMMSS"
-msgstr "HHMMSS"
+msgstr "UUMMSS"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:362
+#: ../raphodo/generatenameconfig.py:366
 msgid "HHMM"
-msgstr "HHMM"
+msgstr "UUMM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:365
+#: ../raphodo/generatenameconfig.py:369
 msgid "HH-MM-SS"
-msgstr "HH-MM-SS"
+msgstr "UU-MM-SS"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:368
+#: ../raphodo/generatenameconfig.py:372
 msgid "HH-MM"
-msgstr "HH-MM"
+msgstr "UU-MM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:371
+#: ../raphodo/generatenameconfig.py:375
 msgid "HH"
-msgstr "HH"
+msgstr "UU"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:374
+#: ../raphodo/generatenameconfig.py:378
 msgid "MM (minutes)"
 msgstr "MM (minuten)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:377
+#: ../raphodo/generatenameconfig.py:381
 msgid "SS"
 msgstr "SS"
 
-#: ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:393
 msgid "Date"
 msgstr "Datum"
 
-#: ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:394
 msgid "Date (hyphens)"
 msgstr "Datum (streepjes)"
 
-#: ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:395
 msgid "Date (underscores)"
 msgstr "Datum (underscores)"
 
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:438
-#: ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:442
+#: ../raphodo/generatenameconfig.py:537
 msgid "Date and Job Code"
 msgstr "Datum en Job Code"
 
-#: ../raphodo/generatenameconfig.py:392
+#: ../raphodo/generatenameconfig.py:396
 msgid "YYYYMM_Job Code"
-msgstr "YYYYMM_Job Code"
+msgstr "JJJJMM_Job Code"
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "Date and Job Code Subfolder"
 msgstr "Datum en Job Code Subfolder"
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "YYYYMM"
-msgstr "YYYYMM"
+msgstr "JJJJMM"
 
-#: ../raphodo/generatenameconfig.py:393 ../raphodo/jobcodepanel.py:198
-#: ../raphodo/nameeditor.py:827 ../raphodo/rapid.py:1809
+#: ../raphodo/generatenameconfig.py:397 ../raphodo/jobcodepanel.py:199
+#: ../raphodo/nameeditor.py:833 ../raphodo/rapid.py:1852
 #: ../raphodo/renamepanel.py:83 ../raphodo/renamepanel.py:241
 msgid "Job Code"
 msgstr "Job Code"
 
-#: ../raphodo/generatenameconfig.py:433 ../raphodo/generatenameconfig.py:512
+#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:532
 msgid "Original Filename"
 msgstr "Originele bestandsnaam"
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "Date-Time and Downloads today"
 msgstr "Datum-Tijd en Downloads vandaag"
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "YYYYMMDD-HHMM-1"
-msgstr "YYYYMMDD-HHMM-1"
+msgstr "JJJJMMDD-UUMM-1"
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "Date and Downloads today"
 msgstr "Datum en Downloads vandaag"
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "YYYYMMDD-1"
-msgstr "YYYYMMDD-1"
+msgstr "JJJJMMDD-1"
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "Date-Time and Image number"
 msgstr "Datum-Tijd en afbeeldingsnummer"
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "YYYYMMDD-1234"
-msgstr "YYYYMMDD-1234"
+msgstr "JJJJMMDD-1234"
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "Date-Time and Job Code"
 msgstr "Datum-Tijd en Job code"
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "YYYYMMDD-HHMM-Job Code-1"
-msgstr "YYYYMMDD-HHMM-Job Code-1"
+msgstr "JJJJMMDD-UUMM-Job Code-1"
 
-#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:442 ../raphodo/generatenameconfig.py:537
 msgid "YYYYMMDD-Job Code-1"
-msgstr "YYYYMMDD-Job Code-1"
+msgstr "JJJJMMDD-Job Code-1"
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "Date-Time and Video number"
 msgstr "Datum-Tijd en Video nummer"
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "YYYYMMDD_1234"
-msgstr "YYYYMMDD_1234"
+msgstr "JJJJMMDD_1234"
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "Resolution"
 msgstr "Resolutie"
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "YYYYMMDD-HHMM-1-1920x1080"
-msgstr "YYYYMMDD-HHMM-1-1920x1080"
+msgstr "JJJJMMDD-UUMM-1-1920x1080"
 
 #: ../raphodo/jobcodepanel.py:64
 msgid "Enter a new Job Code, or select a previous one"
-msgstr "Geef een nieuwe Job Code in of selecteer een bestaande"
+msgstr "Geef een nieuwe Job Code in of selecteer vorige"
 
 #. Translators: the value substituted will be something like '1 photo'.
 #: ../raphodo/jobcodepanel.py:70
 #, python-format
 msgid "The Job Code will be applied to %s that does not yet have a Job Code."
 msgstr ""
+"De Job Code zal worden toegepast op %s die deze Job Code nog niet hebben."
 
 #. Translators: the value substituted will be something like '85 photos and 5
 #. videos'.
@@ -1469,10 +2225,11 @@ msgstr ""
 #, python-format
 msgid "The Job Code will be applied to %s that do not yet have a Job Code."
 msgstr ""
+"De Job Code zal worden toegepast op  %s die deze Job Code nog niet hebben."
 
 #: ../raphodo/jobcodepanel.py:78
 msgid "Apply Job Code to Download"
-msgstr ""
+msgstr "Job Code toepassen op Download"
 
 #: ../raphodo/jobcodepanel.py:80
 msgid "Enter a new Job Code"
@@ -1481,103 +2238,117 @@ msgstr "Geef een nieuwe Job Code in"
 #: ../raphodo/jobcodepanel.py:86
 msgid "The new Job Code will not be applied to any photos or videos."
 msgstr ""
+"De nieuwe Job Code zal op geen enkele foto of video toegepast worden."
 
 #. Translators: the value substituted will be something like '100 photos and 5
 #. videos'.
 #: ../raphodo/jobcodepanel.py:92
 #, python-format
 msgid "The new Job Code will <b>not</b> be applied to %s."
-msgstr ""
+msgstr "De nieuwe Job Code zal <b>niet</b> toegepast worden op %s."
 
 #. Translators: the value substituted will be something like '100 photos and 5
 #. videos'.
 #: ../raphodo/jobcodepanel.py:97
 #, python-format
 msgid "The new Job Code will be applied to %s."
-msgstr ""
+msgstr "De nieuwe Job Code zal toegepast worden op %s."
 
 #: ../raphodo/jobcodepanel.py:99
 msgid "New Job Code"
-msgstr ""
+msgstr "Nieuwe Job Code"
 
 #: ../raphodo/jobcodepanel.py:134
 msgid "&Job Code:"
-msgstr ""
+msgstr "&Job Code:"
 
 #: ../raphodo/jobcodepanel.py:136 ../raphodo/rememberthisdialog.py:68
 msgid "&Remember this choice"
-msgstr ""
+msgstr "Onthoud deze keuze"
 
-#: ../raphodo/jobcodepanel.py:185
+#: ../raphodo/jobcodepanel.py:186
 msgid ""
 "Select photos and videos to be able to apply a new or existing Job Code to "
 "them."
 msgstr ""
+"Selecteer foto's en video's waar de nieuwe of bestaande Job Code op moet "
+"worden toegepast."
 
-#: ../raphodo/jobcodepanel.py:186
-msgid "The new Job Code will be applied to all selected photos and/or videos."
+#: ../raphodo/jobcodepanel.py:187
+msgid ""
+"The new Job Code will be applied to all selected photos and/or videos."
 msgstr ""
+"De nieuwe Job Code zal toegepast worden op alle geselecteerde foto's en/of "
+"video's."
 
-#: ../raphodo/jobcodepanel.py:187
+#: ../raphodo/jobcodepanel.py:188
 msgid ""
 "Click the Apply button to apply the current Job Code to all selected photos "
 "and/or videos. You can also simply double click the Job Code."
 msgstr ""
+"Klik op de knop Toepassing om de huidige Job Code toe te passen op alle "
+"geselecteerde foto's en/of video's. Je kan ook gewoonweg dubbelklikken op de "
+"Job Code."
 
-#: ../raphodo/jobcodepanel.py:189
+#: ../raphodo/jobcodepanel.py:190
 msgid ""
 "Removing a Job Code removes it only from the list of saved Job Codes, not "
 "from any photos or videos that it may have been applied to."
 msgstr ""
+"Het verwijderen van een Job Code, verwijdert deze enkel van de lijst van "
+"opgeslagen Job Codes, niet van enige foto of video waar het aan toegekend "
+"was."
 
-#: ../raphodo/jobcodepanel.py:191
+#: ../raphodo/jobcodepanel.py:192
 msgid ""
 "If you want to use Job Codes, configure file renaming or destination "
 "subfolder names to use them."
 msgstr ""
+"Als je Job Codes wil gebruiken, configureer bestandshernoeming of "
+"bestemmings sub-folders namen om die te gebruiken."
 
-#: ../raphodo/jobcodepanel.py:197
+#: ../raphodo/jobcodepanel.py:198
 msgid "Last Used"
-msgstr ""
+msgstr "Laatst gebruikt op"
 
-#: ../raphodo/jobcodepanel.py:202
+#: ../raphodo/jobcodepanel.py:203
 msgid "Job Code Sort:"
-msgstr ""
+msgstr "Job Code Volgorde:"
 
-#: ../raphodo/jobcodepanel.py:205 ../raphodo/rapid.py:2061
+#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2133
 msgid "Ascending"
 msgstr "Oplopend"
 
-#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2062
+#: ../raphodo/jobcodepanel.py:207 ../raphodo/rapid.py:2134
 msgid "Descending"
 msgstr "Aflopend"
 
-#: ../raphodo/jobcodepanel.py:216
+#: ../raphodo/jobcodepanel.py:217
 msgid "&New..."
-msgstr ""
+msgstr "&Nieuw..."
 
-#: ../raphodo/jobcodepanel.py:220
+#: ../raphodo/jobcodepanel.py:221
 msgid "&Apply"
-msgstr ""
+msgstr "&Toepassen"
 
-#: ../raphodo/jobcodepanel.py:224
+#: ../raphodo/jobcodepanel.py:225
 msgid "&Remove"
-msgstr ""
+msgstr "&Verwijderen"
 
-#: ../raphodo/jobcodepanel.py:228 ../raphodo/preferencedialog.py:125
-#: ../raphodo/preferencedialog.py:154 ../raphodo/preferencedialog.py:433
+#: ../raphodo/jobcodepanel.py:229 ../raphodo/preferencedialog.py:200
+#: ../raphodo/preferencedialog.py:229 ../raphodo/preferencedialog.py:531
 msgid "Remove All"
-msgstr ""
+msgstr "Alles verwijderen"
 
-#: ../raphodo/jobcodepanel.py:427
+#: ../raphodo/jobcodepanel.py:428
 msgid "Do you really want to remove all the Job Codes?"
-msgstr ""
+msgstr "Wens je alle Job Codes te verwijderen?"
 
-#: ../raphodo/jobcodepanel.py:429
+#: ../raphodo/jobcodepanel.py:430
 msgid "Remove all Job Codes"
-msgstr ""
+msgstr "Verwijder alle Job Codes"
 
-#: ../raphodo/jobcodepanel.py:492
+#: ../raphodo/jobcodepanel.py:493
 msgid "Job Codes"
 msgstr "Job Codes"
 
@@ -1586,558 +2357,849 @@ msgstr "Job Codes"
 #: ../raphodo/messagewidget.py:65
 #, python-format
 msgid "<i><b>Hint:</b> %(message)s"
-msgstr ""
+msgstr "<i><b>Tip:</b> %(message)s"
 
-#: ../raphodo/nameeditor.py:418 ../raphodo/nameeditor.py:432
+#: ../raphodo/nameeditor.py:423 ../raphodo/nameeditor.py:437
 #, python-format
 msgid "%(description)s - %(elements)s"
-msgstr ""
+msgstr "%(description)s - %(elements)s"
 
-#: ../raphodo/nameeditor.py:512
+#: ../raphodo/nameeditor.py:517
 msgid "Save New Custom Preset..."
-msgstr ""
+msgstr "Opslaan nieuwe persoonlijke instellingen..."
 
-#: ../raphodo/nameeditor.py:513
+#: ../raphodo/nameeditor.py:518
 msgid "Remove All Custom Presets..."
-msgstr ""
+msgstr "Verwijder alle persoonlijke instellingen..."
 
-#: ../raphodo/nameeditor.py:559
+#: ../raphodo/nameeditor.py:564
 msgid "(New Custom Preset)"
-msgstr ""
+msgstr "(Nieuwe persoonlijke instellingen)"
 
-#: ../raphodo/nameeditor.py:576
+#: ../raphodo/nameeditor.py:581
 #, python-format
 msgid "%s (edited)"
-msgstr ""
+msgstr "%s (bewerkt)"
 
-#: ../raphodo/nameeditor.py:579 ../raphodo/nameeditor.py:1370
+#: ../raphodo/nameeditor.py:584 ../raphodo/nameeditor.py:1379
 #, python-format
 msgid "Update Custom Preset \"%s\""
-msgstr ""
+msgstr "Bijwerken persoonlijke instelling \"%s\""
 
-#: ../raphodo/nameeditor.py:667
+#: ../raphodo/nameeditor.py:672
 msgid "Save New Custom Preset - Rapid Photo Downloader"
-msgstr ""
+msgstr "Opslaan nieuwe persoonlijke instelling - Rapid Photo Downloader"
 
-#: ../raphodo/nameeditor.py:675
+#: ../raphodo/nameeditor.py:680
 msgid "Preset Name:"
-msgstr ""
+msgstr "Vooraf ingestelde naam:"
+
+#: ../raphodo/nameeditor.py:799
+msgid "Photo Subfolder Generation Editor"
+msgstr "Foto Subfolder Generation Editor"
+
+#: ../raphodo/nameeditor.py:805
+msgid "Video Subfolder Generation Editor"
+msgstr "Video Subfolder Generation Editor"
 
-#: ../raphodo/nameeditor.py:836
+#: ../raphodo/nameeditor.py:811
+msgid "Photo Renaming Editor"
+msgstr "Foto Hernoemen Editor"
+
+#: ../raphodo/nameeditor.py:817
+msgid "Video Renaming Editor"
+msgstr "Video Hernoemen Editor"
+
+#: ../raphodo/nameeditor.py:842
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>There is insufficient data to "
 "fully generate the name. Please use other renaming options.</i>"
 msgstr ""
+"<b><font color=\"red\">Opgepast:</font></b> <i>Er zijn onvoldoende gegevens "
+"om een volwaardige naam aan te maken. Gelieve andere hernoem opties te "
+"gebruiken..</i>"
 
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees.
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:846
+#: ../raphodo/nameeditor.py:853
 #, python-format
 msgid "The character</i> %(separator)s <i>creates a new subfolder level."
 msgstr ""
+"Het </i> %(separator)s <i>teken maakt een nieuw sub-folder niveau aan."
 
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:851
+#: ../raphodo/nameeditor.py:858
 #, python-format
 msgid ""
 "There is no need start or end with the folder separator </i> "
 "%(separator)s<i>, because it is added automatically."
 msgstr ""
+"Je moet een foldernaam niet starten of stoppen met een folder separator </i> "
+"%(separator)s<i>, aangezien deze automatisch wordt toegevoegd."
 
-#: ../raphodo/nameeditor.py:859
+#: ../raphodo/nameeditor.py:866
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>Unique filenames may not be "
 "generated. Make filenames unique by using Sequence values.</i>"
 msgstr ""
+"<b><font color=\"red\">Opgepast:</font></b> <i>Unieke bestandsnamen worden "
+"mogelijks niet aangemaakt. Maak bestandsnamen uniek door gebruik te maken "
+"van volgnummers.</i>"
 
-#: ../raphodo/nameeditor.py:882 ../raphodo/renamepanel.py:121
+#: ../raphodo/nameeditor.py:889 ../raphodo/renamepanel.py:121
 msgid "Preset:"
-msgstr ""
+msgstr "Voorinstelling:"
 
 #. Translators: appears in a combobox, e.g. Image Date (YYYY)
-#: ../raphodo/nameeditor.py:959 ../raphodo/nameeditor.py:980
+#: ../raphodo/nameeditor.py:966 ../raphodo/nameeditor.py:987
 #, python-brace-format
 msgid "{choice} ({variant})"
-msgstr ""
+msgstr "{choice} ({variant})"
 
-#: ../raphodo/nameeditor.py:1005 ../raphodo/preferencedialog.py:530
+#: ../raphodo/nameeditor.py:1012 ../raphodo/preferencedialog.py:783
 msgid "Get help online..."
-msgstr ""
+msgstr "Online hulp zoeken..."
 
-#: ../raphodo/nameeditor.py:1025
+#: ../raphodo/nameeditor.py:1034
 msgid "Insert"
-msgstr ""
+msgstr "Toevoegen"
 
-#: ../raphodo/nameeditor.py:1351
+#: ../raphodo/nameeditor.py:1360
 msgid "Save Preset - Rapid Photo Downloader"
-msgstr ""
+msgstr "Voorinstelling opslaan - Rapid Photo Downloader"
 
-#: ../raphodo/nameeditor.py:1356
+#: ../raphodo/nameeditor.py:1365
 msgid ""
-"<b>Do you want to save the changes in a new custom preset?</"
-"b><br><br>Creating a custom preset is not required, but can help you keep "
-"organized.<br><br>The changes to the preferences will still be applied "
-"regardless of whether you create a new custom preset or not."
+"<b>Do you want to save the changes in a new custom "
+"preset?</b><br><br>Creating a custom preset is not required, but can help "
+"you keep organized.<br><br>The changes to the preferences will still be "
+"applied regardless of whether you create a new custom preset or not."
 msgstr ""
+"<b>Wens je de wijzigingen in een nieuwe eigen voorinstelling "
+"bewaren?</b><br><br>Een eigen voorinstelling aanmaken is niet verplicht maar "
+"het kan je wel helpen binnen je organisatie.<br><br>De wijzigingen aan de "
+"voorkeuren zullen steeds toegepast worden ongeacht of je een nieuwe eigen "
+"voorinstelling aanmaakt of niet."
 
-#: ../raphodo/nameeditor.py:1365
+#: ../raphodo/nameeditor.py:1374
 msgid ""
 "<b>Do you want to save the changes in a custom preset?</b><br><br>If you "
 "like, you can create a new custom preset or update the existing custom "
 "preset.<br><br>The changes to the preferences will still be applied "
 "regardless of whether you save a custom preset or not."
 msgstr ""
+"<b>Wens je de wijzigingen in een nieuwe eigen voorinstelling "
+"bewaren?</b><br><br>Als je wenst kan je een nieuwe eigen voorinstelling "
+"aanmaken of een bestaande aanpassen.<br><br>De wijzigingen aan de voorkeuren "
+"zullen steeds toegepast worden ongeacht of je een eigen voorinstelling "
+"bewaart of niet."
 
-#: ../raphodo/nameeditor.py:1372
+#: ../raphodo/nameeditor.py:1381
 msgid "Save New Custom Preset"
-msgstr ""
+msgstr "Bewaar nieuwe aangemaakte voorinstelling."
 
-#: ../raphodo/newversion.py:306
+#: ../raphodo/newversion.py:312
 msgid "Checking for new version..."
-msgstr ""
+msgstr "Controleren op nieuwe versies..."
 
-#: ../raphodo/newversion.py:307
+#: ../raphodo/newversion.py:313
 msgid "You are running the latest version."
-msgstr ""
+msgstr "Je gebruikt momenteel de laatste versie"
 
-#: ../raphodo/newversion.py:308
+#: ../raphodo/newversion.py:314
 msgid "Failed to contact the update server."
-msgstr ""
+msgstr "Kon de update server niet contacteren."
 
-#: ../raphodo/newversion.py:310
+#: ../raphodo/newversion.py:316
 #, python-format
 msgid "A new version of Rapid Photo Downloader (%s) is available."
-msgstr ""
+msgstr "Een nieuwe versie van Rapid Photo Downloader (%s) is beschikbaar."
 
-#: ../raphodo/newversion.py:312
+#: ../raphodo/newversion.py:318
 msgid "Do you want to download the new version?"
-msgstr ""
+msgstr "Wens je de nieuwe versie te downloaden?"
 
-#: ../raphodo/newversion.py:313
+#: ../raphodo/newversion.py:319
 #, python-format
 msgid "Changes in the new release can be viewed <a href=\"%s\">here</a>."
 msgstr ""
+"Wijzigingen in de nieuwe versie kun je <a href=\"%s\">hier</a> raadplegen."
 
 #. Translators: this text appears in a button - the & sets the s key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:340 ../raphodo/newversion.py:353
+#: ../raphodo/newversion.py:348 ../raphodo/newversion.py:363
 msgid "&Skip this release"
-msgstr ""
+msgstr "&Sla deze versie over"
 
 #. Translators: this text appears in a button - the & sets the o key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:356
+#: ../raphodo/newversion.py:366
 msgid "&Open Download Page"
-msgstr ""
+msgstr "&Open Download Pagina"
 
-#: ../raphodo/newversion.py:376
+#: ../raphodo/newversion.py:386
 msgid "Rapid Photo Downloader updates"
-msgstr ""
+msgstr "Rapid Photo Downloader bijwerkingen"
 
 #. Translators: shows how much of a file has been downloaded e.g  123 KB of 1.3 MB
-#: ../raphodo/newversion.py:478
+#: ../raphodo/newversion.py:488
 #, python-format
 msgid "%(downloaded)s of %(total)s"
-msgstr ""
+msgstr "%(downloaded)s van %(total)s"
 
-#: ../raphodo/newversion.py:495
+#: ../raphodo/newversion.py:507
 msgid "Downloading..."
-msgstr ""
+msgstr "Downloaden…"
 
-#: ../raphodo/preferencedialog.py:76
+#: ../raphodo/preferencedialog.py:86
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Automation"
-msgstr "Automatisering"
+msgstr "Automatie"
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Thumbnails"
 msgstr "Miniaturen"
 
-#: ../raphodo/preferencedialog.py:85 ../raphodo/preferencedialog.py:343
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/preferencedialog.py:428
 msgid "Error Handling"
 msgstr "Foutafhandeling"
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Warnings"
-msgstr ""
+msgstr "Waarschuwingen"
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:109
+msgid "Consolidation"
+msgstr "Consolidatie"
+
+#: ../raphodo/preferencedialog.py:109 ../raphodo/preferencedialog.py:119
 msgid "Miscellaneous"
 msgstr "Overige"
 
-#: ../raphodo/preferencedialog.py:94
+#: ../raphodo/preferencedialog.py:147
 msgid "Device Scanning"
-msgstr ""
+msgstr "Apparaten aflopen"
 
-#: ../raphodo/preferencedialog.py:96
+#: ../raphodo/preferencedialog.py:148
 msgid "Scan only external devices"
-msgstr ""
+msgstr "Scan alleen externe apparaten"
 
-#: ../raphodo/preferencedialog.py:98
+#: ../raphodo/preferencedialog.py:150
 msgid ""
 "Scan for photos and videos only on devices that are external to the "
 "computer,\n"
 "including cameras, memory cards, external hard drives, and USB flash drives."
 msgstr ""
+"Scan enkel in de externe apparaten van deze computer op foto's of video's,\n"
+"inclusief camera's, geheugenlkaarten, externe harde schijven en USB sticks."
 
-#: ../raphodo/preferencedialog.py:102
-msgid "Scan non-camera devices lacking a DCIM folder"
+#: ../raphodo/preferencedialog.py:153
+msgid "Scan only specific folders on devices"
+msgstr "Scan enkel specifieke folders op apparaten"
+
+#: ../raphodo/preferencedialog.py:155
+msgid ""
+"Scan for photos and videos only in the folders specified below (except "
+"paths\n"
+"specified in Ignored Paths).\n"
+"\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+"Scan enkel in de folders hieronder aangegeven op foto's of video's "
+"(exclusief paden\n"
+"opgegeven in de 'te negeren paden').\n"
+"\n"
+"Aanpassingen in deze instelling starten het herscannen van alle apparaten."
+
+#: ../raphodo/preferencedialog.py:161
+msgid "Folders to scan:"
+msgstr "Folders die doorlopen moeten worden:"
+
+#: ../raphodo/preferencedialog.py:164
+msgid ""
+"Folders at the base level of device file systems that will be scanned\n"
+"for photos and videos."
 msgstr ""
+"Folders bovenaan het bestandssysteem die gescand zullen worden\n"
+"op foto's en video's."
+
+#: ../raphodo/preferencedialog.py:167 ../raphodo/preferencedialog.py:219
+msgid "Add..."
+msgstr "Toevoegen…"
 
-#: ../raphodo/preferencedialog.py:104
+#: ../raphodo/preferencedialog.py:169
 msgid ""
-"Scan the entirety of a device for photos and videos, irrespective of whether "
-"it contains a DCIM folder,\n"
-"as opposed to only scanning within a DCIM folder.\n"
+"Add a folder to the list of folders to scan for photos and videos.\n"
 "\n"
-"Changing this setting causes all devices to be scanned again.\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+"Voeg een folder toe aan de lijst van te scannen folders voor foto; en "
+"video's.\n"
+"\n"
+"Aanpassingen in deze instelling starten het herscannen van alle apparaten."
+
+#: ../raphodo/preferencedialog.py:172 ../raphodo/preferencedialog.py:198
+#: ../raphodo/preferencedialog.py:224 ../raphodo/preferencedialog.py:529
+msgid "Remove"
+msgstr "Verwijder"
+
+#: ../raphodo/preferencedialog.py:174
+msgid ""
+"Remove a folder from the list of folders to scan for photos and videos.\n"
 "\n"
-"Note: With cameras, only the DCIM folder is scanned."
+"Changing this setting causes all devices to be scanned again."
 msgstr ""
+"Verwijder een folder van de lijst van te scannen folders voor foto's en "
+"video's.\n"
+"\n"
+"Aanpassingen in deze instelling starten het herscannen van alle apparaten."
 
-#: ../raphodo/preferencedialog.py:116
+#: ../raphodo/preferencedialog.py:191
 msgid "Devices that have been set to automatically ignore or download from."
 msgstr ""
+"Apparaten die ingesteld zijn om automatisch genegeerd of van gedownload te "
+"worden."
 
-#: ../raphodo/preferencedialog.py:117
+#: ../raphodo/preferencedialog.py:192
 msgid "Remembered Devices"
-msgstr ""
+msgstr "Onthouden apparaten"
 
-#: ../raphodo/preferencedialog.py:121
+#: ../raphodo/preferencedialog.py:196
 msgid ""
 "Remove a device from the list of devices to automatically ignore or download "
 "from."
 msgstr ""
+"Verwijder een apparaat van de lijst van apparaten die automatisch genegeerd "
+"of waarvan gedownload moet worden."
 
-#: ../raphodo/preferencedialog.py:123 ../raphodo/preferencedialog.py:149
-#: ../raphodo/preferencedialog.py:431
-msgid "Remove"
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:127
+#: ../raphodo/preferencedialog.py:202
 msgid ""
 "Clear the list of devices from which to automatically ignore or download "
 "from.\n"
 "\n"
 "Note: Changes take effect when the computer is next scanned for devices."
 msgstr ""
+"Wis de lijst van apparaten waarvan er automatisch gedownload wordt of die "
+"genegeerd worden.\n"
+"\n"
+"Noot: Aanpassingen worden van kracht wanneer de computer de volgende keer op "
+"apparaten doorzocht wordt."
 
-#: ../raphodo/preferencedialog.py:140
+#: ../raphodo/preferencedialog.py:215
 msgid "Ignored Paths"
 msgstr "Genegeerde paden"
 
-#: ../raphodo/preferencedialog.py:141
+#: ../raphodo/preferencedialog.py:216
 msgid ""
 "The end part of a path that should never be scanned for photos or videos."
 msgstr ""
+"Het eindgedeelte van een pad waar nooit gescanned moet worden op foto's of "
+"video's."
 
-#: ../raphodo/preferencedialog.py:144
-msgid "Add..."
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:146
+#: ../raphodo/preferencedialog.py:221
 msgid ""
 "Add a path to the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
+"Voeg een pad toe aan de lijst van de te negeren paden.\n"
+"\n"
+"Het wijzigen van deze instelling herstart het scannen van alle apparaten"
 
-#: ../raphodo/preferencedialog.py:151
+#: ../raphodo/preferencedialog.py:226
 msgid ""
 "Remove a path from the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
+"Verwijder een pad van de lijst van de te negeren paden.\n"
+"\n"
+"Het wijzigen van deze instelling herstart het scannen van alle apparaten."
 
-#: ../raphodo/preferencedialog.py:156
+#: ../raphodo/preferencedialog.py:231
 msgid ""
 "Clear the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
+"Wis de lijst van de te negeren paden.\n"
+"\n"
+"Het wijzigen van deze instelling herstart het scannen van alle apparaten."
 
-#: ../raphodo/preferencedialog.py:164
+#: ../raphodo/preferencedialog.py:239
 msgid ""
-"Use python-style <a href=\"http://damonlynch.net/rapid/documentation/"
-"#regularexpressions\">regular expressions</a>"
+"Use python-style <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">regula"
+"r expressions</a>"
 msgstr ""
+"Gebruik python-style <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">reguli"
+"ere uitdrukkingen</a>"
 
-#: ../raphodo/preferencedialog.py:168
+#: ../raphodo/preferencedialog.py:243
 msgid ""
 "Use regular expressions in the list of ignored paths.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
+"Gebruik reguliere uitdrukkingen in de lijst van de te negeren paden.\n"
+"\n"
+"Het wijzigen van deze instelling herstart het scannen van alle apparaten."
 
-#: ../raphodo/preferencedialog.py:208
+#: ../raphodo/preferencedialog.py:283
 msgid "Program Automation"
-msgstr ""
+msgstr "Programma Automatisatie"
 
-#: ../raphodo/preferencedialog.py:209
+#: ../raphodo/preferencedialog.py:284
 msgid "Start downloading at program startup"
 msgstr "Start de download tijdens het opstarten van het programma"
 
-#: ../raphodo/preferencedialog.py:210
+#: ../raphodo/preferencedialog.py:285
 msgid "Start downloading upon device insertion"
-msgstr "Start de download zodra het apparaat wordt aangekoppeld"
+msgstr "Start de download zodra een apparaat wordt aangekoppeld"
 
-#: ../raphodo/preferencedialog.py:211
+#: ../raphodo/preferencedialog.py:286
 msgid "Unmount (eject) device upon download completion"
-msgstr ""
+msgstr "Ontkoppel (uitwerpen) van het apparaat na afloop van de download"
 
-#: ../raphodo/preferencedialog.py:212
+#: ../raphodo/preferencedialog.py:287
 msgid "Exit program when download completes"
 msgstr "Beëindig programma als de download afgelopen is"
 
-#: ../raphodo/preferencedialog.py:213
+#: ../raphodo/preferencedialog.py:288
 msgid "Exit program even if download had warnings or errors"
 msgstr ""
 "Beëindig programma zelfs indien de download fouten of waarschuwingen had"
 
-#: ../raphodo/preferencedialog.py:240
+#: ../raphodo/preferencedialog.py:315
 msgid "Thumbnail Generation"
-msgstr ""
+msgstr "Bezig met de miniaturen aan te maken"
 
-#: ../raphodo/preferencedialog.py:241
+#: ../raphodo/preferencedialog.py:316
 msgid "Generate thumbnails"
-msgstr ""
+msgstr "Miniaturen aanmaken"
 
-#: ../raphodo/preferencedialog.py:242
+#: ../raphodo/preferencedialog.py:318
 msgid "Generate thumbnails to show in the main program window"
-msgstr ""
+msgstr "Maak de miniaturen aan om in het hoofdvenster te vertonen."
 
-#: ../raphodo/preferencedialog.py:244
+#: ../raphodo/preferencedialog.py:320
 msgid "Cache thumbnails"
-msgstr ""
+msgstr "Miniaturen cachen"
 
-#: ../raphodo/preferencedialog.py:245
+#: ../raphodo/preferencedialog.py:323
 msgid ""
 "Save thumbnails shown in the main program window in a thumbnail cache unique "
 "to Rapid Photo Downloader"
 msgstr ""
+"Bewaar de miniaturen vertoond in het hoofdvenster in de miniaturencache "
+"eigen aan Rapid Photo Downloader"
 
-#: ../raphodo/preferencedialog.py:247
+#: ../raphodo/preferencedialog.py:327
 msgid "Generate system thumbnails"
-msgstr ""
+msgstr "Systeem miniaturen aanmaken"
 
-#: ../raphodo/preferencedialog.py:248
+#: ../raphodo/preferencedialog.py:330
 msgid ""
 "While downloading, save thumbnails that can be used by desktop file managers "
 "and other programs"
 msgstr ""
+"Bewaar gedurende het downloaden, miniaturen die kunnen gebruikt worden door "
+"bestandsbeheerders en andere programma's"
 
-#: ../raphodo/preferencedialog.py:255
+#: ../raphodo/preferencedialog.py:339
 msgid "Number of CPU cores used to generate thumbnails."
-msgstr ""
+msgstr "Aantal CPU cores gebruikt om miniaturen aan te maken."
 
-#: ../raphodo/preferencedialog.py:256
+#: ../raphodo/preferencedialog.py:340
 msgid "CPU cores:"
-msgstr ""
+msgstr "CPU cores:"
 
 #. Translators: the * acts as an asterisk to denote a reference to an annotation
 #. such as '* Takes effect upon program restart'
-#: ../raphodo/preferencedialog.py:271 ../raphodo/preferencedialog.py:317
+#: ../raphodo/preferencedialog.py:355 ../raphodo/preferencedialog.py:401
 msgid "*"
-msgstr ""
+msgstr "*"
 
-#: ../raphodo/preferencedialog.py:294
+#: ../raphodo/preferencedialog.py:378
 msgid "Thumbnail Cache"
-msgstr ""
+msgstr "Miniatuurcache"
 
-#: ../raphodo/preferencedialog.py:296
+#: ../raphodo/preferencedialog.py:380
 msgid "Calculating..."
-msgstr ""
+msgstr "Bezig met berekenen..."
 
-#: ../raphodo/preferencedialog.py:302
+#: ../raphodo/preferencedialog.py:386
 msgid "days"
-msgstr ""
+msgstr "dagen"
 
-#: ../raphodo/preferencedialog.py:303
+#: ../raphodo/preferencedialog.py:387
 msgid "forever"
-msgstr ""
+msgstr "voor altijd"
 
-#: ../raphodo/preferencedialog.py:308
+#: ../raphodo/preferencedialog.py:392
 msgid "Cache size:"
-msgstr ""
+msgstr "Cache-grootte:"
 
-#: ../raphodo/preferencedialog.py:310
+#: ../raphodo/preferencedialog.py:394
 msgid "Number of thumbnails:"
-msgstr ""
+msgstr "Aantal miniaturen:"
 
-#: ../raphodo/preferencedialog.py:312
+#: ../raphodo/preferencedialog.py:396
 msgid "Database size:"
-msgstr ""
+msgstr "Database grootte:"
 
-#: ../raphodo/preferencedialog.py:314
+#: ../raphodo/preferencedialog.py:398
 msgid "Cache unaccessed thumbnails for:"
-msgstr ""
+msgstr "Plaats niet benaderde miniaturen in de cache voor:"
 
-#: ../raphodo/preferencedialog.py:322
+#: ../raphodo/preferencedialog.py:406
 msgid "Purge Cache..."
-msgstr ""
+msgstr "Cache ledigen"
 
-#: ../raphodo/preferencedialog.py:323
+#: ../raphodo/preferencedialog.py:408
 msgid "Optimize Cache..."
-msgstr ""
+msgstr "Cache optimaliseren..."
 
-#: ../raphodo/preferencedialog.py:336
+#: ../raphodo/preferencedialog.py:421
 msgid "* Takes effect upon program restart"
-msgstr ""
+msgstr "* Vereist een programma herstart"
 
-#: ../raphodo/preferencedialog.py:346
+#: ../raphodo/preferencedialog.py:431
 msgid "Skip download"
 msgstr "Download overslaan"
 
-#: ../raphodo/preferencedialog.py:347
+#: ../raphodo/preferencedialog.py:432
 msgid "Don't download the file, and issue an error message"
-msgstr ""
+msgstr "Download het bestand niet en vertoon een foutbericht."
 
-#: ../raphodo/preferencedialog.py:348
+#: ../raphodo/preferencedialog.py:433
 msgid "Add unique identifier"
-msgstr "Unieke identifiecatieteken toevoegen"
+msgstr "Uniek identifiecatieteken toevoegen"
 
-#: ../raphodo/preferencedialog.py:349
+#: ../raphodo/preferencedialog.py:436
 msgid ""
 "Add an identifier like _1 or _2 to the end of the filename, immediately "
 "before the file's extension"
 msgstr ""
+"Voeg een identificatie zoals _1 of _2 toe aan het einde van de bestandsnaam, "
+"direct voor de bestandsnaam extentie."
 
-#: ../raphodo/preferencedialog.py:355
+#: ../raphodo/preferencedialog.py:444
 msgid "Overwrite"
 msgstr "Overschrijven"
 
-#: ../raphodo/preferencedialog.py:356
+#: ../raphodo/preferencedialog.py:445
 msgid "Overwrite the previously backed up file"
-msgstr ""
+msgstr "Overschrijf het vorige gebackupde bestand"
 
-#: ../raphodo/preferencedialog.py:357
+#: ../raphodo/preferencedialog.py:446
 msgid "Skip"
 msgstr "Overslaan"
 
-#: ../raphodo/preferencedialog.py:358
+#: ../raphodo/preferencedialog.py:448
 msgid "Don't overwrite the backup file, and issue an error message"
-msgstr ""
+msgstr "Overschrijf het back-up bestand niet en vertoon een foutbericht."
 
-#: ../raphodo/preferencedialog.py:364
+#: ../raphodo/preferencedialog.py:455
 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 identifier:"
 msgstr ""
+"Wanneer een foto of video met dezelfde naam reeds gedownload werd, kies om "
+"ofwel de dowload van dat bestand over te slaan, of om er een uniek "
+"identificatienummer aan toe te voegen:"
 
-#: ../raphodo/preferencedialog.py:378
+#: ../raphodo/preferencedialog.py:464
+msgid ""
+"Using sequence numbers to automatically generate unique filenames is "
+"strongly recommended. Configure file renaming in the Rename panel in the "
+"main window."
+msgstr ""
+"Het gebruik van volgnummers om automatisch unieke bestandsnamen aan te maken "
+"is aangeraden. Configureer de hernoeming in het Hernoem paneel  in het "
+"hoofdvenster."
+
+#: ../raphodo/preferencedialog.py:473
 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 ""
+"Kies tijdens het backuppen om een bestand met dezelfde naam op het back-up "
+"apparaat te overschrijven of over te slaan:"
 
-#: ../raphodo/preferencedialog.py:398
+#: ../raphodo/preferencedialog.py:494
 msgid "Program Warnings"
-msgstr ""
+msgstr "Programma verwittigingen"
 
-#: ../raphodo/preferencedialog.py:399
+#: ../raphodo/preferencedialog.py:495
 msgid "Show a warning when:"
-msgstr ""
+msgstr "Vertoon een verwittiging als:"
 
-#: ../raphodo/preferencedialog.py:402
+#: ../raphodo/preferencedialog.py:498
 msgid "Downloading files currently not displayed"
-msgstr ""
+msgstr "Downloaden van bestanden die momenteel niet worden weergegeven"
 
-#: ../raphodo/preferencedialog.py:403
+#: ../raphodo/preferencedialog.py:499
 msgid ""
 "Warn when about to download files that are not displayed in the main window."
 msgstr ""
+"Verwittig als je bestanden gaat downloaden die niet vertoond zijn in het "
+"hoofdvenster."
 
-#: ../raphodo/preferencedialog.py:405
+#: ../raphodo/preferencedialog.py:501
 msgid "Backup destinations are missing"
-msgstr ""
+msgstr "Back-up bestemming ontbreekt"
 
-#: ../raphodo/preferencedialog.py:406
-msgid "Warn before starting a download if it is not possible to back up files."
+#: ../raphodo/preferencedialog.py:502
+msgid ""
+"Warn before starting a download if it is not possible to back up files."
 msgstr ""
+"Verwittig alvorens een download te starten wanneer het niet mogelijk is de "
+"bestanden te backuppen."
 
-#: ../raphodo/preferencedialog.py:408
+#: ../raphodo/preferencedialog.py:504
 msgid "Program libraries are missing or broken"
-msgstr ""
+msgstr "Programma bibliotheken ontbreken of zijn defect."
 
-#: ../raphodo/preferencedialog.py:409
+#: ../raphodo/preferencedialog.py:505
 msgid ""
 "Warn if a software library used by Rapid Photo Downloader is missing or not "
 "functioning."
 msgstr ""
+"Verwittig indien een software bibliotheek gebruikt door Rapid Photo "
+"Downloader ontbreekt of niet werkt."
 
-#: ../raphodo/preferencedialog.py:412
+#: ../raphodo/preferencedialog.py:508
 msgid "Filesystem metadata cannot be set"
-msgstr ""
+msgstr "Bestandssysteem metagegevens kunnen niet ingesteld worden"
 
-#: ../raphodo/preferencedialog.py:413
+#: ../raphodo/preferencedialog.py:509
 msgid ""
 "Warn if there is an error setting a file's filesystem metadata, such as its "
 "modification time."
 msgstr ""
+"Verwittig indien er een fout optreedt bij het instellen van een "
+"bestandsysteem metagegeven, zoals de wijzigingstijd."
 
-#: ../raphodo/preferencedialog.py:416
+#: ../raphodo/preferencedialog.py:512
 msgid "Encountering unhandled files"
-msgstr ""
+msgstr "Niet opgevangen fout opgetreden"
 
-#: ../raphodo/preferencedialog.py:417
+#: ../raphodo/preferencedialog.py:513
 msgid ""
 "Warn after scanning a device or this computer if there are unrecognized "
 "files that will not be included in the download."
 msgstr ""
+"Verwittig indien na het doorlopen van een apparaat of deze computer niet "
+"herkende bestanden zijn die niet zullen opgenomen worden bij de download."
 
-#: ../raphodo/preferencedialog.py:420
+#: ../raphodo/preferencedialog.py:517
 msgid "Do not warn about unhandled files with extensions:"
-msgstr ""
+msgstr "Verwittig niet bij niet opgevangen bestanden met extensies:"
 
-#: ../raphodo/preferencedialog.py:424
+#: ../raphodo/preferencedialog.py:522
 msgid ""
 "File extensions are case insensitive and do not need to include the leading "
 "dot."
 msgstr ""
+"Bestandextenties zijn hoofdletter ongevoelig en moeten het vooraafgaand punt "
+"symbool niet bevatten."
 
-#: ../raphodo/preferencedialog.py:427
+#: ../raphodo/preferencedialog.py:525
 msgid "Add"
-msgstr ""
+msgstr "Toevoegen"
 
-#: ../raphodo/preferencedialog.py:428
+#: ../raphodo/preferencedialog.py:526
 msgid ""
 "Add a file extension to the list of unhandled file types to not warn about."
 msgstr ""
+"Voeg een bestandsextensie toe aan de lijst van niet behandelde "
+"bestandstypes, waar er niet over gewaarschuwd moet worden."
 
-#: ../raphodo/preferencedialog.py:430
+#: ../raphodo/preferencedialog.py:528
 msgid ""
 "Remove a file extension from the list of unhandled file types to not warn "
 "about."
 msgstr ""
+"Verwijder een bestandsextentie van de lijst van niet behandelde "
+"bestandstypes, waar er niet over gewaarschuwd moet worden."
 
-#: ../raphodo/preferencedialog.py:434
+#: ../raphodo/preferencedialog.py:532
 msgid ""
 "Clear the list of file extensions of unhandled file types to not warn about."
 msgstr ""
+"Maak de lijst van niet behandelde bestandstypes, waar er niet over "
+"gewaarschuwd moet worden, leeg."
 
-#: ../raphodo/preferencedialog.py:469
-msgid "Version Check"
+#: ../raphodo/preferencedialog.py:568
+msgid "Photo and Video Consolidation"
+msgstr "Foto en Video Consolidatie"
+
+#: ../raphodo/preferencedialog.py:571
+msgid "Consolidate files across devices and downloads"
+msgstr "Consolideer bestanden over apparaten en downloads heen"
+
+#: ../raphodo/preferencedialog.py:574
+msgid ""
+"Analyze the results of device scans looking for duplicate files and matching "
+"RAW and JPEG pairs,\n"
+"comparing them across multiple devices and download sessions."
 msgstr ""
+"Analyseer de resultaten van de scans van apparaten, voor dubbele bestanden "
+"en bij elkaar passende RAW en JPEG paren,\n"
+"en vergelijk ze over meerdere apparaten en download sessies."
 
-#: ../raphodo/preferencedialog.py:470
-msgid "Check for new version at startup"
+#: ../raphodo/preferencedialog.py:580
+msgid "Treat matching RAW and JPEG files as:"
+msgstr "Behandel passende RAW en JPEG bestanden als:"
+
+#: ../raphodo/preferencedialog.py:581
+msgid "One photo"
+msgstr "Eén foto"
+
+#: ../raphodo/preferencedialog.py:582
+msgid "Two photos"
+msgstr "Twee foto's"
+
+#: ../raphodo/preferencedialog.py:584
+msgid ""
+"Display matching pairs of RAW and JPEG photos as one photo, and if marked, "
+"download both."
 msgstr ""
+"Vertoon overeenkomende paren RAW en JPEG foto's als één foto, en indien "
+"gemarkeerd, download beide."
+
+#: ../raphodo/preferencedialog.py:589
+msgid ""
+"Display matching pairs of RAW and JPEG photos as two different photos. You "
+"can still synchronize their sequence numbers."
+msgstr ""
+"Vertoon overeenkomende paren RAW en JPEG foto's als twee verschillende "
+"foto's. Je kan nog altijd hun volgnummers synchroniseren."
+
+#: ../raphodo/preferencedialog.py:598
+msgid "With matching RAW and JPEG photos:"
+msgstr "Met overeenkomende RAW en JPEG foto's:"
+
+#: ../raphodo/preferencedialog.py:600
+msgid "Do not mark JPEG for download"
+msgstr "Markeer JPEG niet voor download"
+
+#: ../raphodo/preferencedialog.py:601
+msgid "Do not mark RAW for download"
+msgstr "Markeer RAW niet voor download"
+
+#: ../raphodo/preferencedialog.py:602
+msgid "Mark both for download"
+msgstr "Markeer beide voor download"
+
+#: ../raphodo/preferencedialog.py:609
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"JPEG for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+"Wanneer overeenkomende RAW en JPEG foto's gevonden worden, markeer de JPEG "
+"niet automatisch voor\n"
+"download. Je kan het nog steeds manueel markeren."
+
+#: ../raphodo/preferencedialog.py:614
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"RAW for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+"Wanneer overeenkomende RAW en JPEG foto's gevonden worden, markeer de RAW "
+"niet automatisch voor\n"
+"download. Je kan het nog steeds manueel markeren."
+
+#: ../raphodo/preferencedialog.py:619
+msgid ""
+"When matching RAW and JPEG photos are found, automatically mark both for "
+"download."
+msgstr ""
+"Wanneer overeenkomende RAW en JPEG foto's gevonden worden, markeer beide "
+"automatisch voor download."
+
+#: ../raphodo/preferencedialog.py:625
+msgid ""
+"If you disable file consolidation, choose what to do when a download device "
+"is inserted while completed downloads are displayed:"
+msgstr ""
+"Als je bestand consolidering uitzet, kies wat je wenst te doen telkens een "
+"download apparaat ingeplugd wordt, wanneer afgewerkte downloads vertoond "
+"worden:"
+
+#: ../raphodo/preferencedialog.py:631
+msgid ""
+"When a download device is inserted while completed downloads are displayed:"
+msgstr ""
+"Wanneer een download apparaat ingeplugd wordt wanneer de afgewerkte "
+"downloads vertoond worden:"
+
+#: ../raphodo/preferencedialog.py:642
+msgid "Clear completed downloads"
+msgstr "Wis afgewerkte downloads"
+
+#: ../raphodo/preferencedialog.py:643
+msgid "Keep displaying completed downloads"
+msgstr "Blijf afgewerkte downloads vertonen"
+
+#: ../raphodo/preferencedialog.py:644
+msgid "Prompt for what to do"
+msgstr "Vraag wat te doen"
+
+#: ../raphodo/preferencedialog.py:649
+msgid ""
+"Automatically clear the display of completed downloads whenever a new "
+"download device is inserted."
+msgstr ""
+"Wis de lijst van afgewerkte downloads automatisch telkens een nieuw download "
+"apparaat ingeplugd wordt."
+
+#: ../raphodo/preferencedialog.py:654
+msgid ""
+"Keep displaying completed downloads whenever a new download device is "
+"inserted."
+msgstr ""
+"Blijf de lijst van afgewerkte downloads vertonen telkens een nieuw download "
+"apparaat wordt ingeplugd."
+
+#: ../raphodo/preferencedialog.py:658
+msgid ""
+"Prompt whether to keep displaying completed downloads or clear them whenever "
+"a new download device is inserted."
+msgstr ""
+"Vraag of de afgewerkte downloads vertoond moeten blijven, of indien ze "
+"gewist moeten worden, telkens een nieuw download apparaat ingeplugd wordt."
+
+#: ../raphodo/preferencedialog.py:702
+msgid "Version Check"
+msgstr "Versie controle"
+
+#: ../raphodo/preferencedialog.py:703
+msgid "Check for new version at startup"
+msgstr "Controleer op nieuwe versie bij het opstarten"
 
-#: ../raphodo/preferencedialog.py:471
+#: ../raphodo/preferencedialog.py:705
 msgid "Check for a new version of the program each time the program starts."
 msgstr ""
+"Controleer op een nieuwe versie van het programma iedere keer dat het "
+"programma start."
 
-#: ../raphodo/preferencedialog.py:473
+#: ../raphodo/preferencedialog.py:707
 msgid "Include development releases"
-msgstr ""
+msgstr "Inclusief ontwikkel versies"
 
-#: ../raphodo/preferencedialog.py:474
+#: ../raphodo/preferencedialog.py:709
 msgid ""
 "Include alpha, beta and other development releases when checking for a new "
 "version of the program.\n"
@@ -2145,12 +3207,17 @@ msgid ""
 "If you are currently running a development version, the check will always "
 "occur."
 msgstr ""
+"Kijk ook voor alfa, beta en andere ontwikkelversies wanneer er gecontroleerd "
+"wordt op nieuwe versies van het programma.\n"
+"\n"
+"Als je momenteel een ontwikkelversie draait zullen deze controles "
+"automatisch gebeuren."
 
-#: ../raphodo/preferencedialog.py:489
+#: ../raphodo/preferencedialog.py:725
 msgid "Ignore DNG date/time metadata on MTP devices"
-msgstr ""
+msgstr "Negeer DNG datum/tijd metagegevens op MTP apparaten"
 
-#: ../raphodo/preferencedialog.py:490
+#: ../raphodo/preferencedialog.py:727
 msgid ""
 "Ignore date/time metadata in DNG files located on MTP devices, and use the "
 "file's modification time instead.\n"
@@ -2158,71 +3225,98 @@ msgid ""
 "Useful for devices like some phones and tablets that create incorrect DNG "
 "metadata."
 msgstr ""
+"Negeer datum/tijd metagegevens in DNG bestanden op MTP apparaten maar "
+"gebruik de bestandswijzigingstijd.\n"
+"\n"
+"Nuttig voor apparaten zoals sommige telefoons en tablets die foute DNG "
+"metagegevens aanmaken."
+
+#: ../raphodo/preferencedialog.py:741
+msgid "Completed Downloads"
+msgstr "Afgewerkte downloads"
 
 #. Translators: substituted value is a description for the set of preferences
 #. shown in the preference dialog window, e.g. Devices, Automation, etc.
 #. This string is shown in a tooltip for the "Restore Defaults" button
-#: ../raphodo/preferencedialog.py:710
+#: ../raphodo/preferencedialog.py:1067
 #, python-format
 msgid "Restores default %s preference values"
-msgstr ""
+msgstr "Herstel de standaard %s voorkeuren"
 
-#: ../raphodo/preferencedialog.py:832
+#: ../raphodo/preferencedialog.py:1208
 msgid ""
 "Do you want to purge the thumbnail cache? The cache will be purged when the "
 "program is next started."
 msgstr ""
+"Wens je de miniaturen cache te ledigen? De cache zal geledigd worden wanneer "
+"het programma opnieuw wordt opgestart."
 
-#: ../raphodo/preferencedialog.py:835
+#: ../raphodo/preferencedialog.py:1212
 msgid "Purge Thumbnail Cache"
-msgstr ""
+msgstr "Ledig miniaturencache"
 
-#: ../raphodo/preferencedialog.py:847
+#: ../raphodo/preferencedialog.py:1225
 msgid ""
 "Do you want to optimize the thumbnail cache? The cache will be optimized "
 "when the program is next started."
 msgstr ""
+"Wens je de miniaturencache te optimaliseren? De cache zal geoptimaliseerd "
+"worden wanneer het programma opnieuw wordt opgestart."
 
-#: ../raphodo/preferencedialog.py:850
+#: ../raphodo/preferencedialog.py:1229
 msgid "Optimize Thumbnail Cache"
-msgstr ""
+msgstr "Optimaliseer miniaturencache"
 
-#: ../raphodo/preferencedialog.py:1045
+#: ../raphodo/preferencedialog.py:1481
+msgid "Enter a Folder to Scan"
+msgstr "Geef de te doorlopen folder op"
+
+#: ../raphodo/preferencedialog.py:1482
+msgid "Specify a folder that will be scanned for photos and videos"
+msgstr "Geef de te doorlopen folder op voor foto's en video's"
+
+#: ../raphodo/preferencedialog.py:1483
+msgid "Folder:"
+msgstr "Folder:"
+
+#: ../raphodo/preferencedialog.py:1497
 msgid "Enter a Path to Ignore"
 msgstr "Geef het te negeren pad op"
 
-#: ../raphodo/preferencedialog.py:1046
+#: ../raphodo/preferencedialog.py:1498
 msgid "Specify a path that will never be scanned for photos or videos"
 msgstr "Geef een pad op dat nooit op foto's of video's gescand zal worden"
 
-#: ../raphodo/preferencedialog.py:1047
+#: ../raphodo/preferencedialog.py:1499
 msgid "Path:"
 msgstr "Pad:"
 
-#: ../raphodo/preferencedialog.py:1061
+#: ../raphodo/preferencedialog.py:1513
 msgid "Enter a File Extension"
-msgstr ""
+msgstr "Geef een bestandsextensie op"
 
-#: ../raphodo/preferencedialog.py:1062
+#: ../raphodo/preferencedialog.py:1514
 msgid "Specify a file extension (without the leading dot)"
-msgstr ""
+msgstr "Geef een bestandsextensie op (zonder de voorloop punt)"
 
-#: ../raphodo/preferencedialog.py:1063 ../raphodo/renamepanel.py:122
+#: ../raphodo/preferencedialog.py:1515 ../raphodo/renamepanel.py:122
 msgid "Extension:"
-msgstr ""
+msgstr "Extensie:"
 
-#: ../raphodo/preferencedialog.py:1078
+#: ../raphodo/preferencedialog.py:1530
 msgid "Invalid File Extension"
-msgstr ""
+msgstr "Ongeldige bestandsextensie"
 
-#: ../raphodo/preferencedialog.py:1079
+#: ../raphodo/preferencedialog.py:1531
 #, python-format
 msgid ""
 "The file extension <b>%s</b> is recognized by Rapid Photo Downloader, so it "
 "makes no sense to warn about its presence."
 msgstr ""
+"De bestandsextensie <b>%s</b> wordt herkend door Rapid Photo Downloader, dus "
+"heeft het geen zin om te verwittigen over de aanwezigheid ervan."
 
-#: ../raphodo/preferencedialog.py:1081
+#: ../raphodo/preferencedialog.py:1533
 #, python-format
 msgid ""
 "Recognized file types:\n"
@@ -2239,192 +3333,224 @@ msgid ""
 "Other:\n"
 "%(other)s"
 msgstr ""
+"Herkende bestands types:\n"
+"\n"
+"Foto's:\n"
+"%(photos)s\n"
+"\n"
+"Video's:\n"
+"%(videos)s\n"
+"\n"
+"Audio:\n"
+"%(audio)s\n"
+"\n"
+"Andere:\n"
+"%(other)s"
 
 #: ../raphodo/preferences.py:286
 msgid "Wedding"
-msgstr ""
+msgstr "Trouwen"
 
 #: ../raphodo/preferences.py:286
 msgid "Birthday"
-msgstr ""
+msgstr "Verjaardag"
 
-#: ../raphodo/preferences.py:614
+#: ../raphodo/preferences.py:624
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
-msgstr "Submap voorkeuren mogen niet starten met een %s"
+msgstr "Sub-foldervoorkeuren mogen niet starten met een %s"
 
-#: ../raphodo/preferences.py:617
+#: ../raphodo/preferences.py:627
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
-msgstr "Submapvoorkeuren mogen niet eindigen op een %s"
+msgstr "Sub-foldervoorkeuren mogen niet eindigen op een %s"
 
-#: ../raphodo/preferences.py:622
+#: ../raphodo/preferences.py:632
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
-msgstr "Submapvoorkeuren mogen geen twee opeenvolgende %s bevatten"
+msgstr "Sub-foldervoorkeuren mogen geen twee opeenvolgende %s bevatten"
 
-#. self.setFlat(True)
 #: ../raphodo/primarybutton.py:72
 msgid "Download 8 Photos and 10 Videos"
-msgstr ""
+msgstr "Download 8 foto's en 10 video's"
 
-#: ../raphodo/problemnotification.py:86 ../raphodo/problemnotification.py:208
+#: ../raphodo/problemnotification.py:87 ../raphodo/problemnotification.py:209
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
-msgstr ""
+msgstr "Fout: %(errno)s %(strerror)s"
 
-#: ../raphodo/problemnotification.py:89
+#: ../raphodo/problemnotification.py:90
 #, python-format
 msgid "Error: %s"
-msgstr ""
+msgstr "Fout: %s"
 
-#: ../raphodo/problemnotification.py:116
+#: ../raphodo/problemnotification.py:117
 #, python-format
 msgid "GPhoto2 Error: %s"
-msgstr ""
+msgstr "GPhoto2 fout: %s"
 
-#: ../raphodo/problemnotification.py:124
+#: ../raphodo/problemnotification.py:125
 msgid ""
 "Unable to initialize the camera, probably because another program is using "
 "it. No files were copied from it."
 msgstr ""
+"Kan de camera niet initialiseren, wellicht omdat een ander programma het "
+"gebruikt. Er werden geen bestanden gekopieerd."
 
-#: ../raphodo/problemnotification.py:134
+#: ../raphodo/problemnotification.py:135
 #, python-format
 msgid "Unable to read directory %s"
-msgstr ""
+msgstr "Kan de folder %s niet lezen"
 
-#: ../raphodo/problemnotification.py:140
+#: ../raphodo/problemnotification.py:141
 #, python-format
 msgid "Unable to access modification time or size from %s"
-msgstr ""
+msgstr "Kan de wijzigingstijd of grootte van %s niet benaderen"
 
-#: ../raphodo/problemnotification.py:146
+#: ../raphodo/problemnotification.py:147
 #, python-format
 msgid "Unable to read file %s"
-msgstr ""
+msgstr "Lezen van bestand %s mislukt"
 
-#: ../raphodo/problemnotification.py:152
+#: ../raphodo/problemnotification.py:153
 #, python-format
 msgid "Unable to write file %s"
-msgstr ""
+msgstr "Kan bestand %s niet schrijven"
 
-#: ../raphodo/problemnotification.py:158
+#: ../raphodo/problemnotification.py:159
 #, python-format
 msgid "Unable to move file %s"
-msgstr ""
+msgstr "Kan bestand %s niet verplaatsen"
 
-#: ../raphodo/problemnotification.py:164
+#: ../raphodo/problemnotification.py:165
 #, python-format
 msgid "Unable to remove file %s"
-msgstr ""
+msgstr "Kan bestand %s niet verwijderen"
 
-#: ../raphodo/problemnotification.py:170
+#: ../raphodo/problemnotification.py:171
 #, python-format
 msgid "Unable to copy file %s"
-msgstr ""
+msgstr "Kan bestand %s niet kopiëren"
 
-#: ../raphodo/problemnotification.py:176
+#: ../raphodo/problemnotification.py:177
 #, python-format
 msgid "Zero length file %s will not be downloaded"
-msgstr ""
+msgstr "Nul lengte bestand %s zal niet gedownload worden"
 
-#: ../raphodo/problemnotification.py:182
+#: ../raphodo/problemnotification.py:183
 #, python-format
 msgid "Could not determine filesystem modification time for %s"
-msgstr ""
+msgstr "Kon de systeem wijzigingstijd voor bestand %s niet bepalen"
 
-#: ../raphodo/problemnotification.py:188
+#: ../raphodo/problemnotification.py:189
 #, python-format
 msgid "Unable to load metadata from %s"
-msgstr ""
+msgstr "Kan de metagegevens voor %s niet laden"
 
-#: ../raphodo/problemnotification.py:194
+#: ../raphodo/problemnotification.py:195
 #, python-format
 msgid ""
 "Unable to load metadata from %(name)s. The %(filetype)s was not downloaded."
 msgstr ""
+"Kan de metagegevens van %(name)s niet laden. De %(filetype)s werd niet "
+"gedownload."
 
-#: ../raphodo/problemnotification.py:202
+#: ../raphodo/problemnotification.py:203
 #, python-format
 msgid ""
 "An error occurred setting a file's filesystem metadata on the filesystem %s. "
 "If this error occurs again on the same filesystem, it will not be reported "
 "again."
 msgstr ""
+"Er gebeurde een fout tijdens het zetten van de metagegevens van een bestand "
+"op het bestandssysteem %s. Als deze fout zich opnieuw voordoet op hetzelfde "
+"bestandssysteem zal deze niet opnieuw gerapporteerd worden."
 
-#: ../raphodo/problemnotification.py:216
+#: ../raphodo/problemnotification.py:217
 #, python-format
 msgid "Encountered unhandled file %s. It will not be downloaded."
 msgstr ""
+"Niet-behandeld bestand %s tegengekomen. Het zal niet gedownload worden."
 
-#: ../raphodo/problemnotification.py:223
+#: ../raphodo/problemnotification.py:224
 #, python-format
 msgid "%(filetype)s %(destination)s already exists."
-msgstr ""
+msgstr "%(filetype)s %(destination)s bestaan reeds."
 
-#: ../raphodo/problemnotification.py:234 ../raphodo/problemnotification.py:262
+#: ../raphodo/problemnotification.py:235 ../raphodo/problemnotification.py:263
 #, python-format
 msgid ""
 "The existing %(filetype)s %(destination)s was last modified on %(date)s at "
 "%(time)s."
 msgstr ""
+"Bestaande %(filetype)s %(destination)s werd het laatst bijgewerkt op "
+"%(date)s om %(time)s."
 
-#: ../raphodo/problemnotification.py:245
+#: ../raphodo/problemnotification.py:246
 #, python-format
 msgid "The %(filetype)s %(source)s was not downloaded from %(device)s."
-msgstr ""
+msgstr "%(filetype)s %(source)s werd niet gedownload van %(device)s."
 
-#: ../raphodo/problemnotification.py:273
+#: ../raphodo/problemnotification.py:274
 #, python-format
 msgid "The %(filetype)s %(source)s was downloaded from %(device)s."
-msgstr ""
+msgstr "%(filetype)s %(source)s werd gedownload van %(device)s."
 
-#: ../raphodo/problemnotification.py:282
+#: ../raphodo/problemnotification.py:283
 #, python-format
 msgid "The unique identifier '%s' was added to the filename."
-msgstr ""
+msgstr "De unieke identificatie  '%s' werd toegevoegd aan de bestandsnaam."
 
-#: ../raphodo/problemnotification.py:298
+#: ../raphodo/problemnotification.py:299
 #, python-format
 msgid ""
 "The existing backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
+"De bestaande back-up %(filetype)s %(destination)s werd het laatst bijgewerkt "
+"op %(date)s om %(time)s."
 
-#: ../raphodo/problemnotification.py:309
+#: ../raphodo/problemnotification.py:310
 #, python-format
 msgid "The %(filetype)s %(source)s was not backed up from %(device)s."
-msgstr ""
+msgstr "%(filetype)s %(source)s werd niet gebackupped vanaf %(device)s."
 
-#: ../raphodo/problemnotification.py:326
+#: ../raphodo/problemnotification.py:327
 #, python-format
 msgid ""
 "The previous backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
+"De vorige back-up %(filetype)s %(destination)s werd het laatst bijgewerkt op "
+"%(date)s om %(time)s."
 
-#: ../raphodo/problemnotification.py:337
+#: ../raphodo/problemnotification.py:338
 #, python-format
 msgid ""
 "The %(filetype)s %(source)s from %(device)s was backed up, overwriting the "
 "previous backup %(filetype)s."
 msgstr ""
+"%(filetype)s %(source)s van %(device)s werd gebackupped en overschreef de "
+"vorige back-up %(filetype)s."
 
-#: ../raphodo/problemnotification.py:356
+#: ../raphodo/problemnotification.py:357
 #, python-format
 msgid ""
 "When synchronizing RAW + JPEG sequence values, a duplicate %(filetype)s "
 "%(file)s was encountered, and was not downloaded."
 msgstr ""
+"Bij het synchroniseren van de RAW + JPEG volgnummers, werd een dubbele "
+"%(filetype)s %(file)s gevonden en deze werd dus niet gedownload."
 
-#: ../raphodo/problemnotification.py:366
+#: ../raphodo/problemnotification.py:367
 msgid ""
 "When synchronizing RAW + JPEG sequence values, photos were detected with the "
 "same filenames, but taken at different times:"
 msgstr ""
+"Bij het synchroniseren van de volgnummers van RAW + JPEG werden foto's "
+"gevonden met dezelfde bestandsnamen, maar genomen op een verschillende tijd:"
 
-#: ../raphodo/problemnotification.py:373
+#: ../raphodo/problemnotification.py:374
 #, python-format
 msgid ""
 "%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
@@ -2433,134 +3559,145 @@ msgstr ""
 "%(image1)s werd genomen op %(image1_date)s om %(image1_time)s, en %(image2)s "
 "op %(image2_date)s om %(image2_time)s."
 
-#: ../raphodo/problemnotification.py:389
+#: ../raphodo/problemnotification.py:390
 #, python-format
 msgid "Unable to finalize the filename for %s"
-msgstr ""
+msgstr "Kan de bestandsnaam voor %s niet afwerken."
 
-#: ../raphodo/problemnotification.py:424
+#: ../raphodo/problemnotification.py:425
 #, python-format
 msgid ""
 "The filename %(destination)s was not fully generated for %(filetype)s "
 "%(source)s."
 msgstr ""
+"De bestandsnaam %(destination)s werd niet volledig aangemaakt voor "
+"%(filetype)s %(source)s."
 
-#: ../raphodo/problemnotification.py:433
+#: ../raphodo/problemnotification.py:434
 #, python-format
 msgid "The %(type)s metadata is missing."
-msgstr "De %(type)s metagegevens ontbreekt."
+msgstr "De %(type)s metagegeven ontbreekt."
 
-#: ../raphodo/problemnotification.py:439
+#: ../raphodo/problemnotification.py:440
 #, python-format
 msgid "The following metadata is missing: %s."
-msgstr ""
+msgstr "De volgende metagegevens ontbreken: %s."
 
-#: ../raphodo/problemnotification.py:445
+#: ../raphodo/problemnotification.py:446
 #, python-format
 msgid "Date/time conversion failed: %s."
-msgstr ""
+msgstr "Omzetten datum/tijd mislukt: %s"
 
-#: ../raphodo/problemnotification.py:451
+#: ../raphodo/problemnotification.py:452
 msgid ""
 "Could not extract valid date/time metadata or determine the file "
 "modification time."
 msgstr ""
+"Kon de geldige datum/tijd niet uit de metagegevens halen om de "
+"wijzigingstijd te bepalen."
 
-#: ../raphodo/problemnotification.py:457
+#: ../raphodo/problemnotification.py:458
 msgid "Filename does not have an extension."
-msgstr "Bestandsnaam heeft geen extentie."
+msgstr "Bestandsnaam heeft geen extensie."
 
-#: ../raphodo/problemnotification.py:460
+#: ../raphodo/problemnotification.py:461
 msgid "Filename does not have a number component."
 msgstr "Bestandsnaam bevat geen getallenreeks."
 
-#: ../raphodo/problemnotification.py:464
+#: ../raphodo/problemnotification.py:465
 #, python-format
 msgid "Error generating component %(component)s. Error: %(error)s"
-msgstr ""
+msgstr "Fout bij het aanmaken van component %(component)s. Fout: %(error)s"
 
-#: ../raphodo/problemnotification.py:477
+#: ../raphodo/problemnotification.py:478
 #, python-format
 msgid ""
 "The download subfolders %(folder)s were only partially generated for "
 "%(filetype)s %(source)s."
 msgstr ""
+"De download sub-folders %(folder)s werd maar gedeeltelijk aangemaakt voor "
+"%(filetype)s %(source)s."
 
-#: ../raphodo/problemnotification.py:486
+#: ../raphodo/problemnotification.py:487
 #, python-format
 msgid ""
 "There is no data with which to generate the %(subfolder_file)s for "
 "%(filename)s. The %(filetype)s was not downloaded."
 msgstr ""
+"Er zijn geen gegevens waarmee de %(subfolder_file)s voor %(filename)s kan "
+"aangemaakt worden. De %(filetype)s werd niet gedownload."
 
-#: ../raphodo/problemnotification.py:499
+#: ../raphodo/problemnotification.py:500
 #, python-format
 msgid ""
 "Unable to create the %(filetype)s %(destination)s in %(folder)s. The "
 "download file was %(source)s in %(device)s. It was not downloaded."
 msgstr ""
+"Kan %(filetype)s %(destination)s in %(folder)s niet aanmaken. Het download "
+"bestand was %(source)s in %(device)s. Het werd niet gedownload."
 
-#: ../raphodo/problemnotification.py:514
+#: ../raphodo/problemnotification.py:515
 #, python-format
 msgid "Unable to create the download subfolder %s."
-msgstr ""
+msgstr "Kan de download sub-folder %s niet aanmaken."
 
-#: ../raphodo/problemnotification.py:526
+#: ../raphodo/problemnotification.py:527
 #, python-format
 msgid "Unable to create the backup subfolder %s."
-msgstr ""
+msgstr "Kan de back-up sub-folder %s niet aanmaken."
 
-#: ../raphodo/problemnotification.py:577
+#: ../raphodo/problemnotification.py:578
 #, python-format
 msgid "Problems scanning %s"
-msgstr ""
+msgstr "Probleem tijdens het scannen van %s."
 
-#: ../raphodo/problemnotification.py:584
+#: ../raphodo/problemnotification.py:585
 #, python-format
 msgid "Problems copying from %s"
-msgstr ""
+msgstr "Problemen tijdens het kopiëren vanaf %s"
 
-#: ../raphodo/problemnotification.py:591
+#: ../raphodo/problemnotification.py:592
 msgid "Problems while finalizing filenames and generating subfolders"
 msgstr ""
+"Problemen bij het afwerken van bestandsnamen en het aanmaken van sub-folders"
 
-#: ../raphodo/problemnotification.py:598
+#: ../raphodo/problemnotification.py:599
 #, python-format
 msgid "Problems backing up to %s"
-msgstr ""
+msgstr "Problem bij het back-uppen naar %s"
+
+#. Translators: for example Nov 3 2015, 11:25 AM
+#. Translators: for example, Nov 3, 12:15 PM
+#: ../raphodo/proximity.py:188 ../raphodo/proximity.py:213
+#: ../raphodo/proximity.py:236 ../raphodo/proximity.py:239
+#, python-format
+msgid "%(date)s, %(time)s"
+msgstr "%(date)s, %(time)s"
+
+#: ../raphodo/proximity.py:204
+#, python-format
+msgid "%(starttime)s - %(endtime)s"
+msgstr "%(starttime)s - %(endtime)s"
 
-#. Translators: for example Nov 3 or Dec 31
 #. The start and end dates are on a different day
 #. Translators: for example Nov 3 or Dec 31
-#: ../raphodo/proximity.py:105 ../raphodo/proximity.py:221
-#: ../raphodo/proximity.py:224 ../raphodo/proximity.py:828
+#: ../raphodo/proximity.py:221 ../raphodo/proximity.py:225
+#: ../raphodo/proximity.py:980 ../raphodo/timeutils.py:105
 #, python-format
 msgid "%(month)s %(numeric_day)s"
 msgstr "%(month)s %(numeric_day)s"
 
-#. Translators: for example Nov 15 2015
 #. Translators: for example Nov 3 2015
-#: ../raphodo/proximity.py:109 ../raphodo/proximity.py:230
-#: ../raphodo/proximity.py:231 ../raphodo/proximity.py:831
+#. Translators: for example Nov 2 2015
+#. Translators: for example Nov 15 2015
+#: ../raphodo/proximity.py:232 ../raphodo/proximity.py:233
+#: ../raphodo/proximity.py:985 ../raphodo/timeutils.py:110
 #, python-format
 msgid "%(date)s %(year)s"
 msgstr "%(date)s %(year)s"
 
-#. Translators: for example Nov 3 2015, 11:25 AM
-#. Translators: for example, Nov 3, 12:15 PM
-#: ../raphodo/proximity.py:197 ../raphodo/proximity.py:215
-#: ../raphodo/proximity.py:234 ../raphodo/proximity.py:236
-#, python-format
-msgid "%(date)s, %(time)s"
-msgstr "%(date)s, %(time)s"
-
-#: ../raphodo/proximity.py:209
-#, python-format
-msgid "%(starttime)s - %(endtime)s"
-msgstr "%(starttime)s - %(endtime)s"
-
 #. Translators: for example, Nov 3, 12:15 PM - Nov 4, 1:00 AM
-#: ../raphodo/proximity.py:241
+#: ../raphodo/proximity.py:245
 #, python-format
 msgid "%(earlier_time)s - %(later_time)s"
 msgstr "%(earlier_time)s - %(later_time)s"
@@ -2569,7 +3706,7 @@ msgstr "%(earlier_time)s - %(later_time)s"
 #. Nov 3 2012, 12:15 PM -
 #. Nov 4 2012, 1:00 AM
 #. (please keep the line break signified by \n)
-#: ../raphodo/proximity.py:248
+#: ../raphodo/proximity.py:253
 #, python-format
 msgid ""
 "%(earlier_time)s -\n"
@@ -2578,76 +3715,76 @@ msgstr ""
 "%(earlier_time)s -\n"
 "%(later_time)s"
 
-#: ../raphodo/proximity.py:359
+#: ../raphodo/proximity.py:382
 #, python-format
 msgid "%(month)s  %(year)s"
 msgstr "%(month)s  %(year)s"
 
 #. Translators: for example Nov 2015
-#: ../raphodo/proximity.py:833
+#: ../raphodo/proximity.py:987
 #, python-format
 msgid "%(month)s %(year)s"
 msgstr "%(month)s %(year)s"
 
-#: ../raphodo/proximity.py:1344
+#: ../raphodo/proximity.py:1595
 msgid ""
 "The time elapsed between consecutive photos and videos that is used to build "
 "the Timeline"
 msgstr ""
 "De tijd verlopen tussen opeenvolgende foto's en video's gebruikt om de "
-"Tijdlijn op te maken"
+"Tijdslijn op te maken"
 
 #. Translators: e.g. "45m", which is short for 45 minutes.
 #. Replace the very last character (after the d) with the correct
 #. localized value, keeping everything else. In other words, change
 #. only the m character.
-#: ../raphodo/proximity.py:1406
+#: ../raphodo/proximity.py:1652
 #, python-format
 msgid "%(minutes)dm"
 msgstr "%(minutes)dm"
 
 #. Translators: i.e. "1.5h", which is short for 1.5 hours.
 #. Replace the entire string with the correct localized value
-#: ../raphodo/proximity.py:1410
+#: ../raphodo/proximity.py:1656
 msgid "1.5h"
 msgstr "1,5 u"
 
 #. Translators: e.g. "5h", which is short for 5 hours.
 #. Replace the very last character (after the d) with the correct localized value,
 #. keeping everything else. In other words, change only the h character.
-#: ../raphodo/proximity.py:1415
+#: ../raphodo/proximity.py:1661
 #, python-format
 msgid "%(hours)dh"
 msgstr "%(hours)du"
 
-#: ../raphodo/proximity.py:1461
+#: ../raphodo/proximity.py:1710
 msgid ""
 "The Timeline groups photos and videos based on how much time elapsed between "
 "consecutive shots. Use it to identify photos and videos taken at different "
 "periods in a single day or over consecutive days."
 msgstr ""
-"De Tijdlijn groepeert foto's en video's gebaseerd op tijd verlopen tussen "
-"opeenvolgende opnames. Gebruik het om foto's en video's te identificeren op "
-"verschillende tijdstippen in een dag of over meerdere dagen genomen ."
+"De Tijdslijn groepeert foto's en video's gebaseerd op tijd verlopen tussen "
+"opeenvolgende opnames. Gebruik het om foto's en video's te identificeren "
+"genomen op verschillende tijdstippen in een dag of over meerdere dagen."
 
-#: ../raphodo/proximity.py:1464
+#: ../raphodo/proximity.py:1715
 msgid ""
 "Use the slider (below) to adjust the time elapsed between consecutive shots "
 "that is used to build the Timeline."
 msgstr ""
-"Gebruik de schuif (hieronder)  om de tijd verlopen tussen opeenvolgende "
-"opnames bij te stellen, die dan gebruikt zal worden om de Tijdlijn op te "
+"Gebruik de glijder (hieronder)  om de tijd verlopen tussen opeenvolgende "
+"opnames bij te stellen, welke dan gebruikt zal worden om de Tijdslijn op te "
 "bouwen."
 
-#: ../raphodo/proximity.py:1466
+#: ../raphodo/proximity.py:1718
 msgid "Timeline build pending..."
-msgstr "Tijdlijnopbouw hangende..."
+msgstr "Tijdslijnopbouw hangende..."
 
-#: ../raphodo/proximity.py:1467
+#: ../raphodo/proximity.py:1719
 msgid "Timeline is building..."
-msgstr "Tijdlijn wordt opgebouwd"
+msgstr "Tijdslijn wordt opgebouwd"
 
-#: ../raphodo/proximity.py:1468
+#: ../raphodo/proximity.py:1721
 msgid ""
 "The Timeline needs to be rebuilt because the file modification time does not "
 "match the time a shot was taken for one or more shots.<br><br>The Timeline "
@@ -2658,238 +3795,255 @@ msgid ""
 "The time a shot was taken is confirmed when generating thumbnails or "
 "downloading, which is when the metadata is read."
 msgstr ""
-"De Tijdlijn moet opnieuw aangemaakt worden omdat de wijzigingstijd van het "
-"bestand niet klopt met de tijd dat de opname werd gemaakt en dit voor één of "
-"meerdere opnames.<br><br>De Tijdlijn toont wanneer de opnames gemaakt "
-"werden. De tijd van de opname wordt gevonden in de metagegevens van de foto "
-"of video. Metagegevens  lezen vraagt veel tijd, dus voorkomt Rapid Photo "
-"Downloader dat te doen tijdens het scannen van bestanden. Het gebruikt de "
-"tijd dat het bestand laatst veranderd werd als volmacht. De tijd dat een "
-"opname gemaakt werd wordt bevestigd bij het aanmaken van de icoontjes of bij "
-"het downloaden, wanneer de metagegevens gelezen worden."
-
-#: ../raphodo/rapid.py:485 ../raphodo/rapid.py:2461 ../raphodo/rapid.py:3728
-#: ../raphodo/rapid.py:3846 ../raphodo/rapid.py:3850 ../raphodo/rapid.py:3870
-#: ../raphodo/rapid.py:3874 ../raphodo/rapid.py:3998 ../raphodo/rapid.py:4007
-#: ../raphodo/rapid.py:4495 ../raphodo/rapid.py:4888 ../raphodo/rapid.py:5722
-#: ../raphodo/rememberthisdialog.py:97
+"De Tijdslijn moet opnieuw aangemaakt worden omdat de wijzigingstijd van het "
+"bestand niet klopt met de tijd van de opname en dit voor één of meerdere "
+"opnames.<br><br>De Tijdslijn toont wanneer de opnames gemaakt werden. De "
+"tijd van de opname wordt gevonden in de metagegevens van de foto of video. "
+"Metagegevens  lezen vraagt veel tijd, dus voorkomt Rapid Photo Downloader "
+"dat te doen tijdens het scannen van bestanden. Het gebruikt de tijd dat het "
+"bestand laatst veranderd werd als volmacht. De tijd dat een opname gemaakt "
+"werd wordt bevestigd bij het aanmaken van de miniaturen of bij het "
+"downloaden, wanneer de metagegevens gelezen worden."
+
+#: ../raphodo/rapid.py:493 ../raphodo/rapid.py:2555 ../raphodo/rapid.py:3934
+#: ../raphodo/rapid.py:4065 ../raphodo/rapid.py:4069 ../raphodo/rapid.py:4092
+#: ../raphodo/rapid.py:4096 ../raphodo/rapid.py:4226 ../raphodo/rapid.py:4237
+#: ../raphodo/rapid.py:4743 ../raphodo/rapid.py:5195 ../raphodo/rapid.py:5997
+#: ../raphodo/rememberthisdialog.py:99
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:3
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: ../raphodo/rapid.py:1100
+#: ../raphodo/rapid.py:1131
 msgid ""
 "<b>ExifTool has a problem</b><br><br> Rapid Photo Downloader uses ExifTool "
 "to get metadata from videos and photos. The program will run without it, but "
 "installing it is <b>highly</b> recommended."
 msgstr ""
+"<b>ExifTool heeft een probleem</b><br><br> Rapid Photo Downloader gebruikt "
+"ExifTool om de metagegevens van video's en foto's te benaderen. Zonder zal "
+"het programma ook draaien, maar ExifTool installeren wordt <b>ten "
+"stelligste</b> aangeraden."
 
-#: ../raphodo/rapid.py:1110 ../raphodo/rapid.py:1130
+#: ../raphodo/rapid.py:1141 ../raphodo/rapid.py:1161
 msgid "Problem with libmediainfo"
-msgstr ""
+msgstr "Probleem met libmediainfo"
 
-#: ../raphodo/rapid.py:1119
+#: ../raphodo/rapid.py:1150
 msgid ""
 "<b>The library libmediainfo appears to be missing</b><br><br> Rapid Photo "
 "Downloader uses libmediainfo to get the date and time a video was shot. The "
 "program will run  without it, but installing it is recommended."
 msgstr ""
+"<b>De libmediainfo bibliotheek blijkt te ontbreken</b><br><br> Rapid Photo "
+"Downloader gebruikt libmediainfo om de datum en tijd van de opname op te "
+"halen. Het programma zal werken er zonder, maar het installeren ervan wordt "
+"aanbevolen."
 
-#: ../raphodo/rapid.py:1417
+#: ../raphodo/rapid.py:1448
 msgid "Download failed"
-msgstr ""
+msgstr "Downloaden is mislukt"
 
-#: ../raphodo/rapid.py:1419
+#: ../raphodo/rapid.py:1450
 msgid ""
 "Sorry, the download of the new version of Rapid Photo Downloader failed."
 msgstr ""
+"Sorry, de download van de nieuwe versie van Rapid Photo Downloader is "
+"mislukt."
 
-#: ../raphodo/rapid.py:1425
+#: ../raphodo/rapid.py:1457
 msgid ""
 "The new version was successfully downloaded. Do you want to close Rapid "
 "Photo Downloader and install it now?"
 msgstr ""
+"De nieuwe versie werd met succes gedownload. Wens je Rapid Photo Downloader "
+"te stoppen en de installatie te starten?"
 
-#: ../raphodo/rapid.py:1428
+#: ../raphodo/rapid.py:1461
 msgid "Update Rapid Photo Downloader"
-msgstr ""
+msgstr "Bijwerken Rapid Photo Downloader"
 
-#: ../raphodo/rapid.py:1432
+#: ../raphodo/rapid.py:1465
 msgid "Install"
-msgstr ""
+msgstr "Installeren"
 
-#: ../raphodo/rapid.py:1450
+#: ../raphodo/rapid.py:1483
 msgid "New version saved"
-msgstr ""
+msgstr "Nieuw versie opgeslagen"
 
-#: ../raphodo/rapid.py:1451
+#: ../raphodo/rapid.py:1485
 #, python-format
 msgid ""
 "The tar file and installer script are saved at:\n"
 "\n"
 " %s"
 msgstr ""
+"Het tar bestand en het installatieprogramma werden bewaard in:\n"
+"\n"
+" %s"
 
-#: ../raphodo/rapid.py:1468
+#: ../raphodo/rapid.py:1502
 msgid "Upgrade failed"
-msgstr ""
+msgstr "Bijwerken mislukt"
 
-#: ../raphodo/rapid.py:1469
+#: ../raphodo/rapid.py:1505
 msgid ""
 "Sorry, upgrading Rapid Photo Downloader failed because there was an error "
 "opening the installer."
 msgstr ""
+"Sorry, bijwerken van Rapid Photo Downloader is mislukt omder er een fout "
+"optrad bij het openen van het installeerprogramma."
 
-#: ../raphodo/rapid.py:1667 ../raphodo/rapid.py:2331
+#: ../raphodo/rapid.py:1709 ../raphodo/rapid.py:2425
 msgid "Download"
 msgstr "Download"
 
-#: ../raphodo/rapid.py:1671
+#: ../raphodo/rapid.py:1713
 msgid "&Refresh..."
 msgstr "Ve&rvers"
 
-#: ../raphodo/rapid.py:1675
+#: ../raphodo/rapid.py:1717
 msgid "&Preferences"
 msgstr "&Voorkeuren"
 
-#: ../raphodo/rapid.py:1679
+#: ../raphodo/rapid.py:1721
 msgid "&Quit"
 msgstr "&Afsluiten"
 
-#: ../raphodo/rapid.py:1683
+#: ../raphodo/rapid.py:1725
 msgid "Error &Reports"
-msgstr ""
+msgstr "Fout &Rapportages"
 
-#: ../raphodo/rapid.py:1687
+#: ../raphodo/rapid.py:1729
 msgid "Clear Completed Downloads"
 msgstr "Voltooide Downloads Wissen"
 
-#: ../raphodo/rapid.py:1691
+#: ../raphodo/rapid.py:1733
 msgid "Get Help Online..."
 msgstr "Online hulp verktijgen"
 
-#: ../raphodo/rapid.py:1695
+#: ../raphodo/rapid.py:1737
 msgid "&Tip of the Day..."
-msgstr ""
+msgstr "&Tip van de dag..."
 
-#: ../raphodo/rapid.py:1699
+#: ../raphodo/rapid.py:1741
 msgid "Report a Problem..."
 msgstr "Een probleem melden…"
 
-#: ../raphodo/rapid.py:1703
+#: ../raphodo/rapid.py:1745
 msgid "Make a Donation..."
-msgstr "Doe een Gift"
+msgstr "Doe een gift"
 
-#: ../raphodo/rapid.py:1707
+#: ../raphodo/rapid.py:1749
 msgid "Translate this Application..."
-msgstr "Vertaal deze Toepassing..."
+msgstr "Vertaal deze toepassing..."
 
-#: ../raphodo/rapid.py:1711
+#: ../raphodo/rapid.py:1753
 msgid "&About..."
 msgstr "&Over..."
 
-#: ../raphodo/rapid.py:1715
+#: ../raphodo/rapid.py:1757
 msgid "Check for Updates..."
-msgstr ""
+msgstr "Controleren op updates..."
 
-#: ../raphodo/rapid.py:1797
+#: ../raphodo/rapid.py:1840
 msgid "Timeline"
-msgstr "Tijdlijn"
+msgstr "Tijdbalk"
 
-#: ../raphodo/rapid.py:1807
+#: ../raphodo/rapid.py:1850
 msgid "Destination"
 msgstr "Doel"
 
-#: ../raphodo/rapid.py:1808
+#: ../raphodo/rapid.py:1851
 msgid "Rename"
 msgstr "Hernoemen"
 
-#: ../raphodo/rapid.py:1810
+#: ../raphodo/rapid.py:1853
 msgid "Back Up"
 msgstr "Back-up"
 
 #. Devices Header and View
-#: ../raphodo/rapid.py:1926
+#: ../raphodo/rapid.py:1977
 msgid ""
 "Turn on or off the use of devices attached to this computer as download "
 "sources"
 msgstr ""
-"Het gebruiken als downloadbronnen  van apparaten gekoppeld aan deze computer "
-"aan- of uitzetten"
+"Apparaten gekoppeld aan deze computer als downloadbronnen gebruiken aan- of "
+"uitzetten"
 
 #. This Computer Header and View
-#: ../raphodo/rapid.py:1940
+#: ../raphodo/rapid.py:1994
 msgid ""
 "Turn on or off the use of a folder on this computer as a download source"
 msgstr ""
-"Het gebruik van een map als downloadbron op deze computer aan- of uitzetten"
+"Een folder als downloadbron gebruiken op deze computer aan- of uitzetten"
 
-#: ../raphodo/rapid.py:1941
+#: ../raphodo/rapid.py:1996
 msgid "This Computer"
 msgstr "Deze computer"
 
-#: ../raphodo/rapid.py:1952
+#: ../raphodo/rapid.py:2009
 msgid "Select a source folder"
-msgstr "Selecteer de bronmap"
+msgstr "Selecteer de bronfolder"
 
-#: ../raphodo/rapid.py:1975
+#: ../raphodo/rapid.py:2038
 msgid "Projected Storage Use"
-msgstr ""
+msgstr "Geschat gebruik van opslagruimte"
 
-#: ../raphodo/rapid.py:1989 ../raphodo/rapid.py:1997
+#: ../raphodo/rapid.py:2056 ../raphodo/rapid.py:2068
 msgid "Select a destination folder"
 msgstr "Kies een doelmap"
 
-#: ../raphodo/rapid.py:2045
+#: ../raphodo/rapid.py:2117
 msgid "All"
 msgstr "Alles"
 
-#: ../raphodo/rapid.py:2046
+#: ../raphodo/rapid.py:2118
 msgid "New"
 msgstr "Nieuw"
 
-#: ../raphodo/rapid.py:2048
+#: ../raphodo/rapid.py:2120
 msgid "Show:"
 msgstr "Weergeven:"
 
-#: ../raphodo/rapid.py:2051
+#: ../raphodo/rapid.py:2123
 msgid "Modification Time"
-msgstr "Modificatietijd"
+msgstr "Wijzigingstijd"
 
-#: ../raphodo/rapid.py:2052
+#: ../raphodo/rapid.py:2124
 msgid "Checked State"
-msgstr "Aangevinkte toestand"
+msgstr "Aanvink toestand"
 
-#: ../raphodo/rapid.py:2055
+#: ../raphodo/rapid.py:2127
 msgid "File Type"
 msgstr "Bestandstype"
 
-#: ../raphodo/rapid.py:2056
+#: ../raphodo/rapid.py:2128
 msgid "Device"
 msgstr "Apparaat"
 
-#: ../raphodo/rapid.py:2058
+#: ../raphodo/rapid.py:2130
 msgid "Sort:"
 msgstr "Sorteer:"
 
-#: ../raphodo/rapid.py:2069
+#: ../raphodo/rapid.py:2141
 msgid "Select All:"
 msgstr "Alles selecteren:"
 
-#: ../raphodo/rapid.py:2311
+#: ../raphodo/rapid.py:2405
 #, python-format
 msgid "Download %(files)s"
 msgstr "Download %(files)s"
 
-#: ../raphodo/rapid.py:2327
+#: ../raphodo/rapid.py:2421
 msgid "Resume Download"
 msgstr "Download hervatten"
 
-#: ../raphodo/rapid.py:2329
+#: ../raphodo/rapid.py:2423
 msgid "Pause"
 msgstr "Pauze"
 
-#: ../raphodo/rapid.py:2417
+#: ../raphodo/rapid.py:2511
 #, python-brace-format
 msgid ""
 "Please report the problem at <a href=\"{website}\">{website}</a>.<br><br>\n"
@@ -2897,12 +4051,16 @@ msgid ""
 "            <a href=\"{log_path}\">here</a> to open the log directory).\n"
 "            "
 msgstr ""
+"Meld het probleem op  <a href=\"{website}\">{website}</a>.<br><br>\n"
+"            Voeg er het logbestand  <i>{log_file}</i> bij (klik\n"
+"            <a href=\"{log_path}\">hier</a> om de log folder te openen).\n"
+"            "
 
-#: ../raphodo/rapid.py:2431
+#: ../raphodo/rapid.py:2525
 msgid "Thank you for reporting a problem in Rapid Photo Downloader"
-msgstr ""
+msgstr "Bedankt om het probleem in Rapid Photo Downloader te melden."
 
-#: ../raphodo/rapid.py:2529
+#: ../raphodo/rapid.py:2624
 #, python-format
 msgid ""
 "<b>Changing This Computer source path</b><br><br>Do you really want to "
@@ -2910,16 +4068,17 @@ msgid ""
 "from %(source_path)s.<br><br>If you do change the path, the current download "
 "from This Computer will be cancelled."
 msgstr ""
-"<b>Veranderen bronmap op Deze Computer</b><br><br>Wens je de bronmap te "
-"veranderen naar %(new_path)s?<br><br>Je bent momenteel bezig met downloaden "
-"vanaf %(source_path)s.<br><br>Als je verder gaat met het veranderen van de "
-"bronmap, zal de huidige download van Deze Computer geannuleerd worden."
+"<b>Veranderen bronfolder op Deze Computer</b><br><br>Wens je de bronfolder "
+"te veranderen naar %(new_path)s?<br><br>Je bent momenteel bezig met "
+"downloaden vanaf %(source_path)s.<br><br>Als je verder gaat met het "
+"veranderen van de bronfolder, zal de huidige download van Deze Computer "
+"geannuleerd worden."
 
-#: ../raphodo/rapid.py:2595
+#: ../raphodo/rapid.py:2694
 msgid "You cannot change the download destination while downloading."
 msgstr "Je kan de bestemming niet wijzigen tijdens een download."
 
-#: ../raphodo/rapid.py:2604
+#: ../raphodo/rapid.py:2704
 #, python-format
 msgid ""
 "<b>Confirm Download Destination</b><br><br>Are you sure you want to set the "
@@ -2928,254 +4087,254 @@ msgstr ""
 "<b>Bevestig Download Bestemming</b><br><br>Ben je zeker dat je de bestemming "
 "van %(file_type)s downloads op%(path)s wil zetten?"
 
-#: ../raphodo/rapid.py:2682
+#: ../raphodo/rapid.py:2785
 msgid ""
+"\n"
 "<b>Downloading all files</b><br><br>\n"
-"                    A download always includes all files that are checked "
-"for download,\n"
-"                    including those that are not currently displayed because "
-"the Timeline\n"
-"                    is being used or because only new files are being shown."
-"<br><br>\n"
-"                    Do you want to proceed with the download?"
+"A download always includes all files that are checked for download,\n"
+"including those that are not currently displayed because the Timeline\n"
+"is being used or because only new files are being shown.<br><br>\n"
+"Do you want to proceed with the download?\n"
+"                        "
 msgstr ""
+"\n"
 "<b>Alle bestanden downloaden</b><br><br>\n"
-"                    Een download bevat altijd alle bestanden die gemarkeerd "
-"werden voor een download,\n"
-"                    ook deze die monteel niet vertoond zijn omdat de "
-"Tijdlijn\n"
-"                    gebruikt wordt of omdat alleen nieuwe bestanden getoond "
-"worden.<br><br>\n"
-"                    Wens je verder te gaan met de download?"
+"Een download bevat altijd alle bestanden die gemarkeerd zijn voor download,\n"
+"inclusief deze die momenteel niet vertoond worden omdat de Tijdslijn\n"
+"gebruik wordt of omdat enkel de nieuwe bestanden vertoond worden.<br><br>\n"
+"Wens je verder te gaan met de download?\n"
+"                        "
 
-#: ../raphodo/rapid.py:2820
+#: ../raphodo/rapid.py:2937
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
 "%(folder1)s\n"
 "%(folder2)s"
 msgstr ""
-"Deze downloadmappen zijn ongeldig:\n"
+"Deze downloadfolders zijn ongeldig:\n"
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: ../raphodo/rapid.py:2824
+#: ../raphodo/rapid.py:2940
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
 "%s"
 msgstr ""
-"Deze downloadmap is ongeldig:\n"
+"Deze downloadfolder is ongeldig:\n"
 "%s"
 
-#: ../raphodo/rapid.py:2827
+#: ../raphodo/rapid.py:2943
 msgid "Download Failure"
-msgstr ""
+msgstr "Download Mislukt"
 
-#: ../raphodo/rapid.py:2828
+#: ../raphodo/rapid.py:2944
 msgid "The download cannot proceed."
-msgstr ""
+msgstr "De download kan niet doorgaan"
 
-#: ../raphodo/rapid.py:2842
+#: ../raphodo/rapid.py:2962
 msgid ""
 "Photos and videos will not be backed up because there is nowhere to back "
 "them up. Do you still want to start the download?"
 msgstr ""
+"Foto's en video's zullen niet gedownload worden omdat ze nergens naartoe "
+"gebackupped kun worden. Download toch starten?"
 
-#. Translators: filetype will be replaced with 'photos' or 'videos'
-#: ../raphodo/rapid.py:2847 ../raphodo/rapid.py:2854
+#: ../raphodo/rapid.py:2969 ../raphodo/rapid.py:2979
 #, python-format
 msgid ""
 "No backup device exists for backing up %(filetype)s. Do you still want to "
 "start the download?"
 msgstr ""
+"Er is geen back-up apparaat aanwezig om %(filetype)s te backuppen. Download "
+"toch starten?"
 
-#: ../raphodo/rapid.py:2848 ../raphodo/rpdfile.py:228
+#: ../raphodo/rapid.py:2971 ../raphodo/rpdfile.py:228
 msgid "photos"
 msgstr "foto's"
 
-#: ../raphodo/rapid.py:2855 ../raphodo/rpdfile.py:223
+#: ../raphodo/rapid.py:2981 ../raphodo/rpdfile.py:223
 msgid "videos"
 msgstr "video's"
 
-#: ../raphodo/rapid.py:2861
+#: ../raphodo/rapid.py:2989
 msgid ""
 "<b>The photo and video backup destinations do not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
+"<b>De foto en video back-up bestemmingen bestaan niet of er kan niet naar "
+"toe geschreven worden.</b><br><br>Download toch starten?"
 
-#: ../raphodo/rapid.py:2869 ../raphodo/rapid.py:2876
+#: ../raphodo/rapid.py:2999 ../raphodo/rapid.py:3008
 #, python-format
 msgid ""
 "<b>The %(filetype)s backup destination does not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
+"<b>De %(filetype)s backup bestemming bestaat niet of er kan niet naar toe "
+"geschreven worden.</b><br><br>Download toch starten?"
 
-#: ../raphodo/rapid.py:2871 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:818
+#: ../raphodo/rapid.py:3001 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:843
 msgid "photo"
 msgstr "foto"
 
-#: ../raphodo/rapid.py:2878 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:858
+#: ../raphodo/rapid.py:3010 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:883
 msgid "video"
 msgstr "video"
 
-#: ../raphodo/rapid.py:2886
+#: ../raphodo/rapid.py:3018
 msgid "Backup problem"
 msgstr "Back-up probleem"
 
-#. Translators - in the middle is a unicode em dash - please retain it
-#. This string is displayed in the status bar when the download is running
-#: ../raphodo/rapid.py:3571
+#: ../raphodo/rapid.py:3756
 #, python-format
 msgid "%(downloading_from)s — %(time_left)s left (%(speed)s)"
 msgstr "%(downloading_from)s — %(time_left)s over (%(speed)s)"
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3640
+#: ../raphodo/rapid.py:3828
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s gedownload"
 
-#. Translators: e.g. 2 videos failed to download
-#: ../raphodo/rapid.py:3645
+#: ../raphodo/rapid.py:3836
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "%(noFiles)s %(filetypes)s kon niet gedownload worden"
 
-#: ../raphodo/rapid.py:3650 ../raphodo/rapid.py:3723
+#: ../raphodo/rapid.py:3842 ../raphodo/rapid.py:3927
 msgid "warnings"
 msgstr "waarschuwingen"
 
-#: ../raphodo/rapid.py:3679
+#: ../raphodo/rapid.py:3873
 msgid "All downloads complete"
 msgstr "Alle downloads zijn voltooid"
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3686 ../raphodo/rapid.py:3695 ../raphodo/rapid.py:3704
-#: ../raphodo/rapid.py:3713 ../raphodo/rapid.py:3721
+#: ../raphodo/rapid.py:3881 ../raphodo/rapid.py:3892 ../raphodo/rapid.py:3903
+#: ../raphodo/rapid.py:3914 ../raphodo/rapid.py:3924
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: ../raphodo/rapid.py:3688 ../raphodo/rapid.py:3706
+#: ../raphodo/rapid.py:3884 ../raphodo/rapid.py:3906
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s gedownload"
 
-#: ../raphodo/rapid.py:3697 ../raphodo/rapid.py:3715
+#: ../raphodo/rapid.py:3895 ../raphodo/rapid.py:3917
 #, python-format
 msgid "%(filetype)s failed to download"
-msgstr "%(filetype)s werden niet gedownload"
+msgstr "%(filetype)s werd niet gedownload"
 
-#: ../raphodo/rapid.py:3742
+#: ../raphodo/rapid.py:3950
 msgid "1 failure"
-msgstr "1 Fout"
+msgstr "1 Mislukking"
 
-#: ../raphodo/rapid.py:3744
+#: ../raphodo/rapid.py:3952
 #, python-format
 msgid "%d failures"
-msgstr "%d fouten"
+msgstr "%d mislukkingen"
 
-#: ../raphodo/rapid.py:3749
+#: ../raphodo/rapid.py:3957
 msgid "1 warning"
 msgstr "1 waarschuwing"
 
-#: ../raphodo/rapid.py:3751
+#: ../raphodo/rapid.py:3959
 #, python-format
 msgid "%d warnings"
 msgstr "%d waarschuwingen"
 
-#: ../raphodo/rapid.py:3771
+#: ../raphodo/rapid.py:3981
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s"
 msgstr "%(no_files_and_types)s gedownload van %(devices)s"
 
-#: ../raphodo/rapid.py:3774
+#: ../raphodo/rapid.py:3985
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s — %(failures)s"
 msgstr "%(no_files_and_types)s gedownload van %(devices)s — %(failures)s"
 
-#: ../raphodo/rapid.py:3779
+#: ../raphodo/rapid.py:3989
 #, python-format
 msgid "No files downloaded — %(failures)s"
 msgstr "Geen bestanden gedownload — %(failures)s"
 
-#: ../raphodo/rapid.py:3781
+#: ../raphodo/rapid.py:3991
 msgid "No files downloaded"
 msgstr "Geen bestanden gedownload"
 
-#: ../raphodo/rapid.py:3805
+#: ../raphodo/rapid.py:4021
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s"
 msgstr ""
-"De bestemmings submappen en de Tijdlijn zullen opnieuw aangemaakt worden "
-"nadat de icoontjes voor de %(camera)s gegenereerd  zijn."
+"De bestemmings subfolders en de Tijdslijn zullen opnieuw aangemaakt worden "
+"nadat de miniaturen voor de %(camera)s gegenereerd  zijn."
 
-#: ../raphodo/rapid.py:3809
+#: ../raphodo/rapid.py:4026
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for this computer"
 msgstr ""
-"De bestemmings submappen en de Tijdlijn zullen opnieuw aangemaakt worden "
-"nadat de icoontjes voor de deze computer gegenereerd zijn."
+"De bestemmings subfolders en de Tijdslijn zullen opnieuw aangemaakt worden "
+"nadat de miniaturen voor de deze computer gegenereerd zijn."
 
-#: ../raphodo/rapid.py:3812
+#: ../raphodo/rapid.py:4031
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s"
 msgstr ""
-"De bestemmings submappen en de Tijdlijn zullen opnieuw aangemaakt worden "
-"nadat de icoontjes voor %(device)s gegenereerd  zijn."
+"De bestemmings subfolders en de Tijdslijn zullen opnieuw aangemaakt worden "
+"nadat de miniaturen voor %(device)s gegenereerd  zijn."
 
-#: ../raphodo/rapid.py:3820
+#: ../raphodo/rapid.py:4039
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices and this computer"
 msgstr ""
-"De bestemmings submappen en de Tijdlijn zullen opnieuw aangemaakt worden "
-"nadat de icoontjes voor %(number_devices)s apparaten en deze computer "
+"De bestemmings subfolders en de Tijdslijn zullen opnieuw aangemaakt worden "
+"nadat de miniaturen voor %(number_devices)s apparaten en deze computer "
 "gegenereerd zijn."
 
-#: ../raphodo/rapid.py:3833
+#: ../raphodo/rapid.py:4052
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s and this computer"
 msgstr ""
-"De bestemmings submappen en de Tijdlijn zullen opnieuw aangemaakt worden "
-"nadat de icoontjes voor de %(camera)s en deze computer gegenereerd zijn."
+"De bestemmings subfolders en de Tijdslijn zullen opnieuw aangemaakt worden "
+"nadat de miniaturen voor de %(camera)s en deze computer gegenereerd zijn."
 
-#: ../raphodo/rapid.py:3837
+#: ../raphodo/rapid.py:4056
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s and this computer"
 msgstr ""
-"De bestemmings submappen en de Tijdlijn zullen opnieuw aangemaakt worden "
-"nadat de icoontjes voor %(device)s en deze computer gegenereerd zijn."
+"De bestemmings subfolder en de Tijdslijn zullen opnieuw aangemaakt worden "
+"nadat de miniaturen voor %(device)s en deze computer gegenereerd zijn."
 
-#: ../raphodo/rapid.py:3841
+#: ../raphodo/rapid.py:4060
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices"
 msgstr ""
-"De bestemmings submappen en de Tijdlijn zullen opnieuw aangemaakt worden "
-"nadat de icoontjes voor %(number_devices)s apparaten gegenereerd zijn."
+"De bestemmings subfolder en de Tijdslijn zullen opnieuw aangemaakt worden "
+"nadat de miniaturen voor %(number_devices)s apparaten gegenereerd zijn."
 
-#: ../raphodo/rapid.py:3867
+#: ../raphodo/rapid.py:4087
 msgid "The Destination subfolders and Timeline have been rebuilt"
-msgstr "De bestemmings submappen en de Tijdlijn zijn opnieuw aangemaakt"
+msgstr "De bestemmings submappen en de Tijdslijn zijn opnieuw aangemaakt"
 
-#: ../raphodo/rapid.py:3922
+#: ../raphodo/rapid.py:4144
 msgid "Program preferences are invalid"
 msgstr "Programma voorkeuren zijn ongeldig"
 
-#: ../raphodo/rapid.py:3999
+#: ../raphodo/rapid.py:4228
 #, python-format
 msgid ""
 "<b>All files on the %(camera)s are inaccessible</b>.<br><br>It may be locked "
@@ -3190,111 +4349,142 @@ msgstr ""
 "tevens de instelling <i>USB for charging</i> wijzigen naar <i>USB for file "
 "transfers</i>.<br><br>Je kan desgevallend dat apparaat negeren."
 
-#: ../raphodo/rapid.py:4008
+#: ../raphodo/rapid.py:4239
 #, python-format
 msgid ""
-"<b>The %(camera)s appears to be in use by another application.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again.<br><br>Alternatively, you can ignore this "
-"device."
+"<b>The %(camera)s appears to be in use by another "
+"application.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again.<br><br>Alternatively, you "
+"can ignore this device."
 msgstr ""
-"<b>De %(camera)s lijkt gebruikt worden door een ander programma.</"
-"b><br><br>Je kan ieder ander programma dat het apparaat gebruikt (bv: de "
-"bestandsbeheerder) stoppen en opnieuw proberen. Als dat niet lukt, ontkoppel "
-"de %(camera)s van de computer en koppel het opnieuw aan.<br><br>Je kan "
-"desgevallend dat apparaat negeren."
+"<b>De %(camera)s lijkt gebruikt te worden door een ander "
+"programma.</b><br><br>Je kan ieder ander programma dat het apparaat gebruikt "
+"(bv: de bestandsbeheerder) stoppen en opnieuw proberen. Als dat niet lukt, "
+"ontkoppel de %(camera)s van de computer en koppel ze opnieuw aan.<br><br>Je "
+"kan desgevallend dat apparaat negeren."
 
-#: ../raphodo/rapid.py:4019
+#: ../raphodo/rapid.py:4250
 msgid "&Try Again"
 msgstr "Opnieu&w proberen"
 
-#: ../raphodo/rapid.py:4020
+#: ../raphodo/rapid.py:4251
 msgid "&Ignore This Device"
-msgstr "Dit Apparaat &Negeren"
+msgstr "D&it Apparaat Negeren"
 
-#: ../raphodo/rapid.py:4086
+#: ../raphodo/rapid.py:4323
 #, python-format
 msgid "Sorry, an unexpected problem occurred while scanning %s."
 msgstr ""
+"Sorry, een onverwacht probleem deed zich voor tijdens het doorlopen van "
+"apparaat %s."
 
-#: ../raphodo/rapid.py:4087
+#: ../raphodo/rapid.py:4324
 msgid "Unfortunately you cannot download from this device."
-msgstr ""
+msgstr "Je kan jammer genoeg niet downloaden van dit apparaat"
 
-#: ../raphodo/rapid.py:4091
+#: ../raphodo/rapid.py:4328
 msgid ""
 "A possible workaround for the problem might be downloading from the camera's "
 "memory card using a card reader."
 msgstr ""
+"Een mogelijke omweg voor het probleem is eventueel het downloaden van de "
+"geheugenkaart via een kaartlezer."
 
-#: ../raphodo/rapid.py:4096
+#: ../raphodo/rapid.py:4333
 msgid "Device scan failed"
-msgstr ""
+msgstr "Apparaat scan faalde."
 
-#: ../raphodo/rapid.py:4472
+#: ../raphodo/rapid.py:4720
 #, python-format
 msgid ""
-"<b>The %(camera)s cannot be scanned because it cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again."
+"<b>The %(camera)s cannot be scanned because it cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again."
 msgstr ""
-"<b>De %(camera)s kan niet gescand worden omdat het niet ontkoppeld kan "
+"<b>De %(camera)s kan niet gescand worden omdat ze niet ontkoppeld kan "
 "worden.</b><br><br>Je kan ieder ander programma dat het apparaat gebruikt "
 "(bv: de bestandsbeheerder) stoppen en opnieuw proberen. Als dat niet lukt, "
-"ontkoppel de %(camera)s van de computer en koppel het opnieuw aan."
+"ontkoppel de %(camera)s van de computer en koppel ze opnieuw aan."
 
-#: ../raphodo/rapid.py:4496
+#: ../raphodo/rapid.py:4745
 #, python-format
 msgid ""
-"<b>The download cannot start because the %(camera)s cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again, and choose which files you want to "
-"download from it."
+"<b>The download cannot start because the %(camera)s cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again, and choose which files "
+"you want to download from it."
 msgstr ""
 "<b>De download kan niet starten omdat de %(camera)s niet ontkoppeld kan "
 "worden.</b><br><br>Je kan ieder ander programma dat het apparaat gebruikt "
 "(bv: de bestandsbeheerder) stoppen en opnieuw proberen. Als dat niet lukt, "
-"ontkoppel de %(camera)s van de computer en koppel het opnieuw aan en zoek "
+"ontkoppel de %(camera)s van de computer en koppel ze opnieuw aan en zoek "
 "welke bestanden je wenst te downloaden."
 
-#: ../raphodo/rapid.py:4635
+#: ../raphodo/rapid.py:4842
+msgid "Completed Downloads Present"
+msgstr "Afgewerkte Downloads tot op nu."
+
+#: ../raphodo/rapid.py:4844
+#, python-format
+msgid "%s whose download have completed are displayed."
+msgstr "%s waarvan de download voltooid zijn, worden vertoond."
+
+#: ../raphodo/rapid.py:4846
+msgid "Do you want to clear the completed downloads?"
+msgstr "Wens je de lijst van voltooide downloads wissen?"
+
+#: ../raphodo/rapid.py:4848
+msgid "Completed Download Present"
+msgstr "Lijst van voltooide downloads."
+
+#: ../raphodo/rapid.py:4850
+#, python-format
+msgid "%s whose download has completed is displayed."
+msgstr "De download %s die voltooid is wordt vertoond."
+
+#: ../raphodo/rapid.py:4852
+msgid "Do you want to clear the completed download?"
+msgstr "Wenst je de voltooide downloads wissen?"
+
+#: ../raphodo/rapid.py:4933
 #, python-format
 msgid ""
 "Do you want to download photos and videos from the device <i>%(device)s</i>?"
 msgstr ""
+"Wens je foto's en video's te downloaden van apparaat <i>%(device)s</i>?"
 
-#: ../raphodo/rapid.py:4877
+#: ../raphodo/rapid.py:5183
 #, python-format
 msgid "<b>Do you want to ignore the %s whenever this program is run?</b>"
-msgstr "<b>Wenst u %s te negeren telkens het programma draait?</b>"
+msgstr "<b>Wens je %s te negeren telkens het programma draait?</b>"
 
-#: ../raphodo/rapid.py:4879
+#: ../raphodo/rapid.py:5186
 msgid ""
 "All cameras, phones and tablets with the same model name will be ignored."
 msgstr ""
 "All camera's, telefoons en  tablets met dezelfde model naam zullen genegeerd "
 "worden."
 
-#: ../raphodo/rapid.py:4883
+#: ../raphodo/rapid.py:5190
 #, python-format
 msgid ""
 "<b>Do you want to ignore the device %s whenever this program is run?</b>"
 msgstr ""
-"<b>Wenst u het apparaat %s te negeren telkens het programma draait?</b>"
+"<b>Wens je het apparaat %s te negeren telkens het programma draait?</b>"
 
-#: ../raphodo/rapid.py:4885
+#: ../raphodo/rapid.py:5192
 msgid "Any device with the same name will be ignored."
 msgstr "Ieder apparaat met dezelfde naam zal genegeerd worden."
 
-#: ../raphodo/rapid.py:5178
+#: ../raphodo/rapid.py:5492
 #, python-format
 msgid "Downloading from %(location)s on This Computer."
 msgstr "Downloading van %(location)s naar Deze Computer."
 
-#: ../raphodo/rapid.py:5180
+#: ../raphodo/rapid.py:5496
 msgid ""
 "Do you really want to download from here?<br><br>On some systems, scanning "
 "this location can take a very long time."
@@ -3302,117 +4492,118 @@ msgstr ""
 "Wens je werkelijk vanaf hier te downloaden?<br><br>Op bepaalde systemen kan "
 "het scannen van deze locatie heel lang duren."
 
-#: ../raphodo/rapid.py:5224
+#: ../raphodo/rapid.py:5537
 #, python-format
 msgid "Generating thumbnails for %s"
-msgstr "Icoontjes genereren voor %s"
+msgstr "Miniaturen genereren voor %s"
 
-#: ../raphodo/rapid.py:5227
+#: ../raphodo/rapid.py:5540
 #, python-format
 msgid "Scanning %s"
-msgstr "Scannen van %s"
+msgstr "%s wordt doorzocht"
 
-#: ../raphodo/rapid.py:5237
+#: ../raphodo/rapid.py:5551
 #, python-format
 msgid ""
 "%(number)s of %(available files)s checked for download (%(hidden)s hidden)"
 msgstr ""
-"%(number)s van de %(available files)s aangevinkt voor download (%(hidden)s "
-"hidden)"
+"%(number)s van de %(available files)s gemarkeerd voor download (%(hidden)s "
+"verborgen)"
 
-#: ../raphodo/rapid.py:5243
+#: ../raphodo/rapid.py:5559
 #, python-format
 msgid "%(number)s of %(available files)s checked for download"
-msgstr "%(number)s van de %(available files)s aangevinkt voor download"
+msgstr "%(number)s van de %(available files)s gemarkeerd voor download"
 
-#: ../raphodo/rapid.py:5494
+#: ../raphodo/rapid.py:5764
 msgid "Display program information when run from the command line."
-msgstr "Vertoon programma informatie wanneer opgestart vanaf de commandolijn."
+msgstr ""
+"Vertoon programma informatie wanneer opgestart vanaf de commandolijn."
 
-#: ../raphodo/rapid.py:5496
+#: ../raphodo/rapid.py:5766
 msgid "Display debugging information when run from the command line."
 msgstr "Vertoon debug informatie wanneer opgestart van de commandolijn."
 
-#: ../raphodo/rapid.py:5499
+#: ../raphodo/rapid.py:5769
 msgid "List photo and video file extensions the program recognizes and exit."
 msgstr ""
-"Vertoon de foto en video extenties die het programma herkent en verlaat het "
+"Vertoon de foto en video extensies die het programma herkent en verlaat het "
 "programma."
 
-#: ../raphodo/rapid.py:5502
+#: ../raphodo/rapid.py:5772
 msgid "Turn on or off the the renaming of photos."
 msgstr "Hernoemen van foto's aan- of uitzetten."
 
-#: ../raphodo/rapid.py:5504
+#: ../raphodo/rapid.py:5774
 msgid "turn on or off the the renaming of videos."
 msgstr "Hernoemen van video's aan- of uitzetten."
 
-#: ../raphodo/rapid.py:5506
+#: ../raphodo/rapid.py:5776
 msgid ""
 "Turn on or off the automatic detection of devices from which to download."
 msgstr "Automatische detectie van download apparaten aan- of uitzetten."
 
-#: ../raphodo/rapid.py:5510
+#: ../raphodo/rapid.py:5780
 msgid "Turn on or off downloading from this computer."
 msgstr "Downloaden vanaf deze computer aan- of uitzetten."
 
-#: ../raphodo/rapid.py:5512 ../raphodo/rapid.py:5515 ../raphodo/rapid.py:5518
-#: ../raphodo/rapid.py:5539 ../raphodo/rapid.py:5543
+#: ../raphodo/rapid.py:5782 ../raphodo/rapid.py:5785 ../raphodo/rapid.py:5788
+#: ../raphodo/rapid.py:5809 ../raphodo/rapid.py:5813
 msgid "PATH"
 msgstr "PAD"
 
-#: ../raphodo/rapid.py:5513
+#: ../raphodo/rapid.py:5783
 msgid "The PATH on this computer from which to download."
 msgstr "Het download PAD op deze computer."
 
-#: ../raphodo/rapid.py:5516
+#: ../raphodo/rapid.py:5786
 msgid "The PATH where photos will be downloaded to."
 msgstr "Het PAD waar de foto's naartoe zullen gekopieerd worden."
 
-#: ../raphodo/rapid.py:5519
+#: ../raphodo/rapid.py:5789
 msgid "The PATH where videos will be downloaded to."
 msgstr "Het PAD waar de video's naartoe gedownload zullen worden."
 
-#: ../raphodo/rapid.py:5521
+#: ../raphodo/rapid.py:5791
 msgid "Turn on or off the backing up of photos and videos while downloading."
 msgstr ""
 "Back-up van foto's en video's tijdens het downloaden aan- of uitzetten."
 
-#: ../raphodo/rapid.py:5525
+#: ../raphodo/rapid.py:5795
 msgid "Turn on or off the automatic detection of backup devices."
 msgstr "Automatische detectie van Back-up apparaten aan- of uitzetten."
 
-#: ../raphodo/rapid.py:5527 ../raphodo/rapid.py:5533
+#: ../raphodo/rapid.py:5797 ../raphodo/rapid.py:5803
 msgid "FOLDER"
-msgstr "MAP"
+msgstr "FOLDER"
 
-#: ../raphodo/rapid.py:5528
+#: ../raphodo/rapid.py:5798
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected photo "
 "backup device, with the folder's name being used to identify whether or not "
 "the device is used for backups. For each device you wish to use for backing "
 "photos up to, create a folder on it with this name."
 msgstr ""
-"De MAP in dewelke de back-ups opgeslagen zijn op het automatisch "
-"gedetecteerd foto back-up apparaat, waarvan de mapnaam gebruikt wordt om na "
-"te gaan of het apparaat gebruikt wordt voor back-ups. Voor ieder apparaat "
-"dat je als foto back-up wenst te gebruiken, moet je een map aanmaken met "
+"De FOLDER in dewelke de back-ups opgeslagen zijn op het automatisch "
+"gedetecteerd foto back-up apparaat, waarvan de foldernaam gebruikt wordt om "
+"na te gaan of het apparaat gebruikt wordt voor back-ups. Voor ieder apparaat "
+"dat je als foto back-up wenst te gebruiken, moet je een folder aanmaken met "
 "deze naam."
 
-#: ../raphodo/rapid.py:5534
+#: ../raphodo/rapid.py:5804
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected video "
 "backup device, with the folder's name being used to identify whether or not "
 "the device is used for backups. For each device you wish to use for backing "
 "up videos to, create a folder on it with this name."
 msgstr ""
-"De MAP in dewelke de back-ups opgeslagen zijn op het automatisch "
-"gedetecteerd video back-up apparaat, waarvan de mapnaam gebruikt wordt om na "
-"te gaan of het apparaat gebruikt wordt voor back-ups. Voor ieder apparaat "
-"dat je als video back-up wenst te gebruiken, moet je een map aanmaken met "
+"De FOLDER in dewelke de back-ups opgeslagen zijn op het automatisch "
+"gedetecteerd video back-up apparaat, waarvan de foldernaam gebruikt wordt om "
+"na te gaan of het apparaat gebruikt wordt voor back-ups. Voor ieder apparaat "
+"dat je als video back-up wenst te gebruiken, moet je een folder aanmaken met "
 "deze naam."
 
-#: ../raphodo/rapid.py:5540
+#: ../raphodo/rapid.py:5810
 msgid ""
 "The PATH where photos will be backed up when automatic detection of backup "
 "devices is turned off."
@@ -3420,7 +4611,7 @@ msgstr ""
 "Het PAD waar de foto's naar toe gebackup-ed zullen worden als de "
 "automatische detectie van back-up apparaten uit staat."
 
-#: ../raphodo/rapid.py:5544
+#: ../raphodo/rapid.py:5814
 msgid ""
 "The PATH where videos will be backed up when automatic detection of backup "
 "devices is turned off."
@@ -3428,71 +4619,72 @@ msgstr ""
 "Het PAD waar de video's naar toe gebackup-ed zullen worden als de "
 "automatische detectie van back-up apparaten uit staat."
 
-#: ../raphodo/rapid.py:5547
+#: ../raphodo/rapid.py:5817
 #, python-format
 msgid "Ignore photos with the following extensions: %s"
-msgstr "Negeer foto's met de volgende extentie: %s"
+msgstr "Negeer foto's met de volgende extensie: %s"
 
-#: ../raphodo/rapid.py:5551
-msgid "Turn on or off starting downloads as soon as the program itself starts."
-msgstr ""
-"Het starten van de downloads zodra het programma opstart aan- of uitzetten."
+#: ../raphodo/rapid.py:5821
+msgid ""
+"Turn on or off starting downloads as soon as the program itself starts."
+msgstr "Downloaden starten  zodra het programma opstart aan- of uitzetten."
 
-#: ../raphodo/rapid.py:5554
+#: ../raphodo/rapid.py:5824
 msgid "Turn on or off starting downloads as soon as a device is inserted."
 msgstr ""
-"Het starten van de downloads zodra een apparaat is gekoppeld aan- of "
-"uitzetten."
+"Downloaden starten zodra een apparaat is gekoppeld aan- of uitzetten."
 
-#: ../raphodo/rapid.py:5557
+#: ../raphodo/rapid.py:5827
 msgid ""
 "Turn on or off use of the Rapid Photo Downloader Thumbnail Cache. Turning it "
 "off does not delete existing cache contents."
 msgstr ""
-"De Rapid Photo Downloader Icoontjes Cache aan- of uitzetten. Het uitzetten "
-"ervan verwijderd de bestaande cache inhoud niet."
+"De Rapid Photo Downloader miniaturencache aan- of uitzetten. Het uitzetten "
+"ervan verwijdert de bestaande cache inhoud niet."
 
-#: ../raphodo/rapid.py:5561
+#: ../raphodo/rapid.py:5831
 msgid ""
 "Delete all thumbnails in the Rapid Photo Downloader Thumbnail Cache, and "
 "exit."
 msgstr ""
-"Verwijder alle icoontjes in de Rapid Photo Downloader Icoontjes Cache en "
+"Verwijder alle miniaturen in de Rapid Photo Downloader miniaturencache en "
 "verlaat het programma."
 
-#: ../raphodo/rapid.py:5565
+#: ../raphodo/rapid.py:5835
 msgid "Forget which files have been previously downloaded, and exit."
 msgstr ""
 "Vergeet welke bestanden er voordien gedownload werden en verlaat het "
 "programma."
 
-#: ../raphodo/rapid.py:5568
+#: ../raphodo/rapid.py:5838
 msgid ""
 "Import preferences from an old program version and exit. Requires the "
 "command line program gconftool-2."
 msgstr ""
-"Importeer de voorkeuren van een oud programma en verlaat het programma. "
+"Importeer de voorkeuren van een vorig programma en verlaat het programma. "
 "Vereist het commandolijn programma gconftool-2."
 
-#: ../raphodo/rapid.py:5571
+#: ../raphodo/rapid.py:5841
 msgid ""
 "Reset all program settings to their default values, delete all thumbnails in "
 "the Thumbnail cache, forget which files have been previously downloaded, and "
 "exit."
 msgstr ""
 "Zet alle programma instellingen terug op hun standaard waardes, verwijder "
-"all icoontjes in de Iconen Cache, vergeet welke bestanden er al gedownload "
-"werden en verlaat het programma."
+"all miniaturen in de miniaturencache, vergeet welke bestanden er al "
+"gedownload werden en verlaat het programma."
 
-#: ../raphodo/rapid.py:5575
+#: ../raphodo/rapid.py:5845
 msgid "Include gphoto2 debugging information in log files."
 msgstr "Voeg gphoto2 debug informatie toe in de logbestanden."
 
-#: ../raphodo/rapid.py:5579
+#: ../raphodo/rapid.py:5849
 msgid "Print information to the terminal about attached cameras and exit."
 msgstr ""
+"Vertoon informatie van de gekoppelde camera's in de terminal en verlaat het "
+"programma."
 
-#: ../raphodo/rapid.py:5640
+#: ../raphodo/rapid.py:5911
 msgid ""
 "To import preferences from the old version of Rapid Photo Downloader, you "
 "must install the program gconftool-2."
@@ -3500,77 +4692,94 @@ msgstr ""
 "Om de voorkeuren van een oudere versie van Rapid Photo Downloader te "
 "importeren moet het programma gconftool-2 geïnstalleerd zijn."
 
-#: ../raphodo/rapid.py:5649
+#: ../raphodo/rapid.py:5920
 msgid "No prior program preferences detected: exiting"
-msgstr "Geen vorige programma instellingen gevonden. Programma wordt verlaten."
+msgstr ""
+"Geen vorige programma instellingen gevonden. Programma wordt verlaten."
 
-#: ../raphodo/rapid.py:5652
+#: ../raphodo/rapid.py:5923
 #, python-format
 msgid "Importing preferences from Rapid Photo Downloader %(version)s"
 msgstr "Importeren van de voorkeuren van Rapid Photo Downloader %(version)s"
 
-#: ../raphodo/rapid.py:5714
+#: ../raphodo/rapid.py:5989
 #, python-format
-msgid "Do you want to copy the stored sequence number, which has the value %d?"
-msgstr "Wens je het opgeslagen volgnummer dat nu op %d staat mee te kopiëren?"
+msgid ""
+"Do you want to copy the stored sequence number, which has the value %d?"
+msgstr ""
+"Wens je het opgeslagen volgnummer dat nu op %d staat mee te kopiëren?"
 
-#: ../raphodo/rapid.py:5726
+#: ../raphodo/rapid.py:6000
 msgid "Program aborting."
 msgstr "Programma wordt gestopt."
 
-#: ../raphodo/rapid.py:5736
+#: ../raphodo/rapid.py:6010
 msgid "Never run this program as the sudo / root user."
-msgstr ""
+msgstr "Dit programma nooit als sudo / root gebruiker draaien."
 
-#: ../raphodo/rapid.py:5740
+#: ../raphodo/rapid.py:6014
 msgid "You must install ExifTool to run Rapid Photo Downloader."
 msgstr ""
+"ExifTool moet geïnstallerd zijn om Rapid Photo Downloader te draaien."
+
+#: ../raphodo/rapid.py:6026
+msgid ""
+"Rapid Photo Downloader is installed in multiple locations.\n"
+"\n"
+"Uninstall all copies except the version you want to run."
+msgstr ""
+"Rapid Photo Downloader is op meerdere plaatsen geïnstalleerd.\n"
+"\n"
+"Deïnstalleer alle versies behalve deze die je wenst te draaien."
 
-#: ../raphodo/rapid.py:5794
+#: ../raphodo/rapid.py:6083
 msgid ""
 "When specifying a path on the command line, do not also specify an\n"
 "option for device auto detection or a path on \"This Computer\"."
 msgstr ""
+"Wanneer je een pad op de commandolijn meegeeft, mag je geen optie\n"
+"voor apparaat auto herkenning of een pad op \"Mijn computer\" meegeven."
 
-#: ../raphodo/rapid.py:5950
+#: ../raphodo/rapid.py:6243
 msgid "All settings and caches have been reset"
 msgstr "Alle instellingen en caches zijn op beginwaardes teruggezet."
 
-#: ../raphodo/rapid.py:5958
+#: ../raphodo/rapid.py:6251
 msgid "Thumbnail Cache has been reset"
-msgstr "Icoontjes Cache is op beginwaarde teruggezet."
+msgstr "Miniaturencache is op beginwaarde teruggezet."
 
-#: ../raphodo/rapid.py:5964
+#: ../raphodo/rapid.py:6257
 msgid "Remembered files have been forgotten"
 msgstr "Onthouden bestanden zijn nu vergeten."
 
 #: ../raphodo/rememberthisdialog.py:70
 msgid "&Don't ask me about this again"
-msgstr ""
+msgstr "&Stel me deze vraag niet opnieuw"
 
 #: ../raphodo/rememberthisdialog.py:72
 msgid "&Don't warn me about this again"
-msgstr ""
+msgstr "&Verwittig me daarover niet meer"
 
 #: ../raphodo/rememberthisdialog.py:75
 msgid "&Don't warn me again about missing or broken program libraries"
 msgstr ""
+"&Verwittig me niet meer over ontbrekende of gebroken programma bibliotheken"
 
-#: ../raphodo/renameandmovefile.py:546
+#: ../raphodo/renameandmovefile.py:554
 msgid "subfolder and filename"
-msgstr "submap en bestandsnaam"
+msgstr "subfolder en bestandsnaam"
 
-#: ../raphodo/renameandmovefile.py:548
+#: ../raphodo/renameandmovefile.py:556
 msgid "filename"
 msgstr "bestandsnaam"
 
-#: ../raphodo/renameandmovefile.py:550
+#: ../raphodo/renameandmovefile.py:558
 msgid "subfolder"
-msgstr "submap"
+msgstr "subfolder"
 
 #: ../raphodo/renamepanel.py:290
 msgid "A counter for how many downloads occur on each day"
-msgstr ""
+msgstr "Een teller voor het aantal downloads per dag"
 
 #: ../raphodo/renamepanel.py:291
 msgid "Downloads today:"
@@ -3579,6 +4788,7 @@ msgstr "Downloads vandaag:"
 #: ../raphodo/renamepanel.py:313
 msgid "A counter that is remembered each time the program is run "
 msgstr ""
+"Een teller die bijgewerkt wordt iedere keer het programma gestart wordt "
 
 #: ../raphodo/renamepanel.py:314
 msgid "Stored number:"
@@ -3588,16 +4798,17 @@ msgstr "Opgeslagen nummer:"
 msgid ""
 "The time at which the <i>Downloads today</i> sequence number should be reset"
 msgstr ""
+"De tijd wanneer de <i>Downloads Vandaag</i> volgnummer gereset moet worden"
 
 #: ../raphodo/renamepanel.py:332
 msgid "Day start:"
-msgstr "Aanvang dag:"
+msgstr "Aanvangsdag:"
 
 #. 24 hour format, if wanted in a future release:
 #. self.dayStart.setDisplayFormat('HH:mm:ss')
 #: ../raphodo/renamepanel.py:342
 msgid "Synchronize RAW + JPEG"
-msgstr ""
+msgstr "Synchroniseer RAW + JPEG"
 
 #: ../raphodo/renamepanel.py:345
 msgid ""
@@ -3605,10 +4816,13 @@ msgid ""
 "\n"
 "See the online documentation for more details."
 msgstr ""
+"Synchroniseer de volgnummers voor overeenkomende RAW en JPEG paren.\n"
+"\n"
+"Neem de online documentatie door voor meer details."
 
 #: ../raphodo/renamepanel.py:349
 msgid "Sequence Numbers"
-msgstr ""
+msgstr "Volgnummers"
 
 #: ../raphodo/renamepanel.py:360
 msgid "Strip incompatible characters"
@@ -3619,22 +4833,24 @@ msgid ""
 "Whether photo, video and folder names should have any characters removed "
 "that are not allowed by other operating systems"
 msgstr ""
+"Indien bij foto, video en foldernamen karakters verwijderd moeten worden die "
+"niet herkend worden bij andere besturingssystemen."
 
 #: ../raphodo/renamepanel.py:365
 msgid "Compatibility"
-msgstr ""
+msgstr "Compatibiliteit"
 
 #: ../raphodo/renamepanel.py:433
 msgid "Photo Renaming"
-msgstr ""
+msgstr "Foto hernoemen"
 
 #: ../raphodo/renamepanel.py:436
 msgid "Video Renaming"
-msgstr ""
+msgstr "Video hernoemen"
 
 #: ../raphodo/renamepanel.py:439
 msgid "Renaming Options"
-msgstr ""
+msgstr "Hernoem opties"
 
 #: ../raphodo/rpdfile.py:218
 msgid "photos and videos"
@@ -3644,160 +4860,237 @@ msgstr "foto's en video's"
 msgid "photos or videos"
 msgstr "foto's of video's"
 
-#: ../raphodo/rpdfile.py:306
+#: ../raphodo/rpdfile.py:315
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: ../raphodo/rpdfile.py:318
+#. translators: natural language expression signifying a single video
+#: ../raphodo/rpdfile.py:337
+msgid "a video"
+msgstr "een video"
+
+#: ../raphodo/rpdfile.py:339
 msgid "1 Video"
 msgstr "1 Video"
 
-#: ../raphodo/rpdfile.py:323
+#. translators: natural language expression signifying a single photo
+#: ../raphodo/rpdfile.py:346
+msgid "a photo"
+msgstr "een foto"
+
+#: ../raphodo/rpdfile.py:348
 msgid "1 Photo"
 msgstr "1 Foto"
 
-#: ../raphodo/rpdfile.py:803
+#: ../raphodo/rpdfile.py:828
 #, python-format
 msgid "%(path)s on %(camera)s"
 msgstr "%(path)s op %(camera)s"
 
-#: ../raphodo/rpdfile.py:819
+#: ../raphodo/rpdfile.py:844
 msgid "Photo"
 msgstr "Foto"
 
-#: ../raphodo/rpdfile.py:859
+#: ../raphodo/rpdfile.py:884
 msgid "Video"
 msgstr "Video"
 
-#: ../raphodo/storage.py:138
+#: ../raphodo/storage.py:141
 msgid "File system root"
-msgstr ""
+msgstr "File system root"
 
 #. translators: the name of the Pictures folder
-#: ../raphodo/storage.py:433
+#: ../raphodo/storage.py:437
 msgid "Pictures"
-msgstr ""
+msgstr "Afbeeldingen"
 
-#: ../raphodo/thumbnaildisplay.py:426
+#: ../raphodo/thumbnaildisplay.py:432
 #, python-format
 msgid "Taken on %(date_time)s (%(human_readable)s)"
 msgstr "Genomen op %(date_time)s (%(human_readable)s)"
 
-#: ../raphodo/thumbnaildisplay.py:431
+#: ../raphodo/thumbnaildisplay.py:439
 #, python-format
 msgid "Modified on %(date_time)s (%(human_readable)s)"
 msgstr "Bijgewerkt op %(date_time)s (%(human_readable)s)"
 
-#: ../raphodo/thumbnaildisplay.py:437 ../raphodo/thumbnaildisplay.py:466
+#: ../raphodo/thumbnaildisplay.py:447 ../raphodo/thumbnaildisplay.py:481
 #, python-format
 msgid "%(date_time)s (%(human_readable)s)"
 msgstr "%(date_time)s (%(human_readable)s)"
 
-#: ../raphodo/thumbnaildisplay.py:451
+#: ../raphodo/thumbnaildisplay.py:464
 #, python-format
 msgid "Memory cards: %s"
-msgstr "Memory cards: %s"
+msgstr "Geheugenkaarten: %s"
 
-#: ../raphodo/thumbnaildisplay.py:457
+#: ../raphodo/thumbnaildisplay.py:468
+#, python-format
+msgid "Memory card: %s"
+msgstr "Geheugenkaart: %s"
+
+#: ../raphodo/thumbnaildisplay.py:473
 msgid "Downloaded as:"
-msgstr "Gedownloaded als:"
+msgstr "Gedownload als:"
 
-#: ../raphodo/thumbnaildisplay.py:472
+#: ../raphodo/thumbnaildisplay.py:489
 #, python-format
 msgid "<br><br>Previous download:<br>%(filename)s<br>%(path)s<br>%(date)s"
 msgstr "<br><br>Vorige Download:<br>%(filename)s<br>%(path)s<br>%(date)s"
 
-#: ../raphodo/thumbnaildisplay.py:1603
+#: ../raphodo/thumbnaildisplay.py:1645
 msgid "Copy Path"
 msgstr "Kopieer Pad"
 
+#. Translators: these values are file size suffixes like B representing bytes, KB representing
+#. kilobytes, etc.
+#: ../raphodo/utilities.py:170
+msgid "B"
+msgstr "B"
+
+#: ../raphodo/utilities.py:170
+msgid "KB"
+msgstr "KB"
+
+#: ../raphodo/utilities.py:170
+msgid "MB"
+msgstr "MB"
+
+#: ../raphodo/utilities.py:170
+msgid "GB"
+msgstr "GB"
+
+#: ../raphodo/utilities.py:170
+msgid "TB"
+msgstr "TB"
+
+#: ../raphodo/utilities.py:170
+msgid "PB"
+msgstr "PB"
+
+#: ../raphodo/utilities.py:170
+msgid "EB"
+msgstr "EB"
+
+#: ../raphodo/utilities.py:170
+msgid "ZB"
+msgstr "ZB"
+
+#: ../raphodo/utilities.py:170
+msgid "YB"
+msgstr "YB"
+
 #. two things in a list e.g. "device1 and device2"
-#: ../raphodo/utilities.py:391
+#: ../raphodo/utilities.py:394
 #, python-format
 msgid "%(first_item)s and %(last_item)s"
 msgstr "%(first_item)s en %(last_item)s"
 
-#: ../raphodo/utilities.py:464
+#: ../raphodo/utilities.py:468
 msgid "one"
 msgstr "een"
 
-#: ../raphodo/utilities.py:465
+#: ../raphodo/utilities.py:469
 msgid "two"
 msgstr "twee"
 
-#: ../raphodo/utilities.py:466
+#: ../raphodo/utilities.py:470
 msgid "three"
 msgstr "drie"
 
-#: ../raphodo/utilities.py:467
+#: ../raphodo/utilities.py:471
 msgid "four"
 msgstr "vier"
 
-#: ../raphodo/utilities.py:468
+#: ../raphodo/utilities.py:472
 msgid "five"
 msgstr "vijf"
 
-#: ../raphodo/utilities.py:469
+#: ../raphodo/utilities.py:473
 msgid "six"
 msgstr "zes"
 
-#: ../raphodo/utilities.py:470
+#: ../raphodo/utilities.py:474
 msgid "seven"
 msgstr "zeven"
 
-#: ../raphodo/utilities.py:471
+#: ../raphodo/utilities.py:475
 msgid "eight"
 msgstr "acht"
 
-#: ../raphodo/utilities.py:472
+#: ../raphodo/utilities.py:476
 msgid "nine"
 msgstr "negen"
 
-#: ../raphodo/utilities.py:473
+#: ../raphodo/utilities.py:477
 msgid "ten"
 msgstr "tien"
 
-#: ../raphodo/utilities.py:474
+#: ../raphodo/utilities.py:478
 msgid "eleven"
 msgstr "elf"
 
-#: ../raphodo/utilities.py:475
+#: ../raphodo/utilities.py:479
 msgid "twelve"
 msgstr "twaalf"
 
-#: ../raphodo/utilities.py:476
+#: ../raphodo/utilities.py:480
 msgid "thirteen"
 msgstr "dertien"
 
-#: ../raphodo/utilities.py:477
+#: ../raphodo/utilities.py:481
 msgid "fourteen"
-msgstr "veertienv"
+msgstr "veertien"
 
-#: ../raphodo/utilities.py:478
+#: ../raphodo/utilities.py:482
 msgid "fifteen"
-msgstr "ijftien"
+msgstr "vijftien"
 
-#: ../raphodo/utilities.py:479
+#: ../raphodo/utilities.py:483
 msgid "sixteen"
 msgstr "zestien"
 
-#: ../raphodo/utilities.py:480
+#: ../raphodo/utilities.py:484
 msgid "seventeen"
 msgstr "zeventien"
 
-#: ../raphodo/utilities.py:481
+#: ../raphodo/utilities.py:485
 msgid "eighteen"
 msgstr "achttien"
 
-#: ../raphodo/utilities.py:482
+#: ../raphodo/utilities.py:486
 msgid "ninenteen"
 msgstr "negentien"
 
-#: ../raphodo/utilities.py:483
+#: ../raphodo/utilities.py:487
 msgid "twenty"
 msgstr "twintig"
 
+#: ../raphodo/viewutils.py:240
+msgid "&OK"
+msgstr "&OK"
+
+#: ../raphodo/viewutils.py:243
+msgid "&Save"
+msgstr "Op&slaan"
+
+#: ../raphodo/viewutils.py:244
+msgid "&Help"
+msgstr "&Help"
+
+#: ../raphodo/viewutils.py:245
+msgid "Restore Defaults"
+msgstr "Herstel Standaard Instellingen"
+
+#: ../raphodo/viewutils.py:246
+msgid "&Yes"
+msgstr "&Ja"
+
+#: ../raphodo/viewutils.py:247
+msgid "&No"
+msgstr "&Nee"
+
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:1
 msgid ""
 "Rapid Photo Downloader imports photos and videos from cameras, phones, "
@@ -3808,7 +5101,7 @@ msgid ""
 msgstr ""
 "Rapid Photo Downloader importeert zeer snel foto's en video's van camera's, "
 "smartphones, geheugenkaartjes en andere apparaten. Het kan zo ingesteld "
-"worden dat het foto's en video's hernoemd naar betekenisvolle namen die je "
+"worden dat het foto's en video's hernoemt naar betekenisvolle namen die je "
 "aangeeft. Het kan ook je foto's en video's backuppen terwijl je ze "
 "downloadt. Het downloadt van en maakt back-ups naar meerdere apparaten "
 "simultaan."
@@ -3820,7 +5113,7 @@ msgid ""
 "identify photos and videos taken at different periods in a single day or "
 "over consecutive days."
 msgstr ""
-"Uniek voor Rapid Photo Downloader is zijn Tijdlijn, die foto's en video's "
+"Uniek voor Rapid Photo Downloader is zijn Tijdslijn, die foto's en video's "
 "groepeert gebaseerd op de verlopen tijd tussen opeenvolgende opnames. "
 "Gebruik het om foto's en video's te identificeren op verschillende periodes "
 "in één dag of over opeenvolgende dagen."
@@ -3835,24 +5128,24 @@ msgstr ""
 "Geschreven door een fotograaf voor professionele als amateur fotografen, is "
 "Rapid Photo Downloader gemakkelijk in te stellen en te gebruiken. Programma "
 "voorkeuren worden ingesteld zonder nood aan complexe codes. Algemene taken, "
-"zoals het ontkoppelen van een geheugenkaar als de download voltooid is, "
+"zoals het ontkoppelen van een geheugenkaart als de download voltooid is, "
 "kunnen geautomatiseerd worden."
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:4
 msgid "The main window"
-msgstr ""
+msgstr "Hoofdvenster"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:5
 msgid "Downloading"
-msgstr ""
+msgstr "Aan het downloaden"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:6
 msgid "The Timeline"
-msgstr ""
+msgstr "Tijdslijn"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:7
 msgid "Right-clicking on a device"
-msgstr ""
+msgstr "Rechts klikken op een apparaat"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:1
 msgid ""
@@ -3868,11 +5161,11 @@ msgstr "Photo Downloader"
 #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:5
 msgid ""
-"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;"
-"memory;card;"
+"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;memory"
+";card;"
 msgstr ""
-"fotos;download;fotografie;import;video;RAW;camera;telefoon;ingest;backup;"
-"memory;card;"
+"foto;download;fotografie;import;video;RAW;camera;telefoon;ingest;back-"
+"up;geheugen;kaart;"
 
 #: ../data/kde/net.damonlynch.rapid-photo-downloader.desktop.in.h:1
 msgid "Download Photos and Videos with Rapid Photo Downloader"
@@ -3932,6 +5225,7 @@ msgstr "Download Foto's en Video's met Rapid Photo Downloader"
 #~ msgid "Warsaw"
 #~ msgstr "Warschau"
 
+#, python-format
 #~ msgid "<i>Example: %s</i>"
 #~ msgstr "<i>Voorbeeld: %s</i>"
 
@@ -3944,6 +5238,7 @@ msgstr "Download Foto's en Video's met Rapid Photo Downloader"
 #~ msgid "externaldrive2"
 #~ msgstr "extern apparaat 2"
 
+#, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
 #~ "Destination: %(destination)s"
@@ -3978,15 +5273,18 @@ msgstr "Download Foto's en Video's met Rapid Photo Downloader"
 #~ msgid "About 1 second remaining"
 #~ msgstr "Ongeveer 1 seconde te gaan"
 
+#, python-format
 #~ msgid "About %i seconds remaining"
 #~ msgstr "Ongeveer %i seconden te gaan"
 
 #~ msgid "About 1 minute remaining"
 #~ msgstr "Ongeveer 1 minuut te gaan"
 
+#, python-format
 #~ msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 #~ msgstr "Ongeveer %(minutes)i:%(seconds)02i minuten te gaan"
 
+#, python-format
 #~ msgid ""
 #~ "display program information on the command line as the program runs "
 #~ "(default: %default)"
@@ -3997,6 +5295,7 @@ msgstr "Download Foto's en Video's met Rapid Photo Downloader"
 #~ msgid "only output errors to the command line"
 #~ msgstr "alleen fouten naar de commandolijn sturen"
 
+#, python-format
 #~ msgid "and %s"
 #~ msgstr "en %s"
 
@@ -4121,12 +5420,14 @@ msgstr "Download Foto's en Video's met Rapid Photo Downloader"
 #~ msgid "Synchronize RAW + JPEG sequence numbers"
 #~ msgstr "Synchroniseer RAW + JPEG volgnummers"
 
+#, python-format
 #~ msgid "Source: %(source)s"
 #~ msgstr "Bron: %(source)s"
 
 #~ msgid "Remove all Job Codes?"
 #~ msgstr "Verwijder alle Job Codes?"
 
+#, python-format
 #~ msgid "Destination directory could not be created: %(directory)s\n"
 #~ msgstr "Doelmap kon niet aangemaakt worden: %(directory)s\n"
 
@@ -4137,8 +5438,8 @@ msgstr "Download Foto's en Video's met Rapid Photo Downloader"
 #~ "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 #~ "name. Please use other renaming options.</i>"
 #~ msgstr ""
-#~ "<i><b>Opgepast:</b> Er is onvoldoende metadata om een volledige naam aan "
-#~ "te maken. Gelieve andere hernoemings opties te gebruiken.</i>"
+#~ "<i><b>Opgepast:</b> Er is onvoldoende metadata om een volledige naam aan te "
+#~ "maken. Gelieve andere hernoemings opties te gebruiken.</i>"
 
 #~ msgid "Error in Video Rename preferences"
 #~ msgstr "Fout in de voorkeuren Video Hernoemen"
@@ -4146,9 +5447,11 @@ msgstr "Download Foto's en Video's met Rapid Photo Downloader"
 #~ msgid "Error in Photo Rename preferences"
 #~ msgstr "Fout in de voorkeuren van Foto Hernoemen"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s"
 #~ msgstr "%(number)s van %(total)s %(filetypes)s"
 
+#, python-format
 #~ msgid "Backing up to %(path)s"
 #~ msgstr "Backuppen naar %(path)s"
 
@@ -4209,15 +5512,18 @@ msgstr "Download Foto's en Video's met Rapid Photo Downloader"
 #~ msgid "Video backup folder name:"
 #~ msgstr "Video backup foldernaam:"
 
+#, python-format
 #~ msgid "Select a folder containing %(file_types)s"
 #~ msgstr "Selecteer een map die %(file_types)s bevat"
 
 #~ msgid "Select a folder to download photos to"
 #~ msgstr "Duid een map aan om de foto's naar toe te downloaden"
 
+#, python-format
 #~ msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
+#, python-format
 #~ msgid ""
 #~ "%(date)s\n"
 #~ "%(time)s"
@@ -4225,9 +5531,11 @@ msgstr "Download Foto's en Video's met Rapid Photo Downloader"
 #~ "%(date)s\n"
 #~ "%(time)s"
 
+#, python-format
 #~ msgid "%(date)s %(time)s"
 #~ msgstr "%(date)s %(time)s"
 
+#, 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)"
@@ -4235,11 +5543,10 @@ msgstr "Download Foto's en Video's met Rapid Photo Downloader"
 #~ msgid "Photo has already been downloaded"
 #~ msgstr "Foto werd al eens gedownload"
 
-#~ msgid ""
-#~ "Photos detected with the same filenames, but taken at different times"
+#~ 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"
+#~ "Foto's gevonden met dezelfde bestandsnaam, maar op een verschillend tijdstip "
+#~ "genomen"
 
 #~ msgid "Select All Without _Job Code"
 #~ msgstr "Selecteer Alle Zonder _Job Code"
@@ -4248,12 +5555,11 @@ msgstr "Download Foto's en Video's met Rapid Photo Downloader"
 #~ msgstr "Selecteer Alle _met Job Code"
 
 #~ 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."
+#~ "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 ""
-#~ "Wanneer er een foto of een video met dezelfde naam al gedownload was, "
-#~ "kies om het downloaden van dit bestand over te slaan of om er een uniek "
+#~ "Wanneer er een foto of een video met dezelfde naam al gedownload was, kies "
+#~ "om het downloaden van dit bestand over te slaan of om er een uniek "
 #~ "identificatieteken aan toe te voegen."
 
 #~ msgid "_File"
@@ -4262,12 +5568,15 @@ msgstr "Download Foto's en Video's met Rapid Photo Downloader"
 #~ msgid "_Select"
 #~ msgstr "_Selecteer"
 
+#, python-format
 #~ msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
+#, python-format
 #~ msgid "Error: %(inst)s"
 #~ msgstr "Fout: %(inst)s"
 
+#, python-format
 #~ msgid "%(freespace)s. %(backuppaths)s."
 #~ msgstr "%(freespace)s. %(backuppaths)s."
 
@@ -4275,8 +5584,8 @@ msgstr "Download Foto's en Video's met Rapid Photo Downloader"
 #~ "Specify whether photo, video and folder names should have any characters "
 #~ "removed that are not allowed by other operating systems."
 #~ msgstr ""
-#~ "Duid aan of foto-, video- en  mapnamen tekens die niet toegelaten zijn "
-#~ "bij andere besturingssystemen dienen verwijderd te worden."
+#~ "Duid aan of foto-, video- en  mapnamen tekens die niet toegelaten zijn bij "
+#~ "andere besturingssystemen dienen verwijderd te worden."
 
 #~ msgid "Free space:"
 #~ msgstr "Vrije ruimte:"
@@ -4287,38 +5596,48 @@ msgstr "Download Foto's en Video's met Rapid Photo Downloader"
 #~ msgid "."
 #~ msgstr "."
 
+#, python-format
 #~ msgid "(%(file_type)s)"
 #~ msgstr "(%(file_type)s)"
 
+#, python-format
 #~ msgid "%(free)s %(file_type)s"
 #~ msgstr "%(free)s %(file_type)s"
 
+#, python-format
 #~ msgid "%(free)s free"
 #~ msgstr "%(free)s vrij"
 
+#, python-format
 #~ msgid "Error generating component %s."
 #~ msgstr "Fout bij het aanmaken van component %s."
 
+#, 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"
 
+#, python-format
 #~ msgid "%(filetype)s %(area)s could not be generated"
 #~ msgstr "%(filetype)s %(area)s kon niet aangemaakt worden"
 
+#, 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."
 
+#, python-format
 #~ msgid ""
-#~ "The existing %(filetype)s was last modified on %(date)s at %(time)s. "
-#~ "Unique identifier '%(identifier)s' added."
+#~ "The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
+#~ "identifier '%(identifier)s' added."
 #~ msgstr ""
 #~ "De bestaande %(filetype)s werd laatst aangepast op %(date)s om %(time)s. "
 #~ "Uniek identificatienummer '%(identifier)s' toegevoegd."
 
+#, 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."
 
+#, python-format
 #~ msgid "Error: %(errorno)s %(strerror)s"
 #~ msgstr "Fout: %(errorno)s %(strerror)s"
 
@@ -4329,39 +5648,50 @@ msgstr "Download Foto's en Video's met Rapid Photo Downloader"
 #~ "De bestandsnaam, extentie en Exif informatie geven aan dat het reeds "
 #~ "gedownload werd."
 
+#, python-format
 #~ msgid " It was backed up to %(volume)s"
 #~ msgstr " Het werd gebackupped naar %(volume)s"
 
 #~ msgid " It was backed up to these devices: "
 #~ msgstr " Het werd gebackupped naar deze apparaten: "
 
+#, python-format
 #~ msgid "%s, "
 #~ msgstr "%s, "
 
+#, python-format
 #~ msgid "%(volume)s, "
 #~ msgstr "%(volume)s, "
 
+#, python-format
 #~ msgid "%(volume)s (%(inst)s), "
 #~ msgstr "%(volume)s (%(inst)s), "
 
+#, python-format
 #~ msgid "%(volumes)s and %(volume)s."
 #~ msgstr "%(volumes)s en %(volume)s."
 
+#, python-format
 #~ msgid "%(volumes)s and %(volume)s (%(inst)s)."
 #~ msgstr "%(volumes)s en %(volume)s (%(inst)s)."
 
+#, python-format
 #~ msgid "%(volumes)s and %(final_volume)s."
 #~ msgstr "%(volumes)s en %(final_volume)s."
 
+#, python-format
 #~ msgid " Furthermore, there was a %(problem)s."
 #~ msgstr " Daarenboven was er een %(problem)s."
 
+#, python-format
 #~ msgid " Furthermore, there were %(problems)s."
 #~ msgstr " Daarenboven waren er %(problems)s."
 
+#, python-format
 #~ msgid "Problems in %s generation"
 #~ msgstr "Problemen bij het aanmaken van %s"
 
+#, python-format
 #~ msgid "%(filetype)s already exists, but it was backed up"
 #~ msgstr "%(filetype)s bestaat reeds, maar het was gebackupped"
 
@@ -4377,14 +5707,14 @@ msgstr "Download Foto's en Video's met Rapid Photo Downloader"
 #~ msgid "Problems in subfolder and filename generation"
 #~ msgstr "Problemen bij het aanmaken van de submappen en bestandsnamen"
 
-#~ msgid ""
-#~ "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
-#~ msgstr ""
-#~ "%(missing_metadata_elements)s en %(final_missing_metadata_element)s."
+#, python-format
+#~ msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
+#~ msgstr "%(missing_metadata_elements)s en %(final_missing_metadata_element)s."
 
 #~ msgid "there was an error backing up"
 #~ msgstr "er was een fout tijdens het backuppen"
 
+#, python-format
 #~ msgid "%(previousproblem)s, and %(backinguperror)s"
 #~ msgstr "%(previousproblem)s, en %(backinguperror)s"
 
@@ -4409,15 +5739,18 @@ msgstr "Download Foto's en Video's met Rapid Photo Downloader"
 #~ msgid "_Uncheck All"
 #~ msgstr "Alles _uitvinken"
 
+#, python-format
 #~ msgid "%(filetype)s already exists"
 #~ msgstr "%(filetype)s bestaat reeds"
 
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
 #~ msgstr "<span weight=\"bold\" size=\"x-large\">Diversen</span>"
 
+#, python-format
 #~ msgid "%(device)s did not unmount"
 #~ msgstr "%(device)s werd niet ontkoppeld"
 
+#, python-format
 #~ msgid ""
 #~ "%(problem)s\n"
 #~ "File: %(file)s"
@@ -4425,18 +5758,23 @@ msgstr "Download Foto's en Video's met Rapid Photo Downloader"
 #~ "%(problem)s\n"
 #~ "Bestand: %(file)s"
 
+#, python-format
 #~ msgid "Folder: %s"
 #~ msgstr "Map: %s"
 
+#, python-format
 #~ msgid "%(file_type)s download folder is invalid"
 #~ msgstr "%(file_type)s downloadmap is ongeldig"
 
+#, python-format
 #~ msgid "%(file_type)s download folder does not exist"
 #~ msgstr "%(file_type)s downloadmap bestaat niet"
 
+#, python-format
 #~ msgid "%(file_type)s download folder is not writable"
 #~ msgstr "%(file_type)s downloadmap is niet beschrijfbaar"
 
+#, python-format
 #~ msgid "Path: %s"
 #~ msgstr "Pad: %s"
 
@@ -4465,11 +5803,11 @@ msgstr "Download Foto's en Video's met Rapid Photo Downloader"
 #~ msgstr "Apparaat Opties"
 
 #~ msgid ""
-#~ "If you disable automatic detection, choose the exact location of the "
-#~ "photos and videos."
+#~ "If you disable automatic detection, choose the exact location of the photos "
+#~ "and videos."
 #~ msgstr ""
-#~ "Als je de automatische herkenning uitzet, moet je een exacte locatie "
-#~ "ingeven van de foto's en video's."
+#~ "Als je de automatische herkenning uitzet, moet je een exacte locatie ingeven "
+#~ "van de foto's en video's."
 
 #~ msgid "Remove all Remembered Paths?"
 #~ msgstr "Verwijder alle onthouden paden?"
@@ -4492,18 +5830,20 @@ msgstr "Download Foto's en Video's met Rapid Photo Downloader"
 #~ msgid "Remembered Paths"
 #~ msgstr "Onthouden paden"
 
+#, python-format
 #~ msgid ""
 #~ "The following regular expressions are invalid, and will be removed unless "
 #~ "you correct them:\n"
 #~ " %s"
 #~ msgstr ""
-#~ "De volgende reguliere expressies zijn ongeldig en zullen verwijderd "
-#~ "worden tenzij ze verbeterd worden:\n"
+#~ "De volgende reguliere expressies zijn ongeldig en zullen verwijderd worden "
+#~ "tenzij ze verbeterd worden:\n"
 #~ " %s"
 
+#, python-format
 #~ msgid ""
-#~ "This regular expression is invalid, and will be removed unless you "
-#~ "correct it:\n"
+#~ "This regular expression is invalid, and will be removed unless you correct "
+#~ "it:\n"
 #~ " %s"
 #~ msgstr ""
 #~ "Deze volgende reguliere expressie is ongeldig en zal verwijderd worden "
@@ -4514,20 +5854,23 @@ msgstr "Download Foto's en Video's met Rapid Photo Downloader"
 #~ msgstr "Selecteer een map waar foto's naar toe gebackuped moeten worden"
 
 #~ 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."
+#~ "Remembered paths are those associated with devices that you have chosen to "
+#~ "always scan or ignore when automatic detection of Portable Storage Devices "
+#~ "is enabled."
 #~ msgstr ""
 #~ "Onthouden paden zijn deze verbonden met apparaten die je gekozen hebt om "
 #~ "steeds gescand of genegeerd te worden, wanneer de automatische herkenning "
 #~ "van Draagbare Opslag Apparaten aangezet is."
 
+#, 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"
 
+#, python-format
 #~ msgid "Backing up photos and videos to %(path)s"
 #~ msgstr "Foto's en video's aan het backuppen naar %(path)s"
 
+#, python-format
 #~ msgid "Downloading from %(location)s."
 #~ msgstr "Aan het downloaden van %(location)s."
 
@@ -4560,8 +5903,7 @@ msgstr "Download Foto's en Video's met Rapid Photo Downloader"
 #~ msgstr "Naar"
 
 #~ msgid "display debugging information when run from the command line"
-#~ msgstr ""
-#~ "vertoon debug informatie wanneer uitgevoerd vanaf de commando prompt"
+#~ msgstr "vertoon debug informatie wanneer uitgevoerd vanaf de commando prompt"
 
 #~ msgid "reset all program settings and preferences and exit"
 #~ msgstr "herstel alle programma instellingen en verlaat het programma"
@@ -4572,8 +5914,8 @@ msgstr "Download Foto's en Video's met Rapid Photo Downloader"
 #~ msgid ""
 #~ "Should this device or partition be used to download photos or videos from?"
 #~ msgstr ""
-#~ "Moet dit apparaat of deze partitie gebruikt worden om foto's of video's "
-#~ "van te downloaden?"
+#~ "Moet dit apparaat of deze partitie gebruikt worden om foto's of video's van "
+#~ "te downloaden?"
 
 #~ msgid "Error in Video Download Subfolders preferences"
 #~ msgstr "Fout in de voorkeuren Video Download Submappen"
@@ -4588,9 +5930,10 @@ msgstr "Download Foto's en Video's met Rapid Photo Downloader"
 #~ "<i><b>Warning:</b> There is insufficient metadata to fully generate "
 #~ "subfolders. Please use other subfolder naming options.</i>"
 #~ msgstr ""
-#~ "<i><b>Opgepast:</b> Er is onvoldoende metadata om volledige submappen aan "
-#~ "te maken. Kies andere submappen benoemings opties.</i>"
+#~ "<i><b>Opgepast:</b> Er is onvoldoende metadata om volledige submappen aan te "
+#~ "maken. Kies andere submappen benoemings opties.</i>"
 
+#, python-format
 #~ msgid ""
 #~ "The %(filetype)s subfolder preferences entered are invalid and cannot be "
 #~ "used.\n"
@@ -4600,9 +5943,11 @@ msgstr "Download Foto's en Video's met Rapid Photo Downloader"
 #~ "gebruikt worden.\n"
 #~ "Ze zullen naar de standaard waardes worden teruggezet."
 
+#, python-format
 #~ msgid "Date time value %s appears invalid."
 #~ msgstr "Datum tijd waarde %s blijkt ongeldig te zijn."
 
+#, python-format
 #~ msgid ""
 #~ "Photos detected with the same filenames, but taken at different times: "
 #~ "%(details)s"
@@ -4610,9 +5955,11 @@ msgstr "Download Foto's en Video's met Rapid Photo Downloader"
 #~ "Foto's ontdekt met dezelfde bestandsnamen maar genomen op verschillende "
 #~ "tijden: %(details)s"
 
+#, python-format
 #~ msgid "%(previousproblem)s Additionally, %(newproblem)s"
 #~ msgstr "%(previousproblem)s Bovenop, %(newproblem)s"
 
+#, python-format
 #~ msgid "Problem in %s generation"
 #~ msgstr "Probleem bij het aanmaken van %s"
 
@@ -4629,9 +5976,9 @@ msgstr "Download Foto's en Video's met Rapid Photo Downloader"
 #~ msgstr "<span weight=\"bold\" size=\"x-large\">Video Downloadmappen</span>"
 
 #~ 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>."
+#~ "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 ""
 #~ "Sorry, de video download functionaliteit is uitgezet. Om video's te "
 #~ "downloaden moet je ofwel de  <i>hachoir metadata</i> en de <i>kaa "
@@ -4642,8 +5989,7 @@ msgstr "Download Foto's en Video's met Rapid Photo Downloader"
 #~ "automatically created in this folder using the structure specified below."
 #~ msgstr ""
 #~ "Kies de downloadmap. Submappen voor de gedownloadde video's zullen "
-#~ "automatisch aangemaakt worden in deze map conform de onderstaande "
-#~ "structuur."
+#~ "automatisch aangemaakt worden in deze map conform de onderstaande structuur."
 
 #~ msgid "Video Folders"
 #~ msgstr "Videomappen"
@@ -4659,19 +6005,19 @@ msgstr "Download Foto's en Video's met Rapid Photo Downloader"
 #~ "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"
+#~ "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>"
+#~ "<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 ""
 #~ "Met apparaten wordt bedoeld waar je de foto's en video's van downloadt, "
 #~ "zoals camera's, geheugenkaarten of Draagbare Opslagmedia.\n"
 #~ "\n"
-#~ "Er kan vanaf meerdere apparaten simultaan gedownload worden, of je kunt "
-#~ "een plaats op je harde schijf aanduiden.\n"
+#~ "Er kan vanaf meerdere apparaten simultaan gedownload worden, of je kunt een "
+#~ "plaats op je harde schijf aanduiden.\n"
 #~ "\n"
 #~ "<i>Rechtstreeks downloaden vanaf de camera is momenteel een experimentele "
 #~ "optie. Indien rechtstreeks downloaden vanaf de camera niet of onvoldoende "
@@ -4682,33 +6028,31 @@ msgstr "Download Foto's en Video's met Rapid Photo Downloader"
 #~ "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."
+#~ "When this option is enabled, and a potential device is detected, you will be "
+#~ "prompted to determine if it should be scanned or not."
 #~ msgstr ""
-#~ "Als je de automatische herkenning van draagbare opslagmedia aanzet, zal "
-#~ "het volledig apparaat ingelezen worden. Bij grote apparaten kan dat een "
-#~ "tijd duren.\n"
+#~ "Als je de automatische herkenning van draagbare opslagmedia aanzet, zal het "
+#~ "volledig apparaat ingelezen worden. Bij grote apparaten kan dat een tijd "
+#~ "duren.\n"
 #~ "\n"
-#~ "Als deze optie aanstaat en een potentieel apparaat gedetecteerd wordt, "
-#~ "zal je gevraagd worden om te bepalen of het al dan niet ingelezen moet "
-#~ "worden."
+#~ "Als deze optie aanstaat en een potentieel apparaat gedetecteerd wordt, zal "
+#~ "je gevraagd worden om te bepalen of het al dan niet ingelezen moet worden."
 
 #~ 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."
+#~ "devices for photos or videos. Any path ending with the values below will not "
+#~ "be scanned."
 #~ msgstr ""
-#~ "Geef het gedeelte op aan het einde van een pad waarvan je wenst dat dit "
-#~ "pad genegeerd moet worden wanneer er gescand wordt naar foto's of "
-#~ "video's.  Elk pad dat eindigt met de tekens hieronder zal niet gescand "
-#~ "worden."
+#~ "Geef het gedeelte op aan het einde van een pad waarvan je wenst dat dit pad "
+#~ "genegeerd moet worden wanneer er gescand wordt naar foto's of video's.  Elk "
+#~ "pad dat eindigt met de tekens hieronder zal niet gescand worden."
 
 #~ 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>"
+#~ "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 ""
 #~ "Duid de map aan waar de backups bewaard zijn op dat apparaat.  \n"
 #~ "\n"
@@ -4724,8 +6068,8 @@ msgstr "Download Foto's en Video's met Rapid Photo Downloader"
 #~ msgstr "Ontkoppel (\"eject\") apparaat na beëindigen van de download"
 
 #~ msgid ""
-#~ "manually specify the PATH of the device from which to download, "
-#~ "overwriting existing program preferences"
+#~ "manually specify the PATH of the device from which to download, overwriting "
+#~ "existing program preferences"
 #~ msgstr ""
 #~ "specificeer manueel het PAD van het apparaat om van te downloaden, "
 #~ "overschrijf daarbij de programma voorkeuren"
@@ -4734,9 +6078,10 @@ msgstr "Download Foto's en Video's met Rapid Photo Downloader"
 #~ "automatically detect devices from which to download, overwriting existing "
 #~ "program preferences"
 #~ msgstr ""
-#~ "detecteer automatisch apparaten om van te downloaden, overschrijf daarbij "
-#~ "de programma voorkeuren"
+#~ "detecteer automatisch apparaten om van te downloaden, overschrijf daarbij de "
+#~ "programma voorkeuren"
 
+#, 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)..."
 
@@ -4744,8 +6089,8 @@ msgstr "Download Foto's en Video's met Rapid Photo Downloader"
 #~ "Error: specify device auto-detection or manually specify a device's path "
 #~ "from which to download, but do not do both."
 #~ msgstr ""
-#~ "Fout: Specificeer auto-detectie apparaat of geef manueel het pad op van "
-#~ "waar gedownload moet worden, maar doe beiden niet samen."
+#~ "Fout: Specificeer auto-detectie apparaat of geef manueel het pad op van waar "
+#~ "gedownload moet worden, maar doe beiden niet samen."
 
 #~ msgid "Help"
 #~ msgstr "Help"
@@ -4759,9 +6104,11 @@ msgstr "Download Foto's en Video's met Rapid Photo Downloader"
 #~ msgid "Refresh"
 #~ msgstr "Verversen"
 
+#, python-format
 #~ msgid "%(file_type)s not backed up"
 #~ msgstr "%(file_type)s is niet gebackupped"
 
+#, python-format
 #~ msgid "The %(filetype)s did not download correctly"
 #~ msgstr "%(filetype)s is niet correct gedownload"
 
@@ -4774,15 +6121,18 @@ msgstr "Download Foto's en Video's met Rapid Photo Downloader"
 #~ msgid "File verification failed on these devices: "
 #~ msgstr "Bestandscontrole mislukt op deze apparaten: "
 
+#, python-format
 #~ msgid "Backup %(file_type)s overwritten"
 #~ msgstr "Back-up %(file_type)s overschreven"
 
+#, python-format
 #~ msgid "Backup of %(file_type)s already exists"
 #~ msgstr "Back-up van %(file_type)s bestaat reeds"
 
 #~ msgid "Backing up error"
 #~ msgstr "Back-up fout"
 
+#, python-format
 #~ msgid ""
 #~ "%(filetype)s could not be backed up because no suitable backup locations "
 #~ "were found."
@@ -4790,9 +6140,11 @@ msgstr "Download Foto's en Video's met Rapid Photo Downloader"
 #~ "%(filetype)s konden niet gebackupped worden omdat er geen gepaste back-up "
 #~ "locatie gevonden werd."
 
+#, python-format
 #~ msgid "%(filetype)s was already downloaded"
 #~ msgstr "%(filetype)s werd eerder al gedownload"
 
+#, python-format
 #~ msgid "%(filetype)s metadata cannot be read"
 #~ msgstr "%(filetype)s metagegevens kunnen niet gelezen worden"
 
@@ -4803,23 +6155,24 @@ msgstr "Download Foto's en Video's met Rapid Photo Downloader"
 #~ "File verification failed. The downloaded version is different from the "
 #~ "original."
 #~ msgstr ""
-#~ "Bestandscontrole mislukt. De gedownloadde versie verschilt van de "
-#~ "originele."
+#~ "Bestandscontrole mislukt. De gedownloadde versie verschilt van de originele."
 
 #~ msgid "Errors occurred when backing up on the following backup devices: "
 #~ msgstr ""
-#~ "Meerdere fouten gebeurden tijdens het backuppen naar de volgende "
-#~ "apparaten: "
+#~ "Meerdere fouten gebeurden tijdens het backuppen naar de volgende apparaten: "
 
+#, python-format
 #~ msgid "An error occurred when backing up on %(volume)s."
 #~ msgstr "Er gebeurde een fout tijdens het backuppen naar %(volume)s."
 
 #~ msgid "Backups already exist in these locations: "
 #~ msgstr "Back-ups bestaan reeds op volgende plaatsen: "
 
+#, python-format
 #~ msgid "Backup already exists on %(volume)s."
 #~ msgstr "Back-up bestaat reeds op %(volume)s."
 
+#, python-format
 #~ msgid "An error occurred when backing up on %(volume)s: %(inst)s."
 #~ msgstr ""
 #~ "Er gebeurde een fout tijdens het backuppen naar %(volume)s: %(inst)s."
@@ -4827,30 +6180,31 @@ msgstr "Download Foto's en Video's met Rapid Photo Downloader"
 #~ msgid "Backups overwritten on these devices: "
 #~ msgstr "Back-ups overschreven op deze apparaten: "
 
+#, python-format
 #~ msgid "Backup overwritten on %(volume)s."
 #~ msgstr "Back-up overschreven op %(volume)s."
 
+#, python-format
 #~ msgid "An error occurred when creating directories on %(volume)s: %(inst)s."
 #~ msgstr ""
-#~ "Er gebeurde een fout tijdens het aanmaken van mappen op %(volume)s: "
-#~ "%(inst)s."
+#~ "Er gebeurde een fout tijdens het aanmaken van mappen op %(volume)s: %(inst)s."
 
 #~ msgid ""
-#~ "Errors occurred when creating directories on the following backup "
-#~ "devices: "
+#~ "Errors occurred when creating directories on the following backup devices: "
 #~ msgstr ""
-#~ "Er gebeurden fouten tijdens het aanmaken van mappen op de volgende back-"
-#~ "up apparaten: "
+#~ "Er gebeurden fouten tijdens het aanmaken van mappen op de volgende back-up "
+#~ "apparaten: "
 
+#, python-format
 #~ msgid ""
-#~ "File verification failed on %(volume)s. The backed up version is "
-#~ "different from the downloaded version."
+#~ "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 gedownloadde."
+#~ "Bestandscontrole mislukt op %(volume)s. De gebackupde versie verschilt van "
+#~ "de gedownloadde."
 
-#~ msgid ""
-#~ "An error occurred when copying the %(filetype)s, but it was backed up"
+#, python-format
+#~ msgid "An error occurred when copying the %(filetype)s, but it was backed up"
 #~ msgstr ""
 #~ "Er gebeurde een fout tijdens het kopiëren van %(filetype)s, maar het werd "
 #~ "gebackupped"
@@ -4867,6 +6221,7 @@ msgstr "Download Foto's en Video's met Rapid Photo Downloader"
 #~ msgid "Check All Videos"
 #~ msgstr "Alle video's aanvinken"
 
+#, python-format
 #~ msgid "No backup device contains a valid folder for backing up %(filetype)s"
 #~ msgstr ""
 #~ "Geen enkel back-up apparaat bevat een geldige folder om %(filetype)s te "
diff --git a/po/nn.po b/po/nn.po
index a1e0959..6c673f7 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -7,35 +7,435 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: damonlynch@gmail.com\n"
-"POT-Creation-Date: 2017-07-08 19:16-0500\n"
-"PO-Revision-Date: 2017-07-04 11:06+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2017-09-12 17:01-0400\n"
+"PO-Revision-Date: 2017-09-13 18:32+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: Norwegian Nynorsk <nn@li.org>\n"
-"Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-07-05 23:04+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-09-26 22:04+0000\n"
+"X-Generator: Launchpad (build 18463)\n"
+"Language: nn\n"
 
-#. type: QPushButton
-#: ../raphodo/aboutdialog.py:217
-msgid "Credits"
+#: ../install.py:65
+msgid "Rapid Photo Downloader installer"
+msgstr "Rapid Photo Downloader-installasjonsskript"
+
+#: ../install.py:66
+msgid "Download and install latest version of Rapid Photo Downloader."
+msgstr "Last ned og installer siste utgåve av Rapid Photo Downloader."
+
+#: ../install.py:236 ../install.py:1732
+msgid "Installer not found:"
+msgstr "Fann ikkje installasjonsskriptet:"
+
+#. Translators: do not translate the term tar.gz
+#: ../install.py:240 ../install.py:1736
+msgid "Installer not in tar.gz format:"
+msgstr "Installasjonsskriptet er ikkje i tar.gz-format:"
+
+#: ../install.py:465
+msgid ""
+"Incorrect folder ownership detected. Changing ownership of and resetting "
+"permissions for"
 msgstr ""
+"Fann feil mappeeigar. Endrar eigarskap og nullstiller tillatingar for"
 
-#: ../raphodo/backuppanel.py:239
-msgid "Backups are not configured"
+#: ../install.py:540
+msgid "The following command will be run:"
+msgstr "Køyrar følgjande kommando:"
+
+#: ../install.py:543 ../install.py:1479 ../install.py:1484
+msgid "sudo may prompt you for the sudo password."
+msgstr "«sudo» spør deg kanskje om passordet ditt."
+
+#: ../install.py:547
+msgid "Would you like to run the command now?"
+msgstr "Vil du køyra kommandoen no?"
+
+#: ../install.py:549
+msgid "Answer is not yes, exiting."
+msgstr "Svaret er ikkje ja, avsluttar."
+
+#: ../install.py:559 ../install.py:751 ../install.py:966
+msgid "Command failed"
+msgstr "Kommandoen feila"
+
+#: ../install.py:561 ../install.py:752 ../install.py:967
+msgid "Exiting"
+msgstr "Avsluttar"
+
+#: ../install.py:582
+msgid "The Universe repository must be enabled."
+msgstr "Pakkelageret «Universe» må vera skrudd på."
+
+#: ../install.py:606
+msgid ""
+"Do you want to to uninstall the previous version of Rapid Photo Downloader:"
+msgstr "Vil du avinstallera tidlegare utgåver av Rapid Photo Downloader:"
+
+#: ../install.py:715 ../install.py:740
+msgid ""
+"Querying package system to see if an older version of Rapid Photo Downloader "
+"is installed (this may take a while)..."
+msgstr ""
+"Spør pakkesystemet om ei eldre utgåve av Rapid Photo Downloader er "
+"installert (dette kan ta ein stund) …"
+
+#: ../install.py:726
+msgid ""
+"Unable to query package system. Please check your Internet connection and "
+"try again"
+msgstr ""
+"Klarte ikkje å spørja pakkesystemet. Sjekk om du er tilkopla Internett og "
+"prøv igjen"
+
+#: ../install.py:756
+msgid "Checking if previous version installed with pip..."
+msgstr "Sjekkar om førre utgåve var installert med pip …"
+
+#: ../install.py:850
+msgid "The following package is unknown on your system: {}\n"
+msgstr "Følgjande pakke er ukjend på systemet ditt: {}\n"
+
+#: ../install.py:857 ../install.py:929 ../install.py:974
+msgid ""
+"To continue, some packages required to run the application will be installed."
+msgstr ""
+"For å gå vidare, må me installera visse pakker som krevst for å køyra "
+"programmet."
+
+#: ../install.py:886
+msgid "Querying installed and available packages (this may take a while)"
+msgstr ""
+"Spør etter installerte og tilgjengelege pakker (dette kan ta ei stund)"
+
+#: ../install.py:958
+msgid ""
+"Querying zypper to see if any required packages are already installed (this "
+"may take a while)... "
+msgstr ""
+"Spør zypper om nokon av pakkene me treng allereie er installerte (dette kan "
+"ta ei stund) … "
+
+#: ../install.py:1004
+msgid "Query to confirm action at each step."
+msgstr "Spør om å stadfesta handlinga ved kvart steg."
+
+#: ../install.py:1011
+msgid ""
+"When downloading the latest version, install the development version if it "
+"is newer than the stable version."
+msgstr ""
+"Installer utviklingsutgåva viss ho er nyare enn den stabile utgåva når me "
+"lastar ned nyaste utgåve."
+
+#: ../install.py:1020
+msgid ""
+"Optional tar.gz Rapid Photo Downloader installer archive. If not specified, "
+"the latest version is downloaded from the Internet."
+msgstr ""
+"Valfritt tar.gz-arkiv av Rapid Photo Downloader. Utan dette hentar me nyaste "
+"utgåve frå Internett."
+
+#: ../install.py:1043
+msgid ""
+"Do not run the installer in the tar.gz Rapid Photo Downloader installer "
+"archive if it is newer than this version ({}). The default is to run "
+"whichever installer is newer."
+msgstr ""
+"Ikkje køyr installasjonsskriptet i tar.gz-arkivet av Rapid Photo Downloader "
+"viss det er nyare enn denne utgåva ({}). Det vanlege er å installera nyaste "
+"utgåve."
+
+#: ../install.py:1050
+msgid ""
+"Uninstall Rapid Photo Downloader that was installed with pip, keeping its "
+"dependencies."
+msgstr ""
+"Fjern utgåva av Rapid Photo Downloader som blei installert av pip, men la "
+"avhengigheitene vera."
+
+#: ../install.py:1054
+msgid ""
+"Uninstall the dependencies installed by pip during Rapid Photo Downloader's "
+"installation, and Rapid Photo Downloader itself, then exit."
+msgstr ""
+"Fjern avhengigheitene installert av pip ved installering av Rapid Photo "
+"Downloader, og Rapid Photo Downloader sjølv, og avslutt."
+
+#: ../install.py:1059
+msgid ""
+"Note: this will not uninstall any version of Rapid Photo Downloader "
+"installed by your Linux distribution's package manager."
+msgstr ""
+"Merk: Dette vil ikkje fjerna ei eventuell utgåve av Rapid Photo Downloader "
+"installert av pakkesystemet til Linux-distribusjonen din."
+
+#: ../install.py:1066
+msgid ""
+"Dependencies will only be removed if they are not required by other programs."
+msgstr ""
+"Avhengigheiter blir berre fjerna viss dei ikkje krevst av noko anna program."
+
+#: ../install.py:1072
+msgid ""
+"Note: this option will remove the dependencies regardless of whether they "
+"are required by another program pip has installed. Upgrade to pip 9.0 or "
+"above if you want to avoid this behavior. You can do so using the command "
+"'python3 -m pip install pip -U --user'. Also note that any version of Rapid "
+"Photo Downloader installed by your Linux distribution's package manager will "
+"not be uninstalled."
+msgstr ""
+"Merk: Dette valet fjernar avhengigheiter uansett om dei krevst av eit anna "
+"program som pip har installert. Oppgrader til pip 9.0 eller seinare viss du "
+"vil unngå dette. Du kan gjera det med kommandoen «python3 -m pip install pip "
+"-U --user». Merk òg at eventuelle utgåver av Rapid Photo Downloader "
+"installert av pakkesystemet til Linux-distribusjonen din ikkje vil bli "
+"fjerna."
+
+#: ../install.py:1122
+msgid "Failed to download versions file"
+msgstr "Klarte ikkje å lasta ned utgåvefila"
+
+#: ../install.py:1126
+msgid "Got error code {} while accessing versions file"
+msgstr "Fekk feilkode {} ved henting av utgåvefila"
+
+#: ../install.py:1234
+msgid ""
+"Sorry, could not locate installer. Please check your Internet connection and "
+"verify if you can reach https://www.damonlynch.net\n"
+"\n"
+"Exiting.\n"
+msgstr ""
+"Orsak, klarte ikkje finna installeringsprogrammet. Sjekk nettilkoplinga di "
+"og stadfest at du kan opna sida https://www.damonlynch.net\n"
+
+#: ../install.py:1408
+msgid "Installing application requirements..."
+msgstr "Installerer applikasjonskrav …"
+
+#: ../install.py:1424
+msgid "Received error code"
+msgstr "Fekk feilkode"
+
+#: ../install.py:1425
+msgid "Failed to install application requirements: exiting"
+msgstr "Klarte ikkje installera applikasjonskrav; avsluttar"
+
+#: ../install.py:1428
+msgid "Installing application..."
+msgstr "Installerer applikasjonen …"
+
+#: ../install.py:1441
+msgid "Failed to install application: exiting..."
+msgstr "Klarte ikkje installera applikasjonen; avsluttar …"
+
+#: ../install.py:1465
+msgid ""
+"You may have to restart the computer to be able to run the program from the "
+"commmand line or application launcher."
+msgstr ""
+"Du må kanskje omstarta maskinen for å kunna køyra programmet frå "
+"kommandolinja eller programstartaren."
+
+#: ../install.py:1476
+msgid "Do you want to install the application's man pages?"
+msgstr "Vil du installera manualsidene til programmet?"
+
+#: ../install.py:1477
+msgid "They will be installed into {}"
+msgstr "Dei blir installerte til {}"
+
+#: ../install.py:1478 ../install.py:1483
+msgid "If you uninstall the application, remove these manpages yourself."
+msgstr "Viss du fjernar programmet, må du fjerna manualsidene sjølv."
+
+#: ../install.py:1480
+msgid "Do want to install the man pages?"
+msgstr "Vil du installera manualsidene?"
+
+#: ../install.py:1482
+msgid "Installing man pages into {}"
+msgstr "Installerer manualsidene til {}"
+
+#: ../install.py:1499
+msgid "Failed to create man page directory: exiting"
+msgstr "Klarte ikkje oppretta manual-mappa; avsluttar"
+
+#: ../install.py:1511
+msgid "Failed to copy man page."
+msgstr "Klarte ikkje kopiera manualsidene."
+
+#: ../install.py:1521
+msgid "(If a segmentation fault occurs at exit, you can ignore it...)"
+msgstr ""
+
+#: ../install.py:1534
+msgid ""
+"The python3 tool pip is required to uninstall a version of Rapid Photo "
+"Downloader that was installed with pip.\n"
+"Cannot continue. Exiting."
+msgstr ""
+"Me treng python3-verktøyet pip for å avinstallera ei utgåve av Rapid Photo "
+"Downloader tidlegare installert med pip.\n"
+"Kan ikkje fortsetja. Avsluttar."
+
+#: ../install.py:1575
+msgid ""
+"Do not run this installer script as sudo / root user.\n"
+"Run it using the user who will run the program.\n"
+msgstr ""
+"Ikkje køyr installasjonsskriptet som sudo / rotbrukar.\n"
+"Køyr det som brukaren som skal køyra programmet.\n"
+
+#: ../install.py:1585 ../install.py:1599
+msgid "Do not include any other command line arguments when specifying"
+msgstr "Ikkje inkluder andre kommandolinjeargument ved spesifisering av"
+
+#: ../install.py:1614
+msgid ""
+"Sorry, this installer does not support a custom python installation.\n"
+"Exiting..."
+msgstr ""
+"Orsak, installasjonsskriptet kan ikkje bruka ein sjølvvalt python-"
+"installasjon.\n"
+"Avsluttar …"
+
+#: ../install.py:1620
+msgid "Restarting script using system python..."
+msgstr ""
+
+#: ../install.py:1651
+msgid "Exiting..."
+msgstr "Avsluttar …"
+
+#. Translators: do not translate the term python3-apt
+#: ../install.py:1670
+msgid "To continue, the package python3-apt must be installed."
+msgstr "For å fortsetja må pakka python3-apt vera installert."
+
+#: ../install.py:1689
+msgid ""
+"Install the following packages using your Linux distribution's standard "
+"package manager, and then rerun this installer"
+msgstr ""
+
+#: ../install.py:1698
+msgid ""
+"To run this program, programs to assist Python 3 and its package management "
+"must be installed."
+msgstr ""
+"For å køyra dette programmet, treng me å installera program for å støtta "
+"pakkehandteringa til Python 3."
+
+#. Translators: do not translate the terms Python 3, pip and setuptools
+#: ../install.py:1713
+msgid "Python 3's pip and setuptools must be upgraded for your user."
+msgstr ""
+"Python 3-verktøya pip og setuptools må oppgraderast for brukaren din."
+
+#. Translators: do not translate the term python or requests
+#: ../install.py:1726
+msgid "Installing python requests"
+msgstr "Installerer python requests"
+
+#: ../upgrade.py:79
+msgid "Upgrade Rapid Photo Downloader"
+msgstr "Oppgrader Rapid Photo Downloader"
+
+#: ../upgrade.py:401 ../raphodo/viewutils.py:242
+msgid "&Cancel"
+msgstr "&Avbryt"
+
+#: ../upgrade.py:405
+msgid "&Upgrade"
+msgstr "&Oppgrader"
+
+#: ../upgrade.py:410
+#, python-format
+msgid "Click the Upgrade button to upgrade to version %s."
+msgstr "Klikk Oppgrader-knappen for å oppgradera til utgåve %s."
+
+#: ../upgrade.py:413
+msgid "Click the Upgrade button to start the upgrade."
+msgstr "Klikk Oppgrader-knappen for å begynna å oppgradera."
+
+#: ../upgrade.py:416 ../upgrade.py:422 ../raphodo/viewutils.py:241
+msgid "&Close"
+msgstr "&Lukk"
+
+#: ../upgrade.py:417
+msgid "&Run"
+msgstr "&Køyr"
+
+#: ../upgrade.py:447
+msgid "Close Rapid Photo Downloader before running this upgrade"
+msgstr "Lukk Rapid Photo Downloader før du oppgraderer"
+
+#: ../upgrade.py:450
+msgid "Upgrade running..."
+msgstr "Oppgraderer …"
+
+#: ../upgrade.py:486
+#, python-format
+msgid ""
+"Successfully upgraded to %s. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+"Ferdig å oppgradera til %s. Klikk Lukk for å avslutta, eller Køyr for å "
+"starta programmet."
+
+#: ../upgrade.py:491
+msgid ""
+"Upgrade finished successfully. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+"Ferdig å oppgradera. Klikk Lukk for å avslutta, eller Køyr for å starta "
+"programmet."
+
+#: ../upgrade.py:495
+msgid "Upgrade failed. Click Close to exit."
+msgstr "Feil ved oppgradering. Klikk Lukk for å avslutta."
+
+#: ../upgrade.py:6967
+#, python-format
+msgid "Upgrading %s..."
+msgstr ""
+
+#: ../upgrade.py:6969
+msgid "Press any key to continue..."
 msgstr ""
 
-#: ../raphodo/backuppanel.py:241
+#: ../upgrade.py:6982
+msgid "Rapid Photo Downloader upgrade failed"
+msgstr ""
+
+#: ../upgrade.py:6984
+#, python-format
+msgid ""
+"The python package %s could not be updated. The upgrade cannot continue."
+msgstr ""
+
+#: ../raphodo/aboutdialog.py:225
+msgid "Credits"
+msgstr "Medverkande"
+
+#: ../raphodo/backuppanel.py:240
+msgid "Backups are not configured"
+msgstr "Tryggleikkopiering er ikkje konfigurert"
+
+#: ../raphodo/backuppanel.py:242
 msgid "No backup devices detected"
 msgstr "Fann ingen einingar for tryggleikskopiering"
 
-#: ../raphodo/backuppanel.py:243
+#: ../raphodo/backuppanel.py:244
 msgid "Valid backup locations not yet specified"
-msgstr ""
+msgstr "Ingen gyldige stader for tryggleikskopiar spesifisert"
 
-#: ../raphodo/backuppanel.py:401
+#: ../raphodo/backuppanel.py:404
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
@@ -43,264 +443,350 @@ msgstr ""
 "Du kan ta tryggleikskopi av bilete og videoar til fleire stader når du "
 "lastar ned, t.d. til eksterne harddisker."
 
-#: ../raphodo/backuppanel.py:407
+#: ../raphodo/backuppanel.py:412
 msgid "Back up photos and videos when downloading"
 msgstr "Ta tryggleikskopi av bilete og videoar ved nedlasting"
 
-#: ../raphodo/backuppanel.py:413
+#: ../raphodo/backuppanel.py:418
 msgid "Automatically detect backup devices"
 msgstr "Oppdag einingar for tryggleikskopiering automatisk"
 
-#: ../raphodo/backuppanel.py:417
+#: ../raphodo/backuppanel.py:424
 msgid ""
-"Specify the folder in which backups are stored on the device."
-"<br><br><i>Note: the presence of a folder with this name is used to "
+"Specify the folder in which backups are stored on the "
+"device.<br><br><i>Note: the presence of a folder with this name is used to "
 "determine if 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 folder names. By "
 "adding both folders, the same device can be used to back up both photos and "
 "videos.</i>"
 msgstr ""
+"Vel mappa som tryggleikskopiar skal lagrast til på eininga.<br><br><i>Merk: "
+"Me ser om mappa finst eller ikkje for å avgjera om me skal ta kopien. For "
+"alle einingar du vil kopiera til må du altså oppretta ei mappe på eininga "
+"med eitt av desse namna. Ved å legga til mapper kan same eininga brukast til "
+"å tryggleikskopiera både bilete og videoar.</i>"
 
-#: ../raphodo/backuppanel.py:428
+#: ../raphodo/backuppanel.py:439
 msgid "Photo folder name:"
-msgstr ""
+msgstr "Bilet-mappenamn:"
 
-#: ../raphodo/backuppanel.py:433
+#: ../raphodo/backuppanel.py:444
 msgid "Video folder name:"
-msgstr ""
+msgstr "Video-mappenamn:"
 
-#: ../raphodo/backuppanel.py:438 ../raphodo/nameeditor.py:883
+#: ../raphodo/backuppanel.py:449 ../raphodo/nameeditor.py:890
 #: ../raphodo/renamepanel.py:123
 msgid "Example:"
-msgstr ""
+msgstr "Døme:"
 
-#: ../raphodo/backuppanel.py:448
-msgid "If you disable automatic detection, choose the exact backup locations."
+#: ../raphodo/backuppanel.py:460
+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."
 
-#: ../raphodo/backuppanel.py:452
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:468
 msgid "Photo backup location:"
 msgstr "Ta tryggleikskopi av bilete til:"
 
-#: ../raphodo/backuppanel.py:454
+#: ../raphodo/backuppanel.py:474
 msgid "Select Photo Backup Location"
-msgstr ""
+msgstr "Vel stad for tryggleikskopiar av bilete"
 
-#: ../raphodo/backuppanel.py:460
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:485
 msgid "Video backup location:"
 msgstr "Ta tryggleikskopi av videoar til:"
 
-#: ../raphodo/backuppanel.py:462
+#: ../raphodo/backuppanel.py:491
 msgid "Select Video Backup Location"
-msgstr ""
+msgstr "Vel stad for tryggleikskopiar av videoar"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:564
+#: ../raphodo/backuppanel.py:595
 msgid "drive1"
-msgstr ""
+msgstr "lagringseining1"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:567
+#: ../raphodo/backuppanel.py:598
 msgid "drive2"
-msgstr ""
+msgstr "lagringseining2"
 
-#: ../raphodo/backuppanel.py:628
+#: ../raphodo/backuppanel.py:663
 msgid "Projected Backup Storage Use"
-msgstr ""
+msgstr "Anslått lagringsbruk for tryggleikskopiering."
 
-#: ../raphodo/backuppanel.py:632
+#: ../raphodo/backuppanel.py:669
 msgid "Backup Options"
-msgstr ""
+msgstr "Val for tryggleikskopiering"
 
 #. translators: refers to the video thumbnail file that some
 #. cameras generate -- it has a .THM file extension
-#: ../raphodo/copyfiles.py:476
+#: ../raphodo/copyfiles.py:491
 msgid "video THM"
-msgstr ""
+msgstr "video-THM"
 
-#: ../raphodo/copyfiles.py:482
+#: ../raphodo/copyfiles.py:497
 msgid "audio"
-msgstr ""
+msgstr "lyd"
 
 #: ../raphodo/destinationdisplay.py:78 ../raphodo/devicedisplay.py:1079
-#: ../raphodo/rpdfile.py:321
+#: ../raphodo/rpdfile.py:342
 #, python-format
 msgid "%(no_photos)s Photos"
-msgstr ""
+msgstr "%(no_photos)s Bilete"
 
 #: ../raphodo/destinationdisplay.py:82 ../raphodo/devicedisplay.py:1081
-#: ../raphodo/rpdfile.py:316
+#: ../raphodo/rpdfile.py:333
 #, python-format
 msgid "%(no_videos)s Videos"
-msgstr ""
+msgstr "%(no_videos)s Videoar"
 
 #: ../raphodo/destinationdisplay.py:92
 msgid "Used"
-msgstr ""
+msgstr "Brukt"
 
 #: ../raphodo/destinationdisplay.py:93
 msgid "Excess"
-msgstr ""
+msgstr "Overflødig"
 
 #: ../raphodo/destinationdisplay.py:102
 msgid "Device size unknown"
-msgstr ""
+msgstr "Ukjend einingsstorleik"
 
 #: ../raphodo/destinationdisplay.py:112
 #, python-format
 msgid "No space free on %(size_total)s device"
-msgstr ""
+msgstr "Ingen meir fri diskplass på eining med %(size_total)s"
 
 #: ../raphodo/destinationdisplay.py:119
 #, python-format
 msgid "%(size_free)s free of %(size_total)s"
-msgstr ""
+msgstr "%(size_free)s ledig av %(size_total)s"
 
 #: ../raphodo/destinationdisplay.py:190 ../raphodo/devicedisplay.py:993
-#: ../raphodo/rapid.py:1964 ../raphodo/rapid.py:2079 ../raphodo/rapid.py:5753
-#: ../raphodo/rpdfile.py:905
+#: ../raphodo/rapid.py:2023 ../raphodo/rapid.py:2151 ../raphodo/rapid.py:6043
+#: ../raphodo/rpdfile.py:930
 msgid "Photos"
-msgstr ""
+msgstr "Bilete"
 
 #. translators: the name of the Videos folder
 #: ../raphodo/destinationdisplay.py:191 ../raphodo/devicedisplay.py:994
-#: ../raphodo/rapid.py:1967 ../raphodo/rapid.py:2080 ../raphodo/rapid.py:5754
-#: ../raphodo/rpdfile.py:933 ../raphodo/storage.py:445
+#: ../raphodo/rapid.py:2028 ../raphodo/rapid.py:2152 ../raphodo/rapid.py:6044
+#: ../raphodo/rpdfile.py:958 ../raphodo/storage.py:449
 msgid "Videos"
-msgstr ""
+msgstr "Videoar"
 
 #: ../raphodo/destinationdisplay.py:192
 msgid "Projected storage use after download"
-msgstr ""
+msgstr "Anslått lagringsbruk etter nedlasting"
 
-#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:516
+#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:521
 msgid "Custom..."
-msgstr ""
+msgstr "Tilpassa …"
 
 #: ../raphodo/destinationdisplay.py:678
 msgid "Configure photo subfolder creation"
-msgstr ""
+msgstr "Set opp oppretting av biletundermapper"
 
 #: ../raphodo/destinationdisplay.py:680
 msgid "Configure video subfolder creation"
-msgstr ""
+msgstr "Set opp oppretting av videoundermapper"
 
 #: ../raphodo/devicedisplay.py:983
 msgid "Other"
-msgstr ""
+msgstr "Anna"
 
 #: ../raphodo/devicedisplay.py:984
 msgid "Probing device..."
-msgstr ""
+msgstr "Undersøkjer eining …"
 
 #: ../raphodo/devicedisplay.py:1000
 msgid "Temporarily ignore this device"
-msgstr ""
+msgstr "Ignorer denne eininga mellombels"
 
 #: ../raphodo/devicedisplay.py:1002
 msgid "Permanently ignore this device"
-msgstr ""
+msgstr "Ignorer denne eininga permanent"
 
 #: ../raphodo/devicedisplay.py:1004
 msgid "Rescan"
-msgstr ""
+msgstr "Skann på nytt"
 
 #. Translators: percentage full e.g. 75% full
 #: ../raphodo/devicedisplay.py:1093
 #, python-format
 msgid "%s full"
-msgstr ""
+msgstr "%s full"
 
-#: ../raphodo/devices.py:459
+#: ../raphodo/devices.py:463
 msgid "Cameras"
-msgstr ""
+msgstr "Kamera"
 
-#: ../raphodo/devices.py:460 ../raphodo/devices.py:920
-#: ../raphodo/preferencedialog.py:85 ../raphodo/rapid.py:1927
+#: ../raphodo/devices.py:464 ../raphodo/devices.py:927
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/rapid.py:1979
 msgid "Devices"
 msgstr "Einingar"
 
-#: ../raphodo/devices.py:720
+#: ../raphodo/devices.py:724
 #, python-format
 msgid "Downloading from %(device_names)s"
-msgstr ""
+msgstr "Lastar ned frå %(device_names)s"
 
 #. Translators: e.g. Three Devices
-#: ../raphodo/devices.py:780
+#: ../raphodo/devices.py:784
 #, python-format
 msgid "%(no_devices)s %(device_type)s"
-msgstr ""
+msgstr "%(no_devices)s %(device_type)s"
 
-#: ../raphodo/devices.py:905 ../raphodo/rapid.py:1764
+#: ../raphodo/devices.py:912 ../raphodo/rapid.py:1807
 msgid "Select Source"
-msgstr ""
+msgstr "Vel kjelde"
 
-#: ../raphodo/devices.py:936 ../raphodo/devices.py:947
+#: ../raphodo/devices.py:943 ../raphodo/devices.py:954
 #, python-format
 msgid "%(device1)s + %(device2)s"
-msgstr ""
+msgstr "%(device1)s + %(device2)s"
 
 #. Number of cameras e.g. 3 Cameras
-#: ../raphodo/devices.py:958
+#: ../raphodo/devices.py:965
 #, python-format
 msgid "%(no_cameras)s Cameras"
-msgstr ""
+msgstr "%(no_cameras)s kamera"
 
-#: ../raphodo/devices.py:963
+#: ../raphodo/devices.py:970
 #, python-format
 msgid "%(no_devices)s Devices"
-msgstr ""
+msgstr "%(no_devices)s einingar"
 
 #. Translators: two folder names, separated by a plus sign
-#: ../raphodo/devices.py:1258
+#: ../raphodo/devices.py:1265
 #, python-format
 msgid "%s + %s"
-msgstr ""
+msgstr "%s + %s"
 
-#: ../raphodo/didyouknow.py:44
+#: ../raphodo/didyouknow.py:45
 msgid "Click on a file's checkbox to mark or unmark it for download."
 msgstr ""
+"Klikk i avkryssingsboksen for ei fil for å merkja eller avmerkja ho for "
+"nedlasting"
 
-#: ../raphodo/didyouknow.py:50
+#: ../raphodo/didyouknow.py:51
 msgid ""
 "Files that have already been downloaded are remembered. You can still mark "
 "previously downloaded files to download again, but they are unchecked by "
 "default, and their thumbnails are dimmed so you can differentiate them from "
 "files that are yet to be downloaded."
 msgstr ""
+"Filer som allereie er lasta ned, vert hugsa. Du kan enno markera tidlegare "
+"nedlasta filer for å lasta dei ned igjen, men dei er ikkje merkt som "
+"standard, og miniatyrbileta deira er dimma slik at du kan skilja dei frå "
+"filer som enno ikkje er lasta ned."
 
-#: ../raphodo/didyouknow.py:59
+#: ../raphodo/didyouknow.py:60
 msgid ""
 "If more than one file is selected, they'll all take the mark of the file "
 "whose checkbox was clicked, regardless of whether they previously had a "
 "checkmark or not."
 msgstr ""
+"Viss meir enn éi fil er valt, vil alle få merkjet til den fila som fekk eit "
+"klikk i sjekkboksen, uavhengig av om dei var kryssa av frå før av eller "
+"ikkje."
 
-#: ../raphodo/didyouknow.py:67
+#: ../raphodo/didyouknow.py:68
 msgid ""
 "Click on a device's checkbox to quickly mark or unmark all its files for "
 "downloading."
 msgstr ""
+"Klikk i avkryssingsruta for ei eining for å raskt merkja eller avmerkja alle "
+"filene på eininga for nedlasting."
+
+#: ../raphodo/didyouknow.py:75
+msgid ""
+"After a download finishes, an icon replaces the thumbnail's checkbox. The "
+"icon's color indicates whether the download was successful (green), had file "
+"renaming problems (yellow/orange), or failed (red)."
+msgstr ""
+"Etter at ei nedlasting er ferdig vil eit ikon erstatta sjekkboksen til "
+"miniatyrbiletet. Fargen på ikonet markerer om nedlastinga fullførte utan "
+"feil (grøn) eller hadde feil med namngjeving (gul/oransje) eller feila "
+"fullstendig (raud)."
+
+#: ../raphodo/didyouknow.py:83
+msgid ""
+"\n"
+"            In case of any problems, a red icon will appear at the bottom of "
+"the window\n"
+"            indicating how many error reports there are. Clicking on it "
+"opens the Error Report \n"
+"            window.\n"
+"            "
+msgstr ""
+"\n"
+"            Viss eit problem oppstår, vil eit raudt ikon visast nedst på "
+"vindauget og\n"
+"            indikera kor mange feilrapportar det er. Klikk på ikonet for å "
+"opna vindauget\n"
+"            med Feilrapportar.\n"
+"            "
+
+#: ../raphodo/didyouknow.py:91
+msgid ""
+"\n"
+"            The Error Report window lists any problems encountered before, "
+"during or after the \n"
+"            download. An orange triangle represents a warning, a red circle "
+"indicates a failure, \n"
+"            and a black circle indicates more serious failures. You can "
+"click on the hyperlinks to \n"
+"            open its file or device in a file manager. You can also search "
+"the reports using the \n"
+"            search box in the lower left of the Error Report window.\n"
+"            "
+msgstr ""
+"\n"
+"            Feilrapportvindauget viser problem funne før, under eller etter "
+"nedlasting. Ein oransje\n"
+"            trekant representerer ei åtvaring, ein raud sirkel indikerer ein "
+"feil, og ein svart\n"
+"            sirkel indikerer meir alvorlege feil. Du kan klikka på lenkjene "
+"for å opna fila eller\n"
+"            eininga i filhandsamaren. Du kan òg søkja i rapportane med "
+"søkjeboksen nede til venstre\n"
+"            i Feilrapportvindauget.\n"
+"            "
 
-#: ../raphodo/didyouknow.py:74
+#: ../raphodo/didyouknow.py:103
 msgid ""
 "You can simultaneously download from multiple cameras, smartphones, memory "
 "cards, and hard drives&mdash;as many devices as your computer can handle at "
 "one time."
 msgstr ""
+"Du kan lasta frå ned fleire kamera, smarttelefoner, minnekort og harddiskar "
+"samstundes&mdash;så mange einingar som datamaskina kan handtera på ein gong."
 
-#: ../raphodo/didyouknow.py:81
+#: ../raphodo/didyouknow.py:110
 msgid ""
 "The <b>Timeline</b> groups photos and videos based on how much time elapsed "
 "between consecutive shots. Use it to identify photos and videos taken at "
 "different periods in a single day or over consecutive days."
 msgstr ""
+"<b>Tidslinja</b> grupperer bilete og videoar basert på kor mykje tid som "
+"gjekk mellom fotografia. Bruk ho for å finna bilete og videoar teke i ulike "
+"periodar på same dag eller etterfølgande dagar."
 
-#: ../raphodo/didyouknow.py:88
+#: ../raphodo/didyouknow.py:117
 msgid ""
 "\n"
 "<p>In the illustration above, the first row of the Timeline is black because "
@@ -312,28 +798,34 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:99
+#: ../raphodo/didyouknow.py:128
 msgid ""
 "To view photos and videos for a particular time range, use the mouse "
 "(optionally in combination with the <tt>Shift</tt> or <tt>Ctrl</tt> keys) to "
 "select time periods. When a time range is selected, the Timeline button on "
 "the left side of the main window will be highlighted."
 msgstr ""
+"For å visa bilete og videoar innanfor eit bestemt tidsrom, bruk musa "
+"(alternativt i kombinasjon med tastane <tt>Shift</tt> eller <tt>Ctrl</tt>) "
+"for å velja tidsintervall. Når eit tidsrom er valt, vil tidslinjeknappen til "
+"venstre i hovudvindauget uthevast."
 
-#: ../raphodo/didyouknow.py:106
+#: ../raphodo/didyouknow.py:135
 msgid ""
 "A download always includes all files that are checked for download, "
 "including those that are not currently displayed because the Timeline is "
 "being used."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:113
+#: ../raphodo/didyouknow.py:142
 msgid ""
 "You can hide or display the download sources by clicking on the name of the "
 "device you're downloading from at the top left of the program window."
 msgstr ""
+"Du kan skjula eller visa nedlastingskjeldene ved å klikka på namnet på "
+"eininga du lastar ned frå øvst til venstre i programvindauget."
 
-#: ../raphodo/didyouknow.py:120
+#: ../raphodo/didyouknow.py:149
 msgid ""
 "\n"
 "          Thumbnails can be sorted using a variety of criteria:\n"
@@ -352,33 +844,36 @@ msgid ""
 "</ol> "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:137
+#: ../raphodo/didyouknow.py:166
 msgid ""
 "One of Rapid Photo Downloader's most useful features is its ability to "
 "automatically generate download subfolders and rename files as it downloads, "
 "using a scheme of your choosing."
 msgstr ""
+"Ein av dei meste nyttige funksjonane i Rapid Photo Downloader er at du "
+"automatisk kan generera nedlastingsundermapper og endra filnamn ved "
+"nedlasting, og bruka ei organisering som passar deg."
 
-#: ../raphodo/didyouknow.py:143
+#: ../raphodo/didyouknow.py:172
 msgid ""
 "To specify where you want your files downloaded and how you want them named, "
 "open the appropriate panel on the right-side of the application window: "
 "<b>Destination</b>, <b>Rename</b>, or <b>Job Code</b>."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:150
+#: ../raphodo/didyouknow.py:179
 msgid ""
 "\n"
 "When thinking about your download directory structure, keep in mind two "
 "different types\n"
 "of directory:\n"
 "<ol>\n"
-"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, &quot;"
-"Photos&quot;, or\n"
+"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, "
+"&quot;Photos&quot;, or\n"
 "&quot;Videos&quot;. This directory should already exist on your computer. In "
 "the illustration \n"
-"below, the destination folders are &quot;Pictures&quot; and &quot;"
-"Videos&quot;. The\n"
+"below, the destination folders are &quot;Pictures&quot; and "
+"&quot;Videos&quot;. The\n"
 "name of the destination folder is displayed in the grey bar directly above "
 "the folder tree, \n"
 "with a folder icon to its left and a gear icon to its far right.</li>\n"
@@ -391,7 +886,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:167
+#: ../raphodo/didyouknow.py:196
 msgid ""
 "\n"
 "You can download photos and videos to the same destination folder, or "
@@ -404,14 +899,18 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:177
+#: ../raphodo/didyouknow.py:206
 msgid ""
 "Automatically generated download subfolders can contain further "
 "automatically generated subfolders if need be. A common scheme is to create "
 "a year subfolder and then a series of year-month-day subfolders within it."
 msgstr ""
+"Automatiske genererte nedlastingsundermapper kan innehalda ytterlegare "
+"automatisk genererte undermapper om det trengst. Ei vanleg organisering er å "
+"laga ei årsundermappe og så ein serie undermapper med år-månad-dag under "
+"denne."
 
-#: ../raphodo/didyouknow.py:186
+#: ../raphodo/didyouknow.py:215
 msgid ""
 "\n"
 "Whenever possible, the program previews the download subfolders of photos "
@@ -429,7 +928,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:201
+#: ../raphodo/didyouknow.py:230
 msgid ""
 "\n"
 "Download subfolder names are typically generated using some or all of the "
@@ -453,7 +952,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:219
+#: ../raphodo/didyouknow.py:248
 msgid ""
 "\n"
 "To automatically create download subfolders as you download, \n"
@@ -462,8 +961,14 @@ msgid ""
 "the gear icon to bring up a drop-down menu:            \n"
 "            "
 msgstr ""
+"\n"
+"For å laga nedlastingsundermapper automatisk når du lastar ned, \n"
+"kan du bruka eit av dei innebygde forvala i Rapid Photo Downloader, eller "
+"laga eit tilpassa forval. \n"
+"Klikk på tannhjulet for å få fram ein nedtrekksmeny:            \n"
+"            "
 
-#: ../raphodo/didyouknow.py:227
+#: ../raphodo/didyouknow.py:256
 msgid ""
 "\n"
 "Using the drop-down menu, select a built-in preset or click on <b>Custom</b> "
@@ -473,20 +978,21 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:237
+#: ../raphodo/didyouknow.py:266
 msgid ""
 "It's easy to download raw images into one folder, and jpeg images into "
 "another. Simply use the <b>Filename Extension</b> as part of your download "
 "subfolder generation scheme:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:242
+#: ../raphodo/didyouknow.py:271
 msgid ""
 "This illustration shows a saved custom preset named &quot;My custom "
 "preset&quot;."
 msgstr ""
+"Denne illustrasjonen viser eit tilpassa forval kalla «My custom preset»."
 
-#: ../raphodo/didyouknow.py:246
+#: ../raphodo/didyouknow.py:275
 msgid ""
 "\n"
 "You do not have to create nested download subfolders. This illustration "
@@ -497,7 +1003,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:256
+#: ../raphodo/didyouknow.py:285
 msgid ""
 "\n"
 "Although there are many built-in date/time naming options, you may find that "
@@ -511,7 +1017,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:265
+#: ../raphodo/didyouknow.py:294
 msgid ""
 "\n"
 "Read more about all the ways you can generate download subfolder names and "
@@ -521,7 +1027,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:273
+#: ../raphodo/didyouknow.py:302
 msgid ""
 "\n"
 "<b>Job Codes</b> let you easily enter text that describes sets of photos and "
@@ -533,7 +1039,7 @@ msgid ""
 "&quot;Green Bazaar&quot;: \n"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:282
+#: ../raphodo/didyouknow.py:311
 msgid ""
 "\n"
 "You can apply new or existing Job Codes before you start a download. If "
@@ -544,36 +1050,38 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:291
+#: ../raphodo/didyouknow.py:320
 msgid "Look for hints to guide you when working with Job Codes:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:295
+#: ../raphodo/didyouknow.py:324
 msgid ""
 "Hints will vary depending on the context, such as when the mouse is hovering "
 "over a button."
 msgstr ""
+"Hinta vil variera avhengig av konteksten, til dømes når du held musepeikaren "
+"over ein knapp."
 
-#: ../raphodo/didyouknow.py:301
+#: ../raphodo/didyouknow.py:330
 msgid ""
 "\n"
 "When you give your photos and videos unique filenames, you'll never be "
 "confused as to \n"
 "which file is which. Using <b>sequence numbers</b> to make filenames unique "
 "is highly \n"
-"recommended!.\n"
+"recommended!\n"
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:309
+#: ../raphodo/didyouknow.py:338
 msgid ""
 "\n"
 "<p>Four types of sequence values are available to help you assign unique "
 "names to your photos and \n"
 "videos:\n"
 "<ol>\n"
-"<li><b>Downloads today</b>: tracks downloads completed during that day.</"
-"li>\n"
+"<li><b>Downloads today</b>: tracks downloads completed during that "
+"day.</li>\n"
 "<li><b>Stored number</b>: similar to Downloads today, but it is remembered "
 "from the last time the  \n"
 "program was run.</li>\n"
@@ -587,7 +1095,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:327
+#: ../raphodo/didyouknow.py:356
 msgid ""
 "\n"
 "The <b>Rename</b> panel allows you to configure file renaming. To rename "
@@ -595,8 +1103,14 @@ msgid ""
 "from among existing renaming presets or define your own.              \n"
 "            "
 msgstr ""
+"\n"
+"Panelet <b>Endra namn</b> lèt deg konfigurera endring av filnamn. For å gje "
+"nytt namn til filene dine, kan du velja \n"
+"blant eksisterande forval for endring av namn eller laga ditt eige forval.   "
+"           \n"
+"            "
 
-#: ../raphodo/didyouknow.py:334
+#: ../raphodo/didyouknow.py:363
 msgid ""
 "\n"
 "<p>The <b>Synchronize RAW + JPEG</b> option is useful if you use the RAW + "
@@ -615,7 +1129,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:348
+#: ../raphodo/didyouknow.py:377
 msgid ""
 "\n"
 "You can have your photos and videos backed up to multiple locations as they "
@@ -626,13 +1140,13 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:356
+#: ../raphodo/didyouknow.py:385
 msgid ""
 "In this example, the drive <b>photobackup</b> does not contain a folder "
 "named <tt>Videos</tt>, so videos will not be backed up to it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:362
+#: ../raphodo/didyouknow.py:391
 msgid ""
 "\n"
 "Several of the program's preferences can be set from the command line, "
@@ -643,7 +1157,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:372
+#: ../raphodo/didyouknow.py:396
+msgid "You can also import program preferences from the older 0.4 version."
+msgstr "Du kan òg importera programinnstillingar frå den eldre 0.4-utgåva."
+
+#: ../raphodo/didyouknow.py:401
 msgid ""
 "\n"
 "Rapid Photo Downloader deals with three types of cache:\n"
@@ -653,8 +1171,8 @@ msgid ""
 "memory cards, and other devices.</li>\n"
 "<li>A <b>temporary cache</b> of files downloaded from a camera, one for "
 "photos and another for \n"
-"videos. They are located in temporary subfolders in the download destination."
-"</li>\n"
+"videos. They are located in temporary subfolders in the download "
+"destination.</li>\n"
 "<li>The <b>desktop's thumbnail cache</b>, in which Rapid Photo Downloader "
 "stores thumbnails of \n"
 "RAW and TIFF photos once they have been downloaded. File browsers like Gnome "
@@ -669,206 +1187,208 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:431
+#: ../raphodo/didyouknow.py:460
 msgid "Tip of the Day"
-msgstr ""
+msgstr "Dagens tips"
 
-#: ../raphodo/didyouknow.py:439
+#: ../raphodo/didyouknow.py:468
 msgid "Did you know...?"
-msgstr ""
+msgstr "Visste du at …?"
 
-#: ../raphodo/didyouknow.py:466
+#: ../raphodo/didyouknow.py:495
 msgid "Show tips on startup"
-msgstr ""
+msgstr "Vis tips ved oppstart"
 
-#: ../raphodo/didyouknow.py:470
+#: ../raphodo/didyouknow.py:499
 msgid "&Next"
-msgstr ""
+msgstr "&Neste"
 
-#: ../raphodo/didyouknow.py:471
+#: ../raphodo/didyouknow.py:500
 msgid "&Previous"
-msgstr ""
+msgstr "&Førre"
 
 #: ../raphodo/downloadtracker.py:402
 msgid "MB/sec"
-msgstr ""
+msgstr "MB/sek"
 
 #. Be friendly in the last few seconds
 #: ../raphodo/downloadtracker.py:532
 msgid "A few seconds"
-msgstr ""
+msgstr "Eit par sekund"
 
 #: ../raphodo/downloadtracker.py:588
 msgid "1 second"
-msgstr ""
+msgstr "1 sekund"
 
 #: ../raphodo/downloadtracker.py:590
 #, python-format
 msgid "%d seconds"
-msgstr ""
+msgstr "%d sekund"
 
 #: ../raphodo/downloadtracker.py:595
 msgid "1 minute"
-msgstr ""
+msgstr "1 minutt"
 
 #: ../raphodo/downloadtracker.py:597
 #, python-format
 msgid "%d minutes"
-msgstr ""
+msgstr "%d minutt"
 
 #: ../raphodo/downloadtracker.py:602 ../raphodo/downloadtracker.py:784
 msgid "1 hour"
-msgstr ""
+msgstr "1 time"
 
 #: ../raphodo/downloadtracker.py:604
 #, python-format
 msgid "%d hours"
-msgstr ""
+msgstr "%d timar"
 
 #: ../raphodo/downloadtracker.py:609 ../raphodo/downloadtracker.py:813
 #: ../raphodo/downloadtracker.py:821
 msgid "1 day"
-msgstr ""
+msgstr "1 dag"
 
 #: ../raphodo/downloadtracker.py:611
 #, python-format
 msgid "%d days"
-msgstr ""
+msgstr "%d dagar"
 
 #: ../raphodo/downloadtracker.py:790
 msgid "1 minute, 1 second"
-msgstr ""
+msgstr "1 minutt, 1 sekund"
 
 #: ../raphodo/downloadtracker.py:792
 #, python-format
 msgid "1 minute, %d seconds"
-msgstr ""
+msgstr "1 minutt, %d sekund"
 
 #: ../raphodo/downloadtracker.py:795
 #, python-format
 msgid "%d minutes, 1 second"
-msgstr ""
+msgstr "%d minutt, 1 sekund"
 
 #: ../raphodo/downloadtracker.py:797
 #, python-format
 msgid "%(minutes)d minutes, %(seconds)d seconds"
-msgstr ""
+msgstr "%(minutes)d minutt, %(seconds)d sekund"
 
 #: ../raphodo/downloadtracker.py:828
 msgid "1 hour, 1 minute"
-msgstr ""
+msgstr "1 time, 1 minutt"
 
 #: ../raphodo/downloadtracker.py:830
 #, python-format
 msgid "1 hour, %d minutes"
-msgstr ""
+msgstr "1 time, %d minutt"
 
 #: ../raphodo/downloadtracker.py:833
 #, python-format
 msgid "%d hours, 1 minute"
-msgstr ""
+msgstr "%d timar, 1 minutt"
 
 #: ../raphodo/downloadtracker.py:835
 #, python-format
 msgid "%(hours)d hours, %(minutes)d minutes"
-msgstr ""
+msgstr "%(hours)d timar, %(minutes)d minutt"
 
 #: ../raphodo/downloadtracker.py:861
 msgid "1 day, 1 hour"
-msgstr ""
+msgstr "1 dag, 1 time"
 
 #: ../raphodo/downloadtracker.py:863
 #, python-format
 msgid "1 day, %d hours"
-msgstr ""
+msgstr "1 dag, %d timar"
 
 #: ../raphodo/downloadtracker.py:866
 #, python-format
 msgid "%d days, 1 hour"
-msgstr ""
+msgstr "%d dagar, 1 time"
 
 #: ../raphodo/downloadtracker.py:868
 #, python-format
 msgid "%(days)d days, %(hours)d hours"
-msgstr ""
+msgstr "%(days)d dagar, %(hours)d timar"
 
-#: ../raphodo/errorlog.py:65
+#: ../raphodo/errorlog.py:66
 msgid "Find"
-msgstr ""
+msgstr "Finn"
 
-#: ../raphodo/errorlog.py:135
+#: ../raphodo/errorlog.py:136
 msgid "Error Reports - Rapid Photo Downloader"
-msgstr ""
+msgstr "Feilrapportar – Rapid Photo Downloader"
 
-#: ../raphodo/errorlog.py:170
+#: ../raphodo/errorlog.py:171
 msgid "Find in reports"
-msgstr ""
+msgstr "Finn i rapportar"
 
-#: ../raphodo/errorlog.py:187
+#: ../raphodo/errorlog.py:188
 msgid "Find the previous occurrence of the phrase"
-msgstr ""
+msgstr "Finn den førre førekomsten av uttrykket"
 
-#: ../raphodo/errorlog.py:192
+#: ../raphodo/errorlog.py:193
 msgid "Find the next occurrence of the phrase"
-msgstr ""
+msgstr "Finn den neste førekomsten av uttrykket"
 
-#: ../raphodo/errorlog.py:194
+#: ../raphodo/errorlog.py:195
 msgid "&Highlight All"
-msgstr ""
+msgstr "&Utheva alt"
 
-#: ../raphodo/errorlog.py:195
+#: ../raphodo/errorlog.py:196
 msgid "Highlight all occurrences of the phrase"
-msgstr ""
+msgstr "Utheva alle førekomstane av uttrykket"
 
-#: ../raphodo/errorlog.py:196
+#: ../raphodo/errorlog.py:197
 msgid "&Match Case"
-msgstr ""
+msgstr "&Same små/store bokstavar"
 
-#: ../raphodo/errorlog.py:197
+#: ../raphodo/errorlog.py:198
 msgid "Search with case sensitivity"
-msgstr ""
+msgstr "Skil mellom store/små bokstavar"
 
-#: ../raphodo/errorlog.py:198
+#: ../raphodo/errorlog.py:199
 msgid "&Whole Words"
-msgstr ""
+msgstr "&Heile ord"
 
-#: ../raphodo/errorlog.py:199
+#: ../raphodo/errorlog.py:200
 msgid "Search whole words only"
-msgstr ""
+msgstr "Søk berre etter heile ord"
 
-#: ../raphodo/errorlog.py:209 ../raphodo/errorlog.py:341
+#: ../raphodo/errorlog.py:210 ../raphodo/errorlog.py:345
 #, python-format
 msgid "%s of %s matches"
-msgstr ""
+msgstr "%s av %s treff"
 
-#: ../raphodo/errorlog.py:228
+#: ../raphodo/errorlog.py:232
 msgid "Clear"
-msgstr ""
+msgstr "Fjern"
 
-#: ../raphodo/errorlog.py:328
+#: ../raphodo/errorlog.py:332
 msgid "Phrase not found"
-msgstr ""
+msgstr "Fann ikkje uttrykket"
 
-#: ../raphodo/errorlog.py:487
+#: ../raphodo/errorlog.py:491
 msgid "Search pending..."
-msgstr ""
+msgstr "Søk i gang …"
 
-#: ../raphodo/errorlog.py:535
+#: ../raphodo/errorlog.py:539
 msgid ""
 "The number of new entries added to the Error Report since it was last open. "
 "Click to open the Error Report."
 msgstr ""
+"Kor mange nye hendingar som oppstod i Feilrapporten sidan sist du opna han. "
+"Klikk for å opna Feilrapporten."
 
 #: ../raphodo/excepthook.py:77
 msgid "Problem in Rapid Photo Downloader"
-msgstr ""
+msgstr "Problem i Rapid Photo Downloader"
 
 #: ../raphodo/excepthook.py:81
 #, python-brace-format
 msgid ""
 "<b>A problem occurred in Rapid Photo Downloader</b><br><br>\n"
-"    Please report the problem at <a href=\"{website}\">{website}</a>."
-"<br><br>\n"
+"    Please report the problem at <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
 "    Attach the log file <i>{log_file}</i> to your bug report (click\n"
 "    <a href=\"{log_path}\">here</a> to open the log directory).<br><br>If "
 "the same problem occurs\n"
@@ -878,7 +1398,7 @@ msgstr ""
 
 #: ../raphodo/excepthook.py:98
 msgid "A problem occurred in Rapid Photo Downloader\n"
-msgstr ""
+msgstr "Det oppstod ein feil i Rapid Photo Downloader\n"
 
 #: ../raphodo/excepthook.py:99
 #, python-brace-format
@@ -888,562 +1408,567 @@ msgid ""
 "    Attach the log file to your bug report, found at {log_path}\n"
 "\n"
 msgstr ""
+"Ver vennleg og rapporter feilen på {website}\n"
+"\n"
+"    Legg ved loggfila i feilrapporten din, funne i {log_path}\n"
+"\n"
 
-#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1601
+#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1643
 msgid "Open in File Browser..."
-msgstr ""
+msgstr "Opna i filhandsamar …"
 
 #: ../raphodo/foldercombo.py:120
 msgid "File System"
-msgstr ""
+msgstr "Filsystem"
 
 #: ../raphodo/foldercombo.py:157
 msgid "Other..."
-msgstr ""
+msgstr "Andre …"
 
 #. Translators: indicate in combobox that a path does not exist
 #: ../raphodo/foldercombo.py:235
 #, python-format
 msgid "%s (location does not exist)"
-msgstr ""
+msgstr "%s (staden finst ikkje)"
 
-#: ../raphodo/generatenameconfig.py:186
+#: ../raphodo/generatenameconfig.py:190
 msgid "Date time"
 msgstr "Dato tid"
 
-#: ../raphodo/generatenameconfig.py:187
+#: ../raphodo/generatenameconfig.py:191
 msgid "Text"
 msgstr "Tekst"
 
-#: ../raphodo/generatenameconfig.py:188 ../raphodo/rapid.py:2053
+#: ../raphodo/generatenameconfig.py:192 ../raphodo/rapid.py:2125
 msgid "Filename"
 msgstr "Filnamn"
 
-#: ../raphodo/generatenameconfig.py:189 ../raphodo/preferencedialog.py:488
+#: ../raphodo/generatenameconfig.py:193 ../raphodo/preferencedialog.py:724
 msgid "Metadata"
 msgstr "Metadata"
 
-#: ../raphodo/generatenameconfig.py:190
+#: ../raphodo/generatenameconfig.py:194
 msgid "Sequences"
 msgstr "Sekvensar"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: ../raphodo/generatenameconfig.py:193
+#: ../raphodo/generatenameconfig.py:197
 msgid "Job code"
-msgstr "Jobbnamn"
+msgstr "Oppdragsnamn"
 
-#: ../raphodo/generatenameconfig.py:194
+#: ../raphodo/generatenameconfig.py:198
 msgid "Image date"
 msgstr "Biletdato"
 
-#: ../raphodo/generatenameconfig.py:195
+#: ../raphodo/generatenameconfig.py:199
 msgid "Video date"
 msgstr "Videodato"
 
-#: ../raphodo/generatenameconfig.py:196
+#: ../raphodo/generatenameconfig.py:200
 msgid "Today"
 msgstr "Idag"
 
-#: ../raphodo/generatenameconfig.py:197
+#: ../raphodo/generatenameconfig.py:201
 msgid "Yesterday"
 msgstr "Igår"
 
 #. Translators: Download time is the time and date that the download started (when the
 #. user clicked the Download button)
-#: ../raphodo/generatenameconfig.py:200
+#: ../raphodo/generatenameconfig.py:204
 msgid "Download time"
 msgstr "Nedlastingstidspunkt"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:203
+#: ../raphodo/generatenameconfig.py:207
 msgid "Name"
 msgstr "Namn"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:206 ../raphodo/rapid.py:2054
+#: ../raphodo/generatenameconfig.py:210 ../raphodo/rapid.py:2126
 msgid "Extension"
 msgstr "Filtype"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:209
+#: ../raphodo/generatenameconfig.py:213
 msgid "Image number"
 msgstr "Bilettal"
 
-#: ../raphodo/generatenameconfig.py:210
+#: ../raphodo/generatenameconfig.py:214
 msgid "Video number"
 msgstr "Videotal"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:213
+#: ../raphodo/generatenameconfig.py:217
 msgid "Aperture"
 msgstr "Blenderopning"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:216
+#: ../raphodo/generatenameconfig.py:220
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:219
+#: ../raphodo/generatenameconfig.py:223
 msgid "Exposure time"
 msgstr "Lukketid"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:222
+#: ../raphodo/generatenameconfig.py:226
 msgid "Focal length"
 msgstr "Brennvidde"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:225
+#: ../raphodo/generatenameconfig.py:229
 msgid "Camera make"
 msgstr "Kameramerke"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:228
+#: ../raphodo/generatenameconfig.py:232
 msgid "Camera model"
 msgstr "Kameramodell"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:231
+#: ../raphodo/generatenameconfig.py:235
 msgid "Short camera model"
 msgstr "Kort kameramodell"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:234
+#: ../raphodo/generatenameconfig.py:238
 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
-#: ../raphodo/generatenameconfig.py:237
+#: ../raphodo/generatenameconfig.py:241
 msgid "Serial number"
 msgstr "Serienummer"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:240
+#: ../raphodo/generatenameconfig.py:244
 msgid "Shutter count"
 msgstr "Eksponeringsteljar"
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: ../raphodo/generatenameconfig.py:242
+#: ../raphodo/generatenameconfig.py:246
 msgid "File number"
 msgstr "Filnummer"
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:244
+#: ../raphodo/generatenameconfig.py:248
 msgid "Folder only"
 msgstr "Berre mappa"
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:246
+#: ../raphodo/generatenameconfig.py:250
 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
-#: ../raphodo/generatenameconfig.py:249
+#: ../raphodo/generatenameconfig.py:253
 msgid "Owner name"
 msgstr "Namn på eigar"
 
-#: ../raphodo/generatenameconfig.py:250
+#: ../raphodo/generatenameconfig.py:254
 msgid "Codec"
 msgstr "Kodek"
 
-#: ../raphodo/generatenameconfig.py:251
+#: ../raphodo/generatenameconfig.py:255
 msgid "Width"
 msgstr "Breidd"
 
-#: ../raphodo/generatenameconfig.py:252
+#: ../raphodo/generatenameconfig.py:256
 msgid "Height"
 msgstr "Høgd"
 
-#: ../raphodo/generatenameconfig.py:253
+#: ../raphodo/generatenameconfig.py:257
 msgid "Length"
 msgstr "Lengd"
 
-#: ../raphodo/generatenameconfig.py:254
+#: ../raphodo/generatenameconfig.py:258
 msgid "Frames Per Second"
 msgstr "Bilet per sekund"
 
-#: ../raphodo/generatenameconfig.py:255
+#: ../raphodo/generatenameconfig.py:259
 msgid "Artist"
 msgstr "Kunstnar"
 
-#: ../raphodo/generatenameconfig.py:256
+#: ../raphodo/generatenameconfig.py:260
 msgid "Copyright"
 msgstr "Opphavsrett"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:259
+#: ../raphodo/generatenameconfig.py:263
 msgid "Downloads today"
 msgstr "Nedlastingar idag"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:262
+#: ../raphodo/generatenameconfig.py:266
 msgid "Session number"
 msgstr "Øktteljar"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:265
+#: ../raphodo/generatenameconfig.py:269
 msgid "Subfolder number"
 msgstr "Undermappeteljar"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:268
+#: ../raphodo/generatenameconfig.py:272
 msgid "Stored number"
 msgstr "Lagra tal"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: ../raphodo/generatenameconfig.py:271
+#: ../raphodo/generatenameconfig.py:275
 msgid "Sequence letter"
 msgstr "Sekvensbokstav"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:274
+#: ../raphodo/generatenameconfig.py:278
 msgid "All digits"
 msgstr "Alle tal"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:277
+#: ../raphodo/generatenameconfig.py:281
 msgid "Last digit"
 msgstr "Siste tal"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:280
+#: ../raphodo/generatenameconfig.py:284
 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
-#: ../raphodo/generatenameconfig.py:283
+#: ../raphodo/generatenameconfig.py:287
 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
-#: ../raphodo/generatenameconfig.py:286
+#: ../raphodo/generatenameconfig.py:290
 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
-#: ../raphodo/generatenameconfig.py:289
+#: ../raphodo/generatenameconfig.py:293
 msgid "Original Case"
 msgstr "Opphavleg Versalisering"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:292
+#: ../raphodo/generatenameconfig.py:296
 msgid "UPPERCASE"
 msgstr "STORE BOKSTAVAR"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:295
+#: ../raphodo/generatenameconfig.py:299
 msgid "lowercase"
 msgstr "små bokstavar"
 
-#: ../raphodo/generatenameconfig.py:296
+#: ../raphodo/generatenameconfig.py:300
 msgid "One digit"
 msgstr "Eitt tal"
 
-#: ../raphodo/generatenameconfig.py:297
+#: ../raphodo/generatenameconfig.py:301
 msgid "Two digits"
 msgstr "To tal"
 
-#: ../raphodo/generatenameconfig.py:298
+#: ../raphodo/generatenameconfig.py:302
 msgid "Three digits"
 msgstr "Tre tal"
 
-#: ../raphodo/generatenameconfig.py:299
+#: ../raphodo/generatenameconfig.py:303
 msgid "Four digits"
 msgstr "Fire tal"
 
-#: ../raphodo/generatenameconfig.py:300
+#: ../raphodo/generatenameconfig.py:304
 msgid "Five digits"
 msgstr "Fem tal"
 
-#: ../raphodo/generatenameconfig.py:301
+#: ../raphodo/generatenameconfig.py:305
 msgid "Six digits"
 msgstr "Seks tal"
 
-#: ../raphodo/generatenameconfig.py:302
+#: ../raphodo/generatenameconfig.py:306
 msgid "Seven digits"
 msgstr "Sju tal"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:305
+#: ../raphodo/generatenameconfig.py:309
 msgid "Subseconds"
 msgstr "Delsekund"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:308 ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:312 ../raphodo/generatenameconfig.py:393
 msgid "YYYYMMDD"
 msgstr "ÅÅÅÅMMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:311 ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:315 ../raphodo/generatenameconfig.py:394
 msgid "YYYY-MM-DD"
 msgstr "ÅÅÅÅ-MM-DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:314 ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:318 ../raphodo/generatenameconfig.py:395
 msgid "YYYY_MM_DD"
-msgstr ""
+msgstr "ÅÅÅÅ_MM_DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:317
+#: ../raphodo/generatenameconfig.py:321
 msgid "YYMMDD"
 msgstr "ÅÅMMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:320
+#: ../raphodo/generatenameconfig.py:324
 msgid "YY-MM-DD"
 msgstr "ÅÅ-MM-DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:323
+#: ../raphodo/generatenameconfig.py:327
 msgid "YY_MM_DD"
-msgstr ""
+msgstr "ÅÅ_MM_DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:326
+#: ../raphodo/generatenameconfig.py:330
 msgid "MMDDYYYY"
 msgstr "MMDDÅÅÅÅ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:329
+#: ../raphodo/generatenameconfig.py:333
 msgid "MMDDYY"
 msgstr "MMDDÅÅ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:332
+#: ../raphodo/generatenameconfig.py:336
 msgid "MMDD"
 msgstr "MMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:335
+#: ../raphodo/generatenameconfig.py:339
 msgid "DDMMYYYY"
 msgstr "DDMMÅÅÅÅ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:338
+#: ../raphodo/generatenameconfig.py:342
 msgid "DDMMYY"
 msgstr "DDMMÅÅ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:341 ../raphodo/generatenameconfig.py:389
-#: ../raphodo/generatenameconfig.py:390 ../raphodo/generatenameconfig.py:391
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:345 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:394 ../raphodo/generatenameconfig.py:395
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:397
 msgid "YYYY"
 msgstr "ÅÅÅÅ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:344
+#: ../raphodo/generatenameconfig.py:348
 msgid "YY"
 msgstr "ÅÅ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:347
+#: ../raphodo/generatenameconfig.py:351
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:350
+#: ../raphodo/generatenameconfig.py:354
 msgid "DD"
 msgstr "DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:353
+#: ../raphodo/generatenameconfig.py:357
 msgid "Month (full)"
 msgstr "Månad (heile)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:356
+#: ../raphodo/generatenameconfig.py:360
 msgid "Month (abbreviated)"
 msgstr "Månad (forkorta)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:359
+#: ../raphodo/generatenameconfig.py:363
 msgid "HHMMSS"
 msgstr "TTMMSS"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:362
+#: ../raphodo/generatenameconfig.py:366
 msgid "HHMM"
 msgstr "TTMM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:365
+#: ../raphodo/generatenameconfig.py:369
 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
-#: ../raphodo/generatenameconfig.py:368
+#: ../raphodo/generatenameconfig.py:372
 msgid "HH-MM"
 msgstr "TT-MM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:371
+#: ../raphodo/generatenameconfig.py:375
 msgid "HH"
 msgstr "TT"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:374
+#: ../raphodo/generatenameconfig.py:378
 msgid "MM (minutes)"
 msgstr "MM (minutt)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:377
+#: ../raphodo/generatenameconfig.py:381
 msgid "SS"
 msgstr "SS"
 
-#: ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:393
 msgid "Date"
-msgstr ""
+msgstr "Dato"
 
-#: ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:394
 msgid "Date (hyphens)"
-msgstr ""
+msgstr "Dato (bindestrekar)"
 
-#: ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:395
 msgid "Date (underscores)"
-msgstr ""
+msgstr "Dato (understrekar)"
 
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:438
-#: ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:442
+#: ../raphodo/generatenameconfig.py:537
 msgid "Date and Job Code"
-msgstr ""
+msgstr "Dato og oppdragsnamn"
 
-#: ../raphodo/generatenameconfig.py:392
+#: ../raphodo/generatenameconfig.py:396
 msgid "YYYYMM_Job Code"
-msgstr ""
+msgstr "ÅÅÅÅMM_Oppdragsnamn"
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "Date and Job Code Subfolder"
-msgstr ""
+msgstr "Dato og oppdragsnamn-undermapper"
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "YYYYMM"
-msgstr ""
+msgstr "ÅÅÅÅMM"
 
-#: ../raphodo/generatenameconfig.py:393 ../raphodo/jobcodepanel.py:198
-#: ../raphodo/nameeditor.py:827 ../raphodo/rapid.py:1809
+#: ../raphodo/generatenameconfig.py:397 ../raphodo/jobcodepanel.py:199
+#: ../raphodo/nameeditor.py:833 ../raphodo/rapid.py:1852
 #: ../raphodo/renamepanel.py:83 ../raphodo/renamepanel.py:241
 msgid "Job Code"
-msgstr "Jobbnamn"
+msgstr "Oppdragsnamn"
 
-#: ../raphodo/generatenameconfig.py:433 ../raphodo/generatenameconfig.py:512
+#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:532
 msgid "Original Filename"
-msgstr ""
+msgstr "Opphavleg filnamn"
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "Date-Time and Downloads today"
-msgstr ""
+msgstr "Dato-tid og nedlastingar i dag"
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "YYYYMMDD-HHMM-1"
-msgstr ""
+msgstr "ÅÅÅÅMMDD-TTMM-1"
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "Date and Downloads today"
-msgstr ""
+msgstr "Dato og nedlastingar i dag"
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "YYYYMMDD-1"
-msgstr ""
+msgstr "ÅÅÅÅMMDD-1"
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "Date-Time and Image number"
-msgstr ""
+msgstr "Dato-Tid og biletnummer"
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "YYYYMMDD-1234"
-msgstr ""
+msgstr "ÅÅÅÅMMDD-1234"
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "Date-Time and Job Code"
-msgstr ""
+msgstr "Dato-Tid og oppdragsnamn"
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "YYYYMMDD-HHMM-Job Code-1"
-msgstr ""
+msgstr "ÅÅÅÅMMDD-TTMM-Oppdragsnamn-1"
 
-#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:442 ../raphodo/generatenameconfig.py:537
 msgid "YYYYMMDD-Job Code-1"
-msgstr ""
+msgstr "ÅÅÅÅMMDD-Oppdragsnamn-1"
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "Date-Time and Video number"
-msgstr ""
+msgstr "Dato-Tid og videonummer"
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "YYYYMMDD_1234"
-msgstr ""
+msgstr "ÅÅÅÅMMDD_1234"
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "Resolution"
-msgstr ""
+msgstr "Oppløysing"
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "YYYYMMDD-HHMM-1-1920x1080"
-msgstr ""
+msgstr "ÅÅÅÅMMDD-TTMM-1-1920x1080"
 
 #: ../raphodo/jobcodepanel.py:64
 msgid "Enter a new Job Code, or select a previous one"
-msgstr "Skriv inn eit jobbnamn, eller vel eit du har nytta tidlegare"
+msgstr "Skriv inn eit oppdragsnamn, eller vel eit du har nytta tidlegare"
 
 #. Translators: the value substituted will be something like '1 photo'.
 #: ../raphodo/jobcodepanel.py:70
 #, python-format
 msgid "The Job Code will be applied to %s that does not yet have a Job Code."
 msgstr ""
+"Oppdragsnamnet vil brukast på %s som enno ikkje har eit oppdragsnamn."
 
 #. Translators: the value substituted will be something like '85 photos and 5
 #. videos'.
@@ -1451,170 +1976,195 @@ msgstr ""
 #, python-format
 msgid "The Job Code will be applied to %s that do not yet have a Job Code."
 msgstr ""
+"Oppdragsnamnet vil brukast på %s som enno ikkje har eit oppdragsnamn."
 
 #: ../raphodo/jobcodepanel.py:78
 msgid "Apply Job Code to Download"
-msgstr ""
+msgstr "Legg til oppdragsnamn til nedlasting"
 
 #: ../raphodo/jobcodepanel.py:80
 msgid "Enter a new Job Code"
-msgstr "Skriv inn eit nytt jobbnamn"
+msgstr "Skriv inn eit nytt oppdragsnamn"
 
 #: ../raphodo/jobcodepanel.py:86
 msgid "The new Job Code will not be applied to any photos or videos."
 msgstr ""
+"Den nye oppdragsnamnet vil ikkje brukast på nokon bilete eller videoar."
 
 #. Translators: the value substituted will be something like '100 photos and 5
 #. videos'.
 #: ../raphodo/jobcodepanel.py:92
 #, python-format
 msgid "The new Job Code will <b>not</b> be applied to %s."
-msgstr ""
+msgstr "Den nye oppdragsnamnet vil <b>ikkje</b> brukast på %s."
 
 #. Translators: the value substituted will be something like '100 photos and 5
 #. videos'.
 #: ../raphodo/jobcodepanel.py:97
 #, python-format
 msgid "The new Job Code will be applied to %s."
-msgstr ""
+msgstr "Den nye oppdragsnamnet vil brukast på %s."
 
 #: ../raphodo/jobcodepanel.py:99
 msgid "New Job Code"
-msgstr ""
+msgstr "Nytt oppdragsnamn"
 
 #: ../raphodo/jobcodepanel.py:134
 msgid "&Job Code:"
-msgstr ""
+msgstr "&Oppdragsnamn:"
 
 #: ../raphodo/jobcodepanel.py:136 ../raphodo/rememberthisdialog.py:68
 msgid "&Remember this choice"
-msgstr ""
+msgstr "&Hugs dette valet"
 
-#: ../raphodo/jobcodepanel.py:185
+#: ../raphodo/jobcodepanel.py:186
 msgid ""
 "Select photos and videos to be able to apply a new or existing Job Code to "
 "them."
 msgstr ""
+"Vel bilete og videoar for å kunna bruka eit nytt eller eksisterande "
+"oppdragsnamn på dei."
 
-#: ../raphodo/jobcodepanel.py:186
-msgid "The new Job Code will be applied to all selected photos and/or videos."
+#: ../raphodo/jobcodepanel.py:187
+msgid ""
+"The new Job Code will be applied to all selected photos and/or videos."
 msgstr ""
+"Den nye oppdragsnamnet vil brukast på alle valde bilete og/eller videoar."
 
-#: ../raphodo/jobcodepanel.py:187
+#: ../raphodo/jobcodepanel.py:188
 msgid ""
 "Click the Apply button to apply the current Job Code to all selected photos "
 "and/or videos. You can also simply double click the Job Code."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:189
+#: ../raphodo/jobcodepanel.py:190
 msgid ""
 "Removing a Job Code removes it only from the list of saved Job Codes, not "
 "from any photos or videos that it may have been applied to."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:191
+#: ../raphodo/jobcodepanel.py:192
 msgid ""
 "If you want to use Job Codes, configure file renaming or destination "
 "subfolder names to use them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:197
+#: ../raphodo/jobcodepanel.py:198
 msgid "Last Used"
-msgstr ""
+msgstr "Sist brukt"
 
-#: ../raphodo/jobcodepanel.py:202
+#: ../raphodo/jobcodepanel.py:203
 msgid "Job Code Sort:"
-msgstr ""
+msgstr "Oppdragsnamnsortering:"
 
-#: ../raphodo/jobcodepanel.py:205 ../raphodo/rapid.py:2061
+#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2133
 msgid "Ascending"
-msgstr ""
+msgstr "Stigande"
 
-#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2062
+#: ../raphodo/jobcodepanel.py:207 ../raphodo/rapid.py:2134
 msgid "Descending"
-msgstr ""
+msgstr "Søkkande"
 
-#: ../raphodo/jobcodepanel.py:216
+#: ../raphodo/jobcodepanel.py:217
 msgid "&New..."
-msgstr ""
+msgstr "&Ny …"
 
-#: ../raphodo/jobcodepanel.py:220
+#: ../raphodo/jobcodepanel.py:221
 msgid "&Apply"
-msgstr ""
+msgstr "&Bruk"
 
-#: ../raphodo/jobcodepanel.py:224
+#: ../raphodo/jobcodepanel.py:225
 msgid "&Remove"
-msgstr ""
+msgstr "&Fjern"
 
-#: ../raphodo/jobcodepanel.py:228 ../raphodo/preferencedialog.py:125
-#: ../raphodo/preferencedialog.py:154 ../raphodo/preferencedialog.py:433
+#: ../raphodo/jobcodepanel.py:229 ../raphodo/preferencedialog.py:200
+#: ../raphodo/preferencedialog.py:229 ../raphodo/preferencedialog.py:531
 msgid "Remove All"
-msgstr ""
+msgstr "Fjern alle"
 
-#: ../raphodo/jobcodepanel.py:427
+#: ../raphodo/jobcodepanel.py:428
 msgid "Do you really want to remove all the Job Codes?"
-msgstr ""
+msgstr "Vil du verkeleg fjerna alle oppdragskodane?"
 
-#: ../raphodo/jobcodepanel.py:429
+#: ../raphodo/jobcodepanel.py:430
 msgid "Remove all Job Codes"
-msgstr ""
+msgstr "Fjern alle oppdragskodar"
 
-#: ../raphodo/jobcodepanel.py:492
+#: ../raphodo/jobcodepanel.py:493
 msgid "Job Codes"
-msgstr "Jobbnamn"
+msgstr "Oppdragsnamn"
 
 #. 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
 #: ../raphodo/messagewidget.py:65
 #, python-format
 msgid "<i><b>Hint:</b> %(message)s"
-msgstr ""
+msgstr "<i><b>Hint:</b> %(message)s"
 
-#: ../raphodo/nameeditor.py:418 ../raphodo/nameeditor.py:432
+#: ../raphodo/nameeditor.py:423 ../raphodo/nameeditor.py:437
 #, python-format
 msgid "%(description)s - %(elements)s"
-msgstr ""
+msgstr "%(description)s – %(elements)s"
 
-#: ../raphodo/nameeditor.py:512
+#: ../raphodo/nameeditor.py:517
 msgid "Save New Custom Preset..."
-msgstr ""
+msgstr "Lagra nytt tilpassa forval …"
 
-#: ../raphodo/nameeditor.py:513
+#: ../raphodo/nameeditor.py:518
 msgid "Remove All Custom Presets..."
-msgstr ""
+msgstr "Fjern alle tilpassa forval …"
 
-#: ../raphodo/nameeditor.py:559
+#: ../raphodo/nameeditor.py:564
 msgid "(New Custom Preset)"
-msgstr ""
+msgstr "(Nytt tilpassa forval)"
 
-#: ../raphodo/nameeditor.py:576
+#: ../raphodo/nameeditor.py:581
 #, python-format
 msgid "%s (edited)"
-msgstr ""
+msgstr "%s (redigert)"
 
-#: ../raphodo/nameeditor.py:579 ../raphodo/nameeditor.py:1370
+#: ../raphodo/nameeditor.py:584 ../raphodo/nameeditor.py:1379
 #, python-format
 msgid "Update Custom Preset \"%s\""
-msgstr ""
+msgstr "Oppdater tilpassa forval «%s»"
 
-#: ../raphodo/nameeditor.py:667
+#: ../raphodo/nameeditor.py:672
 msgid "Save New Custom Preset - Rapid Photo Downloader"
-msgstr ""
+msgstr "Lagra nytt tilpassa forval – Rapid Photo Downloader"
 
-#: ../raphodo/nameeditor.py:675
+#: ../raphodo/nameeditor.py:680
 msgid "Preset Name:"
-msgstr ""
+msgstr "Namn på forval:"
+
+#: ../raphodo/nameeditor.py:799
+msgid "Photo Subfolder Generation Editor"
+msgstr "Redigering av biletundermappegenerering"
+
+#: ../raphodo/nameeditor.py:805
+msgid "Video Subfolder Generation Editor"
+msgstr "Redigering av videoundermappegenerering"
 
-#: ../raphodo/nameeditor.py:836
+#: ../raphodo/nameeditor.py:811
+msgid "Photo Renaming Editor"
+msgstr "Redigering av biletomdøyping"
+
+#: ../raphodo/nameeditor.py:817
+msgid "Video Renaming Editor"
+msgstr "Redigering av videoomdøyping"
+
+#: ../raphodo/nameeditor.py:842
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>There is insufficient data to "
 "fully generate the name. Please use other renaming options.</i>"
 msgstr ""
+"<b><font color=\"red\">Åtvaring:</font></b> <i>Det er ikkje nok data til å "
+"kunna generera namnet fullt ut. Ver vennleg og bruk andre alternativ for "
+"endring av namn.</i>"
 
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees.
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:846
+#: ../raphodo/nameeditor.py:853
 #, python-format
 msgid "The character</i> %(separator)s <i>creates a new subfolder level."
 msgstr ""
@@ -1622,503 +2172,689 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:851
+#: ../raphodo/nameeditor.py:858
 #, python-format
 msgid ""
 "There is no need start or end with the folder separator </i> "
 "%(separator)s<i>, because it is added automatically."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:859
+#: ../raphodo/nameeditor.py:866
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>Unique filenames may not be "
 "generated. Make filenames unique by using Sequence values.</i>"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:882 ../raphodo/renamepanel.py:121
+#: ../raphodo/nameeditor.py:889 ../raphodo/renamepanel.py:121
 msgid "Preset:"
-msgstr ""
+msgstr "Forval:"
 
 #. Translators: appears in a combobox, e.g. Image Date (YYYY)
-#: ../raphodo/nameeditor.py:959 ../raphodo/nameeditor.py:980
+#: ../raphodo/nameeditor.py:966 ../raphodo/nameeditor.py:987
 #, python-brace-format
 msgid "{choice} ({variant})"
-msgstr ""
+msgstr "{choice} ({variant})"
 
-#: ../raphodo/nameeditor.py:1005 ../raphodo/preferencedialog.py:530
+#: ../raphodo/nameeditor.py:1012 ../raphodo/preferencedialog.py:783
 msgid "Get help online..."
-msgstr ""
+msgstr "Få hjelp på nettet …"
 
-#: ../raphodo/nameeditor.py:1025
+#: ../raphodo/nameeditor.py:1034
 msgid "Insert"
-msgstr ""
+msgstr "Set inn"
 
-#: ../raphodo/nameeditor.py:1351
+#: ../raphodo/nameeditor.py:1360
 msgid "Save Preset - Rapid Photo Downloader"
-msgstr ""
+msgstr "Lagra forval – Rapid Photo Downloader"
 
-#: ../raphodo/nameeditor.py:1356
+#: ../raphodo/nameeditor.py:1365
 msgid ""
-"<b>Do you want to save the changes in a new custom preset?</"
-"b><br><br>Creating a custom preset is not required, but can help you keep "
-"organized.<br><br>The changes to the preferences will still be applied "
-"regardless of whether you create a new custom preset or not."
+"<b>Do you want to save the changes in a new custom "
+"preset?</b><br><br>Creating a custom preset is not required, but can help "
+"you keep organized.<br><br>The changes to the preferences will still be "
+"applied regardless of whether you create a new custom preset or not."
 msgstr ""
+"<b>Vil du lagra endringane som eit nytt tilpassa forval?</b><br><br>Å "
+"oppretta eit tilpassa forval er ikkje påkravd, men det kan hjelpa deg med å "
+"halda orden. <br><br>Dei endra innstillingane vil brukast uavhengig av om du "
+"lagrar dei som eit nytt tilpassa forval eller ikkje."
 
-#: ../raphodo/nameeditor.py:1365
+#: ../raphodo/nameeditor.py:1374
 msgid ""
 "<b>Do you want to save the changes in a custom preset?</b><br><br>If you "
 "like, you can create a new custom preset or update the existing custom "
 "preset.<br><br>The changes to the preferences will still be applied "
 "regardless of whether you save a custom preset or not."
 msgstr ""
+"<b>Vil du lagra endringane som eit tilpassa forval?</b><br><br>Om du vil, så "
+"kan du laga eit nytt tilpassa forval eller oppdatera eit tilpassa forval. "
+"<br><br>Dei endra innstillingane vil brukast uavhengig av om du lagrar dei "
+"som eit nytt tilpassa forval eller ikkje."
 
-#: ../raphodo/nameeditor.py:1372
+#: ../raphodo/nameeditor.py:1381
 msgid "Save New Custom Preset"
-msgstr ""
+msgstr "Lagra nytt tilpassa forval"
 
-#: ../raphodo/newversion.py:306
+#: ../raphodo/newversion.py:312
 msgid "Checking for new version..."
-msgstr ""
+msgstr "Ser etter ny utgåve …"
 
-#: ../raphodo/newversion.py:307
+#: ../raphodo/newversion.py:313
 msgid "You are running the latest version."
-msgstr ""
+msgstr "Du køyrer den seinaste utgåva."
 
-#: ../raphodo/newversion.py:308
+#: ../raphodo/newversion.py:314
 msgid "Failed to contact the update server."
-msgstr ""
+msgstr "Kunne ikkje kontakta oppdateringstenaren."
 
-#: ../raphodo/newversion.py:310
+#: ../raphodo/newversion.py:316
 #, python-format
 msgid "A new version of Rapid Photo Downloader (%s) is available."
-msgstr ""
+msgstr "Ei ny utgåve av Rapid Photo Downloader (%s) er tilgjengeleg."
 
-#: ../raphodo/newversion.py:312
+#: ../raphodo/newversion.py:318
 msgid "Do you want to download the new version?"
-msgstr ""
+msgstr "Vil du lasta ned den nye utgåva?"
 
-#: ../raphodo/newversion.py:313
+#: ../raphodo/newversion.py:319
 #, python-format
 msgid "Changes in the new release can be viewed <a href=\"%s\">here</a>."
-msgstr ""
+msgstr "Endringar i den nye utgåva kan <a href=\"%s\">lesast her</a>."
 
 #. Translators: this text appears in a button - the & sets the s key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:340 ../raphodo/newversion.py:353
+#: ../raphodo/newversion.py:348 ../raphodo/newversion.py:363
 msgid "&Skip this release"
-msgstr ""
+msgstr "&Hopp over denne utgåva"
 
 #. Translators: this text appears in a button - the & sets the o key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:356
+#: ../raphodo/newversion.py:366
 msgid "&Open Download Page"
-msgstr ""
+msgstr "&Opna nedlastingssida"
 
-#: ../raphodo/newversion.py:376
+#: ../raphodo/newversion.py:386
 msgid "Rapid Photo Downloader updates"
-msgstr ""
+msgstr "Oppdateringar av Rapid Photo Downloader"
 
 #. Translators: shows how much of a file has been downloaded e.g  123 KB of 1.3 MB
-#: ../raphodo/newversion.py:478
+#: ../raphodo/newversion.py:488
 #, python-format
 msgid "%(downloaded)s of %(total)s"
-msgstr ""
+msgstr "%(downloaded)s av %(total)s"
 
-#: ../raphodo/newversion.py:495
+#: ../raphodo/newversion.py:507
 msgid "Downloading..."
-msgstr ""
+msgstr "Lastar ned …"
 
-#: ../raphodo/preferencedialog.py:76
+#: ../raphodo/preferencedialog.py:86
 msgid "Preferences"
 msgstr "Innstillingar"
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Automation"
 msgstr "Automatisering"
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Thumbnails"
 msgstr "Miniatyrbilete"
 
-#: ../raphodo/preferencedialog.py:85 ../raphodo/preferencedialog.py:343
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/preferencedialog.py:428
 msgid "Error Handling"
 msgstr "Feilhandtering"
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Warnings"
-msgstr ""
+msgstr "Åtvaringar"
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:109
+msgid "Consolidation"
+msgstr "Konsolidering"
+
+#: ../raphodo/preferencedialog.py:109 ../raphodo/preferencedialog.py:119
 msgid "Miscellaneous"
 msgstr "Ymse"
 
-#: ../raphodo/preferencedialog.py:94
+#: ../raphodo/preferencedialog.py:147
 msgid "Device Scanning"
-msgstr ""
+msgstr "Einingsskanning"
 
-#: ../raphodo/preferencedialog.py:96
+#: ../raphodo/preferencedialog.py:148
 msgid "Scan only external devices"
-msgstr ""
+msgstr "Skann berre eksterne einingar"
 
-#: ../raphodo/preferencedialog.py:98
+#: ../raphodo/preferencedialog.py:150
 msgid ""
 "Scan for photos and videos only on devices that are external to the "
 "computer,\n"
 "including cameras, memory cards, external hard drives, and USB flash drives."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:102
-msgid "Scan non-camera devices lacking a DCIM folder"
+#: ../raphodo/preferencedialog.py:153
+msgid "Scan only specific folders on devices"
+msgstr "Skann berre visse mapper på einingar"
+
+#: ../raphodo/preferencedialog.py:155
+msgid ""
+"Scan for photos and videos only in the folders specified below (except "
+"paths\n"
+"specified in Ignored Paths).\n"
+"\n"
+"Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:104
+#: ../raphodo/preferencedialog.py:161
+msgid "Folders to scan:"
+msgstr "Mapper å skanna:"
+
+#: ../raphodo/preferencedialog.py:164
+msgid ""
+"Folders at the base level of device file systems that will be scanned\n"
+"for photos and videos."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:167 ../raphodo/preferencedialog.py:219
+msgid "Add..."
+msgstr "Legg til …"
+
+#: ../raphodo/preferencedialog.py:169
 msgid ""
-"Scan the entirety of a device for photos and videos, irrespective of whether "
-"it contains a DCIM folder,\n"
-"as opposed to only scanning within a DCIM folder.\n"
+"Add a folder to the list of folders to scan for photos and videos.\n"
 "\n"
-"Changing this setting causes all devices to be scanned again.\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:172 ../raphodo/preferencedialog.py:198
+#: ../raphodo/preferencedialog.py:224 ../raphodo/preferencedialog.py:529
+msgid "Remove"
+msgstr "Fjern"
+
+#: ../raphodo/preferencedialog.py:174
+msgid ""
+"Remove a folder from the list of folders to scan for photos and videos.\n"
 "\n"
-"Note: With cameras, only the DCIM folder is scanned."
+"Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:116
+#: ../raphodo/preferencedialog.py:191
 msgid "Devices that have been set to automatically ignore or download from."
-msgstr ""
+msgstr "Einingar som skal automatisk ignorerast eller lastast ned frå"
 
-#: ../raphodo/preferencedialog.py:117
+#: ../raphodo/preferencedialog.py:192
 msgid "Remembered Devices"
-msgstr ""
+msgstr "Hugsa einingar"
 
-#: ../raphodo/preferencedialog.py:121
+#: ../raphodo/preferencedialog.py:196
 msgid ""
 "Remove a device from the list of devices to automatically ignore or download "
 "from."
 msgstr ""
+"Fjern ei eining frå lista med einingar som skal automatisk ignorerast eller "
+"lastast ned frå."
 
-#: ../raphodo/preferencedialog.py:123 ../raphodo/preferencedialog.py:149
-#: ../raphodo/preferencedialog.py:431
-msgid "Remove"
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:127
+#: ../raphodo/preferencedialog.py:202
 msgid ""
 "Clear the list of devices from which to automatically ignore or download "
 "from.\n"
 "\n"
 "Note: Changes take effect when the computer is next scanned for devices."
 msgstr ""
+"Tøm lista med einingar som skal automatisk ignorerast eller lastast ned "
+"frå.\n"
+"\n"
+"Merk: Endringane trer i kraft neste gong me skannar etter einingar."
 
-#: ../raphodo/preferencedialog.py:140
+#: ../raphodo/preferencedialog.py:215
 msgid "Ignored Paths"
 msgstr "Oversedde stiar"
 
-#: ../raphodo/preferencedialog.py:141
+#: ../raphodo/preferencedialog.py:216
 msgid ""
 "The end part of a path that should never be scanned for photos or videos."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:144
-msgid "Add..."
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:146
+#: ../raphodo/preferencedialog.py:221
 msgid ""
 "Add a path to the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:151
+#: ../raphodo/preferencedialog.py:226
 msgid ""
 "Remove a path from the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:156
+#: ../raphodo/preferencedialog.py:231
 msgid ""
 "Clear the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:164
+#: ../raphodo/preferencedialog.py:239
 msgid ""
-"Use python-style <a href=\"http://damonlynch.net/rapid/documentation/"
-"#regularexpressions\">regular expressions</a>"
+"Use python-style <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">regula"
+"r expressions</a>"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:168
+#: ../raphodo/preferencedialog.py:243
 msgid ""
 "Use regular expressions in the list of ignored paths.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:208
+#: ../raphodo/preferencedialog.py:283
 msgid "Program Automation"
-msgstr ""
+msgstr "Programautomatisering"
 
-#: ../raphodo/preferencedialog.py:209
+#: ../raphodo/preferencedialog.py:284
 msgid "Start downloading at program startup"
 msgstr "Gå i gang med å laste ned bilete når programmet startar"
 
-#: ../raphodo/preferencedialog.py:210
+#: ../raphodo/preferencedialog.py:285
 msgid "Start downloading upon device insertion"
 msgstr "Gå i gang med å laste ned når einingar blir kopla til"
 
-#: ../raphodo/preferencedialog.py:211
+#: ../raphodo/preferencedialog.py:286
 msgid "Unmount (eject) device upon download completion"
-msgstr ""
+msgstr "Avmonter (løys ut) eininga når nedlastinga er ferdig"
 
-#: ../raphodo/preferencedialog.py:212
+#: ../raphodo/preferencedialog.py:287
 msgid "Exit program when download completes"
 msgstr "Avslutt programmet når nedlastinga er ferdig"
 
-#: ../raphodo/preferencedialog.py:213
+#: ../raphodo/preferencedialog.py:288
 msgid "Exit program even if download had warnings or errors"
 msgstr "Avslutt programmet sjølv om nedlastinga hadde feil eller åtvaringar"
 
-#: ../raphodo/preferencedialog.py:240
+#: ../raphodo/preferencedialog.py:315
 msgid "Thumbnail Generation"
-msgstr ""
+msgstr "Generering av miniatyrbilete"
 
-#: ../raphodo/preferencedialog.py:241
+#: ../raphodo/preferencedialog.py:316
 msgid "Generate thumbnails"
-msgstr ""
+msgstr "Generer miniatyrbilete"
 
-#: ../raphodo/preferencedialog.py:242
+#: ../raphodo/preferencedialog.py:318
 msgid "Generate thumbnails to show in the main program window"
-msgstr ""
+msgstr "Generer miniatyrbilete som vil visast i hovudvindauget"
 
-#: ../raphodo/preferencedialog.py:244
+#: ../raphodo/preferencedialog.py:320
 msgid "Cache thumbnails"
-msgstr ""
+msgstr "Mellomlagra miniatyrbilete"
 
-#: ../raphodo/preferencedialog.py:245
+#: ../raphodo/preferencedialog.py:323
 msgid ""
 "Save thumbnails shown in the main program window in a thumbnail cache unique "
 "to Rapid Photo Downloader"
 msgstr ""
+"Lagra miniatyrbilete vist i hovudprogramvindauget i eit mellomlager "
+"spesifikt for Rapid Photo Downloader"
 
-#: ../raphodo/preferencedialog.py:247
+#: ../raphodo/preferencedialog.py:327
 msgid "Generate system thumbnails"
-msgstr ""
+msgstr "Generer system-miniatyrbilete"
 
-#: ../raphodo/preferencedialog.py:248
+#: ../raphodo/preferencedialog.py:330
 msgid ""
 "While downloading, save thumbnails that can be used by desktop file managers "
 "and other programs"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:255
+#: ../raphodo/preferencedialog.py:339
 msgid "Number of CPU cores used to generate thumbnails."
 msgstr ""
+"Kor mange CPU-kjerner som skal brukast for å generera miniatyrbilete."
 
-#: ../raphodo/preferencedialog.py:256
+#: ../raphodo/preferencedialog.py:340
 msgid "CPU cores:"
-msgstr ""
+msgstr "CPU-kjernar:"
 
 #. Translators: the * acts as an asterisk to denote a reference to an annotation
 #. such as '* Takes effect upon program restart'
-#: ../raphodo/preferencedialog.py:271 ../raphodo/preferencedialog.py:317
+#: ../raphodo/preferencedialog.py:355 ../raphodo/preferencedialog.py:401
 msgid "*"
-msgstr ""
+msgstr "*"
 
-#: ../raphodo/preferencedialog.py:294
+#: ../raphodo/preferencedialog.py:378
 msgid "Thumbnail Cache"
-msgstr ""
+msgstr "Mellomlager for miniatyrbilete"
 
-#: ../raphodo/preferencedialog.py:296
+#: ../raphodo/preferencedialog.py:380
 msgid "Calculating..."
-msgstr ""
+msgstr "Reknar …"
 
-#: ../raphodo/preferencedialog.py:302
+#: ../raphodo/preferencedialog.py:386
 msgid "days"
-msgstr ""
+msgstr "dagar"
 
-#: ../raphodo/preferencedialog.py:303
+#: ../raphodo/preferencedialog.py:387
 msgid "forever"
-msgstr ""
+msgstr "alltid"
 
-#: ../raphodo/preferencedialog.py:308
+#: ../raphodo/preferencedialog.py:392
 msgid "Cache size:"
-msgstr ""
+msgstr "Storleik på mellomlageret:"
 
-#: ../raphodo/preferencedialog.py:310
+#: ../raphodo/preferencedialog.py:394
 msgid "Number of thumbnails:"
-msgstr ""
+msgstr "Kor mange miniatyrbilete:"
 
-#: ../raphodo/preferencedialog.py:312
+#: ../raphodo/preferencedialog.py:396
 msgid "Database size:"
-msgstr ""
+msgstr "Databasestorleik:"
 
-#: ../raphodo/preferencedialog.py:314
+#: ../raphodo/preferencedialog.py:398
 msgid "Cache unaccessed thumbnails for:"
-msgstr ""
+msgstr "Mellomlagra utilgjengelege miniatyrbilete i:"
 
-#: ../raphodo/preferencedialog.py:322
+#: ../raphodo/preferencedialog.py:406
 msgid "Purge Cache..."
-msgstr ""
+msgstr "Reins mellomlager …"
 
-#: ../raphodo/preferencedialog.py:323
+#: ../raphodo/preferencedialog.py:408
 msgid "Optimize Cache..."
-msgstr ""
+msgstr "Optimaliser mellomlager …"
 
-#: ../raphodo/preferencedialog.py:336
+#: ../raphodo/preferencedialog.py:421
 msgid "* Takes effect upon program restart"
-msgstr ""
+msgstr "* Trår i kraft etter omstart av programmet"
 
-#: ../raphodo/preferencedialog.py:346
+#: ../raphodo/preferencedialog.py:431
 msgid "Skip download"
 msgstr "Hopp over nedlasting"
 
-#: ../raphodo/preferencedialog.py:347
+#: ../raphodo/preferencedialog.py:432
 msgid "Don't download the file, and issue an error message"
-msgstr ""
+msgstr "Ikkje last ned fila, og gje ei feilmelding"
 
-#: ../raphodo/preferencedialog.py:348
+#: ../raphodo/preferencedialog.py:433
 msgid "Add unique identifier"
 msgstr "Legg til unik identifikator"
 
-#: ../raphodo/preferencedialog.py:349
+#: ../raphodo/preferencedialog.py:436
 msgid ""
 "Add an identifier like _1 or _2 to the end of the filename, immediately "
 "before the file's extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:355
+#: ../raphodo/preferencedialog.py:444
 msgid "Overwrite"
 msgstr "Overskriv"
 
-#: ../raphodo/preferencedialog.py:356
+#: ../raphodo/preferencedialog.py:445
 msgid "Overwrite the previously backed up file"
-msgstr ""
+msgstr "Overskriv den tidlegare tryggleikskopierte fila"
 
-#: ../raphodo/preferencedialog.py:357
+#: ../raphodo/preferencedialog.py:446
 msgid "Skip"
 msgstr "Hopp over"
 
-#: ../raphodo/preferencedialog.py:358
+#: ../raphodo/preferencedialog.py:448
 msgid "Don't overwrite the backup file, and issue an error message"
-msgstr ""
+msgstr "Ikkje overskriv den tryggleikskopierte fila, og gje ei feilmelding"
 
-#: ../raphodo/preferencedialog.py:364
+#: ../raphodo/preferencedialog.py:455
 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 identifier:"
 msgstr ""
+"Vel du om du vil hoppa over nedlasting eller leggja til ein unik "
+"identifikator når eit bilete eller ein video med same namn allereie er lasta "
+"ned:"
 
-#: ../raphodo/preferencedialog.py:378
+#: ../raphodo/preferencedialog.py:464
+msgid ""
+"Using sequence numbers to automatically generate unique filenames is "
+"strongly recommended. Configure file renaming in the Rename panel in the "
+"main window."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:473
 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 ""
+"Vel om du skal overskriva ei fil på tryggleikskopieininga som har same namn "
+"når du tryggleikskopierer, eller hoppa over tryggleikskopiering:"
 
-#: ../raphodo/preferencedialog.py:398
+#: ../raphodo/preferencedialog.py:494
 msgid "Program Warnings"
-msgstr ""
+msgstr "Programåtvaringar"
 
-#: ../raphodo/preferencedialog.py:399
+#: ../raphodo/preferencedialog.py:495
 msgid "Show a warning when:"
-msgstr ""
+msgstr "Vis ei åtvaring når:"
 
-#: ../raphodo/preferencedialog.py:402
+#: ../raphodo/preferencedialog.py:498
 msgid "Downloading files currently not displayed"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:403
+#: ../raphodo/preferencedialog.py:499
 msgid ""
 "Warn when about to download files that are not displayed in the main window."
 msgstr ""
+"Åtvar når du skal til å lasta ned filer som ikkje vert vist i hovudvindauget."
 
-#: ../raphodo/preferencedialog.py:405
+#: ../raphodo/preferencedialog.py:501
 msgid "Backup destinations are missing"
-msgstr ""
+msgstr "Manglar tryggleikskopieringsmål"
 
-#: ../raphodo/preferencedialog.py:406
-msgid "Warn before starting a download if it is not possible to back up files."
+#: ../raphodo/preferencedialog.py:502
+msgid ""
+"Warn before starting a download if it is not possible to back up files."
 msgstr ""
+"Åtvar før du startar ei nedlasting viss det ikkje er mogleg å "
+"tryggleikskopiera filer."
 
-#: ../raphodo/preferencedialog.py:408
+#: ../raphodo/preferencedialog.py:504
 msgid "Program libraries are missing or broken"
-msgstr ""
+msgstr "Programbibliotek manglar eller er skadd"
 
-#: ../raphodo/preferencedialog.py:409
+#: ../raphodo/preferencedialog.py:505
 msgid ""
 "Warn if a software library used by Rapid Photo Downloader is missing or not "
 "functioning."
 msgstr ""
+"Åtvar om eit programvarebibliotek som vert brukt av Rapid Photo Downloader "
+"manglar eller ikkje fungerer."
 
-#: ../raphodo/preferencedialog.py:412
+#: ../raphodo/preferencedialog.py:508
 msgid "Filesystem metadata cannot be set"
-msgstr ""
+msgstr "Klarte ikkje endra filsystem-metadata"
 
-#: ../raphodo/preferencedialog.py:413
+#: ../raphodo/preferencedialog.py:509
 msgid ""
 "Warn if there is an error setting a file's filesystem metadata, such as its "
 "modification time."
 msgstr ""
+"Åtvar om det oppstår ein feil når me endrar metadata for ei fil, slik som "
+"endringstidspunktet til fila."
 
-#: ../raphodo/preferencedialog.py:416
+#: ../raphodo/preferencedialog.py:512
 msgid "Encountering unhandled files"
-msgstr ""
+msgstr "Fann filer som me ikkje handterer"
 
-#: ../raphodo/preferencedialog.py:417
+#: ../raphodo/preferencedialog.py:513
 msgid ""
 "Warn after scanning a device or this computer if there are unrecognized "
 "files that will not be included in the download."
 msgstr ""
+"Åtvar etter skanning av ei eining eller denne datamaskina om det finst "
+"ukjende filer som ikkje vil inkluderast under nedlastinga."
 
-#: ../raphodo/preferencedialog.py:420
+#: ../raphodo/preferencedialog.py:517
 msgid "Do not warn about unhandled files with extensions:"
-msgstr ""
+msgstr "Ikkje åtvar om ubehandla filar av filtypene:"
 
-#: ../raphodo/preferencedialog.py:424
+#: ../raphodo/preferencedialog.py:522
 msgid ""
 "File extensions are case insensitive and do not need to include the leading "
 "dot."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:427
+#: ../raphodo/preferencedialog.py:525
 msgid "Add"
-msgstr ""
+msgstr "Legg til"
 
-#: ../raphodo/preferencedialog.py:428
+#: ../raphodo/preferencedialog.py:526
 msgid ""
 "Add a file extension to the list of unhandled file types to not warn about."
 msgstr ""
+"Legg til filtyper i lista over ubehandla filtyper det ikkje skal åtvarast om."
 
-#: ../raphodo/preferencedialog.py:430
+#: ../raphodo/preferencedialog.py:528
 msgid ""
 "Remove a file extension from the list of unhandled file types to not warn "
 "about."
 msgstr ""
+"Fjern ei filtype frå lista over ubehandla filtyper det ikkje skal åtvarast "
+"om."
 
-#: ../raphodo/preferencedialog.py:434
+#: ../raphodo/preferencedialog.py:532
 msgid ""
 "Clear the list of file extensions of unhandled file types to not warn about."
+msgstr "Tøm heile lista over ubehandla filtyper det ikkje skal åtvarast om."
+
+#: ../raphodo/preferencedialog.py:568
+msgid "Photo and Video Consolidation"
+msgstr "Bilet- og videokonsolidering"
+
+#: ../raphodo/preferencedialog.py:571
+msgid "Consolidate files across devices and downloads"
+msgstr "Konsolider filer på tvers av einingar og nedlastingar"
+
+#: ../raphodo/preferencedialog.py:574
+msgid ""
+"Analyze the results of device scans looking for duplicate files and matching "
+"RAW and JPEG pairs,\n"
+"comparing them across multiple devices and download sessions."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:469
-msgid "Version Check"
+#: ../raphodo/preferencedialog.py:580
+msgid "Treat matching RAW and JPEG files as:"
+msgstr "Sjå på samsvarande RAW- og JPEG-filer som:"
+
+#: ../raphodo/preferencedialog.py:581
+msgid "One photo"
+msgstr "Eitt bilete"
+
+#: ../raphodo/preferencedialog.py:582
+msgid "Two photos"
+msgstr "To bilete"
+
+#: ../raphodo/preferencedialog.py:584
+msgid ""
+"Display matching pairs of RAW and JPEG photos as one photo, and if marked, "
+"download both."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:470
-msgid "Check for new version at startup"
+#: ../raphodo/preferencedialog.py:589
+msgid ""
+"Display matching pairs of RAW and JPEG photos as two different photos. You "
+"can still synchronize their sequence numbers."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:471
-msgid "Check for a new version of the program each time the program starts."
+#: ../raphodo/preferencedialog.py:598
+msgid "With matching RAW and JPEG photos:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:473
-msgid "Include development releases"
+#: ../raphodo/preferencedialog.py:600
+msgid "Do not mark JPEG for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:601
+msgid "Do not mark RAW for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:602
+msgid "Mark both for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:609
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"JPEG for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:614
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"RAW for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:619
+msgid ""
+"When matching RAW and JPEG photos are found, automatically mark both for "
+"download."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:625
+msgid ""
+"If you disable file consolidation, choose what to do when a download device "
+"is inserted while completed downloads are displayed:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:474
+#: ../raphodo/preferencedialog.py:631
+msgid ""
+"When a download device is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:642
+msgid "Clear completed downloads"
+msgstr "Tøm ferdige nedlastingar"
+
+#: ../raphodo/preferencedialog.py:643
+msgid "Keep displaying completed downloads"
+msgstr "Fortset og vis ferdige nedlastingar"
+
+#: ../raphodo/preferencedialog.py:644
+msgid "Prompt for what to do"
+msgstr "Spør om kva me skal gjera"
+
+#: ../raphodo/preferencedialog.py:649
+msgid ""
+"Automatically clear the display of completed downloads whenever a new "
+"download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:654
+msgid ""
+"Keep displaying completed downloads whenever a new download device is "
+"inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:658
+msgid ""
+"Prompt whether to keep displaying completed downloads or clear them whenever "
+"a new download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:702
+msgid "Version Check"
+msgstr "Kontroller utgåve"
+
+#: ../raphodo/preferencedialog.py:703
+msgid "Check for new version at startup"
+msgstr "Sjå etter ny utgåve ved oppstart"
+
+#: ../raphodo/preferencedialog.py:705
+msgid "Check for a new version of the program each time the program starts."
+msgstr "Sjå etter ei ny utgåve av programmet kvar gong programmet startar."
+
+#: ../raphodo/preferencedialog.py:707
+msgid "Include development releases"
+msgstr "Inkluder utviklingsutgåver"
+
+#: ../raphodo/preferencedialog.py:709
 msgid ""
 "Include alpha, beta and other development releases when checking for a new "
 "version of the program.\n"
@@ -2126,12 +2862,16 @@ msgid ""
 "If you are currently running a development version, the check will always "
 "occur."
 msgstr ""
+"Inkluder alfa-, beta- og andre utviklingsutgåver når du ser etter ei ny "
+"utgåve av programmet.\n"
+"\n"
+"Viss du for tida køyrer ei utviklingsutgåve, vil dette alltid finnast."
 
-#: ../raphodo/preferencedialog.py:489
+#: ../raphodo/preferencedialog.py:725
 msgid "Ignore DNG date/time metadata on MTP devices"
-msgstr ""
+msgstr "Ignorer DNG dato/tid-metadata på MTP einingar."
 
-#: ../raphodo/preferencedialog.py:490
+#: ../raphodo/preferencedialog.py:727
 msgid ""
 "Ignore date/time metadata in DNG files located on MTP devices, and use the "
 "file's modification time instead.\n"
@@ -2139,72 +2879,99 @@ msgid ""
 "Useful for devices like some phones and tablets that create incorrect DNG "
 "metadata."
 msgstr ""
+"Ignorer dato/tid metadata i DNG-filer plassert på MTP einingar, og bruk i "
+"staden endringstidspunktet til fila.\n"
+"\n"
+"Nyttig for einingar som opprettar feil DNG-metadata, slik som nokre "
+"telefonar og nettbrett."
+
+#: ../raphodo/preferencedialog.py:741
+msgid "Completed Downloads"
+msgstr "Fullførte nedlastingar"
 
 #. Translators: substituted value is a description for the set of preferences
 #. shown in the preference dialog window, e.g. Devices, Automation, etc.
 #. This string is shown in a tooltip for the "Restore Defaults" button
-#: ../raphodo/preferencedialog.py:710
+#: ../raphodo/preferencedialog.py:1067
 #, python-format
 msgid "Restores default %s preference values"
-msgstr ""
+msgstr "Går tilbake til standardinnstillingane for %s"
 
-#: ../raphodo/preferencedialog.py:832
+#: ../raphodo/preferencedialog.py:1208
 msgid ""
 "Do you want to purge the thumbnail cache? The cache will be purged when the "
 "program is next started."
 msgstr ""
+"Vil du reinsa mellomlageret? Mellomlageret vert reinsa neste gong programmet "
+"startar."
 
-#: ../raphodo/preferencedialog.py:835
+#: ../raphodo/preferencedialog.py:1212
 msgid "Purge Thumbnail Cache"
-msgstr ""
+msgstr "Reins mellomlager for miniatyrbilete"
 
-#: ../raphodo/preferencedialog.py:847
+#: ../raphodo/preferencedialog.py:1225
 msgid ""
 "Do you want to optimize the thumbnail cache? The cache will be optimized "
 "when the program is next started."
 msgstr ""
+"Vil du optimalisera mellomlageret? Mellomlageret vil optimaliserast neste "
+"gong programmet startar."
 
-#: ../raphodo/preferencedialog.py:850
+#: ../raphodo/preferencedialog.py:1229
 msgid "Optimize Thumbnail Cache"
-msgstr ""
+msgstr "Optimaliser mellomlager for miniatyrbilete"
+
+#: ../raphodo/preferencedialog.py:1481
+msgid "Enter a Folder to Scan"
+msgstr "Vel ei mappe å skanna"
+
+#: ../raphodo/preferencedialog.py:1482
+msgid "Specify a folder that will be scanned for photos and videos"
+msgstr "Vel ei mappe som skal skannast for bilete og videoar"
+
+#: ../raphodo/preferencedialog.py:1483
+msgid "Folder:"
+msgstr "Mappe:"
 
-#: ../raphodo/preferencedialog.py:1045
+#: ../raphodo/preferencedialog.py:1497
 msgid "Enter a Path to Ignore"
 msgstr "Oppgi ein søkjesti å oversjå"
 
-#: ../raphodo/preferencedialog.py:1046
+#: ../raphodo/preferencedialog.py:1498
 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"
 
-#: ../raphodo/preferencedialog.py:1047
+#: ../raphodo/preferencedialog.py:1499
 msgid "Path:"
 msgstr "Sti:"
 
-#: ../raphodo/preferencedialog.py:1061
+#: ../raphodo/preferencedialog.py:1513
 msgid "Enter a File Extension"
-msgstr ""
+msgstr "Vel ein filtype"
 
-#: ../raphodo/preferencedialog.py:1062
+#: ../raphodo/preferencedialog.py:1514
 msgid "Specify a file extension (without the leading dot)"
-msgstr ""
+msgstr "Skriv inn ein filtype (utan punktum)"
 
-#: ../raphodo/preferencedialog.py:1063 ../raphodo/renamepanel.py:122
+#: ../raphodo/preferencedialog.py:1515 ../raphodo/renamepanel.py:122
 msgid "Extension:"
-msgstr ""
+msgstr "Filtype:"
 
-#: ../raphodo/preferencedialog.py:1078
+#: ../raphodo/preferencedialog.py:1530
 msgid "Invalid File Extension"
-msgstr ""
+msgstr "Ugyldig filtype"
 
-#: ../raphodo/preferencedialog.py:1079
+#: ../raphodo/preferencedialog.py:1531
 #, python-format
 msgid ""
 "The file extension <b>%s</b> is recognized by Rapid Photo Downloader, so it "
 "makes no sense to warn about its presence."
 msgstr ""
+"Filtypen <b>%s</b> vert kjent att av Rapid Photo Downloader, så det gjev "
+"ikkje meining å åtvara om slike filer finst."
 
-#: ../raphodo/preferencedialog.py:1081
+#: ../raphodo/preferencedialog.py:1533
 #, python-format
 msgid ""
 "Recognized file types:\n"
@@ -2221,113 +2988,125 @@ msgid ""
 "Other:\n"
 "%(other)s"
 msgstr ""
+"Kjende filtyper:\n"
+"\n"
+"Bilete:\n"
+"%(photos)s\n"
+"\n"
+"Videoar:\n"
+"%(videos)s\n"
+"\n"
+"Lyd:\n"
+"%(audio)s\n"
+"\n"
+"Anna:\n"
+"%(other)s"
 
 #: ../raphodo/preferences.py:286
 msgid "Wedding"
-msgstr ""
+msgstr "Bryllaup"
 
 #: ../raphodo/preferences.py:286
 msgid "Birthday"
-msgstr ""
+msgstr "Fødselsdag"
 
-#: ../raphodo/preferences.py:614
+#: ../raphodo/preferences.py:624
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Innstillingane for undermapper burde ikkje byrje med %s"
 
-#: ../raphodo/preferences.py:617
+#: ../raphodo/preferences.py:627
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Innstillingane for undermapper burde ikkje ende med %s"
 
-#: ../raphodo/preferences.py:622
+#: ../raphodo/preferences.py:632
 #, 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"
 
-#. self.setFlat(True)
 #: ../raphodo/primarybutton.py:72
 msgid "Download 8 Photos and 10 Videos"
-msgstr ""
+msgstr "Lasta ned 8 bilete og 10 videoar"
 
-#: ../raphodo/problemnotification.py:86 ../raphodo/problemnotification.py:208
+#: ../raphodo/problemnotification.py:87 ../raphodo/problemnotification.py:209
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
-msgstr ""
+msgstr "Feil: %(errno)s %(strerror)s"
 
-#: ../raphodo/problemnotification.py:89
+#: ../raphodo/problemnotification.py:90
 #, python-format
 msgid "Error: %s"
-msgstr ""
+msgstr "Feil: %s"
 
-#: ../raphodo/problemnotification.py:116
+#: ../raphodo/problemnotification.py:117
 #, python-format
 msgid "GPhoto2 Error: %s"
-msgstr ""
+msgstr "GPhoto2-feil: %s"
 
-#: ../raphodo/problemnotification.py:124
+#: ../raphodo/problemnotification.py:125
 msgid ""
 "Unable to initialize the camera, probably because another program is using "
 "it. No files were copied from it."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:134
+#: ../raphodo/problemnotification.py:135
 #, python-format
 msgid "Unable to read directory %s"
-msgstr ""
+msgstr "Klarte ikkje lesa mappa %s"
 
-#: ../raphodo/problemnotification.py:140
+#: ../raphodo/problemnotification.py:141
 #, python-format
 msgid "Unable to access modification time or size from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:146
+#: ../raphodo/problemnotification.py:147
 #, python-format
 msgid "Unable to read file %s"
-msgstr ""
+msgstr "Kan ikkje lesa fila %s"
 
-#: ../raphodo/problemnotification.py:152
+#: ../raphodo/problemnotification.py:153
 #, python-format
 msgid "Unable to write file %s"
-msgstr ""
+msgstr "Kan ikkje skriva fila %s"
 
-#: ../raphodo/problemnotification.py:158
+#: ../raphodo/problemnotification.py:159
 #, python-format
 msgid "Unable to move file %s"
-msgstr ""
+msgstr "Kan ikkje flytta fila %s"
 
-#: ../raphodo/problemnotification.py:164
+#: ../raphodo/problemnotification.py:165
 #, python-format
 msgid "Unable to remove file %s"
-msgstr ""
+msgstr "Kan ikkje fjerna fila %s"
 
-#: ../raphodo/problemnotification.py:170
+#: ../raphodo/problemnotification.py:171
 #, python-format
 msgid "Unable to copy file %s"
-msgstr ""
+msgstr "Kan ikkje kopiera fila %s"
 
-#: ../raphodo/problemnotification.py:176
+#: ../raphodo/problemnotification.py:177
 #, python-format
 msgid "Zero length file %s will not be downloaded"
-msgstr ""
+msgstr "Den tomme fila %s blir ikkje lasta ned"
 
-#: ../raphodo/problemnotification.py:182
+#: ../raphodo/problemnotification.py:183
 #, python-format
 msgid "Could not determine filesystem modification time for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:188
+#: ../raphodo/problemnotification.py:189
 #, python-format
 msgid "Unable to load metadata from %s"
-msgstr ""
+msgstr "Klarte ikkje lasta metadata frå %s"
 
-#: ../raphodo/problemnotification.py:194
+#: ../raphodo/problemnotification.py:195
 #, python-format
 msgid ""
 "Unable to load metadata from %(name)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:202
+#: ../raphodo/problemnotification.py:203
 #, python-format
 msgid ""
 "An error occurred setting a file's filesystem metadata on the filesystem %s. "
@@ -2335,78 +3114,78 @@ msgid ""
 "again."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:216
+#: ../raphodo/problemnotification.py:217
 #, python-format
 msgid "Encountered unhandled file %s. It will not be downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:223
+#: ../raphodo/problemnotification.py:224
 #, python-format
 msgid "%(filetype)s %(destination)s already exists."
-msgstr ""
+msgstr "%(filetype)s %(destination)s finst alt."
 
-#: ../raphodo/problemnotification.py:234 ../raphodo/problemnotification.py:262
+#: ../raphodo/problemnotification.py:235 ../raphodo/problemnotification.py:263
 #, python-format
 msgid ""
 "The existing %(filetype)s %(destination)s was last modified on %(date)s at "
 "%(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:245
+#: ../raphodo/problemnotification.py:246
 #, python-format
 msgid "The %(filetype)s %(source)s was not downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:273
+#: ../raphodo/problemnotification.py:274
 #, python-format
 msgid "The %(filetype)s %(source)s was downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:282
+#: ../raphodo/problemnotification.py:283
 #, python-format
 msgid "The unique identifier '%s' was added to the filename."
-msgstr ""
+msgstr "Den unike identifikatoren «%s» vart lagt til filnamnet."
 
-#: ../raphodo/problemnotification.py:298
+#: ../raphodo/problemnotification.py:299
 #, python-format
 msgid ""
 "The existing backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:309
+#: ../raphodo/problemnotification.py:310
 #, python-format
 msgid "The %(filetype)s %(source)s was not backed up from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:326
+#: ../raphodo/problemnotification.py:327
 #, python-format
 msgid ""
 "The previous backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:337
+#: ../raphodo/problemnotification.py:338
 #, python-format
 msgid ""
 "The %(filetype)s %(source)s from %(device)s was backed up, overwriting the "
 "previous backup %(filetype)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:356
+#: ../raphodo/problemnotification.py:357
 #, python-format
 msgid ""
 "When synchronizing RAW + JPEG sequence values, a duplicate %(filetype)s "
 "%(file)s was encountered, and was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:366
+#: ../raphodo/problemnotification.py:367
 msgid ""
 "When synchronizing RAW + JPEG sequence values, photos were detected with the "
 "same filenames, but taken at different times:"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:373
+#: ../raphodo/problemnotification.py:374
 #, python-format
 msgid ""
 "%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
@@ -2415,161 +3194,163 @@ msgstr ""
 "%(image1)s vart teke den %(image1_date)s kl. %(image1_time)s, og %(image2)s "
 "den %(image2_date)s kl. %(image2_time)s."
 
-#: ../raphodo/problemnotification.py:389
+#: ../raphodo/problemnotification.py:390
 #, python-format
 msgid "Unable to finalize the filename for %s"
-msgstr ""
+msgstr "Klarte ikkje fullføra filnamnet for %s"
 
-#: ../raphodo/problemnotification.py:424
+#: ../raphodo/problemnotification.py:425
 #, python-format
 msgid ""
 "The filename %(destination)s was not fully generated for %(filetype)s "
 "%(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:433
+#: ../raphodo/problemnotification.py:434
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr "%(type)s-metadataen manglar."
 
-#: ../raphodo/problemnotification.py:439
+#: ../raphodo/problemnotification.py:440
 #, python-format
 msgid "The following metadata is missing: %s."
-msgstr ""
+msgstr "Følgjande metadata manglar: %s."
 
-#: ../raphodo/problemnotification.py:445
+#: ../raphodo/problemnotification.py:446
 #, python-format
 msgid "Date/time conversion failed: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:451
+#: ../raphodo/problemnotification.py:452
 msgid ""
 "Could not extract valid date/time metadata or determine the file "
 "modification time."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:457
+#: ../raphodo/problemnotification.py:458
 msgid "Filename does not have an extension."
 msgstr "Filnamnet manglar filending."
 
-#: ../raphodo/problemnotification.py:460
+#: ../raphodo/problemnotification.py:461
 msgid "Filename does not have a number component."
 msgstr "Filnamnet manglar nummerdelen."
 
-#: ../raphodo/problemnotification.py:464
+#: ../raphodo/problemnotification.py:465
 #, python-format
 msgid "Error generating component %(component)s. Error: %(error)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:477
+#: ../raphodo/problemnotification.py:478
 #, python-format
 msgid ""
 "The download subfolders %(folder)s were only partially generated for "
 "%(filetype)s %(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:486
+#: ../raphodo/problemnotification.py:487
 #, python-format
 msgid ""
 "There is no data with which to generate the %(subfolder_file)s for "
 "%(filename)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:499
+#: ../raphodo/problemnotification.py:500
 #, python-format
 msgid ""
 "Unable to create the %(filetype)s %(destination)s in %(folder)s. The "
 "download file was %(source)s in %(device)s. It was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:514
+#: ../raphodo/problemnotification.py:515
 #, python-format
 msgid "Unable to create the download subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:526
+#: ../raphodo/problemnotification.py:527
 #, python-format
 msgid "Unable to create the backup subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:577
+#: ../raphodo/problemnotification.py:578
 #, python-format
 msgid "Problems scanning %s"
-msgstr ""
+msgstr "Klarte ikkje skanna %s"
 
-#: ../raphodo/problemnotification.py:584
+#: ../raphodo/problemnotification.py:585
 #, python-format
 msgid "Problems copying from %s"
-msgstr ""
+msgstr "Klarte ikkje kopiera frå %s"
 
-#: ../raphodo/problemnotification.py:591
+#: ../raphodo/problemnotification.py:592
 msgid "Problems while finalizing filenames and generating subfolders"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:598
+#: ../raphodo/problemnotification.py:599
 #, python-format
 msgid "Problems backing up to %s"
-msgstr ""
+msgstr "Problem med tryggleikskopiering til %s"
+
+#. Translators: for example Nov 3 2015, 11:25 AM
+#. Translators: for example, Nov 3, 12:15 PM
+#: ../raphodo/proximity.py:188 ../raphodo/proximity.py:213
+#: ../raphodo/proximity.py:236 ../raphodo/proximity.py:239
+#, python-format
+msgid "%(date)s, %(time)s"
+msgstr "%(date)s, %(time)s"
+
+#: ../raphodo/proximity.py:204
+#, python-format
+msgid "%(starttime)s - %(endtime)s"
+msgstr "%(starttime)s - %(endtime)s"
 
-#. Translators: for example Nov 3 or Dec 31
 #. The start and end dates are on a different day
 #. Translators: for example Nov 3 or Dec 31
-#: ../raphodo/proximity.py:105 ../raphodo/proximity.py:221
-#: ../raphodo/proximity.py:224 ../raphodo/proximity.py:828
+#: ../raphodo/proximity.py:221 ../raphodo/proximity.py:225
+#: ../raphodo/proximity.py:980 ../raphodo/timeutils.py:105
 #, python-format
 msgid "%(month)s %(numeric_day)s"
-msgstr ""
+msgstr "%(numeric_day)s. %(month)s"
 
-#. Translators: for example Nov 15 2015
 #. Translators: for example Nov 3 2015
-#: ../raphodo/proximity.py:109 ../raphodo/proximity.py:230
-#: ../raphodo/proximity.py:231 ../raphodo/proximity.py:831
+#. Translators: for example Nov 2 2015
+#. Translators: for example Nov 15 2015
+#: ../raphodo/proximity.py:232 ../raphodo/proximity.py:233
+#: ../raphodo/proximity.py:985 ../raphodo/timeutils.py:110
 #, python-format
 msgid "%(date)s %(year)s"
-msgstr ""
-
-#. Translators: for example Nov 3 2015, 11:25 AM
-#. Translators: for example, Nov 3, 12:15 PM
-#: ../raphodo/proximity.py:197 ../raphodo/proximity.py:215
-#: ../raphodo/proximity.py:234 ../raphodo/proximity.py:236
-#, python-format
-msgid "%(date)s, %(time)s"
-msgstr ""
-
-#: ../raphodo/proximity.py:209
-#, python-format
-msgid "%(starttime)s - %(endtime)s"
-msgstr ""
+msgstr "%(date)s %(year)s"
 
 #. Translators: for example, Nov 3, 12:15 PM - Nov 4, 1:00 AM
-#: ../raphodo/proximity.py:241
+#: ../raphodo/proximity.py:245
 #, python-format
 msgid "%(earlier_time)s - %(later_time)s"
-msgstr ""
+msgstr "%(earlier_time)s – %(later_time)s"
 
 #. Translators, for example:
 #. Nov 3 2012, 12:15 PM -
 #. Nov 4 2012, 1:00 AM
 #. (please keep the line break signified by \n)
-#: ../raphodo/proximity.py:248
+#: ../raphodo/proximity.py:253
 #, python-format
 msgid ""
 "%(earlier_time)s -\n"
 "%(later_time)s"
 msgstr ""
+"%(earlier_time)s –\n"
+"%(later_time)s"
 
-#: ../raphodo/proximity.py:359
+#: ../raphodo/proximity.py:382
 #, python-format
 msgid "%(month)s  %(year)s"
-msgstr ""
+msgstr "%(month)s  %(year)s"
 
 #. Translators: for example Nov 2015
-#: ../raphodo/proximity.py:833
+#: ../raphodo/proximity.py:987
 #, python-format
 msgid "%(month)s %(year)s"
-msgstr ""
+msgstr "%(month)s %(year)s"
 
-#: ../raphodo/proximity.py:1344
+#: ../raphodo/proximity.py:1595
 msgid ""
 "The time elapsed between consecutive photos and videos that is used to build "
 "the Timeline"
@@ -2579,47 +3360,47 @@ msgstr ""
 #. Replace the very last character (after the d) with the correct
 #. localized value, keeping everything else. In other words, change
 #. only the m character.
-#: ../raphodo/proximity.py:1406
+#: ../raphodo/proximity.py:1652
 #, python-format
 msgid "%(minutes)dm"
-msgstr ""
+msgstr "%(minutes)dm"
 
 #. Translators: i.e. "1.5h", which is short for 1.5 hours.
 #. Replace the entire string with the correct localized value
-#: ../raphodo/proximity.py:1410
+#: ../raphodo/proximity.py:1656
 msgid "1.5h"
-msgstr ""
+msgstr "1.5t"
 
 #. Translators: e.g. "5h", which is short for 5 hours.
 #. Replace the very last character (after the d) with the correct localized value,
 #. keeping everything else. In other words, change only the h character.
-#: ../raphodo/proximity.py:1415
+#: ../raphodo/proximity.py:1661
 #, python-format
 msgid "%(hours)dh"
-msgstr ""
+msgstr "%(hours)dt"
 
-#: ../raphodo/proximity.py:1461
+#: ../raphodo/proximity.py:1710
 msgid ""
 "The Timeline groups photos and videos based on how much time elapsed between "
 "consecutive shots. Use it to identify photos and videos taken at different "
 "periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/proximity.py:1464
+#: ../raphodo/proximity.py:1715
 msgid ""
 "Use the slider (below) to adjust the time elapsed between consecutive shots "
 "that is used to build the Timeline."
 msgstr ""
 
-#: ../raphodo/proximity.py:1466
+#: ../raphodo/proximity.py:1718
 msgid "Timeline build pending..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1467
+#: ../raphodo/proximity.py:1719
 msgid "Timeline is building..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1468
+#: ../raphodo/proximity.py:1721
 msgid ""
 "The Timeline needs to be rebuilt because the file modification time does not "
 "match the time a shot was taken for one or more shots.<br><br>The Timeline "
@@ -2631,61 +3412,68 @@ msgid ""
 "downloading, which is when the metadata is read."
 msgstr ""
 
-#: ../raphodo/rapid.py:485 ../raphodo/rapid.py:2461 ../raphodo/rapid.py:3728
-#: ../raphodo/rapid.py:3846 ../raphodo/rapid.py:3850 ../raphodo/rapid.py:3870
-#: ../raphodo/rapid.py:3874 ../raphodo/rapid.py:3998 ../raphodo/rapid.py:4007
-#: ../raphodo/rapid.py:4495 ../raphodo/rapid.py:4888 ../raphodo/rapid.py:5722
-#: ../raphodo/rememberthisdialog.py:97
+#: ../raphodo/rapid.py:493 ../raphodo/rapid.py:2555 ../raphodo/rapid.py:3934
+#: ../raphodo/rapid.py:4065 ../raphodo/rapid.py:4069 ../raphodo/rapid.py:4092
+#: ../raphodo/rapid.py:4096 ../raphodo/rapid.py:4226 ../raphodo/rapid.py:4237
+#: ../raphodo/rapid.py:4743 ../raphodo/rapid.py:5195 ../raphodo/rapid.py:5997
+#: ../raphodo/rememberthisdialog.py:99
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:3
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: ../raphodo/rapid.py:1100
+#: ../raphodo/rapid.py:1131
 msgid ""
 "<b>ExifTool has a problem</b><br><br> Rapid Photo Downloader uses ExifTool "
 "to get metadata from videos and photos. The program will run without it, but "
 "installing it is <b>highly</b> recommended."
 msgstr ""
+"<b>Det er eit problem med ExifTool</b><br><br> Rapid Photo Downloader brukar "
+"ExifTool for å trekkja ut metadata frå videoar og bilete. Programmet vil "
+"kunna køyra utan det, men å installera det er <b>sterkt</b> tilrådd."
 
-#: ../raphodo/rapid.py:1110 ../raphodo/rapid.py:1130
+#: ../raphodo/rapid.py:1141 ../raphodo/rapid.py:1161
 msgid "Problem with libmediainfo"
 msgstr ""
 
-#: ../raphodo/rapid.py:1119
+#: ../raphodo/rapid.py:1150
 msgid ""
 "<b>The library libmediainfo appears to be missing</b><br><br> Rapid Photo "
 "Downloader uses libmediainfo to get the date and time a video was shot. The "
 "program will run  without it, but installing it is recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1417
+#: ../raphodo/rapid.py:1448
 msgid "Download failed"
-msgstr ""
+msgstr "Feil ved nedlasting"
 
-#: ../raphodo/rapid.py:1419
+#: ../raphodo/rapid.py:1450
 msgid ""
 "Sorry, the download of the new version of Rapid Photo Downloader failed."
 msgstr ""
+"Det oppstod dessverre ein feil ved nedlastinga av den nye utgåva av Rapid "
+"Photo Downloader."
 
-#: ../raphodo/rapid.py:1425
+#: ../raphodo/rapid.py:1457
 msgid ""
 "The new version was successfully downloaded. Do you want to close Rapid "
 "Photo Downloader and install it now?"
 msgstr ""
+"Den nye utgåva vart lasta ned. Vil du lukka Rapid Photo Downloader og "
+"installera ho no?"
 
-#: ../raphodo/rapid.py:1428
+#: ../raphodo/rapid.py:1461
 msgid "Update Rapid Photo Downloader"
-msgstr ""
+msgstr "Oppdater Rapid Photo Downloader"
 
-#: ../raphodo/rapid.py:1432
+#: ../raphodo/rapid.py:1465
 msgid "Install"
-msgstr ""
+msgstr "Installer"
 
-#: ../raphodo/rapid.py:1450
+#: ../raphodo/rapid.py:1483
 msgid "New version saved"
-msgstr ""
+msgstr "Ny utgåve lagra"
 
-#: ../raphodo/rapid.py:1451
+#: ../raphodo/rapid.py:1485
 #, python-format
 msgid ""
 "The tar file and installer script are saved at:\n"
@@ -2693,163 +3481,163 @@ msgid ""
 " %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:1468
+#: ../raphodo/rapid.py:1502
 msgid "Upgrade failed"
-msgstr ""
+msgstr "Klarte ikkje oppgradera"
 
-#: ../raphodo/rapid.py:1469
+#: ../raphodo/rapid.py:1505
 msgid ""
 "Sorry, upgrading Rapid Photo Downloader failed because there was an error "
 "opening the installer."
 msgstr ""
 
-#: ../raphodo/rapid.py:1667 ../raphodo/rapid.py:2331
+#: ../raphodo/rapid.py:1709 ../raphodo/rapid.py:2425
 msgid "Download"
 msgstr "Last ned"
 
-#: ../raphodo/rapid.py:1671
+#: ../raphodo/rapid.py:1713
 msgid "&Refresh..."
-msgstr ""
+msgstr "&Oppfrisk …"
 
-#: ../raphodo/rapid.py:1675
+#: ../raphodo/rapid.py:1717
 msgid "&Preferences"
-msgstr ""
+msgstr "&Innstillingar"
 
-#: ../raphodo/rapid.py:1679
+#: ../raphodo/rapid.py:1721
 msgid "&Quit"
-msgstr ""
+msgstr "&Avslutt"
 
-#: ../raphodo/rapid.py:1683
+#: ../raphodo/rapid.py:1725
 msgid "Error &Reports"
-msgstr ""
+msgstr "Feil&rapportar"
 
-#: ../raphodo/rapid.py:1687
+#: ../raphodo/rapid.py:1729
 msgid "Clear Completed Downloads"
-msgstr ""
+msgstr "Fjern fullførde nedlastingar"
 
-#: ../raphodo/rapid.py:1691
+#: ../raphodo/rapid.py:1733
 msgid "Get Help Online..."
-msgstr ""
+msgstr "Få hjelp på Internett …"
 
-#: ../raphodo/rapid.py:1695
+#: ../raphodo/rapid.py:1737
 msgid "&Tip of the Day..."
-msgstr ""
+msgstr "&Dagens tips …"
 
-#: ../raphodo/rapid.py:1699
+#: ../raphodo/rapid.py:1741
 msgid "Report a Problem..."
-msgstr ""
+msgstr "Rapporter eit problem …"
 
-#: ../raphodo/rapid.py:1703
+#: ../raphodo/rapid.py:1745
 msgid "Make a Donation..."
-msgstr ""
+msgstr "Gje ein donasjon …"
 
-#: ../raphodo/rapid.py:1707
+#: ../raphodo/rapid.py:1749
 msgid "Translate this Application..."
 msgstr "Omsett denne applikasjonen …"
 
-#: ../raphodo/rapid.py:1711
+#: ../raphodo/rapid.py:1753
 msgid "&About..."
-msgstr ""
+msgstr "&Om …"
 
-#: ../raphodo/rapid.py:1715
+#: ../raphodo/rapid.py:1757
 msgid "Check for Updates..."
-msgstr ""
+msgstr "Sjå etter oppdateringar …"
 
-#: ../raphodo/rapid.py:1797
+#: ../raphodo/rapid.py:1840
 msgid "Timeline"
-msgstr ""
+msgstr "Tidslinje"
 
-#: ../raphodo/rapid.py:1807
+#: ../raphodo/rapid.py:1850
 msgid "Destination"
-msgstr ""
+msgstr "Mål"
 
-#: ../raphodo/rapid.py:1808
+#: ../raphodo/rapid.py:1851
 msgid "Rename"
-msgstr ""
+msgstr "Endra namn"
 
-#: ../raphodo/rapid.py:1810
+#: ../raphodo/rapid.py:1853
 msgid "Back Up"
-msgstr ""
+msgstr "Tryggleikskopi"
 
 #. Devices Header and View
-#: ../raphodo/rapid.py:1926
+#: ../raphodo/rapid.py:1977
 msgid ""
 "Turn on or off the use of devices attached to this computer as download "
 "sources"
 msgstr ""
 
 #. This Computer Header and View
-#: ../raphodo/rapid.py:1940
+#: ../raphodo/rapid.py:1994
 msgid ""
 "Turn on or off the use of a folder on this computer as a download source"
 msgstr ""
 
-#: ../raphodo/rapid.py:1941
+#: ../raphodo/rapid.py:1996
 msgid "This Computer"
-msgstr ""
+msgstr "Denne datamaskina"
 
-#: ../raphodo/rapid.py:1952
+#: ../raphodo/rapid.py:2009
 msgid "Select a source folder"
-msgstr ""
+msgstr "Vel ei kjeldemappe"
 
-#: ../raphodo/rapid.py:1975
+#: ../raphodo/rapid.py:2038
 msgid "Projected Storage Use"
-msgstr ""
+msgstr "Forventa lagringsbruk"
 
-#: ../raphodo/rapid.py:1989 ../raphodo/rapid.py:1997
+#: ../raphodo/rapid.py:2056 ../raphodo/rapid.py:2068
 msgid "Select a destination folder"
-msgstr ""
+msgstr "Vel ei målmappe"
 
-#: ../raphodo/rapid.py:2045
+#: ../raphodo/rapid.py:2117
 msgid "All"
-msgstr ""
+msgstr "Alle"
 
-#: ../raphodo/rapid.py:2046
+#: ../raphodo/rapid.py:2118
 msgid "New"
-msgstr ""
+msgstr "Ny"
 
-#: ../raphodo/rapid.py:2048
+#: ../raphodo/rapid.py:2120
 msgid "Show:"
-msgstr ""
+msgstr "Vis:"
 
-#: ../raphodo/rapid.py:2051
+#: ../raphodo/rapid.py:2123
 msgid "Modification Time"
-msgstr ""
+msgstr "Endringstid"
 
-#: ../raphodo/rapid.py:2052
+#: ../raphodo/rapid.py:2124
 msgid "Checked State"
-msgstr ""
+msgstr "Avkryssa"
 
-#: ../raphodo/rapid.py:2055
+#: ../raphodo/rapid.py:2127
 msgid "File Type"
-msgstr ""
+msgstr "Filtype"
 
-#: ../raphodo/rapid.py:2056
+#: ../raphodo/rapid.py:2128
 msgid "Device"
 msgstr "Eining"
 
-#: ../raphodo/rapid.py:2058
+#: ../raphodo/rapid.py:2130
 msgid "Sort:"
-msgstr ""
+msgstr "Sorter:"
 
-#: ../raphodo/rapid.py:2069
+#: ../raphodo/rapid.py:2141
 msgid "Select All:"
-msgstr ""
+msgstr "Vel alle:"
 
-#: ../raphodo/rapid.py:2311
+#: ../raphodo/rapid.py:2405
 #, python-format
 msgid "Download %(files)s"
-msgstr ""
+msgstr "Last ned %(files)s"
 
-#: ../raphodo/rapid.py:2327
+#: ../raphodo/rapid.py:2421
 msgid "Resume Download"
-msgstr ""
+msgstr "Hald fram nedlasting"
 
-#: ../raphodo/rapid.py:2329
+#: ../raphodo/rapid.py:2423
 msgid "Pause"
 msgstr "Pause"
 
-#: ../raphodo/rapid.py:2417
+#: ../raphodo/rapid.py:2511
 #, python-brace-format
 msgid ""
 "Please report the problem at <a href=\"{website}\">{website}</a>.<br><br>\n"
@@ -2857,12 +3645,17 @@ msgid ""
 "            <a href=\"{log_path}\">here</a> to open the log directory).\n"
 "            "
 msgstr ""
+"Ver vennleg og rapporter problemet på <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
+"            Legg ved loggfila <i>{log_file}</i> i feilrapporten din (trykk\n"
+"            <a href=\"{log_path}\">her</a> for å opna loggmappa).\n"
+"            "
 
-#: ../raphodo/rapid.py:2431
+#: ../raphodo/rapid.py:2525
 msgid "Thank you for reporting a problem in Rapid Photo Downloader"
-msgstr ""
+msgstr "Takk for at du rapporterte eit problem med Rapid Photo Downloader"
 
-#: ../raphodo/rapid.py:2529
+#: ../raphodo/rapid.py:2624
 #, python-format
 msgid ""
 "<b>Changing This Computer source path</b><br><br>Do you really want to "
@@ -2871,30 +3664,29 @@ msgid ""
 "from This Computer will be cancelled."
 msgstr ""
 
-#: ../raphodo/rapid.py:2595
+#: ../raphodo/rapid.py:2694
 msgid "You cannot change the download destination while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:2604
+#: ../raphodo/rapid.py:2704
 #, python-format
 msgid ""
 "<b>Confirm Download Destination</b><br><br>Are you sure you want to set the "
 "%(file_type)s download destination to %(path)s?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2682
+#: ../raphodo/rapid.py:2785
 msgid ""
+"\n"
 "<b>Downloading all files</b><br><br>\n"
-"                    A download always includes all files that are checked "
-"for download,\n"
-"                    including those that are not currently displayed because "
-"the Timeline\n"
-"                    is being used or because only new files are being shown."
-"<br><br>\n"
-"                    Do you want to proceed with the download?"
+"A download always includes all files that are checked for download,\n"
+"including those that are not currently displayed because the Timeline\n"
+"is being used or because only new files are being shown.<br><br>\n"
+"Do you want to proceed with the download?\n"
+"                        "
 msgstr ""
 
-#: ../raphodo/rapid.py:2820
+#: ../raphodo/rapid.py:2937
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -2905,7 +3697,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: ../raphodo/rapid.py:2824
+#: ../raphodo/rapid.py:2940
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -2914,199 +3706,193 @@ msgstr ""
 "Mappa er ugyldig:\n"
 "%s"
 
-#: ../raphodo/rapid.py:2827
+#: ../raphodo/rapid.py:2943
 msgid "Download Failure"
-msgstr ""
+msgstr "Nedlastingsfeil"
 
-#: ../raphodo/rapid.py:2828
+#: ../raphodo/rapid.py:2944
 msgid "The download cannot proceed."
 msgstr ""
 
-#: ../raphodo/rapid.py:2842
+#: ../raphodo/rapid.py:2962
 msgid ""
 "Photos and videos will not be backed up because there is nowhere to back "
 "them up. Do you still want to start the download?"
 msgstr ""
 
-#. Translators: filetype will be replaced with 'photos' or 'videos'
-#: ../raphodo/rapid.py:2847 ../raphodo/rapid.py:2854
+#: ../raphodo/rapid.py:2969 ../raphodo/rapid.py:2979
 #, python-format
 msgid ""
 "No backup device exists for backing up %(filetype)s. Do you still want to "
 "start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2848 ../raphodo/rpdfile.py:228
+#: ../raphodo/rapid.py:2971 ../raphodo/rpdfile.py:228
 msgid "photos"
 msgstr "bilete"
 
-#: ../raphodo/rapid.py:2855 ../raphodo/rpdfile.py:223
+#: ../raphodo/rapid.py:2981 ../raphodo/rpdfile.py:223
 msgid "videos"
 msgstr "videoar"
 
-#: ../raphodo/rapid.py:2861
+#: ../raphodo/rapid.py:2989
 msgid ""
 "<b>The photo and video backup destinations do not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2869 ../raphodo/rapid.py:2876
+#: ../raphodo/rapid.py:2999 ../raphodo/rapid.py:3008
 #, python-format
 msgid ""
 "<b>The %(filetype)s backup destination does not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2871 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:818
+#: ../raphodo/rapid.py:3001 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:843
 msgid "photo"
 msgstr "bilete"
 
-#: ../raphodo/rapid.py:2878 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:858
+#: ../raphodo/rapid.py:3010 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:883
 msgid "video"
 msgstr "video"
 
-#: ../raphodo/rapid.py:2886
+#: ../raphodo/rapid.py:3018
 msgid "Backup problem"
 msgstr "Problem med tryggleikskopiering"
 
-#. Translators - in the middle is a unicode em dash - please retain it
-#. This string is displayed in the status bar when the download is running
-#: ../raphodo/rapid.py:3571
+#: ../raphodo/rapid.py:3756
 #, python-format
 msgid "%(downloading_from)s — %(time_left)s left (%(speed)s)"
-msgstr ""
+msgstr "%(downloading_from)s – %(time_left)s igjen (%(speed)s)"
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3640
+#: ../raphodo/rapid.py:3828
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "Lasta ned %(noFiles)s %(filetypes)s"
 
-#. Translators: e.g. 2 videos failed to download
-#: ../raphodo/rapid.py:3645
+#: ../raphodo/rapid.py:3836
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "Klarte ikkje å laste ned %(noFiles)s %(filetypes)s"
 
-#: ../raphodo/rapid.py:3650 ../raphodo/rapid.py:3723
+#: ../raphodo/rapid.py:3842 ../raphodo/rapid.py:3927
 msgid "warnings"
 msgstr "åtvaringar"
 
-#: ../raphodo/rapid.py:3679
+#: ../raphodo/rapid.py:3873
 msgid "All downloads complete"
 msgstr "Alle nedlastingar er ferdige"
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3686 ../raphodo/rapid.py:3695 ../raphodo/rapid.py:3704
-#: ../raphodo/rapid.py:3713 ../raphodo/rapid.py:3721
+#: ../raphodo/rapid.py:3881 ../raphodo/rapid.py:3892 ../raphodo/rapid.py:3903
+#: ../raphodo/rapid.py:3914 ../raphodo/rapid.py:3924
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: ../raphodo/rapid.py:3688 ../raphodo/rapid.py:3706
+#: ../raphodo/rapid.py:3884 ../raphodo/rapid.py:3906
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s lasta ned"
 
-#: ../raphodo/rapid.py:3697 ../raphodo/rapid.py:3715
+#: ../raphodo/rapid.py:3895 ../raphodo/rapid.py:3917
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "Klarte ikkje å laste ned %(filetype)s"
 
-#: ../raphodo/rapid.py:3742
+#: ../raphodo/rapid.py:3950
 msgid "1 failure"
-msgstr ""
+msgstr "1 feil"
 
-#: ../raphodo/rapid.py:3744
+#: ../raphodo/rapid.py:3952
 #, python-format
 msgid "%d failures"
-msgstr ""
+msgstr "%d feil"
 
-#: ../raphodo/rapid.py:3749
+#: ../raphodo/rapid.py:3957
 msgid "1 warning"
-msgstr ""
+msgstr "1 åtvaring"
 
-#: ../raphodo/rapid.py:3751
+#: ../raphodo/rapid.py:3959
 #, python-format
 msgid "%d warnings"
-msgstr ""
+msgstr "%d åtvaringar"
 
-#: ../raphodo/rapid.py:3771
+#: ../raphodo/rapid.py:3981
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s"
-msgstr ""
+msgstr "Lasta ned %(no_files_and_types)s frå %(devices)s"
 
-#: ../raphodo/rapid.py:3774
+#: ../raphodo/rapid.py:3985
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s — %(failures)s"
-msgstr ""
+msgstr "Lasta ned %(no_files_and_types)s frå %(devices)s — %(failures)s"
 
-#: ../raphodo/rapid.py:3779
+#: ../raphodo/rapid.py:3989
 #, python-format
 msgid "No files downloaded — %(failures)s"
-msgstr ""
+msgstr "Ingen filer lasta ned — %(failures)s"
 
-#: ../raphodo/rapid.py:3781
+#: ../raphodo/rapid.py:3991
 msgid "No files downloaded"
-msgstr ""
+msgstr "Ingen filer lasta ned"
 
-#: ../raphodo/rapid.py:3805
+#: ../raphodo/rapid.py:4021
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3809
+#: ../raphodo/rapid.py:4026
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3812
+#: ../raphodo/rapid.py:4031
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3820
+#: ../raphodo/rapid.py:4039
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3833
+#: ../raphodo/rapid.py:4052
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3837
+#: ../raphodo/rapid.py:4056
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3841
+#: ../raphodo/rapid.py:4060
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices"
 msgstr ""
 
-#: ../raphodo/rapid.py:3867
+#: ../raphodo/rapid.py:4087
 msgid "The Destination subfolders and Timeline have been rebuilt"
 msgstr ""
 
-#: ../raphodo/rapid.py:3922
+#: ../raphodo/rapid.py:4144
 msgid "Program preferences are invalid"
 msgstr "Programinnstillingane er ugyldige"
 
-#: ../raphodo/rapid.py:3999
+#: ../raphodo/rapid.py:4228
 #, python-format
 msgid ""
 "<b>All files on the %(camera)s are inaccessible</b>.<br><br>It may be locked "
@@ -3116,179 +3902,210 @@ msgid ""
 "ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4008
+#: ../raphodo/rapid.py:4239
 #, python-format
 msgid ""
-"<b>The %(camera)s appears to be in use by another application.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again.<br><br>Alternatively, you can ignore this "
-"device."
+"<b>The %(camera)s appears to be in use by another "
+"application.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again.<br><br>Alternatively, you "
+"can ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4019
+#: ../raphodo/rapid.py:4250
 msgid "&Try Again"
-msgstr ""
+msgstr "&Prøv på nytt"
 
-#: ../raphodo/rapid.py:4020
+#: ../raphodo/rapid.py:4251
 msgid "&Ignore This Device"
-msgstr ""
+msgstr "&Ignorer denne eininga"
 
-#: ../raphodo/rapid.py:4086
+#: ../raphodo/rapid.py:4323
 #, python-format
 msgid "Sorry, an unexpected problem occurred while scanning %s."
 msgstr ""
 
-#: ../raphodo/rapid.py:4087
+#: ../raphodo/rapid.py:4324
 msgid "Unfortunately you cannot download from this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4091
+#: ../raphodo/rapid.py:4328
 msgid ""
 "A possible workaround for the problem might be downloading from the camera's "
 "memory card using a card reader."
 msgstr ""
 
-#: ../raphodo/rapid.py:4096
+#: ../raphodo/rapid.py:4333
 msgid "Device scan failed"
-msgstr ""
+msgstr "Klarte ikkje skanna eininga"
 
-#: ../raphodo/rapid.py:4472
+#: ../raphodo/rapid.py:4720
 #, python-format
 msgid ""
-"<b>The %(camera)s cannot be scanned because it cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again."
+"<b>The %(camera)s cannot be scanned because it cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again."
 msgstr ""
 
-#: ../raphodo/rapid.py:4496
+#: ../raphodo/rapid.py:4745
 #, python-format
 msgid ""
-"<b>The download cannot start because the %(camera)s cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again, and choose which files you want to "
-"download from it."
+"<b>The download cannot start because the %(camera)s cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again, and choose which files "
+"you want to download from it."
+msgstr ""
+
+#: ../raphodo/rapid.py:4842
+msgid "Completed Downloads Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4844
+#, python-format
+msgid "%s whose download have completed are displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4846
+msgid "Do you want to clear the completed downloads?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4848
+msgid "Completed Download Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4850
+#, python-format
+msgid "%s whose download has completed is displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4852
+msgid "Do you want to clear the completed download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:4635
+#: ../raphodo/rapid.py:4933
 #, python-format
 msgid ""
 "Do you want to download photos and videos from the device <i>%(device)s</i>?"
 msgstr ""
 
-#: ../raphodo/rapid.py:4877
+#: ../raphodo/rapid.py:5183
 #, python-format
 msgid "<b>Do you want to ignore the %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4879
+#: ../raphodo/rapid.py:5186
 msgid ""
 "All cameras, phones and tablets with the same model name will be ignored."
 msgstr ""
+"Alle kamera, telefonar og nettbrett med same modellnamn blir ignorert."
 
-#: ../raphodo/rapid.py:4883
+#: ../raphodo/rapid.py:5190
 #, python-format
 msgid ""
 "<b>Do you want to ignore the device %s whenever this program is run?</b>"
-msgstr ""
+msgstr "<b>Vil du ignorera eininga %s kvar gong programmet køyrer?</b>"
 
-#: ../raphodo/rapid.py:4885
+#: ../raphodo/rapid.py:5192
 msgid "Any device with the same name will be ignored."
-msgstr ""
+msgstr "Alle einingar med same namn blir ignorert."
 
-#: ../raphodo/rapid.py:5178
+#: ../raphodo/rapid.py:5492
 #, python-format
 msgid "Downloading from %(location)s on This Computer."
-msgstr ""
+msgstr "Lastar ned frå %(location)s på denne maskina."
 
-#: ../raphodo/rapid.py:5180
+#: ../raphodo/rapid.py:5496
 msgid ""
 "Do you really want to download from here?<br><br>On some systems, scanning "
 "this location can take a very long time."
 msgstr ""
 
-#: ../raphodo/rapid.py:5224
+#: ../raphodo/rapid.py:5537
 #, python-format
 msgid "Generating thumbnails for %s"
-msgstr ""
+msgstr "Lagar miniatyrbilete for %s"
 
-#: ../raphodo/rapid.py:5227
+#: ../raphodo/rapid.py:5540
 #, python-format
 msgid "Scanning %s"
-msgstr ""
+msgstr "Skannar %s"
 
-#: ../raphodo/rapid.py:5237
+#: ../raphodo/rapid.py:5551
 #, python-format
 msgid ""
 "%(number)s of %(available files)s checked for download (%(hidden)s hidden)"
 msgstr ""
+"%(number)s av %(available files)s kontrollert for nedlasting (%(hidden)s "
+"skjulte)"
 
-#: ../raphodo/rapid.py:5243
+#: ../raphodo/rapid.py:5559
 #, python-format
 msgid "%(number)s of %(available files)s checked for download"
-msgstr ""
+msgstr "%(number)s av %(available files)s kontrollert for nedlasting"
 
-#: ../raphodo/rapid.py:5494
+#: ../raphodo/rapid.py:5764
 msgid "Display program information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5496
+#: ../raphodo/rapid.py:5766
 msgid "Display debugging information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5499
+#: ../raphodo/rapid.py:5769
 msgid "List photo and video file extensions the program recognizes and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5502
+#: ../raphodo/rapid.py:5772
 msgid "Turn on or off the the renaming of photos."
-msgstr ""
+msgstr "Skru av eller på omdøyping av bilete."
 
-#: ../raphodo/rapid.py:5504
+#: ../raphodo/rapid.py:5774
 msgid "turn on or off the the renaming of videos."
-msgstr ""
+msgstr "Skru av eller på omdøyping av videoar."
 
-#: ../raphodo/rapid.py:5506
+#: ../raphodo/rapid.py:5776
 msgid ""
 "Turn on or off the automatic detection of devices from which to download."
-msgstr ""
+msgstr "Skru av eller på automatisk oppdaging av einingar å lasta ned frå."
 
-#: ../raphodo/rapid.py:5510
+#: ../raphodo/rapid.py:5780
 msgid "Turn on or off downloading from this computer."
-msgstr ""
+msgstr "Skru av eller på nedlasting frå denne maskina."
 
-#: ../raphodo/rapid.py:5512 ../raphodo/rapid.py:5515 ../raphodo/rapid.py:5518
-#: ../raphodo/rapid.py:5539 ../raphodo/rapid.py:5543
+#: ../raphodo/rapid.py:5782 ../raphodo/rapid.py:5785 ../raphodo/rapid.py:5788
+#: ../raphodo/rapid.py:5809 ../raphodo/rapid.py:5813
 msgid "PATH"
-msgstr ""
+msgstr "STI"
 
-#: ../raphodo/rapid.py:5513
+#: ../raphodo/rapid.py:5783
 msgid "The PATH on this computer from which to download."
-msgstr ""
+msgstr "Stien på denne maskina som me skal lasta ned frå."
 
-#: ../raphodo/rapid.py:5516
+#: ../raphodo/rapid.py:5786
 msgid "The PATH where photos will be downloaded to."
-msgstr ""
+msgstr "Stien me skal lasta ned bilete til."
 
-#: ../raphodo/rapid.py:5519
+#: ../raphodo/rapid.py:5789
 msgid "The PATH where videos will be downloaded to."
-msgstr ""
+msgstr "Stien me skal lasta ned videoar til."
 
-#: ../raphodo/rapid.py:5521
+#: ../raphodo/rapid.py:5791
 msgid "Turn on or off the backing up of photos and videos while downloading."
 msgstr ""
+"Skru av eller på tryggleikskopiering av bilete og videoar ved nedlasting."
 
-#: ../raphodo/rapid.py:5525
+#: ../raphodo/rapid.py:5795
 msgid "Turn on or off the automatic detection of backup devices."
 msgstr ""
+"Skru av eller på automatisk oppdaging av einingar å ta tryggleikskopi til."
 
-#: ../raphodo/rapid.py:5527 ../raphodo/rapid.py:5533
+#: ../raphodo/rapid.py:5797 ../raphodo/rapid.py:5803
 msgid "FOLDER"
-msgstr ""
+msgstr "MAPPE"
 
-#: ../raphodo/rapid.py:5528
+#: ../raphodo/rapid.py:5798
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected photo "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3296,7 +4113,7 @@ msgid ""
 "photos up to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5534
+#: ../raphodo/rapid.py:5804
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected video "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3304,145 +4121,158 @@ msgid ""
 "up videos to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5540
+#: ../raphodo/rapid.py:5810
 msgid ""
 "The PATH where photos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5544
+#: ../raphodo/rapid.py:5814
 msgid ""
 "The PATH where videos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5547
+#: ../raphodo/rapid.py:5817
 #, python-format
 msgid "Ignore photos with the following extensions: %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5551
-msgid "Turn on or off starting downloads as soon as the program itself starts."
+#: ../raphodo/rapid.py:5821
+msgid ""
+"Turn on or off starting downloads as soon as the program itself starts."
 msgstr ""
 
-#: ../raphodo/rapid.py:5554
+#: ../raphodo/rapid.py:5824
 msgid "Turn on or off starting downloads as soon as a device is inserted."
-msgstr ""
+msgstr "Slå på eller av nedlasting straks ei eining vert sett inn."
 
-#: ../raphodo/rapid.py:5557
+#: ../raphodo/rapid.py:5827
 msgid ""
 "Turn on or off use of the Rapid Photo Downloader Thumbnail Cache. Turning it "
 "off does not delete existing cache contents."
 msgstr ""
 
-#: ../raphodo/rapid.py:5561
+#: ../raphodo/rapid.py:5831
 msgid ""
 "Delete all thumbnails in the Rapid Photo Downloader Thumbnail Cache, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5565
+#: ../raphodo/rapid.py:5835
 msgid "Forget which files have been previously downloaded, and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5568
+#: ../raphodo/rapid.py:5838
 msgid ""
 "Import preferences from an old program version and exit. Requires the "
 "command line program gconftool-2."
 msgstr ""
+"Importer innstillingar frå ei eldre programutgåve og avslutt. Krev "
+"kommandolinjeprogrammet gconftool-2."
 
-#: ../raphodo/rapid.py:5571
+#: ../raphodo/rapid.py:5841
 msgid ""
 "Reset all program settings to their default values, delete all thumbnails in "
 "the Thumbnail cache, forget which files have been previously downloaded, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5575
+#: ../raphodo/rapid.py:5845
 msgid "Include gphoto2 debugging information in log files."
 msgstr ""
 
-#: ../raphodo/rapid.py:5579
+#: ../raphodo/rapid.py:5849
 msgid "Print information to the terminal about attached cameras and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5640
+#: ../raphodo/rapid.py:5911
 msgid ""
 "To import preferences from the old version of Rapid Photo Downloader, you "
 "must install the program gconftool-2."
 msgstr ""
+"For å kunna importera innstillingar frå den eldre utgåva av Rapid Photo "
+"Downloader må du installera programmet gconftool-2."
 
-#: ../raphodo/rapid.py:5649
+#: ../raphodo/rapid.py:5920
 msgid "No prior program preferences detected: exiting"
 msgstr ""
 
-#: ../raphodo/rapid.py:5652
+#: ../raphodo/rapid.py:5923
 #, python-format
 msgid "Importing preferences from Rapid Photo Downloader %(version)s"
-msgstr ""
+msgstr "Importerer innstillingar frå Rapid Photo Downloader %(version)s"
 
-#: ../raphodo/rapid.py:5714
+#: ../raphodo/rapid.py:5989
 #, python-format
-msgid "Do you want to copy the stored sequence number, which has the value %d?"
+msgid ""
+"Do you want to copy the stored sequence number, which has the value %d?"
 msgstr ""
 
-#: ../raphodo/rapid.py:5726
+#: ../raphodo/rapid.py:6000
 msgid "Program aborting."
-msgstr ""
+msgstr "Programmet avsluttar."
 
-#: ../raphodo/rapid.py:5736
+#: ../raphodo/rapid.py:6010
 msgid "Never run this program as the sudo / root user."
-msgstr ""
+msgstr "Aldri køyr dette programmet som sudo / root-brukaren."
 
-#: ../raphodo/rapid.py:5740
+#: ../raphodo/rapid.py:6014
 msgid "You must install ExifTool to run Rapid Photo Downloader."
+msgstr "Du må installera ExifTool for å køyra Rapid Photo Downloader."
+
+#: ../raphodo/rapid.py:6026
+msgid ""
+"Rapid Photo Downloader is installed in multiple locations.\n"
+"\n"
+"Uninstall all copies except the version you want to run."
 msgstr ""
 
-#: ../raphodo/rapid.py:5794
+#: ../raphodo/rapid.py:6083
 msgid ""
 "When specifying a path on the command line, do not also specify an\n"
 "option for device auto detection or a path on \"This Computer\"."
 msgstr ""
 
-#: ../raphodo/rapid.py:5950
+#: ../raphodo/rapid.py:6243
 msgid "All settings and caches have been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5958
+#: ../raphodo/rapid.py:6251
 msgid "Thumbnail Cache has been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5964
+#: ../raphodo/rapid.py:6257
 msgid "Remembered files have been forgotten"
 msgstr ""
 
 #: ../raphodo/rememberthisdialog.py:70
 msgid "&Don't ask me about this again"
-msgstr ""
+msgstr "&Ikkje spør meg om dette igjen"
 
 #: ../raphodo/rememberthisdialog.py:72
 msgid "&Don't warn me about this again"
-msgstr ""
+msgstr "&Ikkje åtvara meg om dette igjen"
 
 #: ../raphodo/rememberthisdialog.py:75
 msgid "&Don't warn me again about missing or broken program libraries"
-msgstr ""
+msgstr "&Ikkje åtvar meg igjen om manglande eller skadde programbibliotek"
 
-#: ../raphodo/renameandmovefile.py:546
+#: ../raphodo/renameandmovefile.py:554
 msgid "subfolder and filename"
 msgstr "undermappe og filnamn"
 
-#: ../raphodo/renameandmovefile.py:548
+#: ../raphodo/renameandmovefile.py:556
 msgid "filename"
 msgstr "filnamn"
 
-#: ../raphodo/renameandmovefile.py:550
+#: ../raphodo/renameandmovefile.py:558
 msgid "subfolder"
 msgstr "undermappe"
 
 #: ../raphodo/renamepanel.py:290
 msgid "A counter for how many downloads occur on each day"
-msgstr ""
+msgstr "Ein teljar for kor mange nedlastingar som skjer kvar dag"
 
 #: ../raphodo/renamepanel.py:291
 msgid "Downloads today:"
@@ -3469,7 +4299,7 @@ msgstr "Dag byrjar:"
 #. self.dayStart.setDisplayFormat('HH:mm:ss')
 #: ../raphodo/renamepanel.py:342
 msgid "Synchronize RAW + JPEG"
-msgstr ""
+msgstr "Synkroniser RAW + JPEG"
 
 #: ../raphodo/renamepanel.py:345
 msgid ""
@@ -3480,7 +4310,7 @@ msgstr ""
 
 #: ../raphodo/renamepanel.py:349
 msgid "Sequence Numbers"
-msgstr ""
+msgstr "Sekvenstal"
 
 #: ../raphodo/renamepanel.py:360
 msgid "Strip incompatible characters"
@@ -3494,19 +4324,19 @@ msgstr ""
 
 #: ../raphodo/renamepanel.py:365
 msgid "Compatibility"
-msgstr ""
+msgstr "Kompatibilitet"
 
 #: ../raphodo/renamepanel.py:433
 msgid "Photo Renaming"
-msgstr ""
+msgstr "Biletomdøyping"
 
 #: ../raphodo/renamepanel.py:436
 msgid "Video Renaming"
-msgstr ""
+msgstr "Videoomdøyping"
 
 #: ../raphodo/renamepanel.py:439
 msgid "Renaming Options"
-msgstr ""
+msgstr "Val for omdøyping"
 
 #: ../raphodo/rpdfile.py:218
 msgid "photos and videos"
@@ -3516,159 +4346,236 @@ msgstr "bilete og videoar"
 msgid "photos or videos"
 msgstr "bilete eller videoar"
 
-#: ../raphodo/rpdfile.py:306
+#: ../raphodo/rpdfile.py:315
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: ../raphodo/rpdfile.py:318
+#. translators: natural language expression signifying a single video
+#: ../raphodo/rpdfile.py:337
+msgid "a video"
+msgstr "ein video"
+
+#: ../raphodo/rpdfile.py:339
 msgid "1 Video"
-msgstr ""
+msgstr "1 video"
+
+#. translators: natural language expression signifying a single photo
+#: ../raphodo/rpdfile.py:346
+msgid "a photo"
+msgstr "eit bilete"
 
-#: ../raphodo/rpdfile.py:323
+#: ../raphodo/rpdfile.py:348
 msgid "1 Photo"
-msgstr ""
+msgstr "1 bilete"
 
-#: ../raphodo/rpdfile.py:803
+#: ../raphodo/rpdfile.py:828
 #, python-format
 msgid "%(path)s on %(camera)s"
-msgstr ""
+msgstr "%(path)s på %(camera)s"
 
-#: ../raphodo/rpdfile.py:819
+#: ../raphodo/rpdfile.py:844
 msgid "Photo"
 msgstr "Bilete"
 
-#: ../raphodo/rpdfile.py:859
+#: ../raphodo/rpdfile.py:884
 msgid "Video"
 msgstr "Video"
 
-#: ../raphodo/storage.py:138
+#: ../raphodo/storage.py:141
 msgid "File system root"
-msgstr ""
+msgstr "Filsystemrot"
 
 #. translators: the name of the Pictures folder
-#: ../raphodo/storage.py:433
+#: ../raphodo/storage.py:437
 msgid "Pictures"
-msgstr ""
+msgstr "Bilete"
 
-#: ../raphodo/thumbnaildisplay.py:426
+#: ../raphodo/thumbnaildisplay.py:432
 #, python-format
 msgid "Taken on %(date_time)s (%(human_readable)s)"
-msgstr ""
+msgstr "Tatt %(date_time)s (%(human_readable)s)"
 
-#: ../raphodo/thumbnaildisplay.py:431
+#: ../raphodo/thumbnaildisplay.py:439
 #, python-format
 msgid "Modified on %(date_time)s (%(human_readable)s)"
-msgstr ""
+msgstr "Endra %(date_time)s (%(human_readable)s)"
 
-#: ../raphodo/thumbnaildisplay.py:437 ../raphodo/thumbnaildisplay.py:466
+#: ../raphodo/thumbnaildisplay.py:447 ../raphodo/thumbnaildisplay.py:481
 #, python-format
 msgid "%(date_time)s (%(human_readable)s)"
-msgstr ""
+msgstr "%(date_time)s (%(human_readable)s)"
 
-#: ../raphodo/thumbnaildisplay.py:451
+#: ../raphodo/thumbnaildisplay.py:464
 #, python-format
 msgid "Memory cards: %s"
+msgstr "Minnekort: %s"
+
+#: ../raphodo/thumbnaildisplay.py:468
+#, python-format
+msgid "Memory card: %s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:457
+#: ../raphodo/thumbnaildisplay.py:473
 msgid "Downloaded as:"
-msgstr ""
+msgstr "Lasta ned som:"
 
-#: ../raphodo/thumbnaildisplay.py:472
+#: ../raphodo/thumbnaildisplay.py:489
 #, python-format
 msgid "<br><br>Previous download:<br>%(filename)s<br>%(path)s<br>%(date)s"
-msgstr ""
+msgstr "<br><br>Førre nedlasting:<br>%(filename)s<br>%(path)s<br>%(date)s"
 
-#: ../raphodo/thumbnaildisplay.py:1603
+#: ../raphodo/thumbnaildisplay.py:1645
 msgid "Copy Path"
+msgstr "Kopier sti"
+
+#. Translators: these values are file size suffixes like B representing bytes, KB representing
+#. kilobytes, etc.
+#: ../raphodo/utilities.py:170
+msgid "B"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "KB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "MB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "GB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "TB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "PB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "EB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "ZB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "YB"
 msgstr ""
 
 #. two things in a list e.g. "device1 and device2"
-#: ../raphodo/utilities.py:391
+#: ../raphodo/utilities.py:394
 #, python-format
 msgid "%(first_item)s and %(last_item)s"
-msgstr ""
+msgstr "%(first_item)s og %(last_item)s"
 
-#: ../raphodo/utilities.py:464
+#: ../raphodo/utilities.py:468
 msgid "one"
-msgstr ""
+msgstr "éin"
 
-#: ../raphodo/utilities.py:465
+#: ../raphodo/utilities.py:469
 msgid "two"
-msgstr ""
+msgstr "to"
 
-#: ../raphodo/utilities.py:466
+#: ../raphodo/utilities.py:470
 msgid "three"
-msgstr ""
+msgstr "tre"
 
-#: ../raphodo/utilities.py:467
+#: ../raphodo/utilities.py:471
 msgid "four"
-msgstr ""
+msgstr "fire"
 
-#: ../raphodo/utilities.py:468
+#: ../raphodo/utilities.py:472
 msgid "five"
-msgstr ""
+msgstr "fem"
 
-#: ../raphodo/utilities.py:469
+#: ../raphodo/utilities.py:473
 msgid "six"
-msgstr ""
+msgstr "seks"
 
-#: ../raphodo/utilities.py:470
+#: ../raphodo/utilities.py:474
 msgid "seven"
-msgstr ""
+msgstr "sju"
 
-#: ../raphodo/utilities.py:471
+#: ../raphodo/utilities.py:475
 msgid "eight"
-msgstr ""
+msgstr "åtte"
 
-#: ../raphodo/utilities.py:472
+#: ../raphodo/utilities.py:476
 msgid "nine"
-msgstr ""
+msgstr "ni"
 
-#: ../raphodo/utilities.py:473
+#: ../raphodo/utilities.py:477
 msgid "ten"
-msgstr ""
+msgstr "ti"
 
-#: ../raphodo/utilities.py:474
+#: ../raphodo/utilities.py:478
 msgid "eleven"
-msgstr ""
+msgstr "elleve"
 
-#: ../raphodo/utilities.py:475
+#: ../raphodo/utilities.py:479
 msgid "twelve"
-msgstr ""
+msgstr "tolv"
 
-#: ../raphodo/utilities.py:476
+#: ../raphodo/utilities.py:480
 msgid "thirteen"
-msgstr ""
+msgstr "tretten"
 
-#: ../raphodo/utilities.py:477
+#: ../raphodo/utilities.py:481
 msgid "fourteen"
-msgstr ""
+msgstr "fjorten"
 
-#: ../raphodo/utilities.py:478
+#: ../raphodo/utilities.py:482
 msgid "fifteen"
-msgstr ""
+msgstr "femten"
 
-#: ../raphodo/utilities.py:479
+#: ../raphodo/utilities.py:483
 msgid "sixteen"
-msgstr ""
+msgstr "seksten"
 
-#: ../raphodo/utilities.py:480
+#: ../raphodo/utilities.py:484
 msgid "seventeen"
-msgstr ""
+msgstr "sytten"
 
-#: ../raphodo/utilities.py:481
+#: ../raphodo/utilities.py:485
 msgid "eighteen"
-msgstr ""
+msgstr "atten"
 
-#: ../raphodo/utilities.py:482
+#: ../raphodo/utilities.py:486
 msgid "ninenteen"
-msgstr ""
+msgstr "nitten"
 
-#: ../raphodo/utilities.py:483
+#: ../raphodo/utilities.py:487
 msgid "twenty"
-msgstr ""
+msgstr "tjue"
+
+#: ../raphodo/viewutils.py:240
+msgid "&OK"
+msgstr "&OK"
+
+#: ../raphodo/viewutils.py:243
+msgid "&Save"
+msgstr "&Lagra"
+
+#: ../raphodo/viewutils.py:244
+msgid "&Help"
+msgstr "&Hjelp"
+
+#: ../raphodo/viewutils.py:245
+msgid "Restore Defaults"
+msgstr "Tilbake til standardverdiar"
+
+#: ../raphodo/viewutils.py:246
+msgid "&Yes"
+msgstr "&Ja"
+
+#: ../raphodo/viewutils.py:247
+msgid "&No"
+msgstr "&Nei"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:1
 msgid ""
@@ -3697,39 +4604,43 @@ msgstr ""
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:4
 msgid "The main window"
-msgstr ""
+msgstr "Hovudvindauget"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:5
 msgid "Downloading"
-msgstr ""
+msgstr "Lastar ned"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:6
 msgid "The Timeline"
-msgstr ""
+msgstr "Tidslinja"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:7
 msgid "Right-clicking on a device"
-msgstr ""
+msgstr "Høgreklikk på ei eining"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:1
 msgid ""
 "Download, rename and back up photos and videos from cameras and other devices"
 msgstr ""
+"Last ned, endra namn og tryggleikskopier bilete og videoar frå kamera og "
+"andre einingar"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:2
 msgid "Photo Downloader"
-msgstr ""
+msgstr "Biletnedlastar"
 
 #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:5
 msgid ""
-"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;"
-"memory;card;"
+"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;memory"
+";card;"
 msgstr ""
+"foto;bilete;nedlasting;fotografi;import;video;RAW;kamera;telefon;ingest;backu"
+"p;tryggleikskopi;minne;kort;"
 
 #: ../data/kde/net.damonlynch.rapid-photo-downloader.desktop.in.h:1
 msgid "Download Photos and Videos with Rapid Photo Downloader"
-msgstr ""
+msgstr "Last ned bilete og videoar med Rapid Photo Downloader"
 
 #~ msgid "Berlin"
 #~ msgstr "Berlin"
@@ -3803,6 +4714,7 @@ msgstr ""
 #~ msgid "Select a folder to download videos to"
 #~ msgstr "Vel ei mappe å laste inn video til"
 
+#, python-format
 #~ msgid "Select a folder containing %(file_types)s"
 #~ msgstr "Vel ei mappe med %(file_types)s"
 
@@ -3820,6 +4732,7 @@ msgstr ""
 #~ "<i><b>Åtvaring:</b> Det er ikkje nok metadata for å fullt ut\n"
 #~ "generere undermappene. Ver vennleg og nytt andre omdøpingsval.</i><"
 
+#, python-format
 #~ msgid "<i>Example: %s</i>"
 #~ msgstr "<i>Døme: %s</i>"
 
@@ -3829,6 +4742,7 @@ msgstr ""
 #~ msgid "externaldrive2"
 #~ msgstr "eksterndisk2"
 
+#, python-format
 #~ msgid ""
 #~ "%(date)s\n"
 #~ "%(time)s"
@@ -3836,21 +4750,22 @@ msgstr ""
 #~ "%(date)s\n"
 #~ "%(time)s"
 
+#, python-format
 #~ msgid "%(date)s %(time)s"
 #~ msgstr "%(date)s %(time)s"
 
+#, python-format
 #~ msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
+#, python-format
 #~ msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
-#~ msgid "scanning..."
-#~ msgstr "leiter..."
-
 #~ msgid "Download cannot proceed"
 #~ msgstr "Kan ikkje gå vidare med nedlasting"
 
+#, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
 #~ "Destination: %(destination)s"
@@ -3858,28 +4773,32 @@ msgstr ""
 #~ "Kjelde: %(source)s\n"
 #~ "Mål: %(destination)s"
 
-#~ msgid ""
-#~ "Photos detected with the same filenames, but taken at different times"
+#~ msgid "Photos detected with the same filenames, but taken at different times"
 #~ msgstr "Fann bilete med like filnamn, tatt på ulike datoar"
 
 #~ msgid "Photo has already been downloaded"
 #~ msgstr "Biletet er allereie lasta ned"
 
+#, python-format
 #~ msgid "Source: %(source)s"
 #~ msgstr "Kjelde: %(source)s"
 
 #~ msgid "Backing up error"
 #~ msgstr "Feil ved tryggleikskopiering"
 
+#, python-format
 #~ msgid "Destination directory could not be created: %(directory)s\n"
 #~ msgstr "Klarte ikkje å opprette målmappa %(directory)s\n"
 
+#, python-format
 #~ msgid "Error: %(inst)s"
 #~ msgstr "Feil: %(inst)s"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s"
 #~ msgstr "%(number)s av %(total)s %(filetypes)s"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 #~ msgstr "%(number)s av %(total)s %(filetypes)s (%(remaining)s igjen)"
 
@@ -3894,27 +4813,16 @@ msgstr ""
 
 #~ 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?"
+#~ msgstr "Vil du laste ned bilete eller videoar frå denne eininga/partisjonen?"
 
 #~ msgid "_Remember this choice"
 #~ msgstr "_Hugs dette valet"
 
-#~ msgid "Remove all Job Codes?"
-#~ msgstr "Fjern alle jobbnamn?"
-
-#~ msgid "Should all Job Codes be removed?"
-#~ msgstr "Skal alle jobbnamn fjernast?"
-
-#~ msgid "Enter a Job Code"
-#~ msgstr "Skriv inn eit jobbnamn"
-
-#~ msgid "Job Code:"
-#~ msgstr "Jobbnamn:"
-
+#, python-format
 #~ msgid "Backing up to %(path)s"
 #~ msgstr "Tek tryggleikskopi til %(path)s"
 
+#, python-format
 #~ msgid "%(freespace)s. %(backuppaths)s."
 #~ msgstr "%(freespace)s. %(backuppaths)s."
 
@@ -3933,15 +4841,18 @@ msgstr ""
 #~ msgid "About 1 second remaining"
 #~ msgstr "Omtrent eitt sekund igjen"
 
+#, python-format
 #~ msgid "About %i seconds remaining"
 #~ msgstr "Omtrent %i sekund igjen"
 
 #~ msgid "About 1 minute remaining"
 #~ msgstr "Omtrent eitt minutt igjen"
 
+#, python-format
 #~ msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 #~ msgstr "Omtrent %(minutes)i minutt og %(seconds)02i sekund igjen"
 
+#, python-format
 #~ msgid ""
 #~ "display program information on the command line as the program runs "
 #~ "(default: %default)"
@@ -3965,6 +4876,7 @@ msgstr ""
 #~ msgid "Videos:"
 #~ msgstr "Videoar:"
 
+#, python-format
 #~ msgid "and %s"
 #~ msgstr "og %s"
 
@@ -3998,9 +4910,6 @@ msgstr ""
 #~ msgid "<b>Example</b>"
 #~ msgstr "<b>Døme</b>"
 
-#~ msgid "<b>Job Codes</b>"
-#~ msgstr "<b>Jobbnamn</b>"
-
 #~ msgid "<b>Photo Rename</b>"
 #~ msgstr "<b>Omdøping av bilete</b>"
 
@@ -4037,12 +4946,8 @@ msgstr ""
 #~ 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\">Job Codes</span>"
-#~ msgstr "<span weight=\"bold\" size=\"x-large\">Jobbnamn</span>"
-
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Biletnedlastingsmapper</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Biletnedlastingsmapper</span>"
 
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Photo Rename</span>\t"
 #~ msgstr "<span weight=\"bold\" size=\"x-large\">Omdøping av bilete</span>\t"
@@ -4051,8 +4956,7 @@ msgstr ""
 #~ msgstr "<span weight=\"bold\" size=\"x-large\">Omdøpingsval</span>"
 
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Videonedlastingsmapper</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Videonedlastingsmapper</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"
@@ -4113,24 +5017,18 @@ msgstr ""
 #~ msgid "Rename Options"
 #~ msgstr "Omdøpingsval"
 
-#~ msgid "Select All Wit_h Job Code"
-#~ msgstr "Vel alle med _jobbnamn"
-
-#~ msgid "Select All Without _Job Code"
-#~ msgstr "Vel alle _utan jobbnamn"
-
 #~ 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>"
+#~ "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>"
+#~ "tryggleikskopiering. Lag ei mappe med eitt av desse namna på kvar eining som "
+#~ "du vil ta tryggleikskopi til.</i>"
 
 #~ msgid ""
 #~ "Specify the time in 24 hour format at which the <i>Downloads today</i> "
@@ -4162,22 +5060,18 @@ msgstr ""
 #~ msgstr "Mappenamn for tryggleikskopiering av video:"
 
 #~ 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."
+#~ "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 ""
-#~ "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."
+#~ "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."
 
 #~ 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 ""
-#~ "Ved tryggleikskopiering, vel om du skal overskrive filer på eininga som "
-#~ "har same namn, eller hoppe over den fila."
-
-#~ msgid "_Add..."
-#~ msgstr "_Legg til..."
+#~ "Ved tryggleikskopiering, vel om du skal overskrive filer på eininga som har "
+#~ "same namn, eller hoppe over den fila."
 
 #~ msgid "_Clear Completed Downloads"
 #~ msgstr "_Fjern fullførte nedlastingar"
@@ -4188,27 +5082,19 @@ msgstr ""
 #~ msgid "_File"
 #~ msgstr "_Fil"
 
-#~ msgid "_Get Help Online..."
-#~ msgstr "_Få hjelp på nettet..."
-
 #~ msgid "_Help"
 #~ msgstr "_Hjelp"
 
-#~ msgid "_Make a Donation..."
-#~ msgstr "_Doner..."
-
 #~ msgid "_Report a Problem..."
 #~ msgstr "_Meld frå om eit problem"
 
 #~ msgid "_Select"
 #~ msgstr "_Vel"
 
-#~ msgid "_Translate this Application..."
-#~ msgstr "_Omset dette programmet..."
-
 #~ msgid "_View"
 #~ msgstr "_Vis"
 
+#, python-format
 #~ msgid ""
 #~ "The %(filetype)s subfolder preferences entered are invalid and cannot be "
 #~ "used.\n"
@@ -4221,6 +5107,7 @@ msgstr ""
 #~ msgid "display debugging information when run from the command line"
 #~ msgstr "vis avlusingsinformasjon ved køyring frå kommandolinja"
 
+#, python-format
 #~ msgid "(%(file_type)s)"
 #~ msgstr "(%(file_type)s)"
 
@@ -4233,30 +5120,39 @@ msgstr ""
 #~ msgid "."
 #~ msgstr "."
 
+#, python-format
 #~ msgid "%(free)s %(file_type)s"
 #~ msgstr "%(free)s %(file_type)s"
 
+#, python-format
 #~ msgid "%(file_type)s download folder is not writable"
 #~ msgstr "Nedlastingsmappa til %(file_type)s er ikkje skrivbar"
 
+#, python-format
 #~ msgid "Folder: %s"
 #~ msgstr "Mappe: %s"
 
+#, python-format
 #~ msgid "%(file_type)s download folder is invalid"
 #~ msgstr "Nedlastingsmappa til %(file_type)s er ugyldig"
 
+#, python-format
 #~ msgid "%(file_type)s download folder does not exist"
 #~ msgstr "Nedlastingsmappa til %(file_type)s finst ikkje"
 
+#, python-format
 #~ msgid "%(free)s free"
 #~ msgstr "%(free)s tilgjengeleg"
 
+#, 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"
 
+#, python-format
 #~ msgid "Backing up photos and videos to %(path)s"
 #~ msgstr "Tek tryggleikskopi av bilete og videoar til %(path)s"
 
+#, python-format
 #~ msgid ""
 #~ "%(problem)s\n"
 #~ "File: %(file)s"
@@ -4276,31 +5172,35 @@ msgstr ""
 #~ msgid "Should all ignored paths be removed?"
 #~ msgstr "Skal alle oversedde søkjestiar fjernast?"
 
+#, python-format
 #~ msgid "%(filetype)s metadata cannot be read"
 #~ msgstr "Klarte ikkje å lesa metadata i %(filetype)s."
 
+#, python-format
 #~ msgid "Error generating component %s."
 #~ msgstr "Feil ved oppretting av %s-komponenten."
 
 #~ msgid "Invalid regular expression"
 #~ msgstr "Ugyldig regulært uttrykk"
 
+#, python-format
 #~ msgid ""
 #~ "The following regular expressions are invalid, and will be removed unless "
 #~ "you correct them:\n"
 #~ " %s"
 #~ msgstr ""
-#~ "Dei følgjande regulære uttrykka er ugyldige, og vil bli fjerna om du "
-#~ "ikkje endrar dei:\n"
+#~ "Dei følgjande regulære uttrykka er ugyldige, og vil bli fjerna om du ikkje "
+#~ "endrar dei:\n"
 #~ "%s"
 
+#, python-format
 #~ msgid ""
-#~ "This regular expression is invalid, and will be removed unless you "
-#~ "correct it:\n"
+#~ "This regular expression is invalid, and will be removed unless you correct "
+#~ "it:\n"
 #~ " %s"
 #~ msgstr ""
-#~ "Det følgjande regulære uttrykket er ugyldig, og vil bli fjerna om du "
-#~ "ikkje endrar det:\n"
+#~ "Det følgjande regulære uttrykket er ugyldig, og vil bli fjerna om du ikkje "
+#~ "endrar det:\n"
 #~ "%s"
 
 #~ msgid "Select a folder in which to backup photos"
@@ -4309,12 +5209,15 @@ msgstr ""
 #~ msgid "Select a folder in which to backup videos"
 #~ msgstr "Vel ei mappe kor du vil tryggleikskopiera videoar"
 
+#, python-format
 #~ msgid "Date time value %s appears invalid."
 #~ msgstr "Dato-/tidsverdien %s synest ugyldig."
 
+#, python-format
 #~ msgid "%(device)s did not unmount"
 #~ msgstr "%(device)s vart ikkje avmontert"
 
+#, python-format
 #~ msgid ""
 #~ "%(filetype)s could not be backed up because no suitable backup locations "
 #~ "were found."
@@ -4322,47 +5225,57 @@ msgstr ""
 #~ "Kunne ikkje ta tryggleikskopi av %(filetype)s, fann inga målmappe for "
 #~ "tryggleikskopiar."
 
+#, python-format
 #~ msgid "%(filetype)s already exists"
 #~ msgstr "%(filetype)s finst allereie"
 
+#, python-format
 #~ msgid "%(filetype)s was already downloaded"
 #~ msgstr "%(filetype)s er allereie lasta ned"
 
+#, python-format
 #~ msgid "An error occurred when copying the %(filetype)s"
 #~ msgstr "Ein feil oppstod ved kopiering av %(filetype)s"
 
+#, python-format
 #~ msgid "%(filetype)s %(area)s could not be generated"
 #~ msgstr "Klarte ikkje å oppretta %(filetype)s %(area)s."
 
+#, 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."
 
+#, python-format
 #~ msgid ""
-#~ "The existing %(filetype)s was last modified on %(date)s at %(time)s. "
-#~ "Unique identifier '%(identifier)s' added."
+#~ "The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
+#~ "identifier '%(identifier)s' added."
 #~ msgstr ""
 #~ "Den eksisterande %(filetype)s-en vart sist endra sist den %(date)s kl. "
 #~ "%(time)s, og har fått «%(identifier)s» som unik ID."
 
+#, python-format
 #~ msgid "There is no data with which to name the %(filetype)s."
 #~ msgstr "Manglar data for å namngi %(filetype)s."
 
+#, python-format
 #~ msgid "Error: %(errorno)s %(strerror)s"
 #~ msgstr "Feil: %(errorno)s %(strerror)s"
 
 #~ msgid "Errors occurred when backing up on the following backup devices: "
 #~ msgstr "Ein feil oppstod ved tryggleikskopiering til følgjande einingar: "
 
+#, 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"
+#~ msgstr "Fann bilete med same filnamn, men tekne ved ulike tider: %(details)s"
 
+#, 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."
 
+#, python-format
 #~ msgid "An error occurred when backing up on %(volume)s."
 #~ msgstr "Ein feil oppstod ved tryggleikskopiering til %(volume)s."
 
@@ -4374,52 +5287,62 @@ msgstr ""
 #~ "downloaded."
 #~ msgstr "Filnamnet, filendinga og Exif-informasjonen er allereie overført."
 
+#, python-format
 #~ msgid " It was backed up to %(volume)s"
 #~ msgstr " Han vart tryggleikskopiert til %(volume)s"
 
 #~ msgid " It was backed up to these devices: "
 #~ msgstr " Han vart tryggleikskopiert til dei følgjande einingane: "
 
+#, python-format
 #~ msgid "%s, "
 #~ msgstr "%s, "
 
+#, python-format
 #~ msgid "%(volumes)s and %(final_volume)s."
 #~ msgstr "%(volumes)s og %(final_volume)s."
 
 #~ msgid "Backups overwritten on these devices: "
 #~ msgstr "Tryggleikskopien vart overskriven på følgjande einingar: "
 
+#, python-format
 #~ msgid "Backup overwritten on %(volume)s."
 #~ msgstr "Tryggleikskopien vart overskriven på %(volume)s."
 
+#, python-format
 #~ msgid "%(volume)s, "
 #~ msgstr "%(volume)s, "
 
+#, python-format
 #~ msgid "%(volume)s (%(inst)s), "
 #~ msgstr "%(volume)s (%(inst)s), "
 
 #~ msgid "Backups already exist in these locations: "
 #~ msgstr "Tryggleikskopien finst allereie på følgjande stader: "
 
+#, python-format
 #~ msgid "Backup already exists on %(volume)s."
 #~ msgstr "Tryggleikskopien finst allereie på %(volume)s."
 
+#, python-format
 #~ msgid "%(volumes)s and %(volume)s."
 #~ msgstr "%(volumes)s og %(volume)s."
 
+#, python-format
 #~ msgid "%(volumes)s and %(volume)s (%(inst)s)."
 #~ msgstr "%(volumes)s og %(volume)s (%(inst)s)."
 
+#, 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."
 
 #~ msgid ""
-#~ "Errors occurred when creating directories on the following backup "
-#~ "devices: "
+#~ "Errors occurred when creating directories on the following backup devices: "
 #~ msgstr ""
 #~ "Feil oppstod ved oppretting av mapper på følgjande einingar for "
 #~ "tryggleikskopiering: "
 
+#, python-format
 #~ msgid "Problems in %s generation"
 #~ msgstr "Problem ved oppretting av %s"
 
@@ -4432,26 +5355,29 @@ msgstr ""
 #~ msgid "The following metadata is missing: "
 #~ msgstr "Følgjande metadata manglar: "
 
-#~ msgid ""
-#~ "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
-#~ msgstr ""
-#~ "%(missing_metadata_elements)s og %(final_missing_metadata_element)s."
+#, python-format
+#~ msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
+#~ msgstr "%(missing_metadata_elements)s og %(final_missing_metadata_element)s."
 
+#, python-format
 #~ msgid " Furthermore, there was a %(problem)s."
 #~ msgstr " I tillegg oppstod %(problem)s."
 
+#, python-format
 #~ msgid "%(previousproblem)s Additionally, %(newproblem)s"
 #~ msgstr "%(previousproblem)s I tillegg, %(newproblem)s"
 
+#, python-format
 #~ msgid " Furthermore, there were %(problems)s."
 #~ msgstr " I tillegg oppstod %(problems)s."
 
-#~ msgid ""
-#~ "An error occurred when copying the %(filetype)s, but it was backed up"
+#, 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"
 
+#, python-format
 #~ msgid "%(filetype)s already exists, but it was backed up"
 #~ msgstr "%(filetype)s finst allereie, men blei tryggleikskopiert"
 
@@ -4467,9 +5393,11 @@ msgstr ""
 #~ msgid "There were errors backing up"
 #~ msgstr "Det oppstod feil i tryggleikskopieringa"
 
+#, python-format
 #~ msgid "%(previousproblem)s, and %(backinguperror)s"
 #~ msgstr "%(previousproblem)s, og %(backinguperror)s"
 
+#, python-format
 #~ msgid "Path: %s"
 #~ msgstr "Sti: %s"
 
@@ -4501,11 +5429,10 @@ msgstr ""
 #~ msgstr "<span weight=\"bold\" size=\"x-large\">Ymse</span>"
 
 #~ msgid ""
-#~ "If you disable automatic detection, choose the exact location of the "
-#~ "photos and videos."
+#~ "If you disable automatic detection, choose the exact location of the photos "
+#~ "and videos."
 #~ msgstr ""
-#~ "Viss du skrur av automatisk oppdaging, må du oppgi kor bileta og videoane "
-#~ "er."
+#~ "Viss du skrur av automatisk oppdaging, må du oppgi kor bileta og videoane er."
 
 #~ msgid "Device Options"
 #~ msgstr "Val for einingar"
@@ -4513,6 +5440,7 @@ msgstr ""
 #~ msgid "Generate thumbnails (slower)"
 #~ msgstr "Lag miniatyrbilete (treigare)"
 
+#, python-format
 #~ msgid "Problem in %s generation"
 #~ msgstr "Problem ved oppretting av %s"
 
@@ -4526,13 +5454,12 @@ msgstr ""
 #~ msgstr "_Fjern alle"
 
 #~ 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."
+#~ "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."
+#~ "eller alltid oversjå, ved automatisk oppdaging av berbare lagringseiningar."
 
 #~ msgid "Performance"
 #~ msgstr "Yting"
@@ -4541,11 +5468,11 @@ msgstr ""
 #~ "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."
+#~ "When this option is enabled, and a potential device is detected, you will be "
+#~ "prompted to determine if it should be scanned or not."
 #~ msgstr ""
-#~ "Viss du skrur på automatisk oppdaging på ei berbar lagringseining, vil "
-#~ "heile eininga gjennomsøkjast. På store einingar kan dette ta litt tid.\n"
+#~ "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."
 
@@ -4553,46 +5480,47 @@ msgstr ""
 #~ "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"
+#~ "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>"
+#~ "<i>Downloading directly from cameras is currently an experimental feature. "
+#~ "If downloading directly from your camera works poorly or not at all, try "
+#~ "setting it to PTP mode. If that is not possible, a card reader must be "
+#~ "used.</i>"
 #~ msgstr ""
-#~ "Einingar er der du lastar ned bilete og videoar frå, til dømes "
-#~ "fotoapparat, minnekort eller berbare lagringseiningar.\n"
+#~ "Einingar er der du lastar ned bilete og videoar frå, til dømes fotoapparat, "
+#~ "minnekort eller berbare lagringseiningar.\n"
 #~ "\n"
 #~ "Du kan lasta ned frå fleire einingar samtidig, eller oppgi ein stad på "
 #~ "harddisken din.\n"
 #~ "\n"
 #~ "<i>Nedlasting rett frå fotoapparat er ein eksperimentell funksjon for no. "
-#~ "Viss det fungerer dårleg eller ikkje i det heile, prøv å setja apparatet "
-#~ "i PTP-modus. Viss det ikkje går an, må du bruka ein kortlesar.</i>"
+#~ "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>"
 
 #~ msgid "Use _python-style regular expressions"
 #~ msgstr "Bruk _python sine regulære uttrykk"
 
 #~ 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."
+#~ "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."
+#~ "etter bilete eller videoar. Stiar som ender med verdiane under vil ikkje bli "
+#~ "gjennomsøkt."
 
 #~ msgid ""
 #~ "Do you really want to download from here? On some systems, scanning this "
 #~ "location can take a very long time."
 #~ msgstr ""
-#~ "Vil du verkeleg lasta ned herfrå? På visse system kan det ta veldig lang "
-#~ "tid å skanna dette."
+#~ "Vil du verkeleg lasta ned herfrå? På visse system kan det ta veldig lang tid "
+#~ "å skanna dette."
 
 #~ msgid "the root of the file system"
 #~ msgstr "rotmappa til filsystemet"
 
+#, python-format
 #~ msgid "Downloading from %(location)s."
 #~ msgstr "Lastar ned frå %(location)s."
 
@@ -4615,9 +5543,9 @@ msgstr ""
 #~ msgstr "Roter JPEG-bilete automatisk"
 
 #~ 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>."
+#~ "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 "
@@ -4639,12 +5567,9 @@ msgstr ""
 #~ msgid "Help"
 #~ msgstr "Hjelp"
 
-#~ msgid "About..."
-#~ msgstr "Om …"
-
 #~ msgid ""
-#~ "manually specify the PATH of the device from which to download, "
-#~ "overwriting existing program preferences"
+#~ "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"
@@ -4656,6 +5581,7 @@ msgstr ""
 #~ "oppdag automatisk einingar du vil lasta ned frå, overstyrer eksisterande "
 #~ "innstillingar"
 
+#, python-format
 #~ msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
 #~ msgstr "skannar (fann %(photos)s bilete og %(videos)s videoar) …"
 
@@ -4670,22 +5596,27 @@ msgstr ""
 #~ "original."
 #~ msgstr "Klarte ikkje validera fila. Den nedlasta utgåva er ulik originalen."
 
+#, python-format
 #~ msgid "Backup %(file_type)s overwritten"
 #~ msgstr "Skreiv over tryggleikskopi av %(file_type)s"
 
+#, python-format
 #~ msgid "%(file_type)s not backed up"
 #~ msgstr "%(file_type)s ikkje tryggleikskopiert"
 
+#, python-format
 #~ msgid "Backup of %(file_type)s already exists"
 #~ msgstr "Tryggleikskopi av %(file_type)s finst alt"
 
+#, python-format
 #~ msgid ""
-#~ "File verification failed on %(volume)s. The backed up version is "
-#~ "different from the downloaded version."
+#~ "File verification failed on %(volume)s. The backed up version is different "
+#~ "from the downloaded version."
 #~ msgstr ""
 #~ "Klarte ikkje validera fil på %(volume)s. Den tryggleikskopierte utgåva er "
 #~ "ulik den nedlasta utgåva."
 
+#, python-format
 #~ msgid "The %(filetype)s did not download correctly"
 #~ msgstr "%(filetype)s blei ikkje lasta ned rett"
 
@@ -4695,6 +5626,7 @@ msgstr ""
 #~ msgid "File verification failed on these devices: "
 #~ msgstr "Klarte ikkje validera filer på desse einingane: "
 
+#, python-format
 #~ msgid "No backup device contains a valid folder for backing up %(filetype)s"
 #~ msgstr ""
 #~ "Fann inga eining å ta tryggleikskopi til som har ei gyldig mappe for "
@@ -4702,3 +5634,45 @@ msgstr ""
 
 #~ msgid "Verify files as they are downloaded"
 #~ msgstr "Valider filer ved nedlasting"
+
+#~ msgid "scanning..."
+#~ msgstr "leiter …"
+
+#~ msgid "Remove all Job Codes?"
+#~ msgstr "Fjern alle oppdragsnamn?"
+
+#~ msgid "Should all Job Codes be removed?"
+#~ msgstr "Skal alle oppdragsnamn fjernast?"
+
+#~ msgid "Enter a Job Code"
+#~ msgstr "Skriv inn eit oppdragsnamn"
+
+#~ msgid "Job Code:"
+#~ msgstr "Oppdragsnamn:"
+
+#~ msgid "<b>Job Codes</b>"
+#~ msgstr "<b>Oppdragsnamn</b>"
+
+#~ msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Oppdragsnamn</span>"
+
+#~ msgid "Select All Wit_h Job Code"
+#~ msgstr "Vel alle med _oppdragsnamn"
+
+#~ msgid "Select All Without _Job Code"
+#~ msgstr "Vel alle _utan oppdragsnamn"
+
+#~ msgid "_Add..."
+#~ msgstr "_Legg til …"
+
+#~ msgid "_Get Help Online..."
+#~ msgstr "_Få hjelp på nettet …"
+
+#~ msgid "_Make a Donation..."
+#~ msgstr "_Doner …"
+
+#~ msgid "_Translate this Application..."
+#~ msgstr "_Omset dette programmet …"
+
+#~ msgid "About..."
+#~ msgstr "Om  …"
diff --git a/po/oc.po b/po/oc.po
index 49df6fe..b056311 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -7,129 +7,489 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: damonlynch@gmail.com\n"
-"POT-Creation-Date: 2017-07-08 19:16-0500\n"
-"PO-Revision-Date: 2017-07-04 11:06+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2017-09-12 17:01-0400\n"
+"PO-Revision-Date: 2017-09-13 18:44+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-07-05 23:04+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-09-26 22:04+0000\n"
+"X-Generator: Launchpad (build 18463)\n"
+"Language: \n"
+
+#: ../install.py:65
+msgid "Rapid Photo Downloader installer"
+msgstr ""
+
+#: ../install.py:66
+msgid "Download and install latest version of Rapid Photo Downloader."
+msgstr ""
+
+#: ../install.py:236 ../install.py:1732
+msgid "Installer not found:"
+msgstr ""
+
+#. Translators: do not translate the term tar.gz
+#: ../install.py:240 ../install.py:1736
+msgid "Installer not in tar.gz format:"
+msgstr ""
+
+#: ../install.py:465
+msgid ""
+"Incorrect folder ownership detected. Changing ownership of and resetting "
+"permissions for"
+msgstr ""
+
+#: ../install.py:540
+msgid "The following command will be run:"
+msgstr ""
+
+#: ../install.py:543 ../install.py:1479 ../install.py:1484
+msgid "sudo may prompt you for the sudo password."
+msgstr ""
+
+#: ../install.py:547
+msgid "Would you like to run the command now?"
+msgstr ""
+
+#: ../install.py:549
+msgid "Answer is not yes, exiting."
+msgstr ""
+
+#: ../install.py:559 ../install.py:751 ../install.py:966
+msgid "Command failed"
+msgstr ""
+
+#: ../install.py:561 ../install.py:752 ../install.py:967
+msgid "Exiting"
+msgstr ""
+
+#: ../install.py:582
+msgid "The Universe repository must be enabled."
+msgstr ""
+
+#: ../install.py:606
+msgid ""
+"Do you want to to uninstall the previous version of Rapid Photo Downloader:"
+msgstr ""
+
+#: ../install.py:715 ../install.py:740
+msgid ""
+"Querying package system to see if an older version of Rapid Photo Downloader "
+"is installed (this may take a while)..."
+msgstr ""
+
+#: ../install.py:726
+msgid ""
+"Unable to query package system. Please check your Internet connection and "
+"try again"
+msgstr ""
+
+#: ../install.py:756
+msgid "Checking if previous version installed with pip..."
+msgstr ""
+
+#: ../install.py:850
+msgid "The following package is unknown on your system: {}\n"
+msgstr ""
+
+#: ../install.py:857 ../install.py:929 ../install.py:974
+msgid ""
+"To continue, some packages required to run the application will be installed."
+msgstr ""
+
+#: ../install.py:886
+msgid "Querying installed and available packages (this may take a while)"
+msgstr ""
+
+#: ../install.py:958
+msgid ""
+"Querying zypper to see if any required packages are already installed (this "
+"may take a while)... "
+msgstr ""
+
+#: ../install.py:1004
+msgid "Query to confirm action at each step."
+msgstr ""
+
+#: ../install.py:1011
+msgid ""
+"When downloading the latest version, install the development version if it "
+"is newer than the stable version."
+msgstr ""
+
+#: ../install.py:1020
+msgid ""
+"Optional tar.gz Rapid Photo Downloader installer archive. If not specified, "
+"the latest version is downloaded from the Internet."
+msgstr ""
+
+#: ../install.py:1043
+msgid ""
+"Do not run the installer in the tar.gz Rapid Photo Downloader installer "
+"archive if it is newer than this version ({}). The default is to run "
+"whichever installer is newer."
+msgstr ""
+
+#: ../install.py:1050
+msgid ""
+"Uninstall Rapid Photo Downloader that was installed with pip, keeping its "
+"dependencies."
+msgstr ""
+
+#: ../install.py:1054
+msgid ""
+"Uninstall the dependencies installed by pip during Rapid Photo Downloader's "
+"installation, and Rapid Photo Downloader itself, then exit."
+msgstr ""
 
-#. type: QPushButton
-#: ../raphodo/aboutdialog.py:217
+#: ../install.py:1059
+msgid ""
+"Note: this will not uninstall any version of Rapid Photo Downloader "
+"installed by your Linux distribution's package manager."
+msgstr ""
+
+#: ../install.py:1066
+msgid ""
+"Dependencies will only be removed if they are not required by other programs."
+msgstr ""
+
+#: ../install.py:1072
+msgid ""
+"Note: this option will remove the dependencies regardless of whether they "
+"are required by another program pip has installed. Upgrade to pip 9.0 or "
+"above if you want to avoid this behavior. You can do so using the command "
+"'python3 -m pip install pip -U --user'. Also note that any version of Rapid "
+"Photo Downloader installed by your Linux distribution's package manager will "
+"not be uninstalled."
+msgstr ""
+
+#: ../install.py:1122
+msgid "Failed to download versions file"
+msgstr ""
+
+#: ../install.py:1126
+msgid "Got error code {} while accessing versions file"
+msgstr ""
+
+#: ../install.py:1234
+msgid ""
+"Sorry, could not locate installer. Please check your Internet connection and "
+"verify if you can reach https://www.damonlynch.net\n"
+"\n"
+"Exiting.\n"
+msgstr ""
+
+#: ../install.py:1408
+msgid "Installing application requirements..."
+msgstr ""
+
+#: ../install.py:1424
+msgid "Received error code"
+msgstr ""
+
+#: ../install.py:1425
+msgid "Failed to install application requirements: exiting"
+msgstr ""
+
+#: ../install.py:1428
+msgid "Installing application..."
+msgstr ""
+
+#: ../install.py:1441
+msgid "Failed to install application: exiting..."
+msgstr ""
+
+#: ../install.py:1465
+msgid ""
+"You may have to restart the computer to be able to run the program from the "
+"commmand line or application launcher."
+msgstr ""
+
+#: ../install.py:1476
+msgid "Do you want to install the application's man pages?"
+msgstr ""
+
+#: ../install.py:1477
+msgid "They will be installed into {}"
+msgstr ""
+
+#: ../install.py:1478 ../install.py:1483
+msgid "If you uninstall the application, remove these manpages yourself."
+msgstr ""
+
+#: ../install.py:1480
+msgid "Do want to install the man pages?"
+msgstr ""
+
+#: ../install.py:1482
+msgid "Installing man pages into {}"
+msgstr ""
+
+#: ../install.py:1499
+msgid "Failed to create man page directory: exiting"
+msgstr ""
+
+#: ../install.py:1511
+msgid "Failed to copy man page."
+msgstr ""
+
+#: ../install.py:1521
+msgid "(If a segmentation fault occurs at exit, you can ignore it...)"
+msgstr ""
+
+#: ../install.py:1534
+msgid ""
+"The python3 tool pip is required to uninstall a version of Rapid Photo "
+"Downloader that was installed with pip.\n"
+"Cannot continue. Exiting."
+msgstr ""
+
+#: ../install.py:1575
+msgid ""
+"Do not run this installer script as sudo / root user.\n"
+"Run it using the user who will run the program.\n"
+msgstr ""
+
+#: ../install.py:1585 ../install.py:1599
+msgid "Do not include any other command line arguments when specifying"
+msgstr ""
+
+#: ../install.py:1614
+msgid ""
+"Sorry, this installer does not support a custom python installation.\n"
+"Exiting..."
+msgstr ""
+
+#: ../install.py:1620
+msgid "Restarting script using system python..."
+msgstr ""
+
+#: ../install.py:1651
+msgid "Exiting..."
+msgstr ""
+
+#. Translators: do not translate the term python3-apt
+#: ../install.py:1670
+msgid "To continue, the package python3-apt must be installed."
+msgstr ""
+
+#: ../install.py:1689
+msgid ""
+"Install the following packages using your Linux distribution's standard "
+"package manager, and then rerun this installer"
+msgstr ""
+
+#: ../install.py:1698
+msgid ""
+"To run this program, programs to assist Python 3 and its package management "
+"must be installed."
+msgstr ""
+
+#. Translators: do not translate the terms Python 3, pip and setuptools
+#: ../install.py:1713
+msgid "Python 3's pip and setuptools must be upgraded for your user."
+msgstr ""
+
+#. Translators: do not translate the term python or requests
+#: ../install.py:1726
+msgid "Installing python requests"
+msgstr ""
+
+#: ../upgrade.py:79
+msgid "Upgrade Rapid Photo Downloader"
+msgstr ""
+
+#: ../upgrade.py:401 ../raphodo/viewutils.py:242
+msgid "&Cancel"
+msgstr ""
+
+#: ../upgrade.py:405
+msgid "&Upgrade"
+msgstr ""
+
+#: ../upgrade.py:410
+#, python-format
+msgid "Click the Upgrade button to upgrade to version %s."
+msgstr ""
+
+#: ../upgrade.py:413
+msgid "Click the Upgrade button to start the upgrade."
+msgstr ""
+
+#: ../upgrade.py:416 ../upgrade.py:422 ../raphodo/viewutils.py:241
+msgid "&Close"
+msgstr ""
+
+#: ../upgrade.py:417
+msgid "&Run"
+msgstr ""
+
+#: ../upgrade.py:447
+msgid "Close Rapid Photo Downloader before running this upgrade"
+msgstr ""
+
+#: ../upgrade.py:450
+msgid "Upgrade running..."
+msgstr ""
+
+#: ../upgrade.py:486
+#, python-format
+msgid ""
+"Successfully upgraded to %s. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:491
+msgid ""
+"Upgrade finished successfully. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:495
+msgid "Upgrade failed. Click Close to exit."
+msgstr ""
+
+#: ../upgrade.py:6967
+#, python-format
+msgid "Upgrading %s..."
+msgstr ""
+
+#: ../upgrade.py:6969
+msgid "Press any key to continue..."
+msgstr ""
+
+#: ../upgrade.py:6982
+msgid "Rapid Photo Downloader upgrade failed"
+msgstr ""
+
+#: ../upgrade.py:6984
+#, python-format
+msgid ""
+"The python package %s could not be updated. The upgrade cannot continue."
+msgstr ""
+
+#: ../raphodo/aboutdialog.py:225
 msgid "Credits"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:239
+#: ../raphodo/backuppanel.py:240
 msgid "Backups are not configured"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:241
+#: ../raphodo/backuppanel.py:242
 msgid "No backup devices detected"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:243
+#: ../raphodo/backuppanel.py:244
 msgid "Valid backup locations not yet specified"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:401
+#: ../raphodo/backuppanel.py:404
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
 msgstr ""
 
-#: ../raphodo/backuppanel.py:407
+#: ../raphodo/backuppanel.py:412
 msgid "Back up photos and videos when downloading"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:413
+#: ../raphodo/backuppanel.py:418
 msgid "Automatically detect backup devices"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:417
+#: ../raphodo/backuppanel.py:424
 msgid ""
-"Specify the folder in which backups are stored on the device."
-"<br><br><i>Note: the presence of a folder with this name is used to "
+"Specify the folder in which backups are stored on the "
+"device.<br><br><i>Note: the presence of a folder with this name is used to "
 "determine if 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 folder names. By "
 "adding both folders, the same device can be used to back up both photos and "
 "videos.</i>"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:428
+#: ../raphodo/backuppanel.py:439
 msgid "Photo folder name:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:433
+#: ../raphodo/backuppanel.py:444
 msgid "Video folder name:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:438 ../raphodo/nameeditor.py:883
+#: ../raphodo/backuppanel.py:449 ../raphodo/nameeditor.py:890
 #: ../raphodo/renamepanel.py:123
 msgid "Example:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:448
-msgid "If you disable automatic detection, choose the exact backup locations."
+#: ../raphodo/backuppanel.py:460
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
 
-#: ../raphodo/backuppanel.py:452
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:468
 msgid "Photo backup location:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:454
+#: ../raphodo/backuppanel.py:474
 msgid "Select Photo Backup Location"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:460
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:485
 msgid "Video backup location:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:462
+#: ../raphodo/backuppanel.py:491
 msgid "Select Video Backup Location"
 msgstr ""
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:564
+#: ../raphodo/backuppanel.py:595
 msgid "drive1"
 msgstr ""
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:567
+#: ../raphodo/backuppanel.py:598
 msgid "drive2"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:628
+#: ../raphodo/backuppanel.py:663
 msgid "Projected Backup Storage Use"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:632
+#: ../raphodo/backuppanel.py:669
 msgid "Backup Options"
 msgstr ""
 
 #. translators: refers to the video thumbnail file that some
 #. cameras generate -- it has a .THM file extension
-#: ../raphodo/copyfiles.py:476
+#: ../raphodo/copyfiles.py:491
 msgid "video THM"
 msgstr ""
 
-#: ../raphodo/copyfiles.py:482
+#: ../raphodo/copyfiles.py:497
 msgid "audio"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:78 ../raphodo/devicedisplay.py:1079
-#: ../raphodo/rpdfile.py:321
+#: ../raphodo/rpdfile.py:342
 #, python-format
 msgid "%(no_photos)s Photos"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:82 ../raphodo/devicedisplay.py:1081
-#: ../raphodo/rpdfile.py:316
+#: ../raphodo/rpdfile.py:333
 #, python-format
 msgid "%(no_videos)s Videos"
 msgstr ""
@@ -157,15 +517,15 @@ msgid "%(size_free)s free of %(size_total)s"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:190 ../raphodo/devicedisplay.py:993
-#: ../raphodo/rapid.py:1964 ../raphodo/rapid.py:2079 ../raphodo/rapid.py:5753
-#: ../raphodo/rpdfile.py:905
+#: ../raphodo/rapid.py:2023 ../raphodo/rapid.py:2151 ../raphodo/rapid.py:6043
+#: ../raphodo/rpdfile.py:930
 msgid "Photos"
 msgstr ""
 
 #. translators: the name of the Videos folder
 #: ../raphodo/destinationdisplay.py:191 ../raphodo/devicedisplay.py:994
-#: ../raphodo/rapid.py:1967 ../raphodo/rapid.py:2080 ../raphodo/rapid.py:5754
-#: ../raphodo/rpdfile.py:933 ../raphodo/storage.py:445
+#: ../raphodo/rapid.py:2028 ../raphodo/rapid.py:2152 ../raphodo/rapid.py:6044
+#: ../raphodo/rpdfile.py:958 ../raphodo/storage.py:449
 msgid "Videos"
 msgstr ""
 
@@ -173,7 +533,7 @@ msgstr ""
 msgid "Projected storage use after download"
 msgstr ""
 
-#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:516
+#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:521
 msgid "Custom..."
 msgstr ""
 
@@ -211,57 +571,58 @@ msgstr ""
 msgid "%s full"
 msgstr ""
 
-#: ../raphodo/devices.py:459
+#: ../raphodo/devices.py:463
 msgid "Cameras"
 msgstr ""
 
-#: ../raphodo/devices.py:460 ../raphodo/devices.py:920
-#: ../raphodo/preferencedialog.py:85 ../raphodo/rapid.py:1927
+#: ../raphodo/devices.py:464 ../raphodo/devices.py:927
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/rapid.py:1979
 msgid "Devices"
 msgstr ""
 
-#: ../raphodo/devices.py:720
+#: ../raphodo/devices.py:724
 #, python-format
 msgid "Downloading from %(device_names)s"
 msgstr ""
 
 #. Translators: e.g. Three Devices
-#: ../raphodo/devices.py:780
+#: ../raphodo/devices.py:784
 #, python-format
 msgid "%(no_devices)s %(device_type)s"
 msgstr ""
 
-#: ../raphodo/devices.py:905 ../raphodo/rapid.py:1764
+#: ../raphodo/devices.py:912 ../raphodo/rapid.py:1807
 msgid "Select Source"
 msgstr ""
 
-#: ../raphodo/devices.py:936 ../raphodo/devices.py:947
+#: ../raphodo/devices.py:943 ../raphodo/devices.py:954
 #, python-format
 msgid "%(device1)s + %(device2)s"
 msgstr ""
 
 #. Number of cameras e.g. 3 Cameras
-#: ../raphodo/devices.py:958
+#: ../raphodo/devices.py:965
 #, python-format
 msgid "%(no_cameras)s Cameras"
 msgstr ""
 
-#: ../raphodo/devices.py:963
+#: ../raphodo/devices.py:970
 #, python-format
 msgid "%(no_devices)s Devices"
 msgstr ""
 
 #. Translators: two folder names, separated by a plus sign
-#: ../raphodo/devices.py:1258
+#: ../raphodo/devices.py:1265
 #, python-format
 msgid "%s + %s"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:44
+#: ../raphodo/didyouknow.py:45
 msgid "Click on a file's checkbox to mark or unmark it for download."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:50
+#: ../raphodo/didyouknow.py:51
 msgid ""
 "Files that have already been downloaded are remembered. You can still mark "
 "previously downloaded files to download again, but they are unchecked by "
@@ -269,34 +630,67 @@ msgid ""
 "files that are yet to be downloaded."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:59
+#: ../raphodo/didyouknow.py:60
 msgid ""
 "If more than one file is selected, they'll all take the mark of the file "
 "whose checkbox was clicked, regardless of whether they previously had a "
 "checkmark or not."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:67
+#: ../raphodo/didyouknow.py:68
 msgid ""
 "Click on a device's checkbox to quickly mark or unmark all its files for "
 "downloading."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:74
+#: ../raphodo/didyouknow.py:75
+msgid ""
+"After a download finishes, an icon replaces the thumbnail's checkbox. The "
+"icon's color indicates whether the download was successful (green), had file "
+"renaming problems (yellow/orange), or failed (red)."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:83
+msgid ""
+"\n"
+"            In case of any problems, a red icon will appear at the bottom of "
+"the window\n"
+"            indicating how many error reports there are. Clicking on it "
+"opens the Error Report \n"
+"            window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:91
+msgid ""
+"\n"
+"            The Error Report window lists any problems encountered before, "
+"during or after the \n"
+"            download. An orange triangle represents a warning, a red circle "
+"indicates a failure, \n"
+"            and a black circle indicates more serious failures. You can "
+"click on the hyperlinks to \n"
+"            open its file or device in a file manager. You can also search "
+"the reports using the \n"
+"            search box in the lower left of the Error Report window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:103
 msgid ""
 "You can simultaneously download from multiple cameras, smartphones, memory "
 "cards, and hard drives&mdash;as many devices as your computer can handle at "
 "one time."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:81
+#: ../raphodo/didyouknow.py:110
 msgid ""
 "The <b>Timeline</b> groups photos and videos based on how much time elapsed "
 "between consecutive shots. Use it to identify photos and videos taken at "
 "different periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:88
+#: ../raphodo/didyouknow.py:117
 msgid ""
 "\n"
 "<p>In the illustration above, the first row of the Timeline is black because "
@@ -308,7 +702,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:99
+#: ../raphodo/didyouknow.py:128
 msgid ""
 "To view photos and videos for a particular time range, use the mouse "
 "(optionally in combination with the <tt>Shift</tt> or <tt>Ctrl</tt> keys) to "
@@ -316,20 +710,20 @@ msgid ""
 "the left side of the main window will be highlighted."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:106
+#: ../raphodo/didyouknow.py:135
 msgid ""
 "A download always includes all files that are checked for download, "
 "including those that are not currently displayed because the Timeline is "
 "being used."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:113
+#: ../raphodo/didyouknow.py:142
 msgid ""
 "You can hide or display the download sources by clicking on the name of the "
 "device you're downloading from at the top left of the program window."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:120
+#: ../raphodo/didyouknow.py:149
 msgid ""
 "\n"
 "          Thumbnails can be sorted using a variety of criteria:\n"
@@ -348,33 +742,33 @@ msgid ""
 "</ol> "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:137
+#: ../raphodo/didyouknow.py:166
 msgid ""
 "One of Rapid Photo Downloader's most useful features is its ability to "
 "automatically generate download subfolders and rename files as it downloads, "
 "using a scheme of your choosing."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:143
+#: ../raphodo/didyouknow.py:172
 msgid ""
 "To specify where you want your files downloaded and how you want them named, "
 "open the appropriate panel on the right-side of the application window: "
 "<b>Destination</b>, <b>Rename</b>, or <b>Job Code</b>."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:150
+#: ../raphodo/didyouknow.py:179
 msgid ""
 "\n"
 "When thinking about your download directory structure, keep in mind two "
 "different types\n"
 "of directory:\n"
 "<ol>\n"
-"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, &quot;"
-"Photos&quot;, or\n"
+"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, "
+"&quot;Photos&quot;, or\n"
 "&quot;Videos&quot;. This directory should already exist on your computer. In "
 "the illustration \n"
-"below, the destination folders are &quot;Pictures&quot; and &quot;"
-"Videos&quot;. The\n"
+"below, the destination folders are &quot;Pictures&quot; and "
+"&quot;Videos&quot;. The\n"
 "name of the destination folder is displayed in the grey bar directly above "
 "the folder tree, \n"
 "with a folder icon to its left and a gear icon to its far right.</li>\n"
@@ -387,7 +781,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:167
+#: ../raphodo/didyouknow.py:196
 msgid ""
 "\n"
 "You can download photos and videos to the same destination folder, or "
@@ -400,14 +794,14 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:177
+#: ../raphodo/didyouknow.py:206
 msgid ""
 "Automatically generated download subfolders can contain further "
 "automatically generated subfolders if need be. A common scheme is to create "
 "a year subfolder and then a series of year-month-day subfolders within it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:186
+#: ../raphodo/didyouknow.py:215
 msgid ""
 "\n"
 "Whenever possible, the program previews the download subfolders of photos "
@@ -425,7 +819,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:201
+#: ../raphodo/didyouknow.py:230
 msgid ""
 "\n"
 "Download subfolder names are typically generated using some or all of the "
@@ -449,7 +843,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:219
+#: ../raphodo/didyouknow.py:248
 msgid ""
 "\n"
 "To automatically create download subfolders as you download, \n"
@@ -459,7 +853,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:227
+#: ../raphodo/didyouknow.py:256
 msgid ""
 "\n"
 "Using the drop-down menu, select a built-in preset or click on <b>Custom</b> "
@@ -469,20 +863,20 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:237
+#: ../raphodo/didyouknow.py:266
 msgid ""
 "It's easy to download raw images into one folder, and jpeg images into "
 "another. Simply use the <b>Filename Extension</b> as part of your download "
 "subfolder generation scheme:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:242
+#: ../raphodo/didyouknow.py:271
 msgid ""
 "This illustration shows a saved custom preset named &quot;My custom "
 "preset&quot;."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:246
+#: ../raphodo/didyouknow.py:275
 msgid ""
 "\n"
 "You do not have to create nested download subfolders. This illustration "
@@ -493,7 +887,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:256
+#: ../raphodo/didyouknow.py:285
 msgid ""
 "\n"
 "Although there are many built-in date/time naming options, you may find that "
@@ -507,7 +901,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:265
+#: ../raphodo/didyouknow.py:294
 msgid ""
 "\n"
 "Read more about all the ways you can generate download subfolder names and "
@@ -517,7 +911,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:273
+#: ../raphodo/didyouknow.py:302
 msgid ""
 "\n"
 "<b>Job Codes</b> let you easily enter text that describes sets of photos and "
@@ -529,7 +923,7 @@ msgid ""
 "&quot;Green Bazaar&quot;: \n"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:282
+#: ../raphodo/didyouknow.py:311
 msgid ""
 "\n"
 "You can apply new or existing Job Codes before you start a download. If "
@@ -540,36 +934,36 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:291
+#: ../raphodo/didyouknow.py:320
 msgid "Look for hints to guide you when working with Job Codes:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:295
+#: ../raphodo/didyouknow.py:324
 msgid ""
 "Hints will vary depending on the context, such as when the mouse is hovering "
 "over a button."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:301
+#: ../raphodo/didyouknow.py:330
 msgid ""
 "\n"
 "When you give your photos and videos unique filenames, you'll never be "
 "confused as to \n"
 "which file is which. Using <b>sequence numbers</b> to make filenames unique "
 "is highly \n"
-"recommended!.\n"
+"recommended!\n"
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:309
+#: ../raphodo/didyouknow.py:338
 msgid ""
 "\n"
 "<p>Four types of sequence values are available to help you assign unique "
 "names to your photos and \n"
 "videos:\n"
 "<ol>\n"
-"<li><b>Downloads today</b>: tracks downloads completed during that day.</"
-"li>\n"
+"<li><b>Downloads today</b>: tracks downloads completed during that "
+"day.</li>\n"
 "<li><b>Stored number</b>: similar to Downloads today, but it is remembered "
 "from the last time the  \n"
 "program was run.</li>\n"
@@ -583,7 +977,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:327
+#: ../raphodo/didyouknow.py:356
 msgid ""
 "\n"
 "The <b>Rename</b> panel allows you to configure file renaming. To rename "
@@ -592,7 +986,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:334
+#: ../raphodo/didyouknow.py:363
 msgid ""
 "\n"
 "<p>The <b>Synchronize RAW + JPEG</b> option is useful if you use the RAW + "
@@ -611,7 +1005,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:348
+#: ../raphodo/didyouknow.py:377
 msgid ""
 "\n"
 "You can have your photos and videos backed up to multiple locations as they "
@@ -622,13 +1016,13 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:356
+#: ../raphodo/didyouknow.py:385
 msgid ""
 "In this example, the drive <b>photobackup</b> does not contain a folder "
 "named <tt>Videos</tt>, so videos will not be backed up to it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:362
+#: ../raphodo/didyouknow.py:391
 msgid ""
 "\n"
 "Several of the program's preferences can be set from the command line, "
@@ -639,7 +1033,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:372
+#: ../raphodo/didyouknow.py:396
+msgid "You can also import program preferences from the older 0.4 version."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:401
 msgid ""
 "\n"
 "Rapid Photo Downloader deals with three types of cache:\n"
@@ -649,8 +1047,8 @@ msgid ""
 "memory cards, and other devices.</li>\n"
 "<li>A <b>temporary cache</b> of files downloaded from a camera, one for "
 "photos and another for \n"
-"videos. They are located in temporary subfolders in the download destination."
-"</li>\n"
+"videos. They are located in temporary subfolders in the download "
+"destination.</li>\n"
 "<li>The <b>desktop's thumbnail cache</b>, in which Rapid Photo Downloader "
 "stores thumbnails of \n"
 "RAW and TIFF photos once they have been downloaded. File browsers like Gnome "
@@ -665,23 +1063,23 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:431
+#: ../raphodo/didyouknow.py:460
 msgid "Tip of the Day"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:439
+#: ../raphodo/didyouknow.py:468
 msgid "Did you know...?"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:466
+#: ../raphodo/didyouknow.py:495
 msgid "Show tips on startup"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:470
+#: ../raphodo/didyouknow.py:499
 msgid "&Next"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:471
+#: ../raphodo/didyouknow.py:500
 msgid "&Previous"
 msgstr ""
 
@@ -788,68 +1186,68 @@ msgstr ""
 msgid "%(days)d days, %(hours)d hours"
 msgstr ""
 
-#: ../raphodo/errorlog.py:65
+#: ../raphodo/errorlog.py:66
 msgid "Find"
 msgstr ""
 
-#: ../raphodo/errorlog.py:135
+#: ../raphodo/errorlog.py:136
 msgid "Error Reports - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/errorlog.py:170
+#: ../raphodo/errorlog.py:171
 msgid "Find in reports"
 msgstr ""
 
-#: ../raphodo/errorlog.py:187
+#: ../raphodo/errorlog.py:188
 msgid "Find the previous occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:192
+#: ../raphodo/errorlog.py:193
 msgid "Find the next occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:194
+#: ../raphodo/errorlog.py:195
 msgid "&Highlight All"
 msgstr ""
 
-#: ../raphodo/errorlog.py:195
+#: ../raphodo/errorlog.py:196
 msgid "Highlight all occurrences of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:196
+#: ../raphodo/errorlog.py:197
 msgid "&Match Case"
 msgstr ""
 
-#: ../raphodo/errorlog.py:197
+#: ../raphodo/errorlog.py:198
 msgid "Search with case sensitivity"
 msgstr ""
 
-#: ../raphodo/errorlog.py:198
+#: ../raphodo/errorlog.py:199
 msgid "&Whole Words"
 msgstr ""
 
-#: ../raphodo/errorlog.py:199
+#: ../raphodo/errorlog.py:200
 msgid "Search whole words only"
 msgstr ""
 
-#: ../raphodo/errorlog.py:209 ../raphodo/errorlog.py:341
+#: ../raphodo/errorlog.py:210 ../raphodo/errorlog.py:345
 #, python-format
 msgid "%s of %s matches"
 msgstr ""
 
-#: ../raphodo/errorlog.py:228
+#: ../raphodo/errorlog.py:232
 msgid "Clear"
 msgstr ""
 
-#: ../raphodo/errorlog.py:328
+#: ../raphodo/errorlog.py:332
 msgid "Phrase not found"
 msgstr ""
 
-#: ../raphodo/errorlog.py:487
+#: ../raphodo/errorlog.py:491
 msgid "Search pending..."
 msgstr ""
 
-#: ../raphodo/errorlog.py:535
+#: ../raphodo/errorlog.py:539
 msgid ""
 "The number of new entries added to the Error Report since it was last open. "
 "Click to open the Error Report."
@@ -863,8 +1261,8 @@ msgstr ""
 #, python-brace-format
 msgid ""
 "<b>A problem occurred in Rapid Photo Downloader</b><br><br>\n"
-"    Please report the problem at <a href=\"{website}\">{website}</a>."
-"<br><br>\n"
+"    Please report the problem at <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
 "    Attach the log file <i>{log_file}</i> to your bug report (click\n"
 "    <a href=\"{log_path}\">here</a> to open the log directory).<br><br>If "
 "the same problem occurs\n"
@@ -885,7 +1283,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1601
+#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1643
 msgid "Open in File Browser..."
 msgstr ""
 
@@ -903,531 +1301,531 @@ msgstr ""
 msgid "%s (location does not exist)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:186
+#: ../raphodo/generatenameconfig.py:190
 msgid "Date time"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:187
+#: ../raphodo/generatenameconfig.py:191
 msgid "Text"
 msgstr "Tèxte"
 
-#: ../raphodo/generatenameconfig.py:188 ../raphodo/rapid.py:2053
+#: ../raphodo/generatenameconfig.py:192 ../raphodo/rapid.py:2125
 msgid "Filename"
 msgstr "Nom del fichièr"
 
-#: ../raphodo/generatenameconfig.py:189 ../raphodo/preferencedialog.py:488
+#: ../raphodo/generatenameconfig.py:193 ../raphodo/preferencedialog.py:724
 msgid "Metadata"
 msgstr "Metadonadas"
 
-#: ../raphodo/generatenameconfig.py:190
+#: ../raphodo/generatenameconfig.py:194
 msgid "Sequences"
 msgstr "Sequéncias"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: ../raphodo/generatenameconfig.py:193
+#: ../raphodo/generatenameconfig.py:197
 msgid "Job code"
 msgstr "Etiqueta de transferiment"
 
-#: ../raphodo/generatenameconfig.py:194
+#: ../raphodo/generatenameconfig.py:198
 msgid "Image date"
 msgstr "Data de l'imatge"
 
-#: ../raphodo/generatenameconfig.py:195
+#: ../raphodo/generatenameconfig.py:199
 msgid "Video date"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:196
+#: ../raphodo/generatenameconfig.py:200
 msgid "Today"
 msgstr "Uèi"
 
-#: ../raphodo/generatenameconfig.py:197
+#: ../raphodo/generatenameconfig.py:201
 msgid "Yesterday"
 msgstr "Ièr"
 
 #. Translators: Download time is the time and date that the download started (when the
 #. user clicked the Download button)
-#: ../raphodo/generatenameconfig.py:200
+#: ../raphodo/generatenameconfig.py:204
 msgid "Download time"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:203
+#: ../raphodo/generatenameconfig.py:207
 msgid "Name"
 msgstr "Nom"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:206 ../raphodo/rapid.py:2054
+#: ../raphodo/generatenameconfig.py:210 ../raphodo/rapid.py:2126
 msgid "Extension"
 msgstr "Extension"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:209
+#: ../raphodo/generatenameconfig.py:213
 msgid "Image number"
 msgstr "Numèro de l'imatge"
 
-#: ../raphodo/generatenameconfig.py:210
+#: ../raphodo/generatenameconfig.py:214
 msgid "Video number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:213
+#: ../raphodo/generatenameconfig.py:217
 msgid "Aperture"
 msgstr "Dobertura"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:216
+#: ../raphodo/generatenameconfig.py:220
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:219
+#: ../raphodo/generatenameconfig.py:223
 msgid "Exposure time"
 msgstr "Temps d'exposicion"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:222
+#: ../raphodo/generatenameconfig.py:226
 msgid "Focal length"
 msgstr "Distància focala"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:225
+#: ../raphodo/generatenameconfig.py:229
 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
-#: ../raphodo/generatenameconfig.py:228
+#: ../raphodo/generatenameconfig.py:232
 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
-#: ../raphodo/generatenameconfig.py:231
+#: ../raphodo/generatenameconfig.py:235
 msgid "Short camera model"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:234
+#: ../raphodo/generatenameconfig.py:238
 msgid "Hyphenated short camera model"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:237
+#: ../raphodo/generatenameconfig.py:241
 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
-#: ../raphodo/generatenameconfig.py:240
+#: ../raphodo/generatenameconfig.py:244
 msgid "Shutter count"
 msgstr ""
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: ../raphodo/generatenameconfig.py:242
+#: ../raphodo/generatenameconfig.py:246
 msgid "File number"
 msgstr ""
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:244
+#: ../raphodo/generatenameconfig.py:248
 msgid "Folder only"
 msgstr ""
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:246
+#: ../raphodo/generatenameconfig.py:250
 msgid "Folder and file"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:249
+#: ../raphodo/generatenameconfig.py:253
 msgid "Owner name"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:250
+#: ../raphodo/generatenameconfig.py:254
 msgid "Codec"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:251
+#: ../raphodo/generatenameconfig.py:255
 msgid "Width"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:252
+#: ../raphodo/generatenameconfig.py:256
 msgid "Height"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:253
+#: ../raphodo/generatenameconfig.py:257
 msgid "Length"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:254
+#: ../raphodo/generatenameconfig.py:258
 msgid "Frames Per Second"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:255
+#: ../raphodo/generatenameconfig.py:259
 msgid "Artist"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:256
+#: ../raphodo/generatenameconfig.py:260
 msgid "Copyright"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:259
+#: ../raphodo/generatenameconfig.py:263
 msgid "Downloads today"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:262
+#: ../raphodo/generatenameconfig.py:266
 msgid "Session number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:265
+#: ../raphodo/generatenameconfig.py:269
 msgid "Subfolder number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:268
+#: ../raphodo/generatenameconfig.py:272
 msgid "Stored number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: ../raphodo/generatenameconfig.py:271
+#: ../raphodo/generatenameconfig.py:275
 msgid "Sequence letter"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:274
+#: ../raphodo/generatenameconfig.py:278
 msgid "All digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:277
+#: ../raphodo/generatenameconfig.py:281
 msgid "Last digit"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:280
+#: ../raphodo/generatenameconfig.py:284
 msgid "Last 2 digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:283
+#: ../raphodo/generatenameconfig.py:287
 msgid "Last 3 digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:286
+#: ../raphodo/generatenameconfig.py:290
 msgid "Last 4 digits"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:289
+#: ../raphodo/generatenameconfig.py:293
 msgid "Original Case"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:292
+#: ../raphodo/generatenameconfig.py:296
 msgid "UPPERCASE"
 msgstr "MAJUSCULA"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:295
+#: ../raphodo/generatenameconfig.py:299
 msgid "lowercase"
 msgstr "minuscula"
 
-#: ../raphodo/generatenameconfig.py:296
+#: ../raphodo/generatenameconfig.py:300
 msgid "One digit"
 msgstr "Una chifra"
 
-#: ../raphodo/generatenameconfig.py:297
+#: ../raphodo/generatenameconfig.py:301
 msgid "Two digits"
 msgstr "Doas chifras"
 
-#: ../raphodo/generatenameconfig.py:298
+#: ../raphodo/generatenameconfig.py:302
 msgid "Three digits"
 msgstr "Tres chifras"
 
-#: ../raphodo/generatenameconfig.py:299
+#: ../raphodo/generatenameconfig.py:303
 msgid "Four digits"
 msgstr "Quatre chifras"
 
-#: ../raphodo/generatenameconfig.py:300
+#: ../raphodo/generatenameconfig.py:304
 msgid "Five digits"
 msgstr "Cinc chifras"
 
-#: ../raphodo/generatenameconfig.py:301
+#: ../raphodo/generatenameconfig.py:305
 msgid "Six digits"
 msgstr "Sièis chifras"
 
-#: ../raphodo/generatenameconfig.py:302
+#: ../raphodo/generatenameconfig.py:306
 msgid "Seven digits"
 msgstr "Sèt chifras"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:305
+#: ../raphodo/generatenameconfig.py:309
 msgid "Subseconds"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:308 ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:312 ../raphodo/generatenameconfig.py:393
 msgid "YYYYMMDD"
 msgstr "AAAAMMJJ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:311 ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:315 ../raphodo/generatenameconfig.py:394
 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
-#: ../raphodo/generatenameconfig.py:314 ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:318 ../raphodo/generatenameconfig.py:395
 msgid "YYYY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:317
+#: ../raphodo/generatenameconfig.py:321
 msgid "YYMMDD"
 msgstr "AAMMJJ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:320
+#: ../raphodo/generatenameconfig.py:324
 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
-#: ../raphodo/generatenameconfig.py:323
+#: ../raphodo/generatenameconfig.py:327
 msgid "YY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:326
+#: ../raphodo/generatenameconfig.py:330
 msgid "MMDDYYYY"
 msgstr "MM-JJ-AAAA"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:329
+#: ../raphodo/generatenameconfig.py:333
 msgid "MMDDYY"
 msgstr "MM-JJ-AA"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:332
+#: ../raphodo/generatenameconfig.py:336
 msgid "MMDD"
 msgstr "MMJJ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:335
+#: ../raphodo/generatenameconfig.py:339
 msgid "DDMMYYYY"
 msgstr "JJMMAAAA"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:338
+#: ../raphodo/generatenameconfig.py:342
 msgid "DDMMYY"
 msgstr "JJMMAA"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:341 ../raphodo/generatenameconfig.py:389
-#: ../raphodo/generatenameconfig.py:390 ../raphodo/generatenameconfig.py:391
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:345 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:394 ../raphodo/generatenameconfig.py:395
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:397
 msgid "YYYY"
 msgstr "AAAA"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:344
+#: ../raphodo/generatenameconfig.py:348
 msgid "YY"
 msgstr "AA"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:347
+#: ../raphodo/generatenameconfig.py:351
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:350
+#: ../raphodo/generatenameconfig.py:354
 msgid "DD"
 msgstr "JJ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:353
+#: ../raphodo/generatenameconfig.py:357
 msgid "Month (full)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:356
+#: ../raphodo/generatenameconfig.py:360
 msgid "Month (abbreviated)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:359
+#: ../raphodo/generatenameconfig.py:363
 msgid "HHMMSS"
 msgstr "HHMMSS"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:362
+#: ../raphodo/generatenameconfig.py:366
 msgid "HHMM"
 msgstr "HHMM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:365
+#: ../raphodo/generatenameconfig.py:369
 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
-#: ../raphodo/generatenameconfig.py:368
+#: ../raphodo/generatenameconfig.py:372
 msgid "HH-MM"
 msgstr "HH-MM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:371
+#: ../raphodo/generatenameconfig.py:375
 msgid "HH"
 msgstr "HH"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:374
+#: ../raphodo/generatenameconfig.py:378
 msgid "MM (minutes)"
 msgstr "MM (minutas)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:377
+#: ../raphodo/generatenameconfig.py:381
 msgid "SS"
 msgstr "SS"
 
-#: ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:393
 msgid "Date"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:394
 msgid "Date (hyphens)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:395
 msgid "Date (underscores)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:438
-#: ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:442
+#: ../raphodo/generatenameconfig.py:537
 msgid "Date and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392
+#: ../raphodo/generatenameconfig.py:396
 msgid "YYYYMM_Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "Date and Job Code Subfolder"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "YYYYMM"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393 ../raphodo/jobcodepanel.py:198
-#: ../raphodo/nameeditor.py:827 ../raphodo/rapid.py:1809
+#: ../raphodo/generatenameconfig.py:397 ../raphodo/jobcodepanel.py:199
+#: ../raphodo/nameeditor.py:833 ../raphodo/rapid.py:1852
 #: ../raphodo/renamepanel.py:83 ../raphodo/renamepanel.py:241
 msgid "Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:433 ../raphodo/generatenameconfig.py:512
+#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:532
 msgid "Original Filename"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "Date-Time and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "YYYYMMDD-HHMM-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "Date and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "YYYYMMDD-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "Date-Time and Image number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "YYYYMMDD-1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "Date-Time and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "YYYYMMDD-HHMM-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:442 ../raphodo/generatenameconfig.py:537
 msgid "YYYYMMDD-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "Date-Time and Video number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "YYYYMMDD_1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "Resolution"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "YYYYMMDD-HHMM-1-1920x1080"
 msgstr ""
 
@@ -1486,76 +1884,77 @@ msgstr ""
 msgid "&Remember this choice"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:185
+#: ../raphodo/jobcodepanel.py:186
 msgid ""
 "Select photos and videos to be able to apply a new or existing Job Code to "
 "them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:186
-msgid "The new Job Code will be applied to all selected photos and/or videos."
+#: ../raphodo/jobcodepanel.py:187
+msgid ""
+"The new Job Code will be applied to all selected photos and/or videos."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:187
+#: ../raphodo/jobcodepanel.py:188
 msgid ""
 "Click the Apply button to apply the current Job Code to all selected photos "
 "and/or videos. You can also simply double click the Job Code."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:189
+#: ../raphodo/jobcodepanel.py:190
 msgid ""
 "Removing a Job Code removes it only from the list of saved Job Codes, not "
 "from any photos or videos that it may have been applied to."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:191
+#: ../raphodo/jobcodepanel.py:192
 msgid ""
 "If you want to use Job Codes, configure file renaming or destination "
 "subfolder names to use them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:197
+#: ../raphodo/jobcodepanel.py:198
 msgid "Last Used"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:202
+#: ../raphodo/jobcodepanel.py:203
 msgid "Job Code Sort:"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:205 ../raphodo/rapid.py:2061
+#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2133
 msgid "Ascending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2062
+#: ../raphodo/jobcodepanel.py:207 ../raphodo/rapid.py:2134
 msgid "Descending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:216
+#: ../raphodo/jobcodepanel.py:217
 msgid "&New..."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:220
+#: ../raphodo/jobcodepanel.py:221
 msgid "&Apply"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:224
+#: ../raphodo/jobcodepanel.py:225
 msgid "&Remove"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:228 ../raphodo/preferencedialog.py:125
-#: ../raphodo/preferencedialog.py:154 ../raphodo/preferencedialog.py:433
+#: ../raphodo/jobcodepanel.py:229 ../raphodo/preferencedialog.py:200
+#: ../raphodo/preferencedialog.py:229 ../raphodo/preferencedialog.py:531
 msgid "Remove All"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:427
+#: ../raphodo/jobcodepanel.py:428
 msgid "Do you really want to remove all the Job Codes?"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:429
+#: ../raphodo/jobcodepanel.py:430
 msgid "Remove all Job Codes"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:492
+#: ../raphodo/jobcodepanel.py:493
 msgid "Job Codes"
 msgstr ""
 
@@ -1566,42 +1965,58 @@ msgstr ""
 msgid "<i><b>Hint:</b> %(message)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:418 ../raphodo/nameeditor.py:432
+#: ../raphodo/nameeditor.py:423 ../raphodo/nameeditor.py:437
 #, python-format
 msgid "%(description)s - %(elements)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:512
+#: ../raphodo/nameeditor.py:517
 msgid "Save New Custom Preset..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:513
+#: ../raphodo/nameeditor.py:518
 msgid "Remove All Custom Presets..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:559
+#: ../raphodo/nameeditor.py:564
 msgid "(New Custom Preset)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:576
+#: ../raphodo/nameeditor.py:581
 #, python-format
 msgid "%s (edited)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:579 ../raphodo/nameeditor.py:1370
+#: ../raphodo/nameeditor.py:584 ../raphodo/nameeditor.py:1379
 #, python-format
 msgid "Update Custom Preset \"%s\""
 msgstr ""
 
-#: ../raphodo/nameeditor.py:667
+#: ../raphodo/nameeditor.py:672
 msgid "Save New Custom Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:675
+#: ../raphodo/nameeditor.py:680
 msgid "Preset Name:"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:836
+#: ../raphodo/nameeditor.py:799
+msgid "Photo Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:805
+msgid "Video Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:811
+msgid "Photo Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:817
+msgid "Video Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:842
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>There is insufficient data to "
 "fully generate the name. Please use other renaming options.</i>"
@@ -1610,7 +2025,7 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees.
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:846
+#: ../raphodo/nameeditor.py:853
 #, python-format
 msgid "The character</i> %(separator)s <i>creates a new subfolder level."
 msgstr ""
@@ -1618,50 +2033,50 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:851
+#: ../raphodo/nameeditor.py:858
 #, python-format
 msgid ""
 "There is no need start or end with the folder separator </i> "
 "%(separator)s<i>, because it is added automatically."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:859
+#: ../raphodo/nameeditor.py:866
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>Unique filenames may not be "
 "generated. Make filenames unique by using Sequence values.</i>"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:882 ../raphodo/renamepanel.py:121
+#: ../raphodo/nameeditor.py:889 ../raphodo/renamepanel.py:121
 msgid "Preset:"
 msgstr ""
 
 #. Translators: appears in a combobox, e.g. Image Date (YYYY)
-#: ../raphodo/nameeditor.py:959 ../raphodo/nameeditor.py:980
+#: ../raphodo/nameeditor.py:966 ../raphodo/nameeditor.py:987
 #, python-brace-format
 msgid "{choice} ({variant})"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1005 ../raphodo/preferencedialog.py:530
+#: ../raphodo/nameeditor.py:1012 ../raphodo/preferencedialog.py:783
 msgid "Get help online..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1025
+#: ../raphodo/nameeditor.py:1034
 msgid "Insert"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1351
+#: ../raphodo/nameeditor.py:1360
 msgid "Save Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1356
+#: ../raphodo/nameeditor.py:1365
 msgid ""
-"<b>Do you want to save the changes in a new custom preset?</"
-"b><br><br>Creating a custom preset is not required, but can help you keep "
-"organized.<br><br>The changes to the preferences will still be applied "
-"regardless of whether you create a new custom preset or not."
+"<b>Do you want to save the changes in a new custom "
+"preset?</b><br><br>Creating a custom preset is not required, but can help "
+"you keep organized.<br><br>The changes to the preferences will still be "
+"applied regardless of whether you create a new custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1365
+#: ../raphodo/nameeditor.py:1374
 msgid ""
 "<b>Do you want to save the changes in a custom preset?</b><br><br>If you "
 "like, you can create a new custom preset or update the existing custom "
@@ -1669,136 +2084,167 @@ msgid ""
 "regardless of whether you save a custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1372
+#: ../raphodo/nameeditor.py:1381
 msgid "Save New Custom Preset"
 msgstr ""
 
-#: ../raphodo/newversion.py:306
+#: ../raphodo/newversion.py:312
 msgid "Checking for new version..."
 msgstr ""
 
-#: ../raphodo/newversion.py:307
+#: ../raphodo/newversion.py:313
 msgid "You are running the latest version."
 msgstr ""
 
-#: ../raphodo/newversion.py:308
+#: ../raphodo/newversion.py:314
 msgid "Failed to contact the update server."
 msgstr ""
 
-#: ../raphodo/newversion.py:310
+#: ../raphodo/newversion.py:316
 #, python-format
 msgid "A new version of Rapid Photo Downloader (%s) is available."
 msgstr ""
 
-#: ../raphodo/newversion.py:312
+#: ../raphodo/newversion.py:318
 msgid "Do you want to download the new version?"
 msgstr ""
 
-#: ../raphodo/newversion.py:313
+#: ../raphodo/newversion.py:319
 #, python-format
 msgid "Changes in the new release can be viewed <a href=\"%s\">here</a>."
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the s key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:340 ../raphodo/newversion.py:353
+#: ../raphodo/newversion.py:348 ../raphodo/newversion.py:363
 msgid "&Skip this release"
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the o key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:356
+#: ../raphodo/newversion.py:366
 msgid "&Open Download Page"
 msgstr ""
 
-#: ../raphodo/newversion.py:376
+#: ../raphodo/newversion.py:386
 msgid "Rapid Photo Downloader updates"
 msgstr ""
 
 #. Translators: shows how much of a file has been downloaded e.g  123 KB of 1.3 MB
-#: ../raphodo/newversion.py:478
+#: ../raphodo/newversion.py:488
 #, python-format
 msgid "%(downloaded)s of %(total)s"
 msgstr ""
 
-#: ../raphodo/newversion.py:495
+#: ../raphodo/newversion.py:507
 msgid "Downloading..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:76
+#: ../raphodo/preferencedialog.py:86
 msgid "Preferences"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Automation"
 msgstr "Automatizacion"
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85 ../raphodo/preferencedialog.py:343
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/preferencedialog.py:428
 msgid "Error Handling"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:109
+msgid "Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:109 ../raphodo/preferencedialog.py:119
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:94
+#: ../raphodo/preferencedialog.py:147
 msgid "Device Scanning"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:96
+#: ../raphodo/preferencedialog.py:148
 msgid "Scan only external devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:98
+#: ../raphodo/preferencedialog.py:150
 msgid ""
 "Scan for photos and videos only on devices that are external to the "
 "computer,\n"
 "including cameras, memory cards, external hard drives, and USB flash drives."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:102
-msgid "Scan non-camera devices lacking a DCIM folder"
+#: ../raphodo/preferencedialog.py:153
+msgid "Scan only specific folders on devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:104
+#: ../raphodo/preferencedialog.py:155
 msgid ""
-"Scan the entirety of a device for photos and videos, irrespective of whether "
-"it contains a DCIM folder,\n"
-"as opposed to only scanning within a DCIM folder.\n"
+"Scan for photos and videos only in the folders specified below (except "
+"paths\n"
+"specified in Ignored Paths).\n"
 "\n"
-"Changing this setting causes all devices to be scanned again.\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:161
+msgid "Folders to scan:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:164
+msgid ""
+"Folders at the base level of device file systems that will be scanned\n"
+"for photos and videos."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:167 ../raphodo/preferencedialog.py:219
+msgid "Add..."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:169
+msgid ""
+"Add a folder to the list of folders to scan for photos and videos.\n"
 "\n"
-"Note: With cameras, only the DCIM folder is scanned."
+"Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:116
+#: ../raphodo/preferencedialog.py:172 ../raphodo/preferencedialog.py:198
+#: ../raphodo/preferencedialog.py:224 ../raphodo/preferencedialog.py:529
+msgid "Remove"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:174
+msgid ""
+"Remove a folder from the list of folders to scan for photos and videos.\n"
+"\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:191
 msgid "Devices that have been set to automatically ignore or download from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:117
+#: ../raphodo/preferencedialog.py:192
 msgid "Remembered Devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:121
+#: ../raphodo/preferencedialog.py:196
 msgid ""
 "Remove a device from the list of devices to automatically ignore or download "
 "from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:123 ../raphodo/preferencedialog.py:149
-#: ../raphodo/preferencedialog.py:431
-msgid "Remove"
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:127
+#: ../raphodo/preferencedialog.py:202
 msgid ""
 "Clear the list of devices from which to automatically ignore or download "
 "from.\n"
@@ -1806,315 +2252,436 @@ msgid ""
 "Note: Changes take effect when the computer is next scanned for devices."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:140
+#: ../raphodo/preferencedialog.py:215
 msgid "Ignored Paths"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:141
+#: ../raphodo/preferencedialog.py:216
 msgid ""
 "The end part of a path that should never be scanned for photos or videos."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:144
-msgid "Add..."
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:146
+#: ../raphodo/preferencedialog.py:221
 msgid ""
 "Add a path to the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:151
+#: ../raphodo/preferencedialog.py:226
 msgid ""
 "Remove a path from the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:156
+#: ../raphodo/preferencedialog.py:231
 msgid ""
 "Clear the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:164
+#: ../raphodo/preferencedialog.py:239
 msgid ""
-"Use python-style <a href=\"http://damonlynch.net/rapid/documentation/"
-"#regularexpressions\">regular expressions</a>"
+"Use python-style <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">regula"
+"r expressions</a>"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:168
+#: ../raphodo/preferencedialog.py:243
 msgid ""
 "Use regular expressions in the list of ignored paths.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:208
+#: ../raphodo/preferencedialog.py:283
 msgid "Program Automation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:209
+#: ../raphodo/preferencedialog.py:284
 msgid "Start downloading at program startup"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:210
+#: ../raphodo/preferencedialog.py:285
 msgid "Start downloading upon device insertion"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:211
+#: ../raphodo/preferencedialog.py:286
 msgid "Unmount (eject) device upon download completion"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:212
+#: ../raphodo/preferencedialog.py:287
 msgid "Exit program when download completes"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:213
+#: ../raphodo/preferencedialog.py:288
 msgid "Exit program even if download had warnings or errors"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:240
+#: ../raphodo/preferencedialog.py:315
 msgid "Thumbnail Generation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:241
+#: ../raphodo/preferencedialog.py:316
 msgid "Generate thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:242
+#: ../raphodo/preferencedialog.py:318
 msgid "Generate thumbnails to show in the main program window"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:244
+#: ../raphodo/preferencedialog.py:320
 msgid "Cache thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:245
+#: ../raphodo/preferencedialog.py:323
 msgid ""
 "Save thumbnails shown in the main program window in a thumbnail cache unique "
 "to Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:247
+#: ../raphodo/preferencedialog.py:327
 msgid "Generate system thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:248
+#: ../raphodo/preferencedialog.py:330
 msgid ""
 "While downloading, save thumbnails that can be used by desktop file managers "
 "and other programs"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:255
+#: ../raphodo/preferencedialog.py:339
 msgid "Number of CPU cores used to generate thumbnails."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:256
+#: ../raphodo/preferencedialog.py:340
 msgid "CPU cores:"
 msgstr ""
 
 #. Translators: the * acts as an asterisk to denote a reference to an annotation
 #. such as '* Takes effect upon program restart'
-#: ../raphodo/preferencedialog.py:271 ../raphodo/preferencedialog.py:317
+#: ../raphodo/preferencedialog.py:355 ../raphodo/preferencedialog.py:401
 msgid "*"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:294
+#: ../raphodo/preferencedialog.py:378
 msgid "Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:296
+#: ../raphodo/preferencedialog.py:380
 msgid "Calculating..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:302
+#: ../raphodo/preferencedialog.py:386
 msgid "days"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:303
+#: ../raphodo/preferencedialog.py:387
 msgid "forever"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:308
+#: ../raphodo/preferencedialog.py:392
 msgid "Cache size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:310
+#: ../raphodo/preferencedialog.py:394
 msgid "Number of thumbnails:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:312
+#: ../raphodo/preferencedialog.py:396
 msgid "Database size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:314
+#: ../raphodo/preferencedialog.py:398
 msgid "Cache unaccessed thumbnails for:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:322
+#: ../raphodo/preferencedialog.py:406
 msgid "Purge Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:323
+#: ../raphodo/preferencedialog.py:408
 msgid "Optimize Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:336
+#: ../raphodo/preferencedialog.py:421
 msgid "* Takes effect upon program restart"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:346
+#: ../raphodo/preferencedialog.py:431
 msgid "Skip download"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:347
+#: ../raphodo/preferencedialog.py:432
 msgid "Don't download the file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:348
+#: ../raphodo/preferencedialog.py:433
 msgid "Add unique identifier"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:349
+#: ../raphodo/preferencedialog.py:436
 msgid ""
 "Add an identifier like _1 or _2 to the end of the filename, immediately "
 "before the file's extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:355
+#: ../raphodo/preferencedialog.py:444
 msgid "Overwrite"
 msgstr "Espotir"
 
-#: ../raphodo/preferencedialog.py:356
+#: ../raphodo/preferencedialog.py:445
 msgid "Overwrite the previously backed up file"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:357
+#: ../raphodo/preferencedialog.py:446
 msgid "Skip"
 msgstr "Ignorar"
 
-#: ../raphodo/preferencedialog.py:358
+#: ../raphodo/preferencedialog.py:448
 msgid "Don't overwrite the backup file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:364
+#: ../raphodo/preferencedialog.py:455
 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 identifier:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:378
+#: ../raphodo/preferencedialog.py:464
+msgid ""
+"Using sequence numbers to automatically generate unique filenames is "
+"strongly recommended. Configure file renaming in the Rename panel in the "
+"main window."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:473
 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 ""
 
-#: ../raphodo/preferencedialog.py:398
+#: ../raphodo/preferencedialog.py:494
 msgid "Program Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:399
+#: ../raphodo/preferencedialog.py:495
 msgid "Show a warning when:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:402
+#: ../raphodo/preferencedialog.py:498
 msgid "Downloading files currently not displayed"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:403
+#: ../raphodo/preferencedialog.py:499
 msgid ""
 "Warn when about to download files that are not displayed in the main window."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:405
+#: ../raphodo/preferencedialog.py:501
 msgid "Backup destinations are missing"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:406
-msgid "Warn before starting a download if it is not possible to back up files."
+#: ../raphodo/preferencedialog.py:502
+msgid ""
+"Warn before starting a download if it is not possible to back up files."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:408
+#: ../raphodo/preferencedialog.py:504
 msgid "Program libraries are missing or broken"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:409
+#: ../raphodo/preferencedialog.py:505
 msgid ""
 "Warn if a software library used by Rapid Photo Downloader is missing or not "
 "functioning."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:412
+#: ../raphodo/preferencedialog.py:508
 msgid "Filesystem metadata cannot be set"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:413
+#: ../raphodo/preferencedialog.py:509
 msgid ""
 "Warn if there is an error setting a file's filesystem metadata, such as its "
 "modification time."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:416
+#: ../raphodo/preferencedialog.py:512
 msgid "Encountering unhandled files"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:417
+#: ../raphodo/preferencedialog.py:513
 msgid ""
 "Warn after scanning a device or this computer if there are unrecognized "
 "files that will not be included in the download."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:420
+#: ../raphodo/preferencedialog.py:517
 msgid "Do not warn about unhandled files with extensions:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:424
+#: ../raphodo/preferencedialog.py:522
 msgid ""
 "File extensions are case insensitive and do not need to include the leading "
 "dot."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:427
+#: ../raphodo/preferencedialog.py:525
 msgid "Add"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:428
+#: ../raphodo/preferencedialog.py:526
 msgid ""
 "Add a file extension to the list of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:430
+#: ../raphodo/preferencedialog.py:528
 msgid ""
 "Remove a file extension from the list of unhandled file types to not warn "
 "about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:434
+#: ../raphodo/preferencedialog.py:532
 msgid ""
 "Clear the list of file extensions of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:469
+#: ../raphodo/preferencedialog.py:568
+msgid "Photo and Video Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:571
+msgid "Consolidate files across devices and downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:574
+msgid ""
+"Analyze the results of device scans looking for duplicate files and matching "
+"RAW and JPEG pairs,\n"
+"comparing them across multiple devices and download sessions."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:580
+msgid "Treat matching RAW and JPEG files as:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:581
+msgid "One photo"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:582
+msgid "Two photos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:584
+msgid ""
+"Display matching pairs of RAW and JPEG photos as one photo, and if marked, "
+"download both."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:589
+msgid ""
+"Display matching pairs of RAW and JPEG photos as two different photos. You "
+"can still synchronize their sequence numbers."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:598
+msgid "With matching RAW and JPEG photos:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:600
+msgid "Do not mark JPEG for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:601
+msgid "Do not mark RAW for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:602
+msgid "Mark both for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:609
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"JPEG for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:614
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"RAW for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:619
+msgid ""
+"When matching RAW and JPEG photos are found, automatically mark both for "
+"download."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:625
+msgid ""
+"If you disable file consolidation, choose what to do when a download device "
+"is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:631
+msgid ""
+"When a download device is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:642
+msgid "Clear completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:643
+msgid "Keep displaying completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:644
+msgid "Prompt for what to do"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:649
+msgid ""
+"Automatically clear the display of completed downloads whenever a new "
+"download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:654
+msgid ""
+"Keep displaying completed downloads whenever a new download device is "
+"inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:658
+msgid ""
+"Prompt whether to keep displaying completed downloads or clear them whenever "
+"a new download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:702
 msgid "Version Check"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:470
+#: ../raphodo/preferencedialog.py:703
 msgid "Check for new version at startup"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:471
+#: ../raphodo/preferencedialog.py:705
 msgid "Check for a new version of the program each time the program starts."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:473
+#: ../raphodo/preferencedialog.py:707
 msgid "Include development releases"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:474
+#: ../raphodo/preferencedialog.py:709
 msgid ""
 "Include alpha, beta and other development releases when checking for a new "
 "version of the program.\n"
@@ -2123,11 +2690,11 @@ msgid ""
 "occur."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:489
+#: ../raphodo/preferencedialog.py:725
 msgid "Ignore DNG date/time metadata on MTP devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:490
+#: ../raphodo/preferencedialog.py:727
 msgid ""
 "Ignore date/time metadata in DNG files located on MTP devices, and use the "
 "file's modification time instead.\n"
@@ -2136,70 +2703,86 @@ msgid ""
 "metadata."
 msgstr ""
 
+#: ../raphodo/preferencedialog.py:741
+msgid "Completed Downloads"
+msgstr ""
+
 #. Translators: substituted value is a description for the set of preferences
 #. shown in the preference dialog window, e.g. Devices, Automation, etc.
 #. This string is shown in a tooltip for the "Restore Defaults" button
-#: ../raphodo/preferencedialog.py:710
+#: ../raphodo/preferencedialog.py:1067
 #, python-format
 msgid "Restores default %s preference values"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:832
+#: ../raphodo/preferencedialog.py:1208
 msgid ""
 "Do you want to purge the thumbnail cache? The cache will be purged when the "
 "program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:835
+#: ../raphodo/preferencedialog.py:1212
 msgid "Purge Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:847
+#: ../raphodo/preferencedialog.py:1225
 msgid ""
 "Do you want to optimize the thumbnail cache? The cache will be optimized "
 "when the program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:850
+#: ../raphodo/preferencedialog.py:1229
 msgid "Optimize Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1045
+#: ../raphodo/preferencedialog.py:1481
+msgid "Enter a Folder to Scan"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1482
+msgid "Specify a folder that will be scanned for photos and videos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1483
+msgid "Folder:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1497
 msgid "Enter a Path to Ignore"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1046
+#: ../raphodo/preferencedialog.py:1498
 msgid "Specify a path that will never be scanned for photos or videos"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1047
+#: ../raphodo/preferencedialog.py:1499
 msgid "Path:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1061
+#: ../raphodo/preferencedialog.py:1513
 msgid "Enter a File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1062
+#: ../raphodo/preferencedialog.py:1514
 msgid "Specify a file extension (without the leading dot)"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1063 ../raphodo/renamepanel.py:122
+#: ../raphodo/preferencedialog.py:1515 ../raphodo/renamepanel.py:122
 msgid "Extension:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1078
+#: ../raphodo/preferencedialog.py:1530
 msgid "Invalid File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1079
+#: ../raphodo/preferencedialog.py:1531
 #, python-format
 msgid ""
 "The file extension <b>%s</b> is recognized by Rapid Photo Downloader, so it "
 "makes no sense to warn about its presence."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1081
+#: ../raphodo/preferencedialog.py:1533
 #, python-format
 msgid ""
 "Recognized file types:\n"
@@ -2225,104 +2808,103 @@ msgstr ""
 msgid "Birthday"
 msgstr ""
 
-#: ../raphodo/preferences.py:614
+#: ../raphodo/preferences.py:624
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr ""
 
-#: ../raphodo/preferences.py:617
+#: ../raphodo/preferences.py:627
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr ""
 
-#: ../raphodo/preferences.py:622
+#: ../raphodo/preferences.py:632
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
 
-#. self.setFlat(True)
 #: ../raphodo/primarybutton.py:72
 msgid "Download 8 Photos and 10 Videos"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:86 ../raphodo/problemnotification.py:208
+#: ../raphodo/problemnotification.py:87 ../raphodo/problemnotification.py:209
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:89
+#: ../raphodo/problemnotification.py:90
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:116
+#: ../raphodo/problemnotification.py:117
 #, python-format
 msgid "GPhoto2 Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:124
+#: ../raphodo/problemnotification.py:125
 msgid ""
 "Unable to initialize the camera, probably because another program is using "
 "it. No files were copied from it."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:134
+#: ../raphodo/problemnotification.py:135
 #, python-format
 msgid "Unable to read directory %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:140
+#: ../raphodo/problemnotification.py:141
 #, python-format
 msgid "Unable to access modification time or size from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:146
+#: ../raphodo/problemnotification.py:147
 #, python-format
 msgid "Unable to read file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:152
+#: ../raphodo/problemnotification.py:153
 #, python-format
 msgid "Unable to write file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:158
+#: ../raphodo/problemnotification.py:159
 #, python-format
 msgid "Unable to move file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:164
+#: ../raphodo/problemnotification.py:165
 #, python-format
 msgid "Unable to remove file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:170
+#: ../raphodo/problemnotification.py:171
 #, python-format
 msgid "Unable to copy file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:176
+#: ../raphodo/problemnotification.py:177
 #, python-format
 msgid "Zero length file %s will not be downloaded"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:182
+#: ../raphodo/problemnotification.py:183
 #, python-format
 msgid "Could not determine filesystem modification time for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:188
+#: ../raphodo/problemnotification.py:189
 #, python-format
 msgid "Unable to load metadata from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:194
+#: ../raphodo/problemnotification.py:195
 #, python-format
 msgid ""
 "Unable to load metadata from %(name)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:202
+#: ../raphodo/problemnotification.py:203
 #, python-format
 msgid ""
 "An error occurred setting a file's filesystem metadata on the filesystem %s. "
@@ -2330,212 +2912,212 @@ msgid ""
 "again."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:216
+#: ../raphodo/problemnotification.py:217
 #, python-format
 msgid "Encountered unhandled file %s. It will not be downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:223
+#: ../raphodo/problemnotification.py:224
 #, python-format
 msgid "%(filetype)s %(destination)s already exists."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:234 ../raphodo/problemnotification.py:262
+#: ../raphodo/problemnotification.py:235 ../raphodo/problemnotification.py:263
 #, python-format
 msgid ""
 "The existing %(filetype)s %(destination)s was last modified on %(date)s at "
 "%(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:245
+#: ../raphodo/problemnotification.py:246
 #, python-format
 msgid "The %(filetype)s %(source)s was not downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:273
+#: ../raphodo/problemnotification.py:274
 #, python-format
 msgid "The %(filetype)s %(source)s was downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:282
+#: ../raphodo/problemnotification.py:283
 #, python-format
 msgid "The unique identifier '%s' was added to the filename."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:298
+#: ../raphodo/problemnotification.py:299
 #, python-format
 msgid ""
 "The existing backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:309
+#: ../raphodo/problemnotification.py:310
 #, python-format
 msgid "The %(filetype)s %(source)s was not backed up from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:326
+#: ../raphodo/problemnotification.py:327
 #, python-format
 msgid ""
 "The previous backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:337
+#: ../raphodo/problemnotification.py:338
 #, python-format
 msgid ""
 "The %(filetype)s %(source)s from %(device)s was backed up, overwriting the "
 "previous backup %(filetype)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:356
+#: ../raphodo/problemnotification.py:357
 #, python-format
 msgid ""
 "When synchronizing RAW + JPEG sequence values, a duplicate %(filetype)s "
 "%(file)s was encountered, and was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:366
+#: ../raphodo/problemnotification.py:367
 msgid ""
 "When synchronizing RAW + JPEG sequence values, photos were detected with the "
 "same filenames, but taken at different times:"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:373
+#: ../raphodo/problemnotification.py:374
 #, 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 ""
 
-#: ../raphodo/problemnotification.py:389
+#: ../raphodo/problemnotification.py:390
 #, python-format
 msgid "Unable to finalize the filename for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:424
+#: ../raphodo/problemnotification.py:425
 #, python-format
 msgid ""
 "The filename %(destination)s was not fully generated for %(filetype)s "
 "%(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:433
+#: ../raphodo/problemnotification.py:434
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:439
+#: ../raphodo/problemnotification.py:440
 #, python-format
 msgid "The following metadata is missing: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:445
+#: ../raphodo/problemnotification.py:446
 #, python-format
 msgid "Date/time conversion failed: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:451
+#: ../raphodo/problemnotification.py:452
 msgid ""
 "Could not extract valid date/time metadata or determine the file "
 "modification time."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:457
+#: ../raphodo/problemnotification.py:458
 msgid "Filename does not have an extension."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:460
+#: ../raphodo/problemnotification.py:461
 msgid "Filename does not have a number component."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:464
+#: ../raphodo/problemnotification.py:465
 #, python-format
 msgid "Error generating component %(component)s. Error: %(error)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:477
+#: ../raphodo/problemnotification.py:478
 #, python-format
 msgid ""
 "The download subfolders %(folder)s were only partially generated for "
 "%(filetype)s %(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:486
+#: ../raphodo/problemnotification.py:487
 #, python-format
 msgid ""
 "There is no data with which to generate the %(subfolder_file)s for "
 "%(filename)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:499
+#: ../raphodo/problemnotification.py:500
 #, python-format
 msgid ""
 "Unable to create the %(filetype)s %(destination)s in %(folder)s. The "
 "download file was %(source)s in %(device)s. It was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:514
+#: ../raphodo/problemnotification.py:515
 #, python-format
 msgid "Unable to create the download subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:526
+#: ../raphodo/problemnotification.py:527
 #, python-format
 msgid "Unable to create the backup subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:577
+#: ../raphodo/problemnotification.py:578
 #, python-format
 msgid "Problems scanning %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:584
+#: ../raphodo/problemnotification.py:585
 #, python-format
 msgid "Problems copying from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:591
+#: ../raphodo/problemnotification.py:592
 msgid "Problems while finalizing filenames and generating subfolders"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:598
+#: ../raphodo/problemnotification.py:599
 #, python-format
 msgid "Problems backing up to %s"
 msgstr ""
 
-#. Translators: for example Nov 3 or Dec 31
-#. The start and end dates are on a different day
-#. Translators: for example Nov 3 or Dec 31
-#: ../raphodo/proximity.py:105 ../raphodo/proximity.py:221
-#: ../raphodo/proximity.py:224 ../raphodo/proximity.py:828
+#. Translators: for example Nov 3 2015, 11:25 AM
+#. Translators: for example, Nov 3, 12:15 PM
+#: ../raphodo/proximity.py:188 ../raphodo/proximity.py:213
+#: ../raphodo/proximity.py:236 ../raphodo/proximity.py:239
 #, python-format
-msgid "%(month)s %(numeric_day)s"
+msgid "%(date)s, %(time)s"
 msgstr ""
 
-#. Translators: for example Nov 15 2015
-#. Translators: for example Nov 3 2015
-#: ../raphodo/proximity.py:109 ../raphodo/proximity.py:230
-#: ../raphodo/proximity.py:231 ../raphodo/proximity.py:831
+#: ../raphodo/proximity.py:204
 #, python-format
-msgid "%(date)s %(year)s"
+msgid "%(starttime)s - %(endtime)s"
 msgstr ""
 
-#. Translators: for example Nov 3 2015, 11:25 AM
-#. Translators: for example, Nov 3, 12:15 PM
-#: ../raphodo/proximity.py:197 ../raphodo/proximity.py:215
-#: ../raphodo/proximity.py:234 ../raphodo/proximity.py:236
+#. The start and end dates are on a different day
+#. Translators: for example Nov 3 or Dec 31
+#: ../raphodo/proximity.py:221 ../raphodo/proximity.py:225
+#: ../raphodo/proximity.py:980 ../raphodo/timeutils.py:105
 #, python-format
-msgid "%(date)s, %(time)s"
+msgid "%(month)s %(numeric_day)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:209
+#. Translators: for example Nov 3 2015
+#. Translators: for example Nov 2 2015
+#. Translators: for example Nov 15 2015
+#: ../raphodo/proximity.py:232 ../raphodo/proximity.py:233
+#: ../raphodo/proximity.py:985 ../raphodo/timeutils.py:110
 #, python-format
-msgid "%(starttime)s - %(endtime)s"
+msgid "%(date)s %(year)s"
 msgstr ""
 
 #. Translators: for example, Nov 3, 12:15 PM - Nov 4, 1:00 AM
-#: ../raphodo/proximity.py:241
+#: ../raphodo/proximity.py:245
 #, python-format
 msgid "%(earlier_time)s - %(later_time)s"
 msgstr ""
@@ -2544,25 +3126,25 @@ msgstr ""
 #. Nov 3 2012, 12:15 PM -
 #. Nov 4 2012, 1:00 AM
 #. (please keep the line break signified by \n)
-#: ../raphodo/proximity.py:248
+#: ../raphodo/proximity.py:253
 #, python-format
 msgid ""
 "%(earlier_time)s -\n"
 "%(later_time)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:359
+#: ../raphodo/proximity.py:382
 #, python-format
 msgid "%(month)s  %(year)s"
 msgstr ""
 
 #. Translators: for example Nov 2015
-#: ../raphodo/proximity.py:833
+#: ../raphodo/proximity.py:987
 #, python-format
 msgid "%(month)s %(year)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:1344
+#: ../raphodo/proximity.py:1595
 msgid ""
 "The time elapsed between consecutive photos and videos that is used to build "
 "the Timeline"
@@ -2572,47 +3154,47 @@ msgstr ""
 #. Replace the very last character (after the d) with the correct
 #. localized value, keeping everything else. In other words, change
 #. only the m character.
-#: ../raphodo/proximity.py:1406
+#: ../raphodo/proximity.py:1652
 #, python-format
 msgid "%(minutes)dm"
 msgstr ""
 
 #. Translators: i.e. "1.5h", which is short for 1.5 hours.
 #. Replace the entire string with the correct localized value
-#: ../raphodo/proximity.py:1410
+#: ../raphodo/proximity.py:1656
 msgid "1.5h"
 msgstr ""
 
 #. Translators: e.g. "5h", which is short for 5 hours.
 #. Replace the very last character (after the d) with the correct localized value,
 #. keeping everything else. In other words, change only the h character.
-#: ../raphodo/proximity.py:1415
+#: ../raphodo/proximity.py:1661
 #, python-format
 msgid "%(hours)dh"
 msgstr ""
 
-#: ../raphodo/proximity.py:1461
+#: ../raphodo/proximity.py:1710
 msgid ""
 "The Timeline groups photos and videos based on how much time elapsed between "
 "consecutive shots. Use it to identify photos and videos taken at different "
 "periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/proximity.py:1464
+#: ../raphodo/proximity.py:1715
 msgid ""
 "Use the slider (below) to adjust the time elapsed between consecutive shots "
 "that is used to build the Timeline."
 msgstr ""
 
-#: ../raphodo/proximity.py:1466
+#: ../raphodo/proximity.py:1718
 msgid "Timeline build pending..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1467
+#: ../raphodo/proximity.py:1719
 msgid "Timeline is building..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1468
+#: ../raphodo/proximity.py:1721
 msgid ""
 "The Timeline needs to be rebuilt because the file modification time does not "
 "match the time a shot was taken for one or more shots.<br><br>The Timeline "
@@ -2624,61 +3206,61 @@ msgid ""
 "downloading, which is when the metadata is read."
 msgstr ""
 
-#: ../raphodo/rapid.py:485 ../raphodo/rapid.py:2461 ../raphodo/rapid.py:3728
-#: ../raphodo/rapid.py:3846 ../raphodo/rapid.py:3850 ../raphodo/rapid.py:3870
-#: ../raphodo/rapid.py:3874 ../raphodo/rapid.py:3998 ../raphodo/rapid.py:4007
-#: ../raphodo/rapid.py:4495 ../raphodo/rapid.py:4888 ../raphodo/rapid.py:5722
-#: ../raphodo/rememberthisdialog.py:97
+#: ../raphodo/rapid.py:493 ../raphodo/rapid.py:2555 ../raphodo/rapid.py:3934
+#: ../raphodo/rapid.py:4065 ../raphodo/rapid.py:4069 ../raphodo/rapid.py:4092
+#: ../raphodo/rapid.py:4096 ../raphodo/rapid.py:4226 ../raphodo/rapid.py:4237
+#: ../raphodo/rapid.py:4743 ../raphodo/rapid.py:5195 ../raphodo/rapid.py:5997
+#: ../raphodo/rememberthisdialog.py:99
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:3
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: ../raphodo/rapid.py:1100
+#: ../raphodo/rapid.py:1131
 msgid ""
 "<b>ExifTool has a problem</b><br><br> Rapid Photo Downloader uses ExifTool "
 "to get metadata from videos and photos. The program will run without it, but "
 "installing it is <b>highly</b> recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1110 ../raphodo/rapid.py:1130
+#: ../raphodo/rapid.py:1141 ../raphodo/rapid.py:1161
 msgid "Problem with libmediainfo"
 msgstr ""
 
-#: ../raphodo/rapid.py:1119
+#: ../raphodo/rapid.py:1150
 msgid ""
 "<b>The library libmediainfo appears to be missing</b><br><br> Rapid Photo "
 "Downloader uses libmediainfo to get the date and time a video was shot. The "
 "program will run  without it, but installing it is recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1417
+#: ../raphodo/rapid.py:1448
 msgid "Download failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1419
+#: ../raphodo/rapid.py:1450
 msgid ""
 "Sorry, the download of the new version of Rapid Photo Downloader failed."
 msgstr ""
 
-#: ../raphodo/rapid.py:1425
+#: ../raphodo/rapid.py:1457
 msgid ""
 "The new version was successfully downloaded. Do you want to close Rapid "
 "Photo Downloader and install it now?"
 msgstr ""
 
-#: ../raphodo/rapid.py:1428
+#: ../raphodo/rapid.py:1461
 msgid "Update Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:1432
+#: ../raphodo/rapid.py:1465
 msgid "Install"
 msgstr ""
 
-#: ../raphodo/rapid.py:1450
+#: ../raphodo/rapid.py:1483
 msgid "New version saved"
 msgstr ""
 
-#: ../raphodo/rapid.py:1451
+#: ../raphodo/rapid.py:1485
 #, python-format
 msgid ""
 "The tar file and installer script are saved at:\n"
@@ -2686,163 +3268,163 @@ msgid ""
 " %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:1468
+#: ../raphodo/rapid.py:1502
 msgid "Upgrade failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1469
+#: ../raphodo/rapid.py:1505
 msgid ""
 "Sorry, upgrading Rapid Photo Downloader failed because there was an error "
 "opening the installer."
 msgstr ""
 
-#: ../raphodo/rapid.py:1667 ../raphodo/rapid.py:2331
+#: ../raphodo/rapid.py:1709 ../raphodo/rapid.py:2425
 msgid "Download"
 msgstr ""
 
-#: ../raphodo/rapid.py:1671
+#: ../raphodo/rapid.py:1713
 msgid "&Refresh..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1675
+#: ../raphodo/rapid.py:1717
 msgid "&Preferences"
 msgstr ""
 
-#: ../raphodo/rapid.py:1679
+#: ../raphodo/rapid.py:1721
 msgid "&Quit"
 msgstr ""
 
-#: ../raphodo/rapid.py:1683
+#: ../raphodo/rapid.py:1725
 msgid "Error &Reports"
 msgstr ""
 
-#: ../raphodo/rapid.py:1687
+#: ../raphodo/rapid.py:1729
 msgid "Clear Completed Downloads"
 msgstr ""
 
-#: ../raphodo/rapid.py:1691
+#: ../raphodo/rapid.py:1733
 msgid "Get Help Online..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1695
+#: ../raphodo/rapid.py:1737
 msgid "&Tip of the Day..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1699
+#: ../raphodo/rapid.py:1741
 msgid "Report a Problem..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1703
+#: ../raphodo/rapid.py:1745
 msgid "Make a Donation..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1707
+#: ../raphodo/rapid.py:1749
 msgid "Translate this Application..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1711
+#: ../raphodo/rapid.py:1753
 msgid "&About..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1715
+#: ../raphodo/rapid.py:1757
 msgid "Check for Updates..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1797
+#: ../raphodo/rapid.py:1840
 msgid "Timeline"
 msgstr ""
 
-#: ../raphodo/rapid.py:1807
+#: ../raphodo/rapid.py:1850
 msgid "Destination"
 msgstr ""
 
-#: ../raphodo/rapid.py:1808
+#: ../raphodo/rapid.py:1851
 msgid "Rename"
 msgstr ""
 
-#: ../raphodo/rapid.py:1810
+#: ../raphodo/rapid.py:1853
 msgid "Back Up"
 msgstr ""
 
 #. Devices Header and View
-#: ../raphodo/rapid.py:1926
+#: ../raphodo/rapid.py:1977
 msgid ""
 "Turn on or off the use of devices attached to this computer as download "
 "sources"
 msgstr ""
 
 #. This Computer Header and View
-#: ../raphodo/rapid.py:1940
+#: ../raphodo/rapid.py:1994
 msgid ""
 "Turn on or off the use of a folder on this computer as a download source"
 msgstr ""
 
-#: ../raphodo/rapid.py:1941
+#: ../raphodo/rapid.py:1996
 msgid "This Computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:1952
+#: ../raphodo/rapid.py:2009
 msgid "Select a source folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:1975
+#: ../raphodo/rapid.py:2038
 msgid "Projected Storage Use"
 msgstr ""
 
-#: ../raphodo/rapid.py:1989 ../raphodo/rapid.py:1997
+#: ../raphodo/rapid.py:2056 ../raphodo/rapid.py:2068
 msgid "Select a destination folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:2045
+#: ../raphodo/rapid.py:2117
 msgid "All"
 msgstr ""
 
-#: ../raphodo/rapid.py:2046
+#: ../raphodo/rapid.py:2118
 msgid "New"
 msgstr ""
 
-#: ../raphodo/rapid.py:2048
+#: ../raphodo/rapid.py:2120
 msgid "Show:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2051
+#: ../raphodo/rapid.py:2123
 msgid "Modification Time"
 msgstr ""
 
-#: ../raphodo/rapid.py:2052
+#: ../raphodo/rapid.py:2124
 msgid "Checked State"
 msgstr ""
 
-#: ../raphodo/rapid.py:2055
+#: ../raphodo/rapid.py:2127
 msgid "File Type"
 msgstr ""
 
-#: ../raphodo/rapid.py:2056
+#: ../raphodo/rapid.py:2128
 msgid "Device"
 msgstr "Periferic"
 
-#: ../raphodo/rapid.py:2058
+#: ../raphodo/rapid.py:2130
 msgid "Sort:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2069
+#: ../raphodo/rapid.py:2141
 msgid "Select All:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2311
+#: ../raphodo/rapid.py:2405
 #, python-format
 msgid "Download %(files)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2327
+#: ../raphodo/rapid.py:2421
 msgid "Resume Download"
 msgstr ""
 
-#: ../raphodo/rapid.py:2329
+#: ../raphodo/rapid.py:2423
 msgid "Pause"
 msgstr ""
 
-#: ../raphodo/rapid.py:2417
+#: ../raphodo/rapid.py:2511
 #, python-brace-format
 msgid ""
 "Please report the problem at <a href=\"{website}\">{website}</a>.<br><br>\n"
@@ -2851,11 +3433,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/rapid.py:2431
+#: ../raphodo/rapid.py:2525
 msgid "Thank you for reporting a problem in Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:2529
+#: ../raphodo/rapid.py:2624
 #, python-format
 msgid ""
 "<b>Changing This Computer source path</b><br><br>Do you really want to "
@@ -2864,30 +3446,29 @@ msgid ""
 "from This Computer will be cancelled."
 msgstr ""
 
-#: ../raphodo/rapid.py:2595
+#: ../raphodo/rapid.py:2694
 msgid "You cannot change the download destination while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:2604
+#: ../raphodo/rapid.py:2704
 #, python-format
 msgid ""
 "<b>Confirm Download Destination</b><br><br>Are you sure you want to set the "
 "%(file_type)s download destination to %(path)s?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2682
+#: ../raphodo/rapid.py:2785
 msgid ""
+"\n"
 "<b>Downloading all files</b><br><br>\n"
-"                    A download always includes all files that are checked "
-"for download,\n"
-"                    including those that are not currently displayed because "
-"the Timeline\n"
-"                    is being used or because only new files are being shown."
-"<br><br>\n"
-"                    Do you want to proceed with the download?"
+"A download always includes all files that are checked for download,\n"
+"including those that are not currently displayed because the Timeline\n"
+"is being used or because only new files are being shown.<br><br>\n"
+"Do you want to proceed with the download?\n"
+"                        "
 msgstr ""
 
-#: ../raphodo/rapid.py:2820
+#: ../raphodo/rapid.py:2937
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -2895,206 +3476,200 @@ msgid ""
 "%(folder2)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2824
+#: ../raphodo/rapid.py:2940
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
 "%s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2827
+#: ../raphodo/rapid.py:2943
 msgid "Download Failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:2828
+#: ../raphodo/rapid.py:2944
 msgid "The download cannot proceed."
 msgstr ""
 
-#: ../raphodo/rapid.py:2842
+#: ../raphodo/rapid.py:2962
 msgid ""
 "Photos and videos will not be backed up because there is nowhere to back "
 "them up. Do you still want to start the download?"
 msgstr ""
 
-#. Translators: filetype will be replaced with 'photos' or 'videos'
-#: ../raphodo/rapid.py:2847 ../raphodo/rapid.py:2854
+#: ../raphodo/rapid.py:2969 ../raphodo/rapid.py:2979
 #, python-format
 msgid ""
 "No backup device exists for backing up %(filetype)s. Do you still want to "
 "start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2848 ../raphodo/rpdfile.py:228
+#: ../raphodo/rapid.py:2971 ../raphodo/rpdfile.py:228
 msgid "photos"
 msgstr ""
 
-#: ../raphodo/rapid.py:2855 ../raphodo/rpdfile.py:223
+#: ../raphodo/rapid.py:2981 ../raphodo/rpdfile.py:223
 msgid "videos"
 msgstr ""
 
-#: ../raphodo/rapid.py:2861
+#: ../raphodo/rapid.py:2989
 msgid ""
 "<b>The photo and video backup destinations do not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2869 ../raphodo/rapid.py:2876
+#: ../raphodo/rapid.py:2999 ../raphodo/rapid.py:3008
 #, python-format
 msgid ""
 "<b>The %(filetype)s backup destination does not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2871 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:818
+#: ../raphodo/rapid.py:3001 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:843
 msgid "photo"
 msgstr ""
 
-#: ../raphodo/rapid.py:2878 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:858
+#: ../raphodo/rapid.py:3010 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:883
 msgid "video"
 msgstr ""
 
-#: ../raphodo/rapid.py:2886
+#: ../raphodo/rapid.py:3018
 msgid "Backup problem"
 msgstr ""
 
-#. Translators - in the middle is a unicode em dash - please retain it
-#. This string is displayed in the status bar when the download is running
-#: ../raphodo/rapid.py:3571
+#: ../raphodo/rapid.py:3756
 #, python-format
 msgid "%(downloading_from)s — %(time_left)s left (%(speed)s)"
 msgstr ""
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3640
+#: ../raphodo/rapid.py:3828
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr ""
 
-#. Translators: e.g. 2 videos failed to download
-#: ../raphodo/rapid.py:3645
+#: ../raphodo/rapid.py:3836
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr ""
 
-#: ../raphodo/rapid.py:3650 ../raphodo/rapid.py:3723
+#: ../raphodo/rapid.py:3842 ../raphodo/rapid.py:3927
 msgid "warnings"
 msgstr "avertiments"
 
-#: ../raphodo/rapid.py:3679
+#: ../raphodo/rapid.py:3873
 msgid "All downloads complete"
 msgstr ""
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3686 ../raphodo/rapid.py:3695 ../raphodo/rapid.py:3704
-#: ../raphodo/rapid.py:3713 ../raphodo/rapid.py:3721
+#: ../raphodo/rapid.py:3881 ../raphodo/rapid.py:3892 ../raphodo/rapid.py:3903
+#: ../raphodo/rapid.py:3914 ../raphodo/rapid.py:3924
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3688 ../raphodo/rapid.py:3706
+#: ../raphodo/rapid.py:3884 ../raphodo/rapid.py:3906
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr ""
 
-#: ../raphodo/rapid.py:3697 ../raphodo/rapid.py:3715
+#: ../raphodo/rapid.py:3895 ../raphodo/rapid.py:3917
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr ""
 
-#: ../raphodo/rapid.py:3742
+#: ../raphodo/rapid.py:3950
 msgid "1 failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:3744
+#: ../raphodo/rapid.py:3952
 #, python-format
 msgid "%d failures"
 msgstr ""
 
-#: ../raphodo/rapid.py:3749
+#: ../raphodo/rapid.py:3957
 msgid "1 warning"
 msgstr ""
 
-#: ../raphodo/rapid.py:3751
+#: ../raphodo/rapid.py:3959
 #, python-format
 msgid "%d warnings"
 msgstr ""
 
-#: ../raphodo/rapid.py:3771
+#: ../raphodo/rapid.py:3981
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3774
+#: ../raphodo/rapid.py:3985
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3779
+#: ../raphodo/rapid.py:3989
 #, python-format
 msgid "No files downloaded — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3781
+#: ../raphodo/rapid.py:3991
 msgid "No files downloaded"
 msgstr ""
 
-#: ../raphodo/rapid.py:3805
+#: ../raphodo/rapid.py:4021
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3809
+#: ../raphodo/rapid.py:4026
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3812
+#: ../raphodo/rapid.py:4031
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3820
+#: ../raphodo/rapid.py:4039
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3833
+#: ../raphodo/rapid.py:4052
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3837
+#: ../raphodo/rapid.py:4056
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3841
+#: ../raphodo/rapid.py:4060
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices"
 msgstr ""
 
-#: ../raphodo/rapid.py:3867
+#: ../raphodo/rapid.py:4087
 msgid "The Destination subfolders and Timeline have been rebuilt"
 msgstr ""
 
-#: ../raphodo/rapid.py:3922
+#: ../raphodo/rapid.py:4144
 msgid "Program preferences are invalid"
 msgstr ""
 
-#: ../raphodo/rapid.py:3999
+#: ../raphodo/rapid.py:4228
 #, python-format
 msgid ""
 "<b>All files on the %(camera)s are inaccessible</b>.<br><br>It may be locked "
@@ -3104,179 +3679,205 @@ msgid ""
 "ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4008
+#: ../raphodo/rapid.py:4239
 #, python-format
 msgid ""
-"<b>The %(camera)s appears to be in use by another application.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again.<br><br>Alternatively, you can ignore this "
-"device."
+"<b>The %(camera)s appears to be in use by another "
+"application.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again.<br><br>Alternatively, you "
+"can ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4019
+#: ../raphodo/rapid.py:4250
 msgid "&Try Again"
 msgstr ""
 
-#: ../raphodo/rapid.py:4020
+#: ../raphodo/rapid.py:4251
 msgid "&Ignore This Device"
 msgstr ""
 
-#: ../raphodo/rapid.py:4086
+#: ../raphodo/rapid.py:4323
 #, python-format
 msgid "Sorry, an unexpected problem occurred while scanning %s."
 msgstr ""
 
-#: ../raphodo/rapid.py:4087
+#: ../raphodo/rapid.py:4324
 msgid "Unfortunately you cannot download from this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4091
+#: ../raphodo/rapid.py:4328
 msgid ""
 "A possible workaround for the problem might be downloading from the camera's "
 "memory card using a card reader."
 msgstr ""
 
-#: ../raphodo/rapid.py:4096
+#: ../raphodo/rapid.py:4333
 msgid "Device scan failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:4472
+#: ../raphodo/rapid.py:4720
 #, python-format
 msgid ""
-"<b>The %(camera)s cannot be scanned because it cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again."
+"<b>The %(camera)s cannot be scanned because it cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again."
 msgstr ""
 
-#: ../raphodo/rapid.py:4496
+#: ../raphodo/rapid.py:4745
 #, python-format
 msgid ""
-"<b>The download cannot start because the %(camera)s cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again, and choose which files you want to "
-"download from it."
+"<b>The download cannot start because the %(camera)s cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again, and choose which files "
+"you want to download from it."
+msgstr ""
+
+#: ../raphodo/rapid.py:4842
+msgid "Completed Downloads Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4844
+#, python-format
+msgid "%s whose download have completed are displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4846
+msgid "Do you want to clear the completed downloads?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4848
+msgid "Completed Download Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4850
+#, python-format
+msgid "%s whose download has completed is displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4852
+msgid "Do you want to clear the completed download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:4635
+#: ../raphodo/rapid.py:4933
 #, python-format
 msgid ""
 "Do you want to download photos and videos from the device <i>%(device)s</i>?"
 msgstr ""
 
-#: ../raphodo/rapid.py:4877
+#: ../raphodo/rapid.py:5183
 #, python-format
 msgid "<b>Do you want to ignore the %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4879
+#: ../raphodo/rapid.py:5186
 msgid ""
 "All cameras, phones and tablets with the same model name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:4883
+#: ../raphodo/rapid.py:5190
 #, python-format
 msgid ""
 "<b>Do you want to ignore the device %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4885
+#: ../raphodo/rapid.py:5192
 msgid "Any device with the same name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:5178
+#: ../raphodo/rapid.py:5492
 #, python-format
 msgid "Downloading from %(location)s on This Computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5180
+#: ../raphodo/rapid.py:5496
 msgid ""
 "Do you really want to download from here?<br><br>On some systems, scanning "
 "this location can take a very long time."
 msgstr ""
 
-#: ../raphodo/rapid.py:5224
+#: ../raphodo/rapid.py:5537
 #, python-format
 msgid "Generating thumbnails for %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5227
+#: ../raphodo/rapid.py:5540
 #, python-format
 msgid "Scanning %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5237
+#: ../raphodo/rapid.py:5551
 #, python-format
 msgid ""
 "%(number)s of %(available files)s checked for download (%(hidden)s hidden)"
 msgstr ""
 
-#: ../raphodo/rapid.py:5243
+#: ../raphodo/rapid.py:5559
 #, python-format
 msgid "%(number)s of %(available files)s checked for download"
 msgstr ""
 
-#: ../raphodo/rapid.py:5494
+#: ../raphodo/rapid.py:5764
 msgid "Display program information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5496
+#: ../raphodo/rapid.py:5766
 msgid "Display debugging information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5499
+#: ../raphodo/rapid.py:5769
 msgid "List photo and video file extensions the program recognizes and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5502
+#: ../raphodo/rapid.py:5772
 msgid "Turn on or off the the renaming of photos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5504
+#: ../raphodo/rapid.py:5774
 msgid "turn on or off the the renaming of videos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5506
+#: ../raphodo/rapid.py:5776
 msgid ""
 "Turn on or off the automatic detection of devices from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5510
+#: ../raphodo/rapid.py:5780
 msgid "Turn on or off downloading from this computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5512 ../raphodo/rapid.py:5515 ../raphodo/rapid.py:5518
-#: ../raphodo/rapid.py:5539 ../raphodo/rapid.py:5543
+#: ../raphodo/rapid.py:5782 ../raphodo/rapid.py:5785 ../raphodo/rapid.py:5788
+#: ../raphodo/rapid.py:5809 ../raphodo/rapid.py:5813
 msgid "PATH"
 msgstr ""
 
-#: ../raphodo/rapid.py:5513
+#: ../raphodo/rapid.py:5783
 msgid "The PATH on this computer from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5516
+#: ../raphodo/rapid.py:5786
 msgid "The PATH where photos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5519
+#: ../raphodo/rapid.py:5789
 msgid "The PATH where videos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5521
+#: ../raphodo/rapid.py:5791
 msgid "Turn on or off the backing up of photos and videos while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:5525
+#: ../raphodo/rapid.py:5795
 msgid "Turn on or off the automatic detection of backup devices."
 msgstr ""
 
-#: ../raphodo/rapid.py:5527 ../raphodo/rapid.py:5533
+#: ../raphodo/rapid.py:5797 ../raphodo/rapid.py:5803
 msgid "FOLDER"
 msgstr ""
 
-#: ../raphodo/rapid.py:5528
+#: ../raphodo/rapid.py:5798
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected photo "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3284,7 +3885,7 @@ msgid ""
 "photos up to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5534
+#: ../raphodo/rapid.py:5804
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected video "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3292,115 +3893,124 @@ msgid ""
 "up videos to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5540
+#: ../raphodo/rapid.py:5810
 msgid ""
 "The PATH where photos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5544
+#: ../raphodo/rapid.py:5814
 msgid ""
 "The PATH where videos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5547
+#: ../raphodo/rapid.py:5817
 #, python-format
 msgid "Ignore photos with the following extensions: %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5551
-msgid "Turn on or off starting downloads as soon as the program itself starts."
+#: ../raphodo/rapid.py:5821
+msgid ""
+"Turn on or off starting downloads as soon as the program itself starts."
 msgstr ""
 
-#: ../raphodo/rapid.py:5554
+#: ../raphodo/rapid.py:5824
 msgid "Turn on or off starting downloads as soon as a device is inserted."
 msgstr ""
 
-#: ../raphodo/rapid.py:5557
+#: ../raphodo/rapid.py:5827
 msgid ""
 "Turn on or off use of the Rapid Photo Downloader Thumbnail Cache. Turning it "
 "off does not delete existing cache contents."
 msgstr ""
 
-#: ../raphodo/rapid.py:5561
+#: ../raphodo/rapid.py:5831
 msgid ""
 "Delete all thumbnails in the Rapid Photo Downloader Thumbnail Cache, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5565
+#: ../raphodo/rapid.py:5835
 msgid "Forget which files have been previously downloaded, and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5568
+#: ../raphodo/rapid.py:5838
 msgid ""
 "Import preferences from an old program version and exit. Requires the "
 "command line program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5571
+#: ../raphodo/rapid.py:5841
 msgid ""
 "Reset all program settings to their default values, delete all thumbnails in "
 "the Thumbnail cache, forget which files have been previously downloaded, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5575
+#: ../raphodo/rapid.py:5845
 msgid "Include gphoto2 debugging information in log files."
 msgstr ""
 
-#: ../raphodo/rapid.py:5579
+#: ../raphodo/rapid.py:5849
 msgid "Print information to the terminal about attached cameras and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5640
+#: ../raphodo/rapid.py:5911
 msgid ""
 "To import preferences from the old version of Rapid Photo Downloader, you "
 "must install the program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5649
+#: ../raphodo/rapid.py:5920
 msgid "No prior program preferences detected: exiting"
 msgstr ""
 
-#: ../raphodo/rapid.py:5652
+#: ../raphodo/rapid.py:5923
 #, python-format
 msgid "Importing preferences from Rapid Photo Downloader %(version)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5714
+#: ../raphodo/rapid.py:5989
 #, python-format
-msgid "Do you want to copy the stored sequence number, which has the value %d?"
+msgid ""
+"Do you want to copy the stored sequence number, which has the value %d?"
 msgstr ""
 
-#: ../raphodo/rapid.py:5726
+#: ../raphodo/rapid.py:6000
 msgid "Program aborting."
 msgstr ""
 
-#: ../raphodo/rapid.py:5736
+#: ../raphodo/rapid.py:6010
 msgid "Never run this program as the sudo / root user."
 msgstr ""
 
-#: ../raphodo/rapid.py:5740
+#: ../raphodo/rapid.py:6014
 msgid "You must install ExifTool to run Rapid Photo Downloader."
 msgstr ""
 
-#: ../raphodo/rapid.py:5794
+#: ../raphodo/rapid.py:6026
+msgid ""
+"Rapid Photo Downloader is installed in multiple locations.\n"
+"\n"
+"Uninstall all copies except the version you want to run."
+msgstr ""
+
+#: ../raphodo/rapid.py:6083
 msgid ""
 "When specifying a path on the command line, do not also specify an\n"
 "option for device auto detection or a path on \"This Computer\"."
 msgstr ""
 
-#: ../raphodo/rapid.py:5950
+#: ../raphodo/rapid.py:6243
 msgid "All settings and caches have been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5958
+#: ../raphodo/rapid.py:6251
 msgid "Thumbnail Cache has been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5964
+#: ../raphodo/rapid.py:6257
 msgid "Remembered files have been forgotten"
 msgstr ""
 
@@ -3416,15 +4026,15 @@ msgstr ""
 msgid "&Don't warn me again about missing or broken program libraries"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:546
+#: ../raphodo/renameandmovefile.py:554
 msgid "subfolder and filename"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:548
+#: ../raphodo/renameandmovefile.py:556
 msgid "filename"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:550
+#: ../raphodo/renameandmovefile.py:558
 msgid "subfolder"
 msgstr ""
 
@@ -3504,160 +4114,237 @@ msgstr ""
 msgid "photos or videos"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:306
+#: ../raphodo/rpdfile.py:315
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:318
+#. translators: natural language expression signifying a single video
+#: ../raphodo/rpdfile.py:337
+msgid "a video"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:339
 msgid "1 Video"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:323
+#. translators: natural language expression signifying a single photo
+#: ../raphodo/rpdfile.py:346
+msgid "a photo"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:348
 msgid "1 Photo"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:803
+#: ../raphodo/rpdfile.py:828
 #, python-format
 msgid "%(path)s on %(camera)s"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:819
+#: ../raphodo/rpdfile.py:844
 msgid "Photo"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:859
+#: ../raphodo/rpdfile.py:884
 msgid "Video"
 msgstr ""
 
-#: ../raphodo/storage.py:138
+#: ../raphodo/storage.py:141
 msgid "File system root"
 msgstr ""
 
 #. translators: the name of the Pictures folder
-#: ../raphodo/storage.py:433
+#: ../raphodo/storage.py:437
 msgid "Pictures"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:426
+#: ../raphodo/thumbnaildisplay.py:432
 #, python-format
 msgid "Taken on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:431
+#: ../raphodo/thumbnaildisplay.py:439
 #, python-format
 msgid "Modified on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:437 ../raphodo/thumbnaildisplay.py:466
+#: ../raphodo/thumbnaildisplay.py:447 ../raphodo/thumbnaildisplay.py:481
 #, python-format
 msgid "%(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:451
+#: ../raphodo/thumbnaildisplay.py:464
 #, python-format
 msgid "Memory cards: %s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:457
+#: ../raphodo/thumbnaildisplay.py:468
+#, python-format
+msgid "Memory card: %s"
+msgstr ""
+
+#: ../raphodo/thumbnaildisplay.py:473
 msgid "Downloaded as:"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:472
+#: ../raphodo/thumbnaildisplay.py:489
 #, python-format
 msgid "<br><br>Previous download:<br>%(filename)s<br>%(path)s<br>%(date)s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:1603
+#: ../raphodo/thumbnaildisplay.py:1645
 msgid "Copy Path"
 msgstr ""
 
+#. Translators: these values are file size suffixes like B representing bytes, KB representing
+#. kilobytes, etc.
+#: ../raphodo/utilities.py:170
+msgid "B"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "KB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "MB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "GB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "TB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "PB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "EB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "ZB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "YB"
+msgstr ""
+
 #. two things in a list e.g. "device1 and device2"
-#: ../raphodo/utilities.py:391
+#: ../raphodo/utilities.py:394
 #, python-format
 msgid "%(first_item)s and %(last_item)s"
 msgstr ""
 
-#: ../raphodo/utilities.py:464
+#: ../raphodo/utilities.py:468
 msgid "one"
 msgstr ""
 
-#: ../raphodo/utilities.py:465
+#: ../raphodo/utilities.py:469
 msgid "two"
 msgstr ""
 
-#: ../raphodo/utilities.py:466
+#: ../raphodo/utilities.py:470
 msgid "three"
 msgstr ""
 
-#: ../raphodo/utilities.py:467
+#: ../raphodo/utilities.py:471
 msgid "four"
 msgstr ""
 
-#: ../raphodo/utilities.py:468
+#: ../raphodo/utilities.py:472
 msgid "five"
 msgstr ""
 
-#: ../raphodo/utilities.py:469
+#: ../raphodo/utilities.py:473
 msgid "six"
 msgstr ""
 
-#: ../raphodo/utilities.py:470
+#: ../raphodo/utilities.py:474
 msgid "seven"
 msgstr ""
 
-#: ../raphodo/utilities.py:471
+#: ../raphodo/utilities.py:475
 msgid "eight"
 msgstr ""
 
-#: ../raphodo/utilities.py:472
+#: ../raphodo/utilities.py:476
 msgid "nine"
 msgstr ""
 
-#: ../raphodo/utilities.py:473
+#: ../raphodo/utilities.py:477
 msgid "ten"
 msgstr ""
 
-#: ../raphodo/utilities.py:474
+#: ../raphodo/utilities.py:478
 msgid "eleven"
 msgstr ""
 
-#: ../raphodo/utilities.py:475
+#: ../raphodo/utilities.py:479
 msgid "twelve"
 msgstr ""
 
-#: ../raphodo/utilities.py:476
+#: ../raphodo/utilities.py:480
 msgid "thirteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:477
+#: ../raphodo/utilities.py:481
 msgid "fourteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:478
+#: ../raphodo/utilities.py:482
 msgid "fifteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:479
+#: ../raphodo/utilities.py:483
 msgid "sixteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:480
+#: ../raphodo/utilities.py:484
 msgid "seventeen"
 msgstr ""
 
-#: ../raphodo/utilities.py:481
+#: ../raphodo/utilities.py:485
 msgid "eighteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:482
+#: ../raphodo/utilities.py:486
 msgid "ninenteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:483
+#: ../raphodo/utilities.py:487
 msgid "twenty"
 msgstr ""
 
+#: ../raphodo/viewutils.py:240
+msgid "&OK"
+msgstr ""
+
+#: ../raphodo/viewutils.py:243
+msgid "&Save"
+msgstr ""
+
+#: ../raphodo/viewutils.py:244
+msgid "&Help"
+msgstr ""
+
+#: ../raphodo/viewutils.py:245
+msgid "Restore Defaults"
+msgstr ""
+
+#: ../raphodo/viewutils.py:246
+msgid "&Yes"
+msgstr ""
+
+#: ../raphodo/viewutils.py:247
+msgid "&No"
+msgstr ""
+
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:1
 msgid ""
 "Rapid Photo Downloader imports photos and videos from cameras, phones, "
@@ -3711,8 +4398,8 @@ msgstr ""
 #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:5
 msgid ""
-"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;"
-"memory;card;"
+"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;memory"
+";card;"
 msgstr ""
 
 #: ../data/kde/net.damonlynch.rapid-photo-downloader.desktop.in.h:1
@@ -3773,6 +4460,7 @@ msgstr ""
 #~ msgid "Warsaw"
 #~ msgstr "Varsòvia"
 
+#, python-format
 #~ msgid "<i>Example: %s</i>"
 #~ msgstr "<i>Exemple : %s</i>"
 
@@ -3782,6 +4470,7 @@ msgstr ""
 #~ msgid "externaldrive2"
 #~ msgstr "discextèrne2"
 
+#, python-format
 #~ msgid "Source: %(source)s"
 #~ msgstr "Font : %(source)s"
 
@@ -3797,6 +4486,7 @@ msgstr ""
 #~ msgid "scanning..."
 #~ msgstr "Deteccion en cors..."
 
+#, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
 #~ "Destination: %(destination)s"
@@ -3813,6 +4503,7 @@ msgstr ""
 #~ msgid "MB/s"
 #~ msgstr "Mio/s"
 
+#, python-format
 #~ msgid "and %s"
 #~ msgstr "e %s"
 
diff --git a/po/pl.po b/po/pl.po
index 427de5b..c1512da 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,35 +7,386 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: damonlynch@gmail.com\n"
-"POT-Creation-Date: 2017-07-08 19:16-0500\n"
-"PO-Revision-Date: 2017-07-04 11:06+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2017-09-12 17:01-0400\n"
+"PO-Revision-Date: 2017-09-13 18:32+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: Polish <pl@li.org>\n"
-"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-07-05 23:04+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-09-26 22:04+0000\n"
+"X-Generator: Launchpad (build 18463)\n"
+"Language: pl\n"
+
+#: ../install.py:65
+msgid "Rapid Photo Downloader installer"
+msgstr ""
+
+#: ../install.py:66
+msgid "Download and install latest version of Rapid Photo Downloader."
+msgstr ""
+
+#: ../install.py:236 ../install.py:1732
+msgid "Installer not found:"
+msgstr ""
+
+#. Translators: do not translate the term tar.gz
+#: ../install.py:240 ../install.py:1736
+msgid "Installer not in tar.gz format:"
+msgstr ""
+
+#: ../install.py:465
+msgid ""
+"Incorrect folder ownership detected. Changing ownership of and resetting "
+"permissions for"
+msgstr ""
+
+#: ../install.py:540
+msgid "The following command will be run:"
+msgstr ""
+
+#: ../install.py:543 ../install.py:1479 ../install.py:1484
+msgid "sudo may prompt you for the sudo password."
+msgstr ""
+
+#: ../install.py:547
+msgid "Would you like to run the command now?"
+msgstr ""
+
+#: ../install.py:549
+msgid "Answer is not yes, exiting."
+msgstr ""
+
+#: ../install.py:559 ../install.py:751 ../install.py:966
+msgid "Command failed"
+msgstr ""
+
+#: ../install.py:561 ../install.py:752 ../install.py:967
+msgid "Exiting"
+msgstr ""
+
+#: ../install.py:582
+msgid "The Universe repository must be enabled."
+msgstr ""
+
+#: ../install.py:606
+msgid ""
+"Do you want to to uninstall the previous version of Rapid Photo Downloader:"
+msgstr ""
+
+#: ../install.py:715 ../install.py:740
+msgid ""
+"Querying package system to see if an older version of Rapid Photo Downloader "
+"is installed (this may take a while)..."
+msgstr ""
+
+#: ../install.py:726
+msgid ""
+"Unable to query package system. Please check your Internet connection and "
+"try again"
+msgstr ""
+
+#: ../install.py:756
+msgid "Checking if previous version installed with pip..."
+msgstr ""
+
+#: ../install.py:850
+msgid "The following package is unknown on your system: {}\n"
+msgstr ""
+
+#: ../install.py:857 ../install.py:929 ../install.py:974
+msgid ""
+"To continue, some packages required to run the application will be installed."
+msgstr ""
+
+#: ../install.py:886
+msgid "Querying installed and available packages (this may take a while)"
+msgstr ""
+
+#: ../install.py:958
+msgid ""
+"Querying zypper to see if any required packages are already installed (this "
+"may take a while)... "
+msgstr ""
+
+#: ../install.py:1004
+msgid "Query to confirm action at each step."
+msgstr ""
+
+#: ../install.py:1011
+msgid ""
+"When downloading the latest version, install the development version if it "
+"is newer than the stable version."
+msgstr ""
+
+#: ../install.py:1020
+msgid ""
+"Optional tar.gz Rapid Photo Downloader installer archive. If not specified, "
+"the latest version is downloaded from the Internet."
+msgstr ""
+
+#: ../install.py:1043
+msgid ""
+"Do not run the installer in the tar.gz Rapid Photo Downloader installer "
+"archive if it is newer than this version ({}). The default is to run "
+"whichever installer is newer."
+msgstr ""
+
+#: ../install.py:1050
+msgid ""
+"Uninstall Rapid Photo Downloader that was installed with pip, keeping its "
+"dependencies."
+msgstr ""
+
+#: ../install.py:1054
+msgid ""
+"Uninstall the dependencies installed by pip during Rapid Photo Downloader's "
+"installation, and Rapid Photo Downloader itself, then exit."
+msgstr ""
+
+#: ../install.py:1059
+msgid ""
+"Note: this will not uninstall any version of Rapid Photo Downloader "
+"installed by your Linux distribution's package manager."
+msgstr ""
+
+#: ../install.py:1066
+msgid ""
+"Dependencies will only be removed if they are not required by other programs."
+msgstr ""
+
+#: ../install.py:1072
+msgid ""
+"Note: this option will remove the dependencies regardless of whether they "
+"are required by another program pip has installed. Upgrade to pip 9.0 or "
+"above if you want to avoid this behavior. You can do so using the command "
+"'python3 -m pip install pip -U --user'. Also note that any version of Rapid "
+"Photo Downloader installed by your Linux distribution's package manager will "
+"not be uninstalled."
+msgstr ""
 
-#. type: QPushButton
-#: ../raphodo/aboutdialog.py:217
+#: ../install.py:1122
+msgid "Failed to download versions file"
+msgstr ""
+
+#: ../install.py:1126
+msgid "Got error code {} while accessing versions file"
+msgstr ""
+
+#: ../install.py:1234
+msgid ""
+"Sorry, could not locate installer. Please check your Internet connection and "
+"verify if you can reach https://www.damonlynch.net\n"
+"\n"
+"Exiting.\n"
+msgstr ""
+
+#: ../install.py:1408
+msgid "Installing application requirements..."
+msgstr ""
+
+#: ../install.py:1424
+msgid "Received error code"
+msgstr ""
+
+#: ../install.py:1425
+msgid "Failed to install application requirements: exiting"
+msgstr ""
+
+#: ../install.py:1428
+msgid "Installing application..."
+msgstr ""
+
+#: ../install.py:1441
+msgid "Failed to install application: exiting..."
+msgstr ""
+
+#: ../install.py:1465
+msgid ""
+"You may have to restart the computer to be able to run the program from the "
+"commmand line or application launcher."
+msgstr ""
+
+#: ../install.py:1476
+msgid "Do you want to install the application's man pages?"
+msgstr ""
+
+#: ../install.py:1477
+msgid "They will be installed into {}"
+msgstr ""
+
+#: ../install.py:1478 ../install.py:1483
+msgid "If you uninstall the application, remove these manpages yourself."
+msgstr ""
+
+#: ../install.py:1480
+msgid "Do want to install the man pages?"
+msgstr ""
+
+#: ../install.py:1482
+msgid "Installing man pages into {}"
+msgstr ""
+
+#: ../install.py:1499
+msgid "Failed to create man page directory: exiting"
+msgstr ""
+
+#: ../install.py:1511
+msgid "Failed to copy man page."
+msgstr ""
+
+#: ../install.py:1521
+msgid "(If a segmentation fault occurs at exit, you can ignore it...)"
+msgstr ""
+
+#: ../install.py:1534
+msgid ""
+"The python3 tool pip is required to uninstall a version of Rapid Photo "
+"Downloader that was installed with pip.\n"
+"Cannot continue. Exiting."
+msgstr ""
+
+#: ../install.py:1575
+msgid ""
+"Do not run this installer script as sudo / root user.\n"
+"Run it using the user who will run the program.\n"
+msgstr ""
+
+#: ../install.py:1585 ../install.py:1599
+msgid "Do not include any other command line arguments when specifying"
+msgstr ""
+
+#: ../install.py:1614
+msgid ""
+"Sorry, this installer does not support a custom python installation.\n"
+"Exiting..."
+msgstr ""
+
+#: ../install.py:1620
+msgid "Restarting script using system python..."
+msgstr ""
+
+#: ../install.py:1651
+msgid "Exiting..."
+msgstr ""
+
+#. Translators: do not translate the term python3-apt
+#: ../install.py:1670
+msgid "To continue, the package python3-apt must be installed."
+msgstr ""
+
+#: ../install.py:1689
+msgid ""
+"Install the following packages using your Linux distribution's standard "
+"package manager, and then rerun this installer"
+msgstr ""
+
+#: ../install.py:1698
+msgid ""
+"To run this program, programs to assist Python 3 and its package management "
+"must be installed."
+msgstr ""
+
+#. Translators: do not translate the terms Python 3, pip and setuptools
+#: ../install.py:1713
+msgid "Python 3's pip and setuptools must be upgraded for your user."
+msgstr ""
+
+#. Translators: do not translate the term python or requests
+#: ../install.py:1726
+msgid "Installing python requests"
+msgstr ""
+
+#: ../upgrade.py:79
+msgid "Upgrade Rapid Photo Downloader"
+msgstr ""
+
+#: ../upgrade.py:401 ../raphodo/viewutils.py:242
+msgid "&Cancel"
+msgstr ""
+
+#: ../upgrade.py:405
+msgid "&Upgrade"
+msgstr ""
+
+#: ../upgrade.py:410
+#, python-format
+msgid "Click the Upgrade button to upgrade to version %s."
+msgstr ""
+
+#: ../upgrade.py:413
+msgid "Click the Upgrade button to start the upgrade."
+msgstr ""
+
+#: ../upgrade.py:416 ../upgrade.py:422 ../raphodo/viewutils.py:241
+msgid "&Close"
+msgstr ""
+
+#: ../upgrade.py:417
+msgid "&Run"
+msgstr ""
+
+#: ../upgrade.py:447
+msgid "Close Rapid Photo Downloader before running this upgrade"
+msgstr ""
+
+#: ../upgrade.py:450
+msgid "Upgrade running..."
+msgstr ""
+
+#: ../upgrade.py:486
+#, python-format
+msgid ""
+"Successfully upgraded to %s. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:491
+msgid ""
+"Upgrade finished successfully. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:495
+msgid "Upgrade failed. Click Close to exit."
+msgstr ""
+
+#: ../upgrade.py:6967
+#, python-format
+msgid "Upgrading %s..."
+msgstr ""
+
+#: ../upgrade.py:6969
+msgid "Press any key to continue..."
+msgstr ""
+
+#: ../upgrade.py:6982
+msgid "Rapid Photo Downloader upgrade failed"
+msgstr ""
+
+#: ../upgrade.py:6984
+#, python-format
+msgid ""
+"The python package %s could not be updated. The upgrade cannot continue."
+msgstr ""
+
+#: ../raphodo/aboutdialog.py:225
 msgid "Credits"
 msgstr "Autorzy"
 
-#: ../raphodo/backuppanel.py:239
+#: ../raphodo/backuppanel.py:240
 msgid "Backups are not configured"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:241
+#: ../raphodo/backuppanel.py:242
 msgid "No backup devices detected"
 msgstr "Nie wykryto urządzeń na których można utworzyć kopię zapasową"
 
-#: ../raphodo/backuppanel.py:243
+#: ../raphodo/backuppanel.py:244
 msgid "Valid backup locations not yet specified"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:401
+#: ../raphodo/backuppanel.py:404
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
@@ -43,98 +394,107 @@ msgstr ""
 "Możliwe jest utworzenie wielu kopii zapasowych dla pobieranych zdjęć i "
 "filmów, np. na zewnętrznych dyskach twardych."
 
-#: ../raphodo/backuppanel.py:407
+#: ../raphodo/backuppanel.py:412
 msgid "Back up photos and videos when downloading"
 msgstr "Utwórz kopię zapasową zdjęć i filmów podczas pobierania"
 
-#: ../raphodo/backuppanel.py:413
+#: ../raphodo/backuppanel.py:418
 msgid "Automatically detect backup devices"
 msgstr ""
 "Automatycznie wykryj urządzenia na których można utworzyć kopię zapasową"
 
-#: ../raphodo/backuppanel.py:417
+#: ../raphodo/backuppanel.py:424
 msgid ""
-"Specify the folder in which backups are stored on the device."
-"<br><br><i>Note: the presence of a folder with this name is used to "
+"Specify the folder in which backups are stored on the "
+"device.<br><br><i>Note: the presence of a folder with this name is used to "
 "determine if 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 folder names. By "
 "adding both folders, the same device can be used to back up both photos and "
 "videos.</i>"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:428
+#: ../raphodo/backuppanel.py:439
 msgid "Photo folder name:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:433
+#: ../raphodo/backuppanel.py:444
 msgid "Video folder name:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:438 ../raphodo/nameeditor.py:883
+#: ../raphodo/backuppanel.py:449 ../raphodo/nameeditor.py:890
 #: ../raphodo/renamepanel.py:123
 msgid "Example:"
 msgstr "Przykład:"
 
-#: ../raphodo/backuppanel.py:448
-msgid "If you disable automatic detection, choose the exact backup locations."
+#: ../raphodo/backuppanel.py:460
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
 "W przypadku wyłączenia wykrywania automatycznego, proszę wybrać dokładne "
 "położenie kopii zapasowej."
 
-#: ../raphodo/backuppanel.py:452
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:468
 msgid "Photo backup location:"
 msgstr "Położenie kopii zapasowej:"
 
-#: ../raphodo/backuppanel.py:454
+#: ../raphodo/backuppanel.py:474
 msgid "Select Photo Backup Location"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:460
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:485
 msgid "Video backup location:"
 msgstr "Położenie kopii zapasowej filmów:"
 
-#: ../raphodo/backuppanel.py:462
+#: ../raphodo/backuppanel.py:491
 msgid "Select Video Backup Location"
 msgstr ""
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:564
+#: ../raphodo/backuppanel.py:595
 msgid "drive1"
 msgstr ""
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:567
+#: ../raphodo/backuppanel.py:598
 msgid "drive2"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:628
+#: ../raphodo/backuppanel.py:663
 msgid "Projected Backup Storage Use"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:632
+#: ../raphodo/backuppanel.py:669
 msgid "Backup Options"
 msgstr ""
 
 #. translators: refers to the video thumbnail file that some
 #. cameras generate -- it has a .THM file extension
-#: ../raphodo/copyfiles.py:476
+#: ../raphodo/copyfiles.py:491
 msgid "video THM"
 msgstr ""
 
-#: ../raphodo/copyfiles.py:482
+#: ../raphodo/copyfiles.py:497
 msgid "audio"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:78 ../raphodo/devicedisplay.py:1079
-#: ../raphodo/rpdfile.py:321
+#: ../raphodo/rpdfile.py:342
 #, python-format
 msgid "%(no_photos)s Photos"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:82 ../raphodo/devicedisplay.py:1081
-#: ../raphodo/rpdfile.py:316
+#: ../raphodo/rpdfile.py:333
 #, python-format
 msgid "%(no_videos)s Videos"
 msgstr ""
@@ -162,15 +522,15 @@ msgid "%(size_free)s free of %(size_total)s"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:190 ../raphodo/devicedisplay.py:993
-#: ../raphodo/rapid.py:1964 ../raphodo/rapid.py:2079 ../raphodo/rapid.py:5753
-#: ../raphodo/rpdfile.py:905
+#: ../raphodo/rapid.py:2023 ../raphodo/rapid.py:2151 ../raphodo/rapid.py:6043
+#: ../raphodo/rpdfile.py:930
 msgid "Photos"
 msgstr "Zdjęcia"
 
 #. translators: the name of the Videos folder
 #: ../raphodo/destinationdisplay.py:191 ../raphodo/devicedisplay.py:994
-#: ../raphodo/rapid.py:1967 ../raphodo/rapid.py:2080 ../raphodo/rapid.py:5754
-#: ../raphodo/rpdfile.py:933 ../raphodo/storage.py:445
+#: ../raphodo/rapid.py:2028 ../raphodo/rapid.py:2152 ../raphodo/rapid.py:6044
+#: ../raphodo/rpdfile.py:958 ../raphodo/storage.py:449
 msgid "Videos"
 msgstr "Filmy"
 
@@ -178,7 +538,7 @@ msgstr "Filmy"
 msgid "Projected storage use after download"
 msgstr ""
 
-#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:516
+#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:521
 msgid "Custom..."
 msgstr ""
 
@@ -216,57 +576,58 @@ msgstr "Skanuj ponownie"
 msgid "%s full"
 msgstr ""
 
-#: ../raphodo/devices.py:459
+#: ../raphodo/devices.py:463
 msgid "Cameras"
 msgstr "Aparaty"
 
-#: ../raphodo/devices.py:460 ../raphodo/devices.py:920
-#: ../raphodo/preferencedialog.py:85 ../raphodo/rapid.py:1927
+#: ../raphodo/devices.py:464 ../raphodo/devices.py:927
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/rapid.py:1979
 msgid "Devices"
 msgstr "Urządzenia"
 
-#: ../raphodo/devices.py:720
+#: ../raphodo/devices.py:724
 #, python-format
 msgid "Downloading from %(device_names)s"
 msgstr ""
 
 #. Translators: e.g. Three Devices
-#: ../raphodo/devices.py:780
+#: ../raphodo/devices.py:784
 #, python-format
 msgid "%(no_devices)s %(device_type)s"
 msgstr ""
 
-#: ../raphodo/devices.py:905 ../raphodo/rapid.py:1764
+#: ../raphodo/devices.py:912 ../raphodo/rapid.py:1807
 msgid "Select Source"
 msgstr "Wybór źródła"
 
-#: ../raphodo/devices.py:936 ../raphodo/devices.py:947
+#: ../raphodo/devices.py:943 ../raphodo/devices.py:954
 #, python-format
 msgid "%(device1)s + %(device2)s"
 msgstr ""
 
 #. Number of cameras e.g. 3 Cameras
-#: ../raphodo/devices.py:958
+#: ../raphodo/devices.py:965
 #, python-format
 msgid "%(no_cameras)s Cameras"
 msgstr ""
 
-#: ../raphodo/devices.py:963
+#: ../raphodo/devices.py:970
 #, python-format
 msgid "%(no_devices)s Devices"
 msgstr ""
 
 #. Translators: two folder names, separated by a plus sign
-#: ../raphodo/devices.py:1258
+#: ../raphodo/devices.py:1265
 #, python-format
 msgid "%s + %s"
 msgstr "%s + %s"
 
-#: ../raphodo/didyouknow.py:44
+#: ../raphodo/didyouknow.py:45
 msgid "Click on a file's checkbox to mark or unmark it for download."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:50
+#: ../raphodo/didyouknow.py:51
 msgid ""
 "Files that have already been downloaded are remembered. You can still mark "
 "previously downloaded files to download again, but they are unchecked by "
@@ -274,34 +635,67 @@ msgid ""
 "files that are yet to be downloaded."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:59
+#: ../raphodo/didyouknow.py:60
 msgid ""
 "If more than one file is selected, they'll all take the mark of the file "
 "whose checkbox was clicked, regardless of whether they previously had a "
 "checkmark or not."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:67
+#: ../raphodo/didyouknow.py:68
 msgid ""
 "Click on a device's checkbox to quickly mark or unmark all its files for "
 "downloading."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:74
+#: ../raphodo/didyouknow.py:75
+msgid ""
+"After a download finishes, an icon replaces the thumbnail's checkbox. The "
+"icon's color indicates whether the download was successful (green), had file "
+"renaming problems (yellow/orange), or failed (red)."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:83
+msgid ""
+"\n"
+"            In case of any problems, a red icon will appear at the bottom of "
+"the window\n"
+"            indicating how many error reports there are. Clicking on it "
+"opens the Error Report \n"
+"            window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:91
+msgid ""
+"\n"
+"            The Error Report window lists any problems encountered before, "
+"during or after the \n"
+"            download. An orange triangle represents a warning, a red circle "
+"indicates a failure, \n"
+"            and a black circle indicates more serious failures. You can "
+"click on the hyperlinks to \n"
+"            open its file or device in a file manager. You can also search "
+"the reports using the \n"
+"            search box in the lower left of the Error Report window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:103
 msgid ""
 "You can simultaneously download from multiple cameras, smartphones, memory "
 "cards, and hard drives&mdash;as many devices as your computer can handle at "
 "one time."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:81
+#: ../raphodo/didyouknow.py:110
 msgid ""
 "The <b>Timeline</b> groups photos and videos based on how much time elapsed "
 "between consecutive shots. Use it to identify photos and videos taken at "
 "different periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:88
+#: ../raphodo/didyouknow.py:117
 msgid ""
 "\n"
 "<p>In the illustration above, the first row of the Timeline is black because "
@@ -313,7 +707,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:99
+#: ../raphodo/didyouknow.py:128
 msgid ""
 "To view photos and videos for a particular time range, use the mouse "
 "(optionally in combination with the <tt>Shift</tt> or <tt>Ctrl</tt> keys) to "
@@ -321,20 +715,20 @@ msgid ""
 "the left side of the main window will be highlighted."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:106
+#: ../raphodo/didyouknow.py:135
 msgid ""
 "A download always includes all files that are checked for download, "
 "including those that are not currently displayed because the Timeline is "
 "being used."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:113
+#: ../raphodo/didyouknow.py:142
 msgid ""
 "You can hide or display the download sources by clicking on the name of the "
 "device you're downloading from at the top left of the program window."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:120
+#: ../raphodo/didyouknow.py:149
 msgid ""
 "\n"
 "          Thumbnails can be sorted using a variety of criteria:\n"
@@ -353,33 +747,33 @@ msgid ""
 "</ol> "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:137
+#: ../raphodo/didyouknow.py:166
 msgid ""
 "One of Rapid Photo Downloader's most useful features is its ability to "
 "automatically generate download subfolders and rename files as it downloads, "
 "using a scheme of your choosing."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:143
+#: ../raphodo/didyouknow.py:172
 msgid ""
 "To specify where you want your files downloaded and how you want them named, "
 "open the appropriate panel on the right-side of the application window: "
 "<b>Destination</b>, <b>Rename</b>, or <b>Job Code</b>."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:150
+#: ../raphodo/didyouknow.py:179
 msgid ""
 "\n"
 "When thinking about your download directory structure, keep in mind two "
 "different types\n"
 "of directory:\n"
 "<ol>\n"
-"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, &quot;"
-"Photos&quot;, or\n"
+"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, "
+"&quot;Photos&quot;, or\n"
 "&quot;Videos&quot;. This directory should already exist on your computer. In "
 "the illustration \n"
-"below, the destination folders are &quot;Pictures&quot; and &quot;"
-"Videos&quot;. The\n"
+"below, the destination folders are &quot;Pictures&quot; and "
+"&quot;Videos&quot;. The\n"
 "name of the destination folder is displayed in the grey bar directly above "
 "the folder tree, \n"
 "with a folder icon to its left and a gear icon to its far right.</li>\n"
@@ -392,7 +786,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:167
+#: ../raphodo/didyouknow.py:196
 msgid ""
 "\n"
 "You can download photos and videos to the same destination folder, or "
@@ -405,14 +799,14 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:177
+#: ../raphodo/didyouknow.py:206
 msgid ""
 "Automatically generated download subfolders can contain further "
 "automatically generated subfolders if need be. A common scheme is to create "
 "a year subfolder and then a series of year-month-day subfolders within it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:186
+#: ../raphodo/didyouknow.py:215
 msgid ""
 "\n"
 "Whenever possible, the program previews the download subfolders of photos "
@@ -430,7 +824,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:201
+#: ../raphodo/didyouknow.py:230
 msgid ""
 "\n"
 "Download subfolder names are typically generated using some or all of the "
@@ -454,7 +848,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:219
+#: ../raphodo/didyouknow.py:248
 msgid ""
 "\n"
 "To automatically create download subfolders as you download, \n"
@@ -464,7 +858,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:227
+#: ../raphodo/didyouknow.py:256
 msgid ""
 "\n"
 "Using the drop-down menu, select a built-in preset or click on <b>Custom</b> "
@@ -474,20 +868,20 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:237
+#: ../raphodo/didyouknow.py:266
 msgid ""
 "It's easy to download raw images into one folder, and jpeg images into "
 "another. Simply use the <b>Filename Extension</b> as part of your download "
 "subfolder generation scheme:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:242
+#: ../raphodo/didyouknow.py:271
 msgid ""
 "This illustration shows a saved custom preset named &quot;My custom "
 "preset&quot;."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:246
+#: ../raphodo/didyouknow.py:275
 msgid ""
 "\n"
 "You do not have to create nested download subfolders. This illustration "
@@ -498,7 +892,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:256
+#: ../raphodo/didyouknow.py:285
 msgid ""
 "\n"
 "Although there are many built-in date/time naming options, you may find that "
@@ -512,7 +906,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:265
+#: ../raphodo/didyouknow.py:294
 msgid ""
 "\n"
 "Read more about all the ways you can generate download subfolder names and "
@@ -522,7 +916,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:273
+#: ../raphodo/didyouknow.py:302
 msgid ""
 "\n"
 "<b>Job Codes</b> let you easily enter text that describes sets of photos and "
@@ -534,7 +928,7 @@ msgid ""
 "&quot;Green Bazaar&quot;: \n"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:282
+#: ../raphodo/didyouknow.py:311
 msgid ""
 "\n"
 "You can apply new or existing Job Codes before you start a download. If "
@@ -545,36 +939,36 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:291
+#: ../raphodo/didyouknow.py:320
 msgid "Look for hints to guide you when working with Job Codes:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:295
+#: ../raphodo/didyouknow.py:324
 msgid ""
 "Hints will vary depending on the context, such as when the mouse is hovering "
 "over a button."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:301
+#: ../raphodo/didyouknow.py:330
 msgid ""
 "\n"
 "When you give your photos and videos unique filenames, you'll never be "
 "confused as to \n"
 "which file is which. Using <b>sequence numbers</b> to make filenames unique "
 "is highly \n"
-"recommended!.\n"
+"recommended!\n"
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:309
+#: ../raphodo/didyouknow.py:338
 msgid ""
 "\n"
 "<p>Four types of sequence values are available to help you assign unique "
 "names to your photos and \n"
 "videos:\n"
 "<ol>\n"
-"<li><b>Downloads today</b>: tracks downloads completed during that day.</"
-"li>\n"
+"<li><b>Downloads today</b>: tracks downloads completed during that "
+"day.</li>\n"
 "<li><b>Stored number</b>: similar to Downloads today, but it is remembered "
 "from the last time the  \n"
 "program was run.</li>\n"
@@ -588,7 +982,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:327
+#: ../raphodo/didyouknow.py:356
 msgid ""
 "\n"
 "The <b>Rename</b> panel allows you to configure file renaming. To rename "
@@ -597,7 +991,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:334
+#: ../raphodo/didyouknow.py:363
 msgid ""
 "\n"
 "<p>The <b>Synchronize RAW + JPEG</b> option is useful if you use the RAW + "
@@ -616,7 +1010,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:348
+#: ../raphodo/didyouknow.py:377
 msgid ""
 "\n"
 "You can have your photos and videos backed up to multiple locations as they "
@@ -627,13 +1021,13 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:356
+#: ../raphodo/didyouknow.py:385
 msgid ""
 "In this example, the drive <b>photobackup</b> does not contain a folder "
 "named <tt>Videos</tt>, so videos will not be backed up to it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:362
+#: ../raphodo/didyouknow.py:391
 msgid ""
 "\n"
 "Several of the program's preferences can be set from the command line, "
@@ -644,7 +1038,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:372
+#: ../raphodo/didyouknow.py:396
+msgid "You can also import program preferences from the older 0.4 version."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:401
 msgid ""
 "\n"
 "Rapid Photo Downloader deals with three types of cache:\n"
@@ -654,8 +1052,8 @@ msgid ""
 "memory cards, and other devices.</li>\n"
 "<li>A <b>temporary cache</b> of files downloaded from a camera, one for "
 "photos and another for \n"
-"videos. They are located in temporary subfolders in the download destination."
-"</li>\n"
+"videos. They are located in temporary subfolders in the download "
+"destination.</li>\n"
 "<li>The <b>desktop's thumbnail cache</b>, in which Rapid Photo Downloader "
 "stores thumbnails of \n"
 "RAW and TIFF photos once they have been downloaded. File browsers like Gnome "
@@ -670,23 +1068,23 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:431
+#: ../raphodo/didyouknow.py:460
 msgid "Tip of the Day"
 msgstr "Porada dnia"
 
-#: ../raphodo/didyouknow.py:439
+#: ../raphodo/didyouknow.py:468
 msgid "Did you know...?"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:466
+#: ../raphodo/didyouknow.py:495
 msgid "Show tips on startup"
 msgstr "Pokaż porady po uruchomieniu"
 
-#: ../raphodo/didyouknow.py:470
+#: ../raphodo/didyouknow.py:499
 msgid "&Next"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:471
+#: ../raphodo/didyouknow.py:500
 msgid "&Previous"
 msgstr ""
 
@@ -793,68 +1191,68 @@ msgstr ""
 msgid "%(days)d days, %(hours)d hours"
 msgstr ""
 
-#: ../raphodo/errorlog.py:65
+#: ../raphodo/errorlog.py:66
 msgid "Find"
 msgstr ""
 
-#: ../raphodo/errorlog.py:135
+#: ../raphodo/errorlog.py:136
 msgid "Error Reports - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/errorlog.py:170
+#: ../raphodo/errorlog.py:171
 msgid "Find in reports"
 msgstr ""
 
-#: ../raphodo/errorlog.py:187
+#: ../raphodo/errorlog.py:188
 msgid "Find the previous occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:192
+#: ../raphodo/errorlog.py:193
 msgid "Find the next occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:194
+#: ../raphodo/errorlog.py:195
 msgid "&Highlight All"
 msgstr ""
 
-#: ../raphodo/errorlog.py:195
+#: ../raphodo/errorlog.py:196
 msgid "Highlight all occurrences of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:196
+#: ../raphodo/errorlog.py:197
 msgid "&Match Case"
 msgstr ""
 
-#: ../raphodo/errorlog.py:197
+#: ../raphodo/errorlog.py:198
 msgid "Search with case sensitivity"
 msgstr ""
 
-#: ../raphodo/errorlog.py:198
+#: ../raphodo/errorlog.py:199
 msgid "&Whole Words"
 msgstr ""
 
-#: ../raphodo/errorlog.py:199
+#: ../raphodo/errorlog.py:200
 msgid "Search whole words only"
 msgstr ""
 
-#: ../raphodo/errorlog.py:209 ../raphodo/errorlog.py:341
+#: ../raphodo/errorlog.py:210 ../raphodo/errorlog.py:345
 #, python-format
 msgid "%s of %s matches"
 msgstr ""
 
-#: ../raphodo/errorlog.py:228
+#: ../raphodo/errorlog.py:232
 msgid "Clear"
 msgstr ""
 
-#: ../raphodo/errorlog.py:328
+#: ../raphodo/errorlog.py:332
 msgid "Phrase not found"
 msgstr ""
 
-#: ../raphodo/errorlog.py:487
+#: ../raphodo/errorlog.py:491
 msgid "Search pending..."
 msgstr ""
 
-#: ../raphodo/errorlog.py:535
+#: ../raphodo/errorlog.py:539
 msgid ""
 "The number of new entries added to the Error Report since it was last open. "
 "Click to open the Error Report."
@@ -868,8 +1266,8 @@ msgstr ""
 #, python-brace-format
 msgid ""
 "<b>A problem occurred in Rapid Photo Downloader</b><br><br>\n"
-"    Please report the problem at <a href=\"{website}\">{website}</a>."
-"<br><br>\n"
+"    Please report the problem at <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
 "    Attach the log file <i>{log_file}</i> to your bug report (click\n"
 "    <a href=\"{log_path}\">here</a> to open the log directory).<br><br>If "
 "the same problem occurs\n"
@@ -890,7 +1288,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1601
+#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1643
 msgid "Open in File Browser..."
 msgstr ""
 
@@ -908,531 +1306,531 @@ msgstr ""
 msgid "%s (location does not exist)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:186
+#: ../raphodo/generatenameconfig.py:190
 msgid "Date time"
 msgstr "Data czas"
 
-#: ../raphodo/generatenameconfig.py:187
+#: ../raphodo/generatenameconfig.py:191
 msgid "Text"
 msgstr "Tekst"
 
-#: ../raphodo/generatenameconfig.py:188 ../raphodo/rapid.py:2053
+#: ../raphodo/generatenameconfig.py:192 ../raphodo/rapid.py:2125
 msgid "Filename"
 msgstr "Nazwa pliku"
 
-#: ../raphodo/generatenameconfig.py:189 ../raphodo/preferencedialog.py:488
+#: ../raphodo/generatenameconfig.py:193 ../raphodo/preferencedialog.py:724
 msgid "Metadata"
 msgstr "Metadane"
 
-#: ../raphodo/generatenameconfig.py:190
+#: ../raphodo/generatenameconfig.py:194
 msgid "Sequences"
 msgstr "Sekwencje"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: ../raphodo/generatenameconfig.py:193
+#: ../raphodo/generatenameconfig.py:197
 msgid "Job code"
 msgstr "Kod pracy"
 
-#: ../raphodo/generatenameconfig.py:194
+#: ../raphodo/generatenameconfig.py:198
 msgid "Image date"
 msgstr "Data zdjęcia"
 
-#: ../raphodo/generatenameconfig.py:195
+#: ../raphodo/generatenameconfig.py:199
 msgid "Video date"
 msgstr "Data filmu"
 
-#: ../raphodo/generatenameconfig.py:196
+#: ../raphodo/generatenameconfig.py:200
 msgid "Today"
 msgstr "Dzisiaj"
 
-#: ../raphodo/generatenameconfig.py:197
+#: ../raphodo/generatenameconfig.py:201
 msgid "Yesterday"
 msgstr "Wczoraj"
 
 #. Translators: Download time is the time and date that the download started (when the
 #. user clicked the Download button)
-#: ../raphodo/generatenameconfig.py:200
+#: ../raphodo/generatenameconfig.py:204
 msgid "Download time"
 msgstr "Data pobierania"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:203
+#: ../raphodo/generatenameconfig.py:207
 msgid "Name"
 msgstr "Nazwa"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:206 ../raphodo/rapid.py:2054
+#: ../raphodo/generatenameconfig.py:210 ../raphodo/rapid.py:2126
 msgid "Extension"
 msgstr "Rozszerzenie"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:209
+#: ../raphodo/generatenameconfig.py:213
 msgid "Image number"
 msgstr "Numer obrazu"
 
-#: ../raphodo/generatenameconfig.py:210
+#: ../raphodo/generatenameconfig.py:214
 msgid "Video number"
 msgstr "Numer filmu"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:213
+#: ../raphodo/generatenameconfig.py:217
 msgid "Aperture"
 msgstr "Przysłona"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:216
+#: ../raphodo/generatenameconfig.py:220
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:219
+#: ../raphodo/generatenameconfig.py:223
 msgid "Exposure time"
 msgstr "Czas naświetlania"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:222
+#: ../raphodo/generatenameconfig.py:226
 msgid "Focal length"
 msgstr "Ogniskowa"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:225
+#: ../raphodo/generatenameconfig.py:229
 msgid "Camera make"
 msgstr "Producent aparatu"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:228
+#: ../raphodo/generatenameconfig.py:232
 msgid "Camera model"
 msgstr "Model aparatu"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:231
+#: ../raphodo/generatenameconfig.py:235
 msgid "Short camera model"
 msgstr "Skrót modelu aparatu"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:234
+#: ../raphodo/generatenameconfig.py:238
 msgid "Hyphenated short camera model"
 msgstr "Skrót z myślnikiem modelu aparatu"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:237
+#: ../raphodo/generatenameconfig.py:241
 msgid "Serial number"
 msgstr "Numer seryjny"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:240
+#: ../raphodo/generatenameconfig.py:244
 msgid "Shutter count"
 msgstr "Licznik migawki"
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: ../raphodo/generatenameconfig.py:242
+#: ../raphodo/generatenameconfig.py:246
 msgid "File number"
 msgstr "Numer pliku"
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:244
+#: ../raphodo/generatenameconfig.py:248
 msgid "Folder only"
 msgstr "Tylko katalog"
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:246
+#: ../raphodo/generatenameconfig.py:250
 msgid "Folder and file"
 msgstr "Katalog i plik"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:249
+#: ../raphodo/generatenameconfig.py:253
 msgid "Owner name"
 msgstr "Nazwa właściciela"
 
-#: ../raphodo/generatenameconfig.py:250
+#: ../raphodo/generatenameconfig.py:254
 msgid "Codec"
 msgstr "Kodek"
 
-#: ../raphodo/generatenameconfig.py:251
+#: ../raphodo/generatenameconfig.py:255
 msgid "Width"
 msgstr "Szerokość"
 
-#: ../raphodo/generatenameconfig.py:252
+#: ../raphodo/generatenameconfig.py:256
 msgid "Height"
 msgstr "Wysokość"
 
-#: ../raphodo/generatenameconfig.py:253
+#: ../raphodo/generatenameconfig.py:257
 msgid "Length"
 msgstr "Długość"
 
-#: ../raphodo/generatenameconfig.py:254
+#: ../raphodo/generatenameconfig.py:258
 msgid "Frames Per Second"
 msgstr "Klatki na sekundę"
 
-#: ../raphodo/generatenameconfig.py:255
+#: ../raphodo/generatenameconfig.py:259
 msgid "Artist"
 msgstr "Wykonawca"
 
-#: ../raphodo/generatenameconfig.py:256
+#: ../raphodo/generatenameconfig.py:260
 msgid "Copyright"
 msgstr "Prawa autorskie"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:259
+#: ../raphodo/generatenameconfig.py:263
 msgid "Downloads today"
 msgstr "Pobierań dzisiaj"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:262
+#: ../raphodo/generatenameconfig.py:266
 msgid "Session number"
 msgstr "Numer sesji"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:265
+#: ../raphodo/generatenameconfig.py:269
 msgid "Subfolder number"
 msgstr "Numer podkatalogu"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:268
+#: ../raphodo/generatenameconfig.py:272
 msgid "Stored number"
 msgstr "Numer zachowany"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: ../raphodo/generatenameconfig.py:271
+#: ../raphodo/generatenameconfig.py:275
 msgid "Sequence letter"
 msgstr "Litera sekwencji"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:274
+#: ../raphodo/generatenameconfig.py:278
 msgid "All digits"
 msgstr "Wszystkie cyfry"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:277
+#: ../raphodo/generatenameconfig.py:281
 msgid "Last digit"
 msgstr "Ostatnia cyfra"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:280
+#: ../raphodo/generatenameconfig.py:284
 msgid "Last 2 digits"
 msgstr "Ostatnie 2 cyfry"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:283
+#: ../raphodo/generatenameconfig.py:287
 msgid "Last 3 digits"
 msgstr "Ostatnie 3 cyfry"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:286
+#: ../raphodo/generatenameconfig.py:290
 msgid "Last 4 digits"
 msgstr "Ostatnie 4 cyfry"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:289
+#: ../raphodo/generatenameconfig.py:293
 msgid "Original Case"
 msgstr "Oryginalna wielkość liter"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:292
+#: ../raphodo/generatenameconfig.py:296
 msgid "UPPERCASE"
 msgstr "WIELKIE LITERY"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:295
+#: ../raphodo/generatenameconfig.py:299
 msgid "lowercase"
 msgstr "małe litery"
 
-#: ../raphodo/generatenameconfig.py:296
+#: ../raphodo/generatenameconfig.py:300
 msgid "One digit"
 msgstr "Jedna cyfra"
 
-#: ../raphodo/generatenameconfig.py:297
+#: ../raphodo/generatenameconfig.py:301
 msgid "Two digits"
 msgstr "Dwie cyfry"
 
-#: ../raphodo/generatenameconfig.py:298
+#: ../raphodo/generatenameconfig.py:302
 msgid "Three digits"
 msgstr "Trzy cyfry"
 
-#: ../raphodo/generatenameconfig.py:299
+#: ../raphodo/generatenameconfig.py:303
 msgid "Four digits"
 msgstr "Cztery cyfry"
 
-#: ../raphodo/generatenameconfig.py:300
+#: ../raphodo/generatenameconfig.py:304
 msgid "Five digits"
 msgstr "Pięć cyfr"
 
-#: ../raphodo/generatenameconfig.py:301
+#: ../raphodo/generatenameconfig.py:305
 msgid "Six digits"
 msgstr "Sześć cyfr"
 
-#: ../raphodo/generatenameconfig.py:302
+#: ../raphodo/generatenameconfig.py:306
 msgid "Seven digits"
 msgstr "Siedem cyfr"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:305
+#: ../raphodo/generatenameconfig.py:309
 msgid "Subseconds"
 msgstr "Części sekundy"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:308 ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:312 ../raphodo/generatenameconfig.py:393
 msgid "YYYYMMDD"
 msgstr "RRRRMMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:311 ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:315 ../raphodo/generatenameconfig.py:394
 msgid "YYYY-MM-DD"
 msgstr "RRRR-MM-DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:314 ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:318 ../raphodo/generatenameconfig.py:395
 msgid "YYYY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:317
+#: ../raphodo/generatenameconfig.py:321
 msgid "YYMMDD"
 msgstr "RRMMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:320
+#: ../raphodo/generatenameconfig.py:324
 msgid "YY-MM-DD"
 msgstr "RR-MM-DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:323
+#: ../raphodo/generatenameconfig.py:327
 msgid "YY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:326
+#: ../raphodo/generatenameconfig.py:330
 msgid "MMDDYYYY"
 msgstr "MMDDRRRR"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:329
+#: ../raphodo/generatenameconfig.py:333
 msgid "MMDDYY"
 msgstr "MMDDRR"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:332
+#: ../raphodo/generatenameconfig.py:336
 msgid "MMDD"
 msgstr "MMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:335
+#: ../raphodo/generatenameconfig.py:339
 msgid "DDMMYYYY"
 msgstr "DDMMRRRR"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:338
+#: ../raphodo/generatenameconfig.py:342
 msgid "DDMMYY"
 msgstr "DDMMRR"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:341 ../raphodo/generatenameconfig.py:389
-#: ../raphodo/generatenameconfig.py:390 ../raphodo/generatenameconfig.py:391
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:345 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:394 ../raphodo/generatenameconfig.py:395
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:397
 msgid "YYYY"
 msgstr "RRRR"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:344
+#: ../raphodo/generatenameconfig.py:348
 msgid "YY"
 msgstr "RR"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:347
+#: ../raphodo/generatenameconfig.py:351
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:350
+#: ../raphodo/generatenameconfig.py:354
 msgid "DD"
 msgstr "DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:353
+#: ../raphodo/generatenameconfig.py:357
 msgid "Month (full)"
 msgstr "Miesiąc (pełna nazwa)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:356
+#: ../raphodo/generatenameconfig.py:360
 msgid "Month (abbreviated)"
 msgstr "Miesiąc (skrót nazwy)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:359
+#: ../raphodo/generatenameconfig.py:363
 msgid "HHMMSS"
 msgstr "GGMMSS"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:362
+#: ../raphodo/generatenameconfig.py:366
 msgid "HHMM"
 msgstr "GGMM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:365
+#: ../raphodo/generatenameconfig.py:369
 msgid "HH-MM-SS"
 msgstr "GG-MM-SS"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:368
+#: ../raphodo/generatenameconfig.py:372
 msgid "HH-MM"
 msgstr "GG-MM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:371
+#: ../raphodo/generatenameconfig.py:375
 msgid "HH"
 msgstr "GG"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:374
+#: ../raphodo/generatenameconfig.py:378
 msgid "MM (minutes)"
 msgstr "MM (minuty)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:377
+#: ../raphodo/generatenameconfig.py:381
 msgid "SS"
 msgstr "SS"
 
-#: ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:393
 msgid "Date"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:394
 msgid "Date (hyphens)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:395
 msgid "Date (underscores)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:438
-#: ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:442
+#: ../raphodo/generatenameconfig.py:537
 msgid "Date and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392
+#: ../raphodo/generatenameconfig.py:396
 msgid "YYYYMM_Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "Date and Job Code Subfolder"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "YYYYMM"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393 ../raphodo/jobcodepanel.py:198
-#: ../raphodo/nameeditor.py:827 ../raphodo/rapid.py:1809
+#: ../raphodo/generatenameconfig.py:397 ../raphodo/jobcodepanel.py:199
+#: ../raphodo/nameeditor.py:833 ../raphodo/rapid.py:1852
 #: ../raphodo/renamepanel.py:83 ../raphodo/renamepanel.py:241
 msgid "Job Code"
 msgstr "Kod pracy"
 
-#: ../raphodo/generatenameconfig.py:433 ../raphodo/generatenameconfig.py:512
+#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:532
 msgid "Original Filename"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "Date-Time and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "YYYYMMDD-HHMM-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "Date and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "YYYYMMDD-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "Date-Time and Image number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "YYYYMMDD-1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "Date-Time and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "YYYYMMDD-HHMM-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:442 ../raphodo/generatenameconfig.py:537
 msgid "YYYYMMDD-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "Date-Time and Video number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "YYYYMMDD_1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "Resolution"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "YYYYMMDD-HHMM-1-1920x1080"
 msgstr ""
 
@@ -1491,76 +1889,77 @@ msgstr ""
 msgid "&Remember this choice"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:185
+#: ../raphodo/jobcodepanel.py:186
 msgid ""
 "Select photos and videos to be able to apply a new or existing Job Code to "
 "them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:186
-msgid "The new Job Code will be applied to all selected photos and/or videos."
+#: ../raphodo/jobcodepanel.py:187
+msgid ""
+"The new Job Code will be applied to all selected photos and/or videos."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:187
+#: ../raphodo/jobcodepanel.py:188
 msgid ""
 "Click the Apply button to apply the current Job Code to all selected photos "
 "and/or videos. You can also simply double click the Job Code."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:189
+#: ../raphodo/jobcodepanel.py:190
 msgid ""
 "Removing a Job Code removes it only from the list of saved Job Codes, not "
 "from any photos or videos that it may have been applied to."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:191
+#: ../raphodo/jobcodepanel.py:192
 msgid ""
 "If you want to use Job Codes, configure file renaming or destination "
 "subfolder names to use them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:197
+#: ../raphodo/jobcodepanel.py:198
 msgid "Last Used"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:202
+#: ../raphodo/jobcodepanel.py:203
 msgid "Job Code Sort:"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:205 ../raphodo/rapid.py:2061
+#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2133
 msgid "Ascending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2062
+#: ../raphodo/jobcodepanel.py:207 ../raphodo/rapid.py:2134
 msgid "Descending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:216
+#: ../raphodo/jobcodepanel.py:217
 msgid "&New..."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:220
+#: ../raphodo/jobcodepanel.py:221
 msgid "&Apply"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:224
+#: ../raphodo/jobcodepanel.py:225
 msgid "&Remove"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:228 ../raphodo/preferencedialog.py:125
-#: ../raphodo/preferencedialog.py:154 ../raphodo/preferencedialog.py:433
+#: ../raphodo/jobcodepanel.py:229 ../raphodo/preferencedialog.py:200
+#: ../raphodo/preferencedialog.py:229 ../raphodo/preferencedialog.py:531
 msgid "Remove All"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:427
+#: ../raphodo/jobcodepanel.py:428
 msgid "Do you really want to remove all the Job Codes?"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:429
+#: ../raphodo/jobcodepanel.py:430
 msgid "Remove all Job Codes"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:492
+#: ../raphodo/jobcodepanel.py:493
 msgid "Job Codes"
 msgstr "Kody pracy"
 
@@ -1571,42 +1970,58 @@ msgstr "Kody pracy"
 msgid "<i><b>Hint:</b> %(message)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:418 ../raphodo/nameeditor.py:432
+#: ../raphodo/nameeditor.py:423 ../raphodo/nameeditor.py:437
 #, python-format
 msgid "%(description)s - %(elements)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:512
+#: ../raphodo/nameeditor.py:517
 msgid "Save New Custom Preset..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:513
+#: ../raphodo/nameeditor.py:518
 msgid "Remove All Custom Presets..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:559
+#: ../raphodo/nameeditor.py:564
 msgid "(New Custom Preset)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:576
+#: ../raphodo/nameeditor.py:581
 #, python-format
 msgid "%s (edited)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:579 ../raphodo/nameeditor.py:1370
+#: ../raphodo/nameeditor.py:584 ../raphodo/nameeditor.py:1379
 #, python-format
 msgid "Update Custom Preset \"%s\""
 msgstr ""
 
-#: ../raphodo/nameeditor.py:667
+#: ../raphodo/nameeditor.py:672
 msgid "Save New Custom Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:675
+#: ../raphodo/nameeditor.py:680
 msgid "Preset Name:"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:836
+#: ../raphodo/nameeditor.py:799
+msgid "Photo Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:805
+msgid "Video Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:811
+msgid "Photo Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:817
+msgid "Video Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:842
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>There is insufficient data to "
 "fully generate the name. Please use other renaming options.</i>"
@@ -1615,7 +2030,7 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees.
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:846
+#: ../raphodo/nameeditor.py:853
 #, python-format
 msgid "The character</i> %(separator)s <i>creates a new subfolder level."
 msgstr ""
@@ -1623,50 +2038,50 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:851
+#: ../raphodo/nameeditor.py:858
 #, python-format
 msgid ""
 "There is no need start or end with the folder separator </i> "
 "%(separator)s<i>, because it is added automatically."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:859
+#: ../raphodo/nameeditor.py:866
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>Unique filenames may not be "
 "generated. Make filenames unique by using Sequence values.</i>"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:882 ../raphodo/renamepanel.py:121
+#: ../raphodo/nameeditor.py:889 ../raphodo/renamepanel.py:121
 msgid "Preset:"
 msgstr ""
 
 #. Translators: appears in a combobox, e.g. Image Date (YYYY)
-#: ../raphodo/nameeditor.py:959 ../raphodo/nameeditor.py:980
+#: ../raphodo/nameeditor.py:966 ../raphodo/nameeditor.py:987
 #, python-brace-format
 msgid "{choice} ({variant})"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1005 ../raphodo/preferencedialog.py:530
+#: ../raphodo/nameeditor.py:1012 ../raphodo/preferencedialog.py:783
 msgid "Get help online..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1025
+#: ../raphodo/nameeditor.py:1034
 msgid "Insert"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1351
+#: ../raphodo/nameeditor.py:1360
 msgid "Save Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1356
+#: ../raphodo/nameeditor.py:1365
 msgid ""
-"<b>Do you want to save the changes in a new custom preset?</"
-"b><br><br>Creating a custom preset is not required, but can help you keep "
-"organized.<br><br>The changes to the preferences will still be applied "
-"regardless of whether you create a new custom preset or not."
+"<b>Do you want to save the changes in a new custom "
+"preset?</b><br><br>Creating a custom preset is not required, but can help "
+"you keep organized.<br><br>The changes to the preferences will still be "
+"applied regardless of whether you create a new custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1365
+#: ../raphodo/nameeditor.py:1374
 msgid ""
 "<b>Do you want to save the changes in a custom preset?</b><br><br>If you "
 "like, you can create a new custom preset or update the existing custom "
@@ -1674,136 +2089,167 @@ msgid ""
 "regardless of whether you save a custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1372
+#: ../raphodo/nameeditor.py:1381
 msgid "Save New Custom Preset"
 msgstr ""
 
-#: ../raphodo/newversion.py:306
+#: ../raphodo/newversion.py:312
 msgid "Checking for new version..."
 msgstr ""
 
-#: ../raphodo/newversion.py:307
+#: ../raphodo/newversion.py:313
 msgid "You are running the latest version."
 msgstr ""
 
-#: ../raphodo/newversion.py:308
+#: ../raphodo/newversion.py:314
 msgid "Failed to contact the update server."
 msgstr ""
 
-#: ../raphodo/newversion.py:310
+#: ../raphodo/newversion.py:316
 #, python-format
 msgid "A new version of Rapid Photo Downloader (%s) is available."
 msgstr ""
 
-#: ../raphodo/newversion.py:312
+#: ../raphodo/newversion.py:318
 msgid "Do you want to download the new version?"
 msgstr ""
 
-#: ../raphodo/newversion.py:313
+#: ../raphodo/newversion.py:319
 #, python-format
 msgid "Changes in the new release can be viewed <a href=\"%s\">here</a>."
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the s key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:340 ../raphodo/newversion.py:353
+#: ../raphodo/newversion.py:348 ../raphodo/newversion.py:363
 msgid "&Skip this release"
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the o key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:356
+#: ../raphodo/newversion.py:366
 msgid "&Open Download Page"
 msgstr ""
 
-#: ../raphodo/newversion.py:376
+#: ../raphodo/newversion.py:386
 msgid "Rapid Photo Downloader updates"
 msgstr ""
 
 #. Translators: shows how much of a file has been downloaded e.g  123 KB of 1.3 MB
-#: ../raphodo/newversion.py:478
+#: ../raphodo/newversion.py:488
 #, python-format
 msgid "%(downloaded)s of %(total)s"
 msgstr ""
 
-#: ../raphodo/newversion.py:495
+#: ../raphodo/newversion.py:507
 msgid "Downloading..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:76
+#: ../raphodo/preferencedialog.py:86
 msgid "Preferences"
 msgstr "Preferencje"
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Automation"
 msgstr "Automatyzacja"
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Thumbnails"
 msgstr "Miniatury"
 
-#: ../raphodo/preferencedialog.py:85 ../raphodo/preferencedialog.py:343
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/preferencedialog.py:428
 msgid "Error Handling"
 msgstr "Obsługa błędów"
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:109
+msgid "Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:109 ../raphodo/preferencedialog.py:119
 msgid "Miscellaneous"
 msgstr "Różności"
 
-#: ../raphodo/preferencedialog.py:94
+#: ../raphodo/preferencedialog.py:147
 msgid "Device Scanning"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:96
+#: ../raphodo/preferencedialog.py:148
 msgid "Scan only external devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:98
+#: ../raphodo/preferencedialog.py:150
 msgid ""
 "Scan for photos and videos only on devices that are external to the "
 "computer,\n"
 "including cameras, memory cards, external hard drives, and USB flash drives."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:102
-msgid "Scan non-camera devices lacking a DCIM folder"
+#: ../raphodo/preferencedialog.py:153
+msgid "Scan only specific folders on devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:104
+#: ../raphodo/preferencedialog.py:155
 msgid ""
-"Scan the entirety of a device for photos and videos, irrespective of whether "
-"it contains a DCIM folder,\n"
-"as opposed to only scanning within a DCIM folder.\n"
+"Scan for photos and videos only in the folders specified below (except "
+"paths\n"
+"specified in Ignored Paths).\n"
 "\n"
-"Changing this setting causes all devices to be scanned again.\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:161
+msgid "Folders to scan:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:164
+msgid ""
+"Folders at the base level of device file systems that will be scanned\n"
+"for photos and videos."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:167 ../raphodo/preferencedialog.py:219
+msgid "Add..."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:169
+msgid ""
+"Add a folder to the list of folders to scan for photos and videos.\n"
 "\n"
-"Note: With cameras, only the DCIM folder is scanned."
+"Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:116
+#: ../raphodo/preferencedialog.py:172 ../raphodo/preferencedialog.py:198
+#: ../raphodo/preferencedialog.py:224 ../raphodo/preferencedialog.py:529
+msgid "Remove"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:174
+msgid ""
+"Remove a folder from the list of folders to scan for photos and videos.\n"
+"\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:191
 msgid "Devices that have been set to automatically ignore or download from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:117
+#: ../raphodo/preferencedialog.py:192
 msgid "Remembered Devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:121
+#: ../raphodo/preferencedialog.py:196
 msgid ""
 "Remove a device from the list of devices to automatically ignore or download "
 "from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:123 ../raphodo/preferencedialog.py:149
-#: ../raphodo/preferencedialog.py:431
-msgid "Remove"
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:127
+#: ../raphodo/preferencedialog.py:202
 msgid ""
 "Clear the list of devices from which to automatically ignore or download "
 "from.\n"
@@ -1811,316 +2257,437 @@ msgid ""
 "Note: Changes take effect when the computer is next scanned for devices."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:140
+#: ../raphodo/preferencedialog.py:215
 msgid "Ignored Paths"
 msgstr "Ścieżki ignorowane"
 
-#: ../raphodo/preferencedialog.py:141
+#: ../raphodo/preferencedialog.py:216
 msgid ""
 "The end part of a path that should never be scanned for photos or videos."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:144
-msgid "Add..."
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:146
+#: ../raphodo/preferencedialog.py:221
 msgid ""
 "Add a path to the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:151
+#: ../raphodo/preferencedialog.py:226
 msgid ""
 "Remove a path from the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:156
+#: ../raphodo/preferencedialog.py:231
 msgid ""
 "Clear the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:164
+#: ../raphodo/preferencedialog.py:239
 msgid ""
-"Use python-style <a href=\"http://damonlynch.net/rapid/documentation/"
-"#regularexpressions\">regular expressions</a>"
+"Use python-style <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">regula"
+"r expressions</a>"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:168
+#: ../raphodo/preferencedialog.py:243
 msgid ""
 "Use regular expressions in the list of ignored paths.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:208
+#: ../raphodo/preferencedialog.py:283
 msgid "Program Automation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:209
+#: ../raphodo/preferencedialog.py:284
 msgid "Start downloading at program startup"
 msgstr "Rozpocznij pobieranie przy uruchomieniu programu"
 
-#: ../raphodo/preferencedialog.py:210
+#: ../raphodo/preferencedialog.py:285
 msgid "Start downloading upon device insertion"
 msgstr "Rozpocznij pobieranie po podłączeniu urządzenia"
 
-#: ../raphodo/preferencedialog.py:211
+#: ../raphodo/preferencedialog.py:286
 msgid "Unmount (eject) device upon download completion"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:212
+#: ../raphodo/preferencedialog.py:287
 msgid "Exit program when download completes"
 msgstr "Opuść program po zakończeniu pobierania"
 
-#: ../raphodo/preferencedialog.py:213
+#: ../raphodo/preferencedialog.py:288
 msgid "Exit program even if download had warnings or errors"
 msgstr ""
 "Zakończ program nawet jeśli wystąpią błędy i ostrzeżenia podczas pobierania"
 
-#: ../raphodo/preferencedialog.py:240
+#: ../raphodo/preferencedialog.py:315
 msgid "Thumbnail Generation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:241
+#: ../raphodo/preferencedialog.py:316
 msgid "Generate thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:242
+#: ../raphodo/preferencedialog.py:318
 msgid "Generate thumbnails to show in the main program window"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:244
+#: ../raphodo/preferencedialog.py:320
 msgid "Cache thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:245
+#: ../raphodo/preferencedialog.py:323
 msgid ""
 "Save thumbnails shown in the main program window in a thumbnail cache unique "
 "to Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:247
+#: ../raphodo/preferencedialog.py:327
 msgid "Generate system thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:248
+#: ../raphodo/preferencedialog.py:330
 msgid ""
 "While downloading, save thumbnails that can be used by desktop file managers "
 "and other programs"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:255
+#: ../raphodo/preferencedialog.py:339
 msgid "Number of CPU cores used to generate thumbnails."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:256
+#: ../raphodo/preferencedialog.py:340
 msgid "CPU cores:"
 msgstr ""
 
 #. Translators: the * acts as an asterisk to denote a reference to an annotation
 #. such as '* Takes effect upon program restart'
-#: ../raphodo/preferencedialog.py:271 ../raphodo/preferencedialog.py:317
+#: ../raphodo/preferencedialog.py:355 ../raphodo/preferencedialog.py:401
 msgid "*"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:294
+#: ../raphodo/preferencedialog.py:378
 msgid "Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:296
+#: ../raphodo/preferencedialog.py:380
 msgid "Calculating..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:302
+#: ../raphodo/preferencedialog.py:386
 msgid "days"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:303
+#: ../raphodo/preferencedialog.py:387
 msgid "forever"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:308
+#: ../raphodo/preferencedialog.py:392
 msgid "Cache size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:310
+#: ../raphodo/preferencedialog.py:394
 msgid "Number of thumbnails:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:312
+#: ../raphodo/preferencedialog.py:396
 msgid "Database size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:314
+#: ../raphodo/preferencedialog.py:398
 msgid "Cache unaccessed thumbnails for:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:322
+#: ../raphodo/preferencedialog.py:406
 msgid "Purge Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:323
+#: ../raphodo/preferencedialog.py:408
 msgid "Optimize Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:336
+#: ../raphodo/preferencedialog.py:421
 msgid "* Takes effect upon program restart"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:346
+#: ../raphodo/preferencedialog.py:431
 msgid "Skip download"
 msgstr "Pomiń pobieranie"
 
-#: ../raphodo/preferencedialog.py:347
+#: ../raphodo/preferencedialog.py:432
 msgid "Don't download the file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:348
+#: ../raphodo/preferencedialog.py:433
 msgid "Add unique identifier"
 msgstr "Dodaj unikatowy identyfikator"
 
-#: ../raphodo/preferencedialog.py:349
+#: ../raphodo/preferencedialog.py:436
 msgid ""
 "Add an identifier like _1 or _2 to the end of the filename, immediately "
 "before the file's extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:355
+#: ../raphodo/preferencedialog.py:444
 msgid "Overwrite"
 msgstr "Nadpisz"
 
-#: ../raphodo/preferencedialog.py:356
+#: ../raphodo/preferencedialog.py:445
 msgid "Overwrite the previously backed up file"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:357
+#: ../raphodo/preferencedialog.py:446
 msgid "Skip"
 msgstr "Pomiń"
 
-#: ../raphodo/preferencedialog.py:358
+#: ../raphodo/preferencedialog.py:448
 msgid "Don't overwrite the backup file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:364
+#: ../raphodo/preferencedialog.py:455
 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 identifier:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:378
+#: ../raphodo/preferencedialog.py:464
+msgid ""
+"Using sequence numbers to automatically generate unique filenames is "
+"strongly recommended. Configure file renaming in the Rename panel in the "
+"main window."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:473
 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 ""
 
-#: ../raphodo/preferencedialog.py:398
+#: ../raphodo/preferencedialog.py:494
 msgid "Program Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:399
+#: ../raphodo/preferencedialog.py:495
 msgid "Show a warning when:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:402
+#: ../raphodo/preferencedialog.py:498
 msgid "Downloading files currently not displayed"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:403
+#: ../raphodo/preferencedialog.py:499
 msgid ""
 "Warn when about to download files that are not displayed in the main window."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:405
+#: ../raphodo/preferencedialog.py:501
 msgid "Backup destinations are missing"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:406
-msgid "Warn before starting a download if it is not possible to back up files."
+#: ../raphodo/preferencedialog.py:502
+msgid ""
+"Warn before starting a download if it is not possible to back up files."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:408
+#: ../raphodo/preferencedialog.py:504
 msgid "Program libraries are missing or broken"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:409
+#: ../raphodo/preferencedialog.py:505
 msgid ""
 "Warn if a software library used by Rapid Photo Downloader is missing or not "
 "functioning."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:412
+#: ../raphodo/preferencedialog.py:508
 msgid "Filesystem metadata cannot be set"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:413
+#: ../raphodo/preferencedialog.py:509
 msgid ""
 "Warn if there is an error setting a file's filesystem metadata, such as its "
 "modification time."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:416
+#: ../raphodo/preferencedialog.py:512
 msgid "Encountering unhandled files"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:417
+#: ../raphodo/preferencedialog.py:513
 msgid ""
 "Warn after scanning a device or this computer if there are unrecognized "
 "files that will not be included in the download."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:420
+#: ../raphodo/preferencedialog.py:517
 msgid "Do not warn about unhandled files with extensions:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:424
+#: ../raphodo/preferencedialog.py:522
 msgid ""
 "File extensions are case insensitive and do not need to include the leading "
 "dot."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:427
+#: ../raphodo/preferencedialog.py:525
 msgid "Add"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:428
+#: ../raphodo/preferencedialog.py:526
 msgid ""
 "Add a file extension to the list of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:430
+#: ../raphodo/preferencedialog.py:528
 msgid ""
 "Remove a file extension from the list of unhandled file types to not warn "
 "about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:434
+#: ../raphodo/preferencedialog.py:532
 msgid ""
 "Clear the list of file extensions of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:469
+#: ../raphodo/preferencedialog.py:568
+msgid "Photo and Video Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:571
+msgid "Consolidate files across devices and downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:574
+msgid ""
+"Analyze the results of device scans looking for duplicate files and matching "
+"RAW and JPEG pairs,\n"
+"comparing them across multiple devices and download sessions."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:580
+msgid "Treat matching RAW and JPEG files as:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:581
+msgid "One photo"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:582
+msgid "Two photos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:584
+msgid ""
+"Display matching pairs of RAW and JPEG photos as one photo, and if marked, "
+"download both."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:589
+msgid ""
+"Display matching pairs of RAW and JPEG photos as two different photos. You "
+"can still synchronize their sequence numbers."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:598
+msgid "With matching RAW and JPEG photos:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:600
+msgid "Do not mark JPEG for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:601
+msgid "Do not mark RAW for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:602
+msgid "Mark both for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:609
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"JPEG for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:614
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"RAW for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:619
+msgid ""
+"When matching RAW and JPEG photos are found, automatically mark both for "
+"download."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:625
+msgid ""
+"If you disable file consolidation, choose what to do when a download device "
+"is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:631
+msgid ""
+"When a download device is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:642
+msgid "Clear completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:643
+msgid "Keep displaying completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:644
+msgid "Prompt for what to do"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:649
+msgid ""
+"Automatically clear the display of completed downloads whenever a new "
+"download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:654
+msgid ""
+"Keep displaying completed downloads whenever a new download device is "
+"inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:658
+msgid ""
+"Prompt whether to keep displaying completed downloads or clear them whenever "
+"a new download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:702
 msgid "Version Check"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:470
+#: ../raphodo/preferencedialog.py:703
 msgid "Check for new version at startup"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:471
+#: ../raphodo/preferencedialog.py:705
 msgid "Check for a new version of the program each time the program starts."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:473
+#: ../raphodo/preferencedialog.py:707
 msgid "Include development releases"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:474
+#: ../raphodo/preferencedialog.py:709
 msgid ""
 "Include alpha, beta and other development releases when checking for a new "
 "version of the program.\n"
@@ -2129,11 +2696,11 @@ msgid ""
 "occur."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:489
+#: ../raphodo/preferencedialog.py:725
 msgid "Ignore DNG date/time metadata on MTP devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:490
+#: ../raphodo/preferencedialog.py:727
 msgid ""
 "Ignore date/time metadata in DNG files located on MTP devices, and use the "
 "file's modification time instead.\n"
@@ -2142,72 +2709,88 @@ msgid ""
 "metadata."
 msgstr ""
 
+#: ../raphodo/preferencedialog.py:741
+msgid "Completed Downloads"
+msgstr ""
+
 #. Translators: substituted value is a description for the set of preferences
 #. shown in the preference dialog window, e.g. Devices, Automation, etc.
 #. This string is shown in a tooltip for the "Restore Defaults" button
-#: ../raphodo/preferencedialog.py:710
+#: ../raphodo/preferencedialog.py:1067
 #, python-format
 msgid "Restores default %s preference values"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:832
+#: ../raphodo/preferencedialog.py:1208
 msgid ""
 "Do you want to purge the thumbnail cache? The cache will be purged when the "
 "program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:835
+#: ../raphodo/preferencedialog.py:1212
 msgid "Purge Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:847
+#: ../raphodo/preferencedialog.py:1225
 msgid ""
 "Do you want to optimize the thumbnail cache? The cache will be optimized "
 "when the program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:850
+#: ../raphodo/preferencedialog.py:1229
 msgid "Optimize Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1045
+#: ../raphodo/preferencedialog.py:1481
+msgid "Enter a Folder to Scan"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1482
+msgid "Specify a folder that will be scanned for photos and videos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1483
+msgid "Folder:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1497
 msgid "Enter a Path to Ignore"
 msgstr "Wprowadź Ścieżkę ignorowaną"
 
-#: ../raphodo/preferencedialog.py:1046
+#: ../raphodo/preferencedialog.py:1498
 msgid "Specify a path that will never be scanned for photos or videos"
 msgstr ""
 "Proszę określić ścieżkę, która nigdy nie będzie sprawdzana w poszukiwaniu "
 "zdjęć lub obrazów"
 
-#: ../raphodo/preferencedialog.py:1047
+#: ../raphodo/preferencedialog.py:1499
 msgid "Path:"
 msgstr "Ścieżka:"
 
-#: ../raphodo/preferencedialog.py:1061
+#: ../raphodo/preferencedialog.py:1513
 msgid "Enter a File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1062
+#: ../raphodo/preferencedialog.py:1514
 msgid "Specify a file extension (without the leading dot)"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1063 ../raphodo/renamepanel.py:122
+#: ../raphodo/preferencedialog.py:1515 ../raphodo/renamepanel.py:122
 msgid "Extension:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1078
+#: ../raphodo/preferencedialog.py:1530
 msgid "Invalid File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1079
+#: ../raphodo/preferencedialog.py:1531
 #, python-format
 msgid ""
 "The file extension <b>%s</b> is recognized by Rapid Photo Downloader, so it "
 "makes no sense to warn about its presence."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1081
+#: ../raphodo/preferencedialog.py:1533
 #, python-format
 msgid ""
 "Recognized file types:\n"
@@ -2233,104 +2816,104 @@ msgstr ""
 msgid "Birthday"
 msgstr ""
 
-#: ../raphodo/preferences.py:614
+#: ../raphodo/preferences.py:624
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Preferencje podkatalogu nie powinny zaczynać się od %s"
 
-#: ../raphodo/preferences.py:617
+#: ../raphodo/preferences.py:627
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Preferencje podkatalogu nie powinny kończyć się na %s"
 
-#: ../raphodo/preferences.py:622
+#: ../raphodo/preferences.py:632
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
-msgstr "Preferencje podkatalogu nie powinny zawierać dwóch %s jeden po drugim"
+msgstr ""
+"Preferencje podkatalogu nie powinny zawierać dwóch %s jeden po drugim"
 
-#. self.setFlat(True)
 #: ../raphodo/primarybutton.py:72
 msgid "Download 8 Photos and 10 Videos"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:86 ../raphodo/problemnotification.py:208
+#: ../raphodo/problemnotification.py:87 ../raphodo/problemnotification.py:209
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:89
+#: ../raphodo/problemnotification.py:90
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:116
+#: ../raphodo/problemnotification.py:117
 #, python-format
 msgid "GPhoto2 Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:124
+#: ../raphodo/problemnotification.py:125
 msgid ""
 "Unable to initialize the camera, probably because another program is using "
 "it. No files were copied from it."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:134
+#: ../raphodo/problemnotification.py:135
 #, python-format
 msgid "Unable to read directory %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:140
+#: ../raphodo/problemnotification.py:141
 #, python-format
 msgid "Unable to access modification time or size from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:146
+#: ../raphodo/problemnotification.py:147
 #, python-format
 msgid "Unable to read file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:152
+#: ../raphodo/problemnotification.py:153
 #, python-format
 msgid "Unable to write file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:158
+#: ../raphodo/problemnotification.py:159
 #, python-format
 msgid "Unable to move file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:164
+#: ../raphodo/problemnotification.py:165
 #, python-format
 msgid "Unable to remove file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:170
+#: ../raphodo/problemnotification.py:171
 #, python-format
 msgid "Unable to copy file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:176
+#: ../raphodo/problemnotification.py:177
 #, python-format
 msgid "Zero length file %s will not be downloaded"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:182
+#: ../raphodo/problemnotification.py:183
 #, python-format
 msgid "Could not determine filesystem modification time for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:188
+#: ../raphodo/problemnotification.py:189
 #, python-format
 msgid "Unable to load metadata from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:194
+#: ../raphodo/problemnotification.py:195
 #, python-format
 msgid ""
 "Unable to load metadata from %(name)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:202
+#: ../raphodo/problemnotification.py:203
 #, python-format
 msgid ""
 "An error occurred setting a file's filesystem metadata on the filesystem %s. "
@@ -2338,78 +2921,78 @@ msgid ""
 "again."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:216
+#: ../raphodo/problemnotification.py:217
 #, python-format
 msgid "Encountered unhandled file %s. It will not be downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:223
+#: ../raphodo/problemnotification.py:224
 #, python-format
 msgid "%(filetype)s %(destination)s already exists."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:234 ../raphodo/problemnotification.py:262
+#: ../raphodo/problemnotification.py:235 ../raphodo/problemnotification.py:263
 #, python-format
 msgid ""
 "The existing %(filetype)s %(destination)s was last modified on %(date)s at "
 "%(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:245
+#: ../raphodo/problemnotification.py:246
 #, python-format
 msgid "The %(filetype)s %(source)s was not downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:273
+#: ../raphodo/problemnotification.py:274
 #, python-format
 msgid "The %(filetype)s %(source)s was downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:282
+#: ../raphodo/problemnotification.py:283
 #, python-format
 msgid "The unique identifier '%s' was added to the filename."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:298
+#: ../raphodo/problemnotification.py:299
 #, python-format
 msgid ""
 "The existing backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:309
+#: ../raphodo/problemnotification.py:310
 #, python-format
 msgid "The %(filetype)s %(source)s was not backed up from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:326
+#: ../raphodo/problemnotification.py:327
 #, python-format
 msgid ""
 "The previous backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:337
+#: ../raphodo/problemnotification.py:338
 #, python-format
 msgid ""
 "The %(filetype)s %(source)s from %(device)s was backed up, overwriting the "
 "previous backup %(filetype)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:356
+#: ../raphodo/problemnotification.py:357
 #, python-format
 msgid ""
 "When synchronizing RAW + JPEG sequence values, a duplicate %(filetype)s "
 "%(file)s was encountered, and was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:366
+#: ../raphodo/problemnotification.py:367
 msgid ""
 "When synchronizing RAW + JPEG sequence values, photos were detected with the "
 "same filenames, but taken at different times:"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:373
+#: ../raphodo/problemnotification.py:374
 #, python-format
 msgid ""
 "%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
@@ -2418,134 +3001,134 @@ msgstr ""
 "%(image1)s zostało zrobione %(image1_date)s o %(image1_time)s, a %(image2)s  "
 "%(image2_date)s o %(image2_time)s."
 
-#: ../raphodo/problemnotification.py:389
+#: ../raphodo/problemnotification.py:390
 #, python-format
 msgid "Unable to finalize the filename for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:424
+#: ../raphodo/problemnotification.py:425
 #, python-format
 msgid ""
 "The filename %(destination)s was not fully generated for %(filetype)s "
 "%(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:433
+#: ../raphodo/problemnotification.py:434
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr "Brak metadanych %(type)s."
 
-#: ../raphodo/problemnotification.py:439
+#: ../raphodo/problemnotification.py:440
 #, python-format
 msgid "The following metadata is missing: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:445
+#: ../raphodo/problemnotification.py:446
 #, python-format
 msgid "Date/time conversion failed: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:451
+#: ../raphodo/problemnotification.py:452
 msgid ""
 "Could not extract valid date/time metadata or determine the file "
 "modification time."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:457
+#: ../raphodo/problemnotification.py:458
 msgid "Filename does not have an extension."
 msgstr "Nazwa pliku nie posiada rozszerzenia."
 
-#: ../raphodo/problemnotification.py:460
+#: ../raphodo/problemnotification.py:461
 msgid "Filename does not have a number component."
 msgstr "Plik nie posiada cyfr w swojej nazwie."
 
-#: ../raphodo/problemnotification.py:464
+#: ../raphodo/problemnotification.py:465
 #, python-format
 msgid "Error generating component %(component)s. Error: %(error)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:477
+#: ../raphodo/problemnotification.py:478
 #, python-format
 msgid ""
 "The download subfolders %(folder)s were only partially generated for "
 "%(filetype)s %(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:486
+#: ../raphodo/problemnotification.py:487
 #, python-format
 msgid ""
 "There is no data with which to generate the %(subfolder_file)s for "
 "%(filename)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:499
+#: ../raphodo/problemnotification.py:500
 #, python-format
 msgid ""
 "Unable to create the %(filetype)s %(destination)s in %(folder)s. The "
 "download file was %(source)s in %(device)s. It was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:514
+#: ../raphodo/problemnotification.py:515
 #, python-format
 msgid "Unable to create the download subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:526
+#: ../raphodo/problemnotification.py:527
 #, python-format
 msgid "Unable to create the backup subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:577
+#: ../raphodo/problemnotification.py:578
 #, python-format
 msgid "Problems scanning %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:584
+#: ../raphodo/problemnotification.py:585
 #, python-format
 msgid "Problems copying from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:591
+#: ../raphodo/problemnotification.py:592
 msgid "Problems while finalizing filenames and generating subfolders"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:598
+#: ../raphodo/problemnotification.py:599
 #, python-format
 msgid "Problems backing up to %s"
 msgstr ""
 
-#. Translators: for example Nov 3 or Dec 31
-#. The start and end dates are on a different day
-#. Translators: for example Nov 3 or Dec 31
-#: ../raphodo/proximity.py:105 ../raphodo/proximity.py:221
-#: ../raphodo/proximity.py:224 ../raphodo/proximity.py:828
+#. Translators: for example Nov 3 2015, 11:25 AM
+#. Translators: for example, Nov 3, 12:15 PM
+#: ../raphodo/proximity.py:188 ../raphodo/proximity.py:213
+#: ../raphodo/proximity.py:236 ../raphodo/proximity.py:239
 #, python-format
-msgid "%(month)s %(numeric_day)s"
+msgid "%(date)s, %(time)s"
 msgstr ""
 
-#. Translators: for example Nov 15 2015
-#. Translators: for example Nov 3 2015
-#: ../raphodo/proximity.py:109 ../raphodo/proximity.py:230
-#: ../raphodo/proximity.py:231 ../raphodo/proximity.py:831
+#: ../raphodo/proximity.py:204
 #, python-format
-msgid "%(date)s %(year)s"
+msgid "%(starttime)s - %(endtime)s"
 msgstr ""
 
-#. Translators: for example Nov 3 2015, 11:25 AM
-#. Translators: for example, Nov 3, 12:15 PM
-#: ../raphodo/proximity.py:197 ../raphodo/proximity.py:215
-#: ../raphodo/proximity.py:234 ../raphodo/proximity.py:236
+#. The start and end dates are on a different day
+#. Translators: for example Nov 3 or Dec 31
+#: ../raphodo/proximity.py:221 ../raphodo/proximity.py:225
+#: ../raphodo/proximity.py:980 ../raphodo/timeutils.py:105
 #, python-format
-msgid "%(date)s, %(time)s"
+msgid "%(month)s %(numeric_day)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:209
+#. Translators: for example Nov 3 2015
+#. Translators: for example Nov 2 2015
+#. Translators: for example Nov 15 2015
+#: ../raphodo/proximity.py:232 ../raphodo/proximity.py:233
+#: ../raphodo/proximity.py:985 ../raphodo/timeutils.py:110
 #, python-format
-msgid "%(starttime)s - %(endtime)s"
+msgid "%(date)s %(year)s"
 msgstr ""
 
 #. Translators: for example, Nov 3, 12:15 PM - Nov 4, 1:00 AM
-#: ../raphodo/proximity.py:241
+#: ../raphodo/proximity.py:245
 #, python-format
 msgid "%(earlier_time)s - %(later_time)s"
 msgstr ""
@@ -2554,25 +3137,25 @@ msgstr ""
 #. Nov 3 2012, 12:15 PM -
 #. Nov 4 2012, 1:00 AM
 #. (please keep the line break signified by \n)
-#: ../raphodo/proximity.py:248
+#: ../raphodo/proximity.py:253
 #, python-format
 msgid ""
 "%(earlier_time)s -\n"
 "%(later_time)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:359
+#: ../raphodo/proximity.py:382
 #, python-format
 msgid "%(month)s  %(year)s"
 msgstr ""
 
 #. Translators: for example Nov 2015
-#: ../raphodo/proximity.py:833
+#: ../raphodo/proximity.py:987
 #, python-format
 msgid "%(month)s %(year)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:1344
+#: ../raphodo/proximity.py:1595
 msgid ""
 "The time elapsed between consecutive photos and videos that is used to build "
 "the Timeline"
@@ -2582,47 +3165,47 @@ msgstr ""
 #. Replace the very last character (after the d) with the correct
 #. localized value, keeping everything else. In other words, change
 #. only the m character.
-#: ../raphodo/proximity.py:1406
+#: ../raphodo/proximity.py:1652
 #, python-format
 msgid "%(minutes)dm"
 msgstr ""
 
 #. Translators: i.e. "1.5h", which is short for 1.5 hours.
 #. Replace the entire string with the correct localized value
-#: ../raphodo/proximity.py:1410
+#: ../raphodo/proximity.py:1656
 msgid "1.5h"
 msgstr ""
 
 #. Translators: e.g. "5h", which is short for 5 hours.
 #. Replace the very last character (after the d) with the correct localized value,
 #. keeping everything else. In other words, change only the h character.
-#: ../raphodo/proximity.py:1415
+#: ../raphodo/proximity.py:1661
 #, python-format
 msgid "%(hours)dh"
 msgstr ""
 
-#: ../raphodo/proximity.py:1461
+#: ../raphodo/proximity.py:1710
 msgid ""
 "The Timeline groups photos and videos based on how much time elapsed between "
 "consecutive shots. Use it to identify photos and videos taken at different "
 "periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/proximity.py:1464
+#: ../raphodo/proximity.py:1715
 msgid ""
 "Use the slider (below) to adjust the time elapsed between consecutive shots "
 "that is used to build the Timeline."
 msgstr ""
 
-#: ../raphodo/proximity.py:1466
+#: ../raphodo/proximity.py:1718
 msgid "Timeline build pending..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1467
+#: ../raphodo/proximity.py:1719
 msgid "Timeline is building..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1468
+#: ../raphodo/proximity.py:1721
 msgid ""
 "The Timeline needs to be rebuilt because the file modification time does not "
 "match the time a shot was taken for one or more shots.<br><br>The Timeline "
@@ -2634,61 +3217,61 @@ msgid ""
 "downloading, which is when the metadata is read."
 msgstr ""
 
-#: ../raphodo/rapid.py:485 ../raphodo/rapid.py:2461 ../raphodo/rapid.py:3728
-#: ../raphodo/rapid.py:3846 ../raphodo/rapid.py:3850 ../raphodo/rapid.py:3870
-#: ../raphodo/rapid.py:3874 ../raphodo/rapid.py:3998 ../raphodo/rapid.py:4007
-#: ../raphodo/rapid.py:4495 ../raphodo/rapid.py:4888 ../raphodo/rapid.py:5722
-#: ../raphodo/rememberthisdialog.py:97
+#: ../raphodo/rapid.py:493 ../raphodo/rapid.py:2555 ../raphodo/rapid.py:3934
+#: ../raphodo/rapid.py:4065 ../raphodo/rapid.py:4069 ../raphodo/rapid.py:4092
+#: ../raphodo/rapid.py:4096 ../raphodo/rapid.py:4226 ../raphodo/rapid.py:4237
+#: ../raphodo/rapid.py:4743 ../raphodo/rapid.py:5195 ../raphodo/rapid.py:5997
+#: ../raphodo/rememberthisdialog.py:99
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:3
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: ../raphodo/rapid.py:1100
+#: ../raphodo/rapid.py:1131
 msgid ""
 "<b>ExifTool has a problem</b><br><br> Rapid Photo Downloader uses ExifTool "
 "to get metadata from videos and photos. The program will run without it, but "
 "installing it is <b>highly</b> recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1110 ../raphodo/rapid.py:1130
+#: ../raphodo/rapid.py:1141 ../raphodo/rapid.py:1161
 msgid "Problem with libmediainfo"
 msgstr ""
 
-#: ../raphodo/rapid.py:1119
+#: ../raphodo/rapid.py:1150
 msgid ""
 "<b>The library libmediainfo appears to be missing</b><br><br> Rapid Photo "
 "Downloader uses libmediainfo to get the date and time a video was shot. The "
 "program will run  without it, but installing it is recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1417
+#: ../raphodo/rapid.py:1448
 msgid "Download failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1419
+#: ../raphodo/rapid.py:1450
 msgid ""
 "Sorry, the download of the new version of Rapid Photo Downloader failed."
 msgstr ""
 
-#: ../raphodo/rapid.py:1425
+#: ../raphodo/rapid.py:1457
 msgid ""
 "The new version was successfully downloaded. Do you want to close Rapid "
 "Photo Downloader and install it now?"
 msgstr ""
 
-#: ../raphodo/rapid.py:1428
+#: ../raphodo/rapid.py:1461
 msgid "Update Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:1432
+#: ../raphodo/rapid.py:1465
 msgid "Install"
 msgstr ""
 
-#: ../raphodo/rapid.py:1450
+#: ../raphodo/rapid.py:1483
 msgid "New version saved"
 msgstr ""
 
-#: ../raphodo/rapid.py:1451
+#: ../raphodo/rapid.py:1485
 #, python-format
 msgid ""
 "The tar file and installer script are saved at:\n"
@@ -2696,163 +3279,163 @@ msgid ""
 " %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:1468
+#: ../raphodo/rapid.py:1502
 msgid "Upgrade failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1469
+#: ../raphodo/rapid.py:1505
 msgid ""
 "Sorry, upgrading Rapid Photo Downloader failed because there was an error "
 "opening the installer."
 msgstr ""
 
-#: ../raphodo/rapid.py:1667 ../raphodo/rapid.py:2331
+#: ../raphodo/rapid.py:1709 ../raphodo/rapid.py:2425
 msgid "Download"
 msgstr "Pobierz"
 
-#: ../raphodo/rapid.py:1671
+#: ../raphodo/rapid.py:1713
 msgid "&Refresh..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1675
+#: ../raphodo/rapid.py:1717
 msgid "&Preferences"
 msgstr ""
 
-#: ../raphodo/rapid.py:1679
+#: ../raphodo/rapid.py:1721
 msgid "&Quit"
 msgstr ""
 
-#: ../raphodo/rapid.py:1683
+#: ../raphodo/rapid.py:1725
 msgid "Error &Reports"
 msgstr ""
 
-#: ../raphodo/rapid.py:1687
+#: ../raphodo/rapid.py:1729
 msgid "Clear Completed Downloads"
 msgstr ""
 
-#: ../raphodo/rapid.py:1691
+#: ../raphodo/rapid.py:1733
 msgid "Get Help Online..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1695
+#: ../raphodo/rapid.py:1737
 msgid "&Tip of the Day..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1699
+#: ../raphodo/rapid.py:1741
 msgid "Report a Problem..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1703
+#: ../raphodo/rapid.py:1745
 msgid "Make a Donation..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1707
+#: ../raphodo/rapid.py:1749
 msgid "Translate this Application..."
 msgstr "Przetłumacz ten program..."
 
-#: ../raphodo/rapid.py:1711
+#: ../raphodo/rapid.py:1753
 msgid "&About..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1715
+#: ../raphodo/rapid.py:1757
 msgid "Check for Updates..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1797
+#: ../raphodo/rapid.py:1840
 msgid "Timeline"
 msgstr ""
 
-#: ../raphodo/rapid.py:1807
+#: ../raphodo/rapid.py:1850
 msgid "Destination"
 msgstr ""
 
-#: ../raphodo/rapid.py:1808
+#: ../raphodo/rapid.py:1851
 msgid "Rename"
 msgstr ""
 
-#: ../raphodo/rapid.py:1810
+#: ../raphodo/rapid.py:1853
 msgid "Back Up"
 msgstr ""
 
 #. Devices Header and View
-#: ../raphodo/rapid.py:1926
+#: ../raphodo/rapid.py:1977
 msgid ""
 "Turn on or off the use of devices attached to this computer as download "
 "sources"
 msgstr ""
 
 #. This Computer Header and View
-#: ../raphodo/rapid.py:1940
+#: ../raphodo/rapid.py:1994
 msgid ""
 "Turn on or off the use of a folder on this computer as a download source"
 msgstr ""
 
-#: ../raphodo/rapid.py:1941
+#: ../raphodo/rapid.py:1996
 msgid "This Computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:1952
+#: ../raphodo/rapid.py:2009
 msgid "Select a source folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:1975
+#: ../raphodo/rapid.py:2038
 msgid "Projected Storage Use"
 msgstr ""
 
-#: ../raphodo/rapid.py:1989 ../raphodo/rapid.py:1997
+#: ../raphodo/rapid.py:2056 ../raphodo/rapid.py:2068
 msgid "Select a destination folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:2045
+#: ../raphodo/rapid.py:2117
 msgid "All"
 msgstr ""
 
-#: ../raphodo/rapid.py:2046
+#: ../raphodo/rapid.py:2118
 msgid "New"
 msgstr ""
 
-#: ../raphodo/rapid.py:2048
+#: ../raphodo/rapid.py:2120
 msgid "Show:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2051
+#: ../raphodo/rapid.py:2123
 msgid "Modification Time"
 msgstr ""
 
-#: ../raphodo/rapid.py:2052
+#: ../raphodo/rapid.py:2124
 msgid "Checked State"
 msgstr ""
 
-#: ../raphodo/rapid.py:2055
+#: ../raphodo/rapid.py:2127
 msgid "File Type"
 msgstr ""
 
-#: ../raphodo/rapid.py:2056
+#: ../raphodo/rapid.py:2128
 msgid "Device"
 msgstr "Urządzenie"
 
-#: ../raphodo/rapid.py:2058
+#: ../raphodo/rapid.py:2130
 msgid "Sort:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2069
+#: ../raphodo/rapid.py:2141
 msgid "Select All:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2311
+#: ../raphodo/rapid.py:2405
 #, python-format
 msgid "Download %(files)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2327
+#: ../raphodo/rapid.py:2421
 msgid "Resume Download"
 msgstr ""
 
-#: ../raphodo/rapid.py:2329
+#: ../raphodo/rapid.py:2423
 msgid "Pause"
 msgstr "Wstrzymaj"
 
-#: ../raphodo/rapid.py:2417
+#: ../raphodo/rapid.py:2511
 #, python-brace-format
 msgid ""
 "Please report the problem at <a href=\"{website}\">{website}</a>.<br><br>\n"
@@ -2861,11 +3444,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/rapid.py:2431
+#: ../raphodo/rapid.py:2525
 msgid "Thank you for reporting a problem in Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:2529
+#: ../raphodo/rapid.py:2624
 #, python-format
 msgid ""
 "<b>Changing This Computer source path</b><br><br>Do you really want to "
@@ -2874,30 +3457,29 @@ msgid ""
 "from This Computer will be cancelled."
 msgstr ""
 
-#: ../raphodo/rapid.py:2595
+#: ../raphodo/rapid.py:2694
 msgid "You cannot change the download destination while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:2604
+#: ../raphodo/rapid.py:2704
 #, python-format
 msgid ""
 "<b>Confirm Download Destination</b><br><br>Are you sure you want to set the "
 "%(file_type)s download destination to %(path)s?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2682
+#: ../raphodo/rapid.py:2785
 msgid ""
+"\n"
 "<b>Downloading all files</b><br><br>\n"
-"                    A download always includes all files that are checked "
-"for download,\n"
-"                    including those that are not currently displayed because "
-"the Timeline\n"
-"                    is being used or because only new files are being shown."
-"<br><br>\n"
-"                    Do you want to proceed with the download?"
+"A download always includes all files that are checked for download,\n"
+"including those that are not currently displayed because the Timeline\n"
+"is being used or because only new files are being shown.<br><br>\n"
+"Do you want to proceed with the download?\n"
+"                        "
 msgstr ""
 
-#: ../raphodo/rapid.py:2820
+#: ../raphodo/rapid.py:2937
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -2908,7 +3490,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: ../raphodo/rapid.py:2824
+#: ../raphodo/rapid.py:2940
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -2917,199 +3499,193 @@ msgstr ""
 "Nieprawidłowy katalog pobierania:\n"
 "%s"
 
-#: ../raphodo/rapid.py:2827
+#: ../raphodo/rapid.py:2943
 msgid "Download Failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:2828
+#: ../raphodo/rapid.py:2944
 msgid "The download cannot proceed."
 msgstr ""
 
-#: ../raphodo/rapid.py:2842
+#: ../raphodo/rapid.py:2962
 msgid ""
 "Photos and videos will not be backed up because there is nowhere to back "
 "them up. Do you still want to start the download?"
 msgstr ""
 
-#. Translators: filetype will be replaced with 'photos' or 'videos'
-#: ../raphodo/rapid.py:2847 ../raphodo/rapid.py:2854
+#: ../raphodo/rapid.py:2969 ../raphodo/rapid.py:2979
 #, python-format
 msgid ""
 "No backup device exists for backing up %(filetype)s. Do you still want to "
 "start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2848 ../raphodo/rpdfile.py:228
+#: ../raphodo/rapid.py:2971 ../raphodo/rpdfile.py:228
 msgid "photos"
 msgstr "zdjęcia"
 
-#: ../raphodo/rapid.py:2855 ../raphodo/rpdfile.py:223
+#: ../raphodo/rapid.py:2981 ../raphodo/rpdfile.py:223
 msgid "videos"
 msgstr "filmy"
 
-#: ../raphodo/rapid.py:2861
+#: ../raphodo/rapid.py:2989
 msgid ""
 "<b>The photo and video backup destinations do not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2869 ../raphodo/rapid.py:2876
+#: ../raphodo/rapid.py:2999 ../raphodo/rapid.py:3008
 #, python-format
 msgid ""
 "<b>The %(filetype)s backup destination does not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2871 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:818
+#: ../raphodo/rapid.py:3001 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:843
 msgid "photo"
 msgstr "zdjęcie"
 
-#: ../raphodo/rapid.py:2878 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:858
+#: ../raphodo/rapid.py:3010 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:883
 msgid "video"
 msgstr "film"
 
-#: ../raphodo/rapid.py:2886
+#: ../raphodo/rapid.py:3018
 msgid "Backup problem"
 msgstr "Problem z zapisem kopii zapasowej"
 
-#. Translators - in the middle is a unicode em dash - please retain it
-#. This string is displayed in the status bar when the download is running
-#: ../raphodo/rapid.py:3571
+#: ../raphodo/rapid.py:3756
 #, python-format
 msgid "%(downloading_from)s — %(time_left)s left (%(speed)s)"
 msgstr ""
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3640
+#: ../raphodo/rapid.py:3828
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "Pobrane pliki typu %(filetypes)s: %(noFiles)s"
 
-#. Translators: e.g. 2 videos failed to download
-#: ../raphodo/rapid.py:3645
+#: ../raphodo/rapid.py:3836
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "Nieudanych pobrań plików typu %(filetypes)s: %(noFiles)s"
 
-#: ../raphodo/rapid.py:3650 ../raphodo/rapid.py:3723
+#: ../raphodo/rapid.py:3842 ../raphodo/rapid.py:3927
 msgid "warnings"
 msgstr "ostrzeżenia"
 
-#: ../raphodo/rapid.py:3679
+#: ../raphodo/rapid.py:3873
 msgid "All downloads complete"
 msgstr "Ukończono wszystkie pobierania"
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3686 ../raphodo/rapid.py:3695 ../raphodo/rapid.py:3704
-#: ../raphodo/rapid.py:3713 ../raphodo/rapid.py:3721
+#: ../raphodo/rapid.py:3881 ../raphodo/rapid.py:3892 ../raphodo/rapid.py:3903
+#: ../raphodo/rapid.py:3914 ../raphodo/rapid.py:3924
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: ../raphodo/rapid.py:3688 ../raphodo/rapid.py:3706
+#: ../raphodo/rapid.py:3884 ../raphodo/rapid.py:3906
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "Plik typu %(filetype)s został pobrany"
 
-#: ../raphodo/rapid.py:3697 ../raphodo/rapid.py:3715
+#: ../raphodo/rapid.py:3895 ../raphodo/rapid.py:3917
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "Nie udało się pobrać pliku typu %(filetype)s"
 
-#: ../raphodo/rapid.py:3742
+#: ../raphodo/rapid.py:3950
 msgid "1 failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:3744
+#: ../raphodo/rapid.py:3952
 #, python-format
 msgid "%d failures"
 msgstr ""
 
-#: ../raphodo/rapid.py:3749
+#: ../raphodo/rapid.py:3957
 msgid "1 warning"
 msgstr ""
 
-#: ../raphodo/rapid.py:3751
+#: ../raphodo/rapid.py:3959
 #, python-format
 msgid "%d warnings"
 msgstr ""
 
-#: ../raphodo/rapid.py:3771
+#: ../raphodo/rapid.py:3981
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3774
+#: ../raphodo/rapid.py:3985
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3779
+#: ../raphodo/rapid.py:3989
 #, python-format
 msgid "No files downloaded — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3781
+#: ../raphodo/rapid.py:3991
 msgid "No files downloaded"
 msgstr ""
 
-#: ../raphodo/rapid.py:3805
+#: ../raphodo/rapid.py:4021
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3809
+#: ../raphodo/rapid.py:4026
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3812
+#: ../raphodo/rapid.py:4031
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3820
+#: ../raphodo/rapid.py:4039
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3833
+#: ../raphodo/rapid.py:4052
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3837
+#: ../raphodo/rapid.py:4056
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3841
+#: ../raphodo/rapid.py:4060
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices"
 msgstr ""
 
-#: ../raphodo/rapid.py:3867
+#: ../raphodo/rapid.py:4087
 msgid "The Destination subfolders and Timeline have been rebuilt"
 msgstr ""
 
-#: ../raphodo/rapid.py:3922
+#: ../raphodo/rapid.py:4144
 msgid "Program preferences are invalid"
 msgstr "Preferencje programu są nieprawidłowe"
 
-#: ../raphodo/rapid.py:3999
+#: ../raphodo/rapid.py:4228
 #, python-format
 msgid ""
 "<b>All files on the %(camera)s are inaccessible</b>.<br><br>It may be locked "
@@ -3119,179 +3695,205 @@ msgid ""
 "ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4008
+#: ../raphodo/rapid.py:4239
 #, python-format
 msgid ""
-"<b>The %(camera)s appears to be in use by another application.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again.<br><br>Alternatively, you can ignore this "
-"device."
+"<b>The %(camera)s appears to be in use by another "
+"application.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again.<br><br>Alternatively, you "
+"can ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4019
+#: ../raphodo/rapid.py:4250
 msgid "&Try Again"
 msgstr ""
 
-#: ../raphodo/rapid.py:4020
+#: ../raphodo/rapid.py:4251
 msgid "&Ignore This Device"
 msgstr ""
 
-#: ../raphodo/rapid.py:4086
+#: ../raphodo/rapid.py:4323
 #, python-format
 msgid "Sorry, an unexpected problem occurred while scanning %s."
 msgstr ""
 
-#: ../raphodo/rapid.py:4087
+#: ../raphodo/rapid.py:4324
 msgid "Unfortunately you cannot download from this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4091
+#: ../raphodo/rapid.py:4328
 msgid ""
 "A possible workaround for the problem might be downloading from the camera's "
 "memory card using a card reader."
 msgstr ""
 
-#: ../raphodo/rapid.py:4096
+#: ../raphodo/rapid.py:4333
 msgid "Device scan failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:4472
+#: ../raphodo/rapid.py:4720
 #, python-format
 msgid ""
-"<b>The %(camera)s cannot be scanned because it cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again."
+"<b>The %(camera)s cannot be scanned because it cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again."
 msgstr ""
 
-#: ../raphodo/rapid.py:4496
+#: ../raphodo/rapid.py:4745
 #, python-format
 msgid ""
-"<b>The download cannot start because the %(camera)s cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again, and choose which files you want to "
-"download from it."
+"<b>The download cannot start because the %(camera)s cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again, and choose which files "
+"you want to download from it."
+msgstr ""
+
+#: ../raphodo/rapid.py:4842
+msgid "Completed Downloads Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4844
+#, python-format
+msgid "%s whose download have completed are displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4846
+msgid "Do you want to clear the completed downloads?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4848
+msgid "Completed Download Present"
 msgstr ""
 
-#: ../raphodo/rapid.py:4635
+#: ../raphodo/rapid.py:4850
+#, python-format
+msgid "%s whose download has completed is displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4852
+msgid "Do you want to clear the completed download?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4933
 #, python-format
 msgid ""
 "Do you want to download photos and videos from the device <i>%(device)s</i>?"
 msgstr ""
 
-#: ../raphodo/rapid.py:4877
+#: ../raphodo/rapid.py:5183
 #, python-format
 msgid "<b>Do you want to ignore the %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4879
+#: ../raphodo/rapid.py:5186
 msgid ""
 "All cameras, phones and tablets with the same model name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:4883
+#: ../raphodo/rapid.py:5190
 #, python-format
 msgid ""
 "<b>Do you want to ignore the device %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4885
+#: ../raphodo/rapid.py:5192
 msgid "Any device with the same name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:5178
+#: ../raphodo/rapid.py:5492
 #, python-format
 msgid "Downloading from %(location)s on This Computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5180
+#: ../raphodo/rapid.py:5496
 msgid ""
 "Do you really want to download from here?<br><br>On some systems, scanning "
 "this location can take a very long time."
 msgstr ""
 
-#: ../raphodo/rapid.py:5224
+#: ../raphodo/rapid.py:5537
 #, python-format
 msgid "Generating thumbnails for %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5227
+#: ../raphodo/rapid.py:5540
 #, python-format
 msgid "Scanning %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5237
+#: ../raphodo/rapid.py:5551
 #, python-format
 msgid ""
 "%(number)s of %(available files)s checked for download (%(hidden)s hidden)"
 msgstr ""
 
-#: ../raphodo/rapid.py:5243
+#: ../raphodo/rapid.py:5559
 #, python-format
 msgid "%(number)s of %(available files)s checked for download"
 msgstr ""
 
-#: ../raphodo/rapid.py:5494
+#: ../raphodo/rapid.py:5764
 msgid "Display program information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5496
+#: ../raphodo/rapid.py:5766
 msgid "Display debugging information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5499
+#: ../raphodo/rapid.py:5769
 msgid "List photo and video file extensions the program recognizes and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5502
+#: ../raphodo/rapid.py:5772
 msgid "Turn on or off the the renaming of photos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5504
+#: ../raphodo/rapid.py:5774
 msgid "turn on or off the the renaming of videos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5506
+#: ../raphodo/rapid.py:5776
 msgid ""
 "Turn on or off the automatic detection of devices from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5510
+#: ../raphodo/rapid.py:5780
 msgid "Turn on or off downloading from this computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5512 ../raphodo/rapid.py:5515 ../raphodo/rapid.py:5518
-#: ../raphodo/rapid.py:5539 ../raphodo/rapid.py:5543
+#: ../raphodo/rapid.py:5782 ../raphodo/rapid.py:5785 ../raphodo/rapid.py:5788
+#: ../raphodo/rapid.py:5809 ../raphodo/rapid.py:5813
 msgid "PATH"
 msgstr ""
 
-#: ../raphodo/rapid.py:5513
+#: ../raphodo/rapid.py:5783
 msgid "The PATH on this computer from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5516
+#: ../raphodo/rapid.py:5786
 msgid "The PATH where photos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5519
+#: ../raphodo/rapid.py:5789
 msgid "The PATH where videos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5521
+#: ../raphodo/rapid.py:5791
 msgid "Turn on or off the backing up of photos and videos while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:5525
+#: ../raphodo/rapid.py:5795
 msgid "Turn on or off the automatic detection of backup devices."
 msgstr ""
 
-#: ../raphodo/rapid.py:5527 ../raphodo/rapid.py:5533
+#: ../raphodo/rapid.py:5797 ../raphodo/rapid.py:5803
 msgid "FOLDER"
 msgstr ""
 
-#: ../raphodo/rapid.py:5528
+#: ../raphodo/rapid.py:5798
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected photo "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3299,7 +3901,7 @@ msgid ""
 "photos up to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5534
+#: ../raphodo/rapid.py:5804
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected video "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3307,115 +3909,124 @@ msgid ""
 "up videos to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5540
+#: ../raphodo/rapid.py:5810
 msgid ""
 "The PATH where photos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5544
+#: ../raphodo/rapid.py:5814
 msgid ""
 "The PATH where videos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5547
+#: ../raphodo/rapid.py:5817
 #, python-format
 msgid "Ignore photos with the following extensions: %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5551
-msgid "Turn on or off starting downloads as soon as the program itself starts."
+#: ../raphodo/rapid.py:5821
+msgid ""
+"Turn on or off starting downloads as soon as the program itself starts."
 msgstr ""
 
-#: ../raphodo/rapid.py:5554
+#: ../raphodo/rapid.py:5824
 msgid "Turn on or off starting downloads as soon as a device is inserted."
 msgstr ""
 
-#: ../raphodo/rapid.py:5557
+#: ../raphodo/rapid.py:5827
 msgid ""
 "Turn on or off use of the Rapid Photo Downloader Thumbnail Cache. Turning it "
 "off does not delete existing cache contents."
 msgstr ""
 
-#: ../raphodo/rapid.py:5561
+#: ../raphodo/rapid.py:5831
 msgid ""
 "Delete all thumbnails in the Rapid Photo Downloader Thumbnail Cache, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5565
+#: ../raphodo/rapid.py:5835
 msgid "Forget which files have been previously downloaded, and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5568
+#: ../raphodo/rapid.py:5838
 msgid ""
 "Import preferences from an old program version and exit. Requires the "
 "command line program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5571
+#: ../raphodo/rapid.py:5841
 msgid ""
 "Reset all program settings to their default values, delete all thumbnails in "
 "the Thumbnail cache, forget which files have been previously downloaded, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5575
+#: ../raphodo/rapid.py:5845
 msgid "Include gphoto2 debugging information in log files."
 msgstr ""
 
-#: ../raphodo/rapid.py:5579
+#: ../raphodo/rapid.py:5849
 msgid "Print information to the terminal about attached cameras and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5640
+#: ../raphodo/rapid.py:5911
 msgid ""
 "To import preferences from the old version of Rapid Photo Downloader, you "
 "must install the program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5649
+#: ../raphodo/rapid.py:5920
 msgid "No prior program preferences detected: exiting"
 msgstr ""
 
-#: ../raphodo/rapid.py:5652
+#: ../raphodo/rapid.py:5923
 #, python-format
 msgid "Importing preferences from Rapid Photo Downloader %(version)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5714
+#: ../raphodo/rapid.py:5989
 #, python-format
-msgid "Do you want to copy the stored sequence number, which has the value %d?"
+msgid ""
+"Do you want to copy the stored sequence number, which has the value %d?"
 msgstr ""
 
-#: ../raphodo/rapid.py:5726
+#: ../raphodo/rapid.py:6000
 msgid "Program aborting."
 msgstr ""
 
-#: ../raphodo/rapid.py:5736
+#: ../raphodo/rapid.py:6010
 msgid "Never run this program as the sudo / root user."
 msgstr ""
 
-#: ../raphodo/rapid.py:5740
+#: ../raphodo/rapid.py:6014
 msgid "You must install ExifTool to run Rapid Photo Downloader."
 msgstr ""
 
-#: ../raphodo/rapid.py:5794
+#: ../raphodo/rapid.py:6026
+msgid ""
+"Rapid Photo Downloader is installed in multiple locations.\n"
+"\n"
+"Uninstall all copies except the version you want to run."
+msgstr ""
+
+#: ../raphodo/rapid.py:6083
 msgid ""
 "When specifying a path on the command line, do not also specify an\n"
 "option for device auto detection or a path on \"This Computer\"."
 msgstr ""
 
-#: ../raphodo/rapid.py:5950
+#: ../raphodo/rapid.py:6243
 msgid "All settings and caches have been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5958
+#: ../raphodo/rapid.py:6251
 msgid "Thumbnail Cache has been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5964
+#: ../raphodo/rapid.py:6257
 msgid "Remembered files have been forgotten"
 msgstr ""
 
@@ -3431,15 +4042,15 @@ msgstr ""
 msgid "&Don't warn me again about missing or broken program libraries"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:546
+#: ../raphodo/renameandmovefile.py:554
 msgid "subfolder and filename"
 msgstr "podkatalog i nazwa pliku"
 
-#: ../raphodo/renameandmovefile.py:548
+#: ../raphodo/renameandmovefile.py:556
 msgid "filename"
 msgstr "nazwa pliku"
 
-#: ../raphodo/renameandmovefile.py:550
+#: ../raphodo/renameandmovefile.py:558
 msgid "subfolder"
 msgstr "podkatalog"
 
@@ -3519,160 +4130,237 @@ msgstr "zdjęcia i filmy"
 msgid "photos or videos"
 msgstr "zdjęcia lub filmy"
 
-#: ../raphodo/rpdfile.py:306
+#: ../raphodo/rpdfile.py:315
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: ../raphodo/rpdfile.py:318
+#. translators: natural language expression signifying a single video
+#: ../raphodo/rpdfile.py:337
+msgid "a video"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:339
 msgid "1 Video"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:323
+#. translators: natural language expression signifying a single photo
+#: ../raphodo/rpdfile.py:346
+msgid "a photo"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:348
 msgid "1 Photo"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:803
+#: ../raphodo/rpdfile.py:828
 #, python-format
 msgid "%(path)s on %(camera)s"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:819
+#: ../raphodo/rpdfile.py:844
 msgid "Photo"
 msgstr "Zdjęcie"
 
-#: ../raphodo/rpdfile.py:859
+#: ../raphodo/rpdfile.py:884
 msgid "Video"
 msgstr "Film"
 
-#: ../raphodo/storage.py:138
+#: ../raphodo/storage.py:141
 msgid "File system root"
 msgstr ""
 
 #. translators: the name of the Pictures folder
-#: ../raphodo/storage.py:433
+#: ../raphodo/storage.py:437
 msgid "Pictures"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:426
+#: ../raphodo/thumbnaildisplay.py:432
 #, python-format
 msgid "Taken on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:431
+#: ../raphodo/thumbnaildisplay.py:439
 #, python-format
 msgid "Modified on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:437 ../raphodo/thumbnaildisplay.py:466
+#: ../raphodo/thumbnaildisplay.py:447 ../raphodo/thumbnaildisplay.py:481
 #, python-format
 msgid "%(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:451
+#: ../raphodo/thumbnaildisplay.py:464
 #, python-format
 msgid "Memory cards: %s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:457
+#: ../raphodo/thumbnaildisplay.py:468
+#, python-format
+msgid "Memory card: %s"
+msgstr ""
+
+#: ../raphodo/thumbnaildisplay.py:473
 msgid "Downloaded as:"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:472
+#: ../raphodo/thumbnaildisplay.py:489
 #, python-format
 msgid "<br><br>Previous download:<br>%(filename)s<br>%(path)s<br>%(date)s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:1603
+#: ../raphodo/thumbnaildisplay.py:1645
 msgid "Copy Path"
 msgstr ""
 
+#. Translators: these values are file size suffixes like B representing bytes, KB representing
+#. kilobytes, etc.
+#: ../raphodo/utilities.py:170
+msgid "B"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "KB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "MB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "GB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "TB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "PB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "EB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "ZB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "YB"
+msgstr ""
+
 #. two things in a list e.g. "device1 and device2"
-#: ../raphodo/utilities.py:391
+#: ../raphodo/utilities.py:394
 #, python-format
 msgid "%(first_item)s and %(last_item)s"
 msgstr ""
 
-#: ../raphodo/utilities.py:464
+#: ../raphodo/utilities.py:468
 msgid "one"
 msgstr ""
 
-#: ../raphodo/utilities.py:465
+#: ../raphodo/utilities.py:469
 msgid "two"
 msgstr ""
 
-#: ../raphodo/utilities.py:466
+#: ../raphodo/utilities.py:470
 msgid "three"
 msgstr ""
 
-#: ../raphodo/utilities.py:467
+#: ../raphodo/utilities.py:471
 msgid "four"
 msgstr ""
 
-#: ../raphodo/utilities.py:468
+#: ../raphodo/utilities.py:472
 msgid "five"
 msgstr ""
 
-#: ../raphodo/utilities.py:469
+#: ../raphodo/utilities.py:473
 msgid "six"
 msgstr ""
 
-#: ../raphodo/utilities.py:470
+#: ../raphodo/utilities.py:474
 msgid "seven"
 msgstr ""
 
-#: ../raphodo/utilities.py:471
+#: ../raphodo/utilities.py:475
 msgid "eight"
 msgstr ""
 
-#: ../raphodo/utilities.py:472
+#: ../raphodo/utilities.py:476
 msgid "nine"
 msgstr ""
 
-#: ../raphodo/utilities.py:473
+#: ../raphodo/utilities.py:477
 msgid "ten"
 msgstr ""
 
-#: ../raphodo/utilities.py:474
+#: ../raphodo/utilities.py:478
 msgid "eleven"
 msgstr ""
 
-#: ../raphodo/utilities.py:475
+#: ../raphodo/utilities.py:479
 msgid "twelve"
 msgstr ""
 
-#: ../raphodo/utilities.py:476
+#: ../raphodo/utilities.py:480
 msgid "thirteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:477
+#: ../raphodo/utilities.py:481
 msgid "fourteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:478
+#: ../raphodo/utilities.py:482
 msgid "fifteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:479
+#: ../raphodo/utilities.py:483
 msgid "sixteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:480
+#: ../raphodo/utilities.py:484
 msgid "seventeen"
 msgstr ""
 
-#: ../raphodo/utilities.py:481
+#: ../raphodo/utilities.py:485
 msgid "eighteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:482
+#: ../raphodo/utilities.py:486
 msgid "ninenteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:483
+#: ../raphodo/utilities.py:487
 msgid "twenty"
 msgstr ""
 
+#: ../raphodo/viewutils.py:240
+msgid "&OK"
+msgstr ""
+
+#: ../raphodo/viewutils.py:243
+msgid "&Save"
+msgstr ""
+
+#: ../raphodo/viewutils.py:244
+msgid "&Help"
+msgstr ""
+
+#: ../raphodo/viewutils.py:245
+msgid "Restore Defaults"
+msgstr ""
+
+#: ../raphodo/viewutils.py:246
+msgid "&Yes"
+msgstr ""
+
+#: ../raphodo/viewutils.py:247
+msgid "&No"
+msgstr ""
+
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:1
 msgid ""
 "Rapid Photo Downloader imports photos and videos from cameras, phones, "
@@ -3726,14 +4414,15 @@ msgstr ""
 #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:5
 msgid ""
-"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;"
-"memory;card;"
+"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;memory"
+";card;"
 msgstr ""
 
 #: ../data/kde/net.damonlynch.rapid-photo-downloader.desktop.in.h:1
 msgid "Download Photos and Videos with Rapid Photo Downloader"
 msgstr ""
 
+#, python-format
 #~ msgid "<i>Example: %s</i>"
 #~ msgstr "<i>Przykład: %s</i>"
 
@@ -3747,8 +4436,8 @@ msgstr ""
 #~ "Choose the download folder. Subfolders for the downloaded photos will be "
 #~ "automatically created in this folder using the structure specified below."
 #~ msgstr ""
-#~ "Proszę wybrać katalog pobierania. Podkatalogi dla pobranych zdjęć zostaną "
-#~ "w nim automatycznie utworzone w oparciu o poniższą specyfikację."
+#~ "Proszę wybrać katalog pobierania. Podkatalogi dla pobranych zdjęć zostaną w "
+#~ "nim automatycznie utworzone w oparciu o poniższą specyfikację."
 
 #~ msgid "<b>Download Folder</b>"
 #~ msgstr "<b>Katalog pobierania</b>"
@@ -3834,6 +4523,7 @@ msgstr ""
 #~ msgid "externaldrive2"
 #~ msgstr "dyskzewnętrzny2"
 
+#, python-format
 #~ msgid "About %i seconds remaining"
 #~ msgstr "Pozostało około %i sekund"
 
@@ -3858,6 +4548,7 @@ msgstr ""
 #~ msgid "_Translate this Application..."
 #~ msgstr "_Przetłumacz ten program..."
 
+#, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
 #~ "Destination: %(destination)s"
@@ -3865,6 +4556,7 @@ msgstr ""
 #~ "Źródło: %(source)s\n"
 #~ "Cel: %(destination)s"
 
+#, python-format
 #~ msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 #~ msgstr "Pozostało około %(minutes)i:%(seconds)02i minut"
 
@@ -3889,6 +4581,7 @@ msgstr ""
 #~ msgid "MB/s"
 #~ msgstr "MB/s"
 
+#, python-format
 #~ msgid ""
 #~ "display program information on the command line as the program runs "
 #~ "(default: %default)"
@@ -3899,6 +4592,7 @@ msgstr ""
 #~ msgid "only output errors to the command line"
 #~ msgstr "wyświetlaj jedynie błędy w linii komend"
 
+#, python-format
 #~ msgid "and %s"
 #~ msgstr "oraz %s"
 
@@ -3996,6 +4690,7 @@ msgstr ""
 #~ msgid "Synchronize RAW + JPEG sequence numbers"
 #~ msgstr "Synchronizuj numery sekwencji RAW + JPEG"
 
+#, python-format
 #~ msgid "Source: %(source)s"
 #~ msgstr "Źródło: %(source)s"
 
@@ -4005,6 +4700,7 @@ msgstr ""
 #~ msgid "Remove all Job Codes?"
 #~ msgstr "Usunąć wszystkie kody pracy?"
 
+#, python-format
 #~ msgid "Destination directory could not be created: %(directory)s\n"
 #~ msgstr "Katalog docelowy nie mógł zostać utworzony:  %(directory)s\n"
 
@@ -4020,13 +4716,14 @@ msgstr ""
 #~ msgid "Photo Folders"
 #~ msgstr "Katalogi zdjęć"
 
+#, 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 ""
-#~ "Wprowadzone preferencje podkatalogu %(filetype)s są nieprawidłowe i nie "
-#~ "mogą zostać użyte.\n"
+#~ "Wprowadzone preferencje podkatalogu %(filetype)s są nieprawidłowe i nie mogą "
+#~ "zostać użyte.\n"
 #~ "Zostaną przywrócone ich domyślne wartości."
 
 #~ msgid ""
@@ -4039,6 +4736,7 @@ msgstr ""
 #~ msgid "reset all program settings and preferences and exit"
 #~ msgstr "zresetuj wszystkie ustawienia oraz preferencje programu i zakończ"
 
+#, python-format
 #~ msgid "Backing up to %(path)s"
 #~ msgstr "Tworzenie kopii zapasowej w %(path)s"
 
@@ -4075,8 +4773,8 @@ msgstr ""
 #~ "Choose the download folder. Subfolders for the downloaded videos will be "
 #~ "automatically created in this folder using the structure specified below."
 #~ msgstr ""
-#~ "Proszę wybrać katalog pobierania. Podkatalogi dla pobranych filmów "
-#~ "zostaną w nim automatycznie utworzone w oparciu o poniższą specyfikację."
+#~ "Proszę wybrać katalog pobierania. Podkatalogi dla pobranych filmów zostaną w "
+#~ "nim automatycznie utworzone w oparciu o poniższą specyfikację."
 
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
 #~ msgstr "<span weight=\"bold\" size=\"x-large\">Zmiana nazw filmów</span>\t"
@@ -4106,16 +4804,15 @@ msgstr ""
 #~ "<i><b>Warning:</b> There is insufficient metadata to fully generate "
 #~ "subfolders. Please use other subfolder naming options.</i>"
 #~ msgstr ""
-#~ "<i><b>Ostrzeżenie:</b> Metadane są niewystarczające do pełnego "
-#~ "wygenerowania podkatalogów. Proszę użyć innej opcji określenia nazw "
-#~ "podkatalogów.</i>"
+#~ "<i><b>Ostrzeżenie:</b> Metadane są niewystarczające do pełnego wygenerowania "
+#~ "podkatalogów. Proszę użyć innej opcji określenia nazw podkatalogów.</i>"
 
 #~ msgid ""
 #~ "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 #~ "name. Please use other renaming options.</i>"
 #~ msgstr ""
-#~ "<i><b>Ostrzeżenie:</b> Metadane są niewystarczające do pełnego "
-#~ "wygenerowania nazwy. Proszę użyć innej opcji zmiany nazwy.</i>"
+#~ "<i><b>Ostrzeżenie:</b> Metadane są niewystarczające do pełnego wygenerowania "
+#~ "nazwy. Proszę użyć innej opcji zmiany nazwy.</i>"
 
 #~ msgid "Unmount (\"eject\") device upon download completion"
 #~ msgstr "Odmontuj (\"wysuń\") urządzenie po ukończeniu pobierania"
@@ -4139,6 +4836,7 @@ msgstr ""
 #~ msgid "Select a folder to download videos to"
 #~ msgstr "Wybór katalogu dla pobieranych filmów"
 
+#, python-format
 #~ msgid "Select a folder containing %(file_types)s"
 #~ msgstr "Wybór katalogu zawierającego %(file_types)s"
 
@@ -4146,26 +4844,30 @@ msgstr ""
 #~ "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>"
+#~ "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 ""
 #~ "Proszę określić katalog dla tego urządzenia w którym przechowywana będzie "
 #~ "kopia zapasowa.  \n"
 #~ "\n"
 #~ "<i>Uwaga: zostanie to również wykorzystane do określenia czy urządzenie "
 #~ "będzie używane do tworzenia kopii zapasowych. Proszę utworzyć katalog o "
-#~ "podanej nazwie dla każdego urządzenia, które będzie używane do zapisu "
-#~ "kopii zapasowych.</i>"
+#~ "podanej nazwie dla każdego urządzenia, które będzie używane do zapisu kopii "
+#~ "zapasowych.</i>"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s"
 #~ msgstr "%(number)s z %(total)s plików typu %(filetypes)s"
 
+#, python-format
 #~ msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
+#, python-format
 #~ msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
+#, python-format
 #~ msgid ""
 #~ "%(date)s\n"
 #~ "%(time)s"
@@ -4173,9 +4875,11 @@ msgstr ""
 #~ "%(date)s\n"
 #~ "%(time)s"
 
+#, python-format
 #~ msgid "%(date)s %(time)s"
 #~ msgstr "%(date)s %(time)s"
 
+#, python-format
 #~ msgid "Error: %(inst)s"
 #~ msgstr "Błąd: %(inst)s"
 
@@ -4189,9 +4893,8 @@ msgstr ""
 #~ msgstr "Zaznacz wszystkie _bez kodu pracy"
 
 #~ 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."
+#~ "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 ""
 #~ "Proszę określić działanie w przypadku, gdy zdjęcie lub film o tej samej "
 #~ "nazwie został już pobrany."
@@ -4206,15 +4909,15 @@ msgstr ""
 #~ msgid "Photo has already been downloaded"
 #~ msgstr "Zdjęcie zostało już pobrane"
 
-#~ msgid ""
-#~ "Photos detected with the same filenames, but taken at different times"
+#~ 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"
 
+#, 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)"
+#~ "%(number)s z %(total)s plików typu %(filetypes)s (pozostało: %(remaining)s)"
 
+#, python-format
 #~ msgid "%(freespace)s. %(backuppaths)s."
 #~ msgstr "%(freespace)s. %(backuppaths)s."
 
@@ -4228,30 +4931,38 @@ msgstr ""
 #~ msgid "."
 #~ msgstr "."
 
+#, python-format
 #~ msgid "Folder: %s"
 #~ msgstr "Katalog: %s"
 
+#, python-format
 #~ msgid "%(filetype)s already exists"
 #~ msgstr "%(filetype)s już istnieje"
 
+#, python-format
 #~ msgid "Error: %(errorno)s %(strerror)s"
 #~ msgstr "Błąd: %(errorno)s %(strerror)s"
 
 #~ msgid "The metadata might be corrupt."
 #~ msgstr "Metadane mogą być uszkodzone."
 
+#, python-format
 #~ msgid "%s, "
 #~ msgstr "%s, "
 
+#, python-format
 #~ msgid "%(volume)s, "
 #~ msgstr "%(volume)s, "
 
+#, python-format
 #~ msgid "%(volume)s (%(inst)s), "
 #~ msgstr "%(volume)s (%(inst)s), "
 
+#, python-format
 #~ msgid "%(volumes)s and %(volume)s."
 #~ msgstr "%(volumes)s oraz %(volume)s."
 
+#, python-format
 #~ msgid "%(volumes)s and %(volume)s (%(inst)s)."
 #~ msgstr "%(volumes)s oraz %(volume)s (%(inst)s)."
 
@@ -4261,32 +4972,38 @@ msgstr ""
 #~ msgid "Problems in subfolder and filename generation"
 #~ msgstr "Problemy przy tworzeniu podkatalogów i nazw plików"
 
+#, python-format
 #~ msgid "Problems in %s generation"
 #~ msgstr "Problemy w tworzeniu %s"
 
+#, python-format
 #~ msgid "Problem in %s generation"
 #~ msgstr "Problem w tworzeniu %s"
 
 #~ msgid "Problem in subfolder and filename generation"
 #~ msgstr "Problem w tworzeniu podkatalogu i nazwy pliku"
 
+#, python-format
 #~ msgid ""
 #~ "Photos detected with the same filenames, but taken at different times: "
 #~ "%(details)s"
 #~ msgstr ""
 #~ "Zdjęcia o tej samej nazwie pliku, ale zrobione w innym czasie: %(details)s"
 
+#, python-format
 #~ msgid "%(volumes)s and %(final_volume)s."
 #~ msgstr "%(volumes)s oraz %(final_volume)s."
 
-#~ msgid ""
-#~ "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
+#, python-format
+#~ msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
 #~ msgstr ""
 #~ "%(missing_metadata_elements)s oraz %(final_missing_metadata_element)s."
 
+#, python-format
 #~ msgid "%(previousproblem)s, and %(backinguperror)s"
 #~ msgstr "%(previousproblem)s, oraz %(backinguperror)s"
 
+#, python-format
 #~ msgid "Path: %s"
 #~ msgstr "Ścieżka: %s"
 
@@ -4299,9 +5016,11 @@ msgstr ""
 #~ msgid "Free space:"
 #~ msgstr "Wolne miejsce:"
 
+#, python-format
 #~ msgid "(%(file_type)s)"
 #~ msgstr "(%(file_type)s)"
 
+#, python-format
 #~ msgid "%(free)s %(file_type)s"
 #~ msgstr "%(free)s %(file_type)s"
 
@@ -4326,15 +5045,19 @@ msgstr ""
 #~ msgid "Generate thumbnails (slower)"
 #~ msgstr "Utwórz miniatury (wolniej)"
 
+#, python-format
 #~ msgid "%(file_type)s download folder is not writable"
 #~ msgstr "katalog pobierania %(file_type)s nie jest zapisywalny"
 
+#, python-format
 #~ msgid "%(file_type)s download folder is invalid"
 #~ msgstr "katalog pobierania %(file_type)s jest nieprawidłowy"
 
+#, python-format
 #~ msgid "%(file_type)s download folder does not exist"
 #~ msgstr "katalog pobierania %(file_type)s nie istnieje"
 
+#, python-format
 #~ msgid ""
 #~ "%(problem)s\n"
 #~ "File: %(file)s"
@@ -4342,22 +5065,27 @@ msgstr ""
 #~ "%(problem)s\n"
 #~ "Plik: %(file)s"
 
+#, python-format
 #~ msgid "%(free)s free"
 #~ msgstr "%(free)s wolnego miejsca"
 
+#, python-format
 #~ msgid ""
 #~ "%(filetype)s could not be backed up because no suitable backup locations "
 #~ "were found."
 #~ msgstr ""
-#~ "Nie można utworzyć kopii zapasowej pliku %(filetype)s ponieważ nie udało "
-#~ "się znaleźć właściwego miejsca na kopię."
+#~ "Nie można utworzyć kopii zapasowej pliku %(filetype)s ponieważ nie udało się "
+#~ "znaleźć właściwego miejsca na kopię."
 
+#, python-format
 #~ msgid "%(filetype)s was already downloaded"
 #~ msgstr "Plik %(filetype)s już został pobrany"
 
+#, python-format
 #~ msgid "%(filetype)s metadata cannot be read"
 #~ msgstr "metadane pliku %(filetype)s nie mogą zostać odczytane"
 
+#, python-format
 #~ msgid "An error occurred when copying the %(filetype)s"
 #~ msgstr "Wystąpił błąd przy kopiowaniu %(filetype)s"
 
@@ -4366,12 +5094,14 @@ msgstr ""
 #~ "Wystąpiły błędy podczas tworzenia kopii zapasowej na następujących "
 #~ "nośnikach: "
 
+#, python-format
 #~ msgid "An error occurred when backing up on %(volume)s."
 #~ msgstr "Wystąpił błąd podczas tworzenia kopii zapasowej na %(volume)s."
 
 #~ msgid "Backups already exist in these locations: "
 #~ msgstr "Kopia zapasowa już istnieje w następujących miejscach: "
 
+#, python-format
 #~ msgid "Backup already exists on %(volume)s."
 #~ msgstr "Kopia zapasowa już istnieje na %(volume)s."
 
@@ -4384,6 +5114,7 @@ msgstr ""
 #~ msgid "There were errors backing up"
 #~ msgstr "Wystąpiły błędy podczas tworzenia kopii zapasowej"
 
+#, python-format
 #~ msgid "%(previousproblem)s Additionally, %(newproblem)s"
 #~ msgstr "%(previousproblem)s Dodatkowo, %(newproblem)s"
 
@@ -4399,27 +5130,33 @@ msgstr ""
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Miscellaneous</span>"
 #~ msgstr "<span weight=\"bold\" size=\"x-large\">Różności</span>"
 
+#, python-format
 #~ msgid "Error generating component %s."
 #~ msgstr "Błąd w generowaniu składowej %s."
 
+#, 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."
 
+#, python-format
 #~ msgid ""
-#~ "The existing %(filetype)s was last modified on %(date)s at %(time)s. "
-#~ "Unique identifier '%(identifier)s' added."
+#~ "The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
+#~ "identifier '%(identifier)s' added."
 #~ msgstr ""
 #~ "Istniejący plik %(filetype)s został ostatnio zmodyfikowany %(date)s o "
 #~ "%(time)s. Dodano unikalny identyfikator '%(identifier)s'."
 
+#, python-format
 #~ msgid "%(filetype)s %(area)s could not be generated"
 #~ msgstr "Nie można wygenerować %(filetype)s %(area)s"
 
+#, python-format
 #~ msgid "Date time value %s appears invalid."
 #~ msgstr "Wartość daty %s wydaje się nieprawidłowa."
 
+#, python-format
 #~ msgid "There is no data with which to name the %(filetype)s."
 #~ msgstr "Brak danych aby nazwać %(filetype)s."
 
@@ -4431,86 +5168,92 @@ msgstr ""
 #~ msgid "Backups overwritten on these devices: "
 #~ msgstr "Kopia zapasowa nadpisana na nośnikach: "
 
+#, python-format
 #~ msgid "Backup overwritten on %(volume)s."
 #~ msgstr "Kopia zapasowa nadpisana na %(volume)s."
 
+#, python-format
 #~ msgid "%(filetype)s already exists, but it was backed up"
 #~ msgstr "%(filetype)s już istnieje, ale została utworzona kopia zapasowa"
 
+#, python-format
 #~ msgid " Furthermore, there were %(problems)s."
 #~ msgstr " Oprócz tego wystąpiły %(problems)s."
 
+#, 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."
 
+#, python-format
 #~ msgid " It was backed up to %(volume)s"
 #~ msgstr " Kopia zapasowa została utworzona na %(volume)s"
 
+#, python-format
 #~ msgid " Furthermore, there was a %(problem)s."
 #~ msgstr " Oprócz tego wystąpił %(problem)s."
 
 #~ msgid " It was backed up to these devices: "
 #~ msgstr " Kopia zapasowa została utworzona na nośnikach: "
 
+#, 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."
 
 #~ msgid ""
-#~ "Errors occurred when creating directories on the following backup "
-#~ "devices: "
+#~ "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: "
 
 #~ msgid "_Include in download"
 #~ msgstr "Zaw_rzyj w pobieraniu"
 
+#, python-format
 #~ msgid "%(device)s did not unmount"
 #~ msgstr "Nie odmontowano %(device)s"
 
-#~ msgid ""
-#~ "An error occurred when copying the %(filetype)s, but it was backed up"
+#, 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"
+#~ "Wystąpił błąd podczas kopiowania %(filetype)s, ale została utworzona kopia "
+#~ "zapasowa"
 
 #~ 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."
+#~ "When this option is enabled, and a potential device is detected, you will be "
+#~ "prompted to determine if it should be scanned or not."
 #~ msgstr ""
 #~ "Jeżeli automatyczne wykrywanie przenośnych magazynów danych jest aktywne, "
 #~ "obrazy będą wyszukiwane na całym nośniku. W przypadku nośników o dużych "
 #~ "pojemnościach, może to chwilę potrwać.\n"
 #~ "\n"
-#~ "Jeżeli ta opcja jest zaznaczona, a potencjalne urządzenie zostanie "
-#~ "wykryte, pojawi się komunikat z pytaniem o przeprowadzenie skanowania."
+#~ "Jeżeli ta opcja jest zaznaczona, a potencjalne urządzenie zostanie wykryte, "
+#~ "pojawi się komunikat z pytaniem o przeprowadzenie skanowania."
 
 #~ 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"
+#~ "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>"
+#~ "<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 ""
 #~ "Urządzenia z których można pobrać zdjęcia i filmy, takie jak aparaty "
 #~ "fotograficzne, karty pamięci czy przenośne magazyny danych.\n"
 #~ "\n"
-#~ "Pobieranie może następować z kilku urządzeń jednocześnie, lub z "
-#~ "określonego położenia na dysku.\n"
+#~ "Pobieranie może następować z kilku urządzeń jednocześnie, lub z określonego "
+#~ "położenia na dysku.\n"
 #~ "\n"
-#~ "<i>Pobieranie bezpośrednio z aparatu jest obecnie w fazie "
-#~ "eksperymentalnej. Jeśli pobieranie bezpośrednio z aparatu fotograficznego "
-#~ "działa nieprawidłowo lub wcale, proszę spróbować przestawić go do trybu "
-#~ "PTP. Jeśli nie jest to możliwe, zalecane jest użycie czytnika kart "
-#~ "pamięci.</i>"
+#~ "<i>Pobieranie bezpośrednio z aparatu jest obecnie w fazie eksperymentalnej. "
+#~ "Jeśli pobieranie bezpośrednio z aparatu fotograficznego działa nieprawidłowo "
+#~ "lub wcale, proszę spróbować przestawić go do trybu PTP. Jeśli nie jest to "
+#~ "możliwe, zalecane jest użycie czytnika kart pamięci.</i>"
 
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Device Options</span>"
 #~ msgstr "<span weight=\"bold\" size=\"x-large\">Opcje urządzenia</span>"
@@ -4519,8 +5262,8 @@ msgstr ""
 #~ msgstr "Opcje urządzenia"
 
 #~ msgid ""
-#~ "If you disable automatic detection, choose the exact location of the "
-#~ "photos and videos."
+#~ "If you disable automatic detection, choose the exact location of the photos "
+#~ "and videos."
 #~ msgstr ""
 #~ "W przypadku wyłączenia wykrywania automatycznego, proszę wybrać dokładne "
 #~ "położenie zdjęć i filmów."
@@ -4528,15 +5271,18 @@ msgstr ""
 #~ msgid "Invalid regular expression"
 #~ msgstr "Nieprawidłowe wyrażenie regularne"
 
+#, 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"
 
+#, python-format
 #~ msgid "Backing up photos and videos to %(path)s"
 #~ msgstr "Tworzenie kopii zapasowej zdjęć i filmów w %(path)s"
 
 #~ msgid "Remembered Paths"
 #~ msgstr "Ścieżki pamiętane"
 
+#, python-format
 #~ msgid ""
 #~ "The following regular expressions are invalid, and will be removed unless "
 #~ "you correct them:\n"
@@ -4546,13 +5292,14 @@ msgstr ""
 #~ "nie będą poprawione:\n"
 #~ " %s"
 
+#, python-format
 #~ msgid ""
-#~ "This regular expression is invalid, and will be removed unless you "
-#~ "correct it:\n"
+#~ "This regular expression is invalid, and will be removed unless you correct "
+#~ "it:\n"
 #~ " %s"
 #~ msgstr ""
-#~ "To wyrażenie regularne są niepoprawne, i zostanie usunięte, jeśli nie "
-#~ "będzie poprawione:\n"
+#~ "To wyrażenie regularne są niepoprawne, i zostanie usunięte, jeśli nie będzie "
+#~ "poprawione:\n"
 #~ " %s"
 
 #~ msgid "Select a folder in which to backup photos"
@@ -4574,12 +5321,12 @@ msgstr ""
 #~ msgstr "Czy wszystkie zapamiętane ścieżki powinny zostać usunięte?"
 
 #~ 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."
+#~ "Remembered paths are those associated with devices that you have chosen to "
+#~ "always scan or ignore when automatic detection of Portable Storage Devices "
+#~ "is enabled."
 #~ msgstr ""
-#~ "Zapamiętane ścieżki to te przypisane do urządzeń, które zostały wybrane "
-#~ "do ignorowania lub sprawdzania zawsze, kiedy Automatyczne wykrywanie "
+#~ "Zapamiętane ścieżki to te przypisane do urządzeń, które zostały wybrane do "
+#~ "ignorowania lub sprawdzania zawsze, kiedy Automatyczne wykrywanie "
 #~ "przenośnych magazynów danych jest aktywne."
 
 #~ msgid "Re_move All"
@@ -4590,12 +5337,12 @@ msgstr ""
 
 #~ 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."
+#~ "devices for photos or videos. Any path ending with the values below will not "
+#~ "be scanned."
 #~ msgstr ""
-#~ "Proszę określić końcowy fragment dowolnej ścieżki, która ma być "
-#~ "ignorowana podczas skanowania urządzeń. Każda ścieżka mająca na końcu "
-#~ "poniższe wartości nie będzie skanowana."
+#~ "Proszę określić końcowy fragment dowolnej ścieżki, która ma być ignorowana "
+#~ "podczas skanowania urządzeń. Każda ścieżka mająca na końcu poniższe wartości "
+#~ "nie będzie skanowana."
 
 #~ msgid "Copy"
 #~ msgstr "Skopiuj"
@@ -4616,13 +5363,13 @@ msgstr ""
 #~ msgstr "Automatycznie obracaj obrazy JPEG"
 
 #~ 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>."
+#~ "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 ""
-#~ "Przepraszamy, pobieranie filmów jest wyłączone. Aby pobierać filmy, "
-#~ "należy zainstalować pakiety dla pythona <i>hachoir metadata</i> oraz "
-#~ "<i>kaa metadata</i>, lub <i>exiftool</i>."
+#~ "Przepraszamy, pobieranie filmów jest wyłączone. Aby pobierać filmy, należy "
+#~ "zainstalować pakiety dla pythona <i>hachoir metadata</i> oraz <i>kaa "
+#~ "metadata</i>, lub <i>exiftool</i>."
 
 #~ msgid ""
 #~ "Do you really want to download from here? On some systems, scanning this "
@@ -4634,17 +5381,19 @@ msgstr ""
 #~ msgid "the root of the file system"
 #~ msgstr "katalog główny systemu plików"
 
+#, python-format
 #~ msgid "Downloading from %(location)s."
 #~ msgstr "Pobieranie z %(location)s."
 
+#, python-format
 #~ msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
 #~ msgstr ""
 #~ "wyszukiwanie (znalezionych zdjęć: %(photos)s znalezionych filmów: "
 #~ "%(videos)s)..."
 
 #~ msgid ""
-#~ "manually specify the PATH of the device from which to download, "
-#~ "overwriting existing program preferences"
+#~ "manually specify the PATH of the device from which to download, overwriting "
+#~ "existing program preferences"
 #~ msgstr ""
 #~ "ręcznie określ ścieżkę dostępu do urządzenia z którego ma nastąpić "
 #~ "pobieranie, nadpisując istniejące ustawienia programu"
@@ -4660,8 +5409,8 @@ msgstr ""
 #~ "Error: specify device auto-detection or manually specify a device's path "
 #~ "from which to download, but do not do both."
 #~ msgstr ""
-#~ "Błąd: określ automatyczne wykrywanie urządzeń lub określ ścieżkę dostępu "
-#~ "do urządzenia z którego ma nastąpić pobieranie, ale nie obydwie rzeczy "
+#~ "Błąd: określ automatyczne wykrywanie urządzeń lub określ ścieżkę dostępu do "
+#~ "urządzenia z którego ma nastąpić pobieranie, ale nie obydwie rzeczy "
 #~ "jednocześnie."
 
 #~ msgid "Help"
@@ -4682,20 +5431,25 @@ msgstr ""
 #~ msgid "Refresh"
 #~ msgstr "Odśwież"
 
+#, 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"
 
+#, python-format
 #~ msgid "Backup of %(file_type)s already exists"
 #~ msgstr "Kopia zapasowa %(file_type)s już istnieje"
 
+#, python-format
 #~ msgid "Backup %(file_type)s overwritten"
 #~ msgstr "Nadpisano kopię zapasową %(file_type)s"
 
+#, python-format
 #~ msgid "%(file_type)s not backed up"
 #~ msgstr "%(file_type)s nie ma kopii zapasowej"
 
+#, python-format
 #~ msgid "The %(filetype)s did not download correctly"
 #~ msgstr "Niepoprawne pobranie %(filetype)s"
 
@@ -4710,9 +5464,10 @@ msgstr ""
 #~ "original."
 #~ msgstr "Nieudana weryfikacja plików. Pobrana wersja różni się od oryginału."
 
+#, python-format
 #~ msgid ""
-#~ "File verification failed on %(volume)s. The backed up version is "
-#~ "different from the downloaded version."
+#~ "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."
diff --git a/po/pt.po b/po/pt.po
index 1ca879c..526aa6b 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,35 +7,386 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: damonlynch@gmail.com\n"
-"POT-Creation-Date: 2017-07-08 19:16-0500\n"
-"PO-Revision-Date: 2017-07-04 11:06+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2017-09-12 17:01-0400\n"
+"PO-Revision-Date: 2017-09-13 18:37+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: Portuguese <pt@li.org>\n"
-"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-07-05 23:04+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-09-26 22:04+0000\n"
+"X-Generator: Launchpad (build 18463)\n"
+"Language: pt\n"
+
+#: ../install.py:65
+msgid "Rapid Photo Downloader installer"
+msgstr ""
+
+#: ../install.py:66
+msgid "Download and install latest version of Rapid Photo Downloader."
+msgstr ""
+
+#: ../install.py:236 ../install.py:1732
+msgid "Installer not found:"
+msgstr ""
+
+#. Translators: do not translate the term tar.gz
+#: ../install.py:240 ../install.py:1736
+msgid "Installer not in tar.gz format:"
+msgstr ""
+
+#: ../install.py:465
+msgid ""
+"Incorrect folder ownership detected. Changing ownership of and resetting "
+"permissions for"
+msgstr ""
+
+#: ../install.py:540
+msgid "The following command will be run:"
+msgstr ""
+
+#: ../install.py:543 ../install.py:1479 ../install.py:1484
+msgid "sudo may prompt you for the sudo password."
+msgstr ""
+
+#: ../install.py:547
+msgid "Would you like to run the command now?"
+msgstr ""
+
+#: ../install.py:549
+msgid "Answer is not yes, exiting."
+msgstr ""
+
+#: ../install.py:559 ../install.py:751 ../install.py:966
+msgid "Command failed"
+msgstr ""
+
+#: ../install.py:561 ../install.py:752 ../install.py:967
+msgid "Exiting"
+msgstr ""
+
+#: ../install.py:582
+msgid "The Universe repository must be enabled."
+msgstr ""
+
+#: ../install.py:606
+msgid ""
+"Do you want to to uninstall the previous version of Rapid Photo Downloader:"
+msgstr ""
+
+#: ../install.py:715 ../install.py:740
+msgid ""
+"Querying package system to see if an older version of Rapid Photo Downloader "
+"is installed (this may take a while)..."
+msgstr ""
+
+#: ../install.py:726
+msgid ""
+"Unable to query package system. Please check your Internet connection and "
+"try again"
+msgstr ""
+
+#: ../install.py:756
+msgid "Checking if previous version installed with pip..."
+msgstr ""
+
+#: ../install.py:850
+msgid "The following package is unknown on your system: {}\n"
+msgstr ""
+
+#: ../install.py:857 ../install.py:929 ../install.py:974
+msgid ""
+"To continue, some packages required to run the application will be installed."
+msgstr ""
+
+#: ../install.py:886
+msgid "Querying installed and available packages (this may take a while)"
+msgstr ""
+
+#: ../install.py:958
+msgid ""
+"Querying zypper to see if any required packages are already installed (this "
+"may take a while)... "
+msgstr ""
+
+#: ../install.py:1004
+msgid "Query to confirm action at each step."
+msgstr ""
+
+#: ../install.py:1011
+msgid ""
+"When downloading the latest version, install the development version if it "
+"is newer than the stable version."
+msgstr ""
+
+#: ../install.py:1020
+msgid ""
+"Optional tar.gz Rapid Photo Downloader installer archive. If not specified, "
+"the latest version is downloaded from the Internet."
+msgstr ""
+
+#: ../install.py:1043
+msgid ""
+"Do not run the installer in the tar.gz Rapid Photo Downloader installer "
+"archive if it is newer than this version ({}). The default is to run "
+"whichever installer is newer."
+msgstr ""
+
+#: ../install.py:1050
+msgid ""
+"Uninstall Rapid Photo Downloader that was installed with pip, keeping its "
+"dependencies."
+msgstr ""
+
+#: ../install.py:1054
+msgid ""
+"Uninstall the dependencies installed by pip during Rapid Photo Downloader's "
+"installation, and Rapid Photo Downloader itself, then exit."
+msgstr ""
+
+#: ../install.py:1059
+msgid ""
+"Note: this will not uninstall any version of Rapid Photo Downloader "
+"installed by your Linux distribution's package manager."
+msgstr ""
+
+#: ../install.py:1066
+msgid ""
+"Dependencies will only be removed if they are not required by other programs."
+msgstr ""
+
+#: ../install.py:1072
+msgid ""
+"Note: this option will remove the dependencies regardless of whether they "
+"are required by another program pip has installed. Upgrade to pip 9.0 or "
+"above if you want to avoid this behavior. You can do so using the command "
+"'python3 -m pip install pip -U --user'. Also note that any version of Rapid "
+"Photo Downloader installed by your Linux distribution's package manager will "
+"not be uninstalled."
+msgstr ""
 
-#. type: QPushButton
-#: ../raphodo/aboutdialog.py:217
+#: ../install.py:1122
+msgid "Failed to download versions file"
+msgstr ""
+
+#: ../install.py:1126
+msgid "Got error code {} while accessing versions file"
+msgstr ""
+
+#: ../install.py:1234
+msgid ""
+"Sorry, could not locate installer. Please check your Internet connection and "
+"verify if you can reach https://www.damonlynch.net\n"
+"\n"
+"Exiting.\n"
+msgstr ""
+
+#: ../install.py:1408
+msgid "Installing application requirements..."
+msgstr ""
+
+#: ../install.py:1424
+msgid "Received error code"
+msgstr ""
+
+#: ../install.py:1425
+msgid "Failed to install application requirements: exiting"
+msgstr ""
+
+#: ../install.py:1428
+msgid "Installing application..."
+msgstr ""
+
+#: ../install.py:1441
+msgid "Failed to install application: exiting..."
+msgstr ""
+
+#: ../install.py:1465
+msgid ""
+"You may have to restart the computer to be able to run the program from the "
+"commmand line or application launcher."
+msgstr ""
+
+#: ../install.py:1476
+msgid "Do you want to install the application's man pages?"
+msgstr ""
+
+#: ../install.py:1477
+msgid "They will be installed into {}"
+msgstr ""
+
+#: ../install.py:1478 ../install.py:1483
+msgid "If you uninstall the application, remove these manpages yourself."
+msgstr ""
+
+#: ../install.py:1480
+msgid "Do want to install the man pages?"
+msgstr ""
+
+#: ../install.py:1482
+msgid "Installing man pages into {}"
+msgstr ""
+
+#: ../install.py:1499
+msgid "Failed to create man page directory: exiting"
+msgstr ""
+
+#: ../install.py:1511
+msgid "Failed to copy man page."
+msgstr ""
+
+#: ../install.py:1521
+msgid "(If a segmentation fault occurs at exit, you can ignore it...)"
+msgstr ""
+
+#: ../install.py:1534
+msgid ""
+"The python3 tool pip is required to uninstall a version of Rapid Photo "
+"Downloader that was installed with pip.\n"
+"Cannot continue. Exiting."
+msgstr ""
+
+#: ../install.py:1575
+msgid ""
+"Do not run this installer script as sudo / root user.\n"
+"Run it using the user who will run the program.\n"
+msgstr ""
+
+#: ../install.py:1585 ../install.py:1599
+msgid "Do not include any other command line arguments when specifying"
+msgstr ""
+
+#: ../install.py:1614
+msgid ""
+"Sorry, this installer does not support a custom python installation.\n"
+"Exiting..."
+msgstr ""
+
+#: ../install.py:1620
+msgid "Restarting script using system python..."
+msgstr ""
+
+#: ../install.py:1651
+msgid "Exiting..."
+msgstr ""
+
+#. Translators: do not translate the term python3-apt
+#: ../install.py:1670
+msgid "To continue, the package python3-apt must be installed."
+msgstr ""
+
+#: ../install.py:1689
+msgid ""
+"Install the following packages using your Linux distribution's standard "
+"package manager, and then rerun this installer"
+msgstr ""
+
+#: ../install.py:1698
+msgid ""
+"To run this program, programs to assist Python 3 and its package management "
+"must be installed."
+msgstr ""
+
+#. Translators: do not translate the terms Python 3, pip and setuptools
+#: ../install.py:1713
+msgid "Python 3's pip and setuptools must be upgraded for your user."
+msgstr ""
+
+#. Translators: do not translate the term python or requests
+#: ../install.py:1726
+msgid "Installing python requests"
+msgstr ""
+
+#: ../upgrade.py:79
+msgid "Upgrade Rapid Photo Downloader"
+msgstr ""
+
+#: ../upgrade.py:401 ../raphodo/viewutils.py:242
+msgid "&Cancel"
+msgstr ""
+
+#: ../upgrade.py:405
+msgid "&Upgrade"
+msgstr ""
+
+#: ../upgrade.py:410
+#, python-format
+msgid "Click the Upgrade button to upgrade to version %s."
+msgstr ""
+
+#: ../upgrade.py:413
+msgid "Click the Upgrade button to start the upgrade."
+msgstr ""
+
+#: ../upgrade.py:416 ../upgrade.py:422 ../raphodo/viewutils.py:241
+msgid "&Close"
+msgstr ""
+
+#: ../upgrade.py:417
+msgid "&Run"
+msgstr ""
+
+#: ../upgrade.py:447
+msgid "Close Rapid Photo Downloader before running this upgrade"
+msgstr ""
+
+#: ../upgrade.py:450
+msgid "Upgrade running..."
+msgstr ""
+
+#: ../upgrade.py:486
+#, python-format
+msgid ""
+"Successfully upgraded to %s. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:491
+msgid ""
+"Upgrade finished successfully. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:495
+msgid "Upgrade failed. Click Close to exit."
+msgstr ""
+
+#: ../upgrade.py:6967
+#, python-format
+msgid "Upgrading %s..."
+msgstr ""
+
+#: ../upgrade.py:6969
+msgid "Press any key to continue..."
+msgstr ""
+
+#: ../upgrade.py:6982
+msgid "Rapid Photo Downloader upgrade failed"
+msgstr ""
+
+#: ../upgrade.py:6984
+#, python-format
+msgid ""
+"The python package %s could not be updated. The upgrade cannot continue."
+msgstr ""
+
+#: ../raphodo/aboutdialog.py:225
 msgid "Credits"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:239
+#: ../raphodo/backuppanel.py:240
 msgid "Backups are not configured"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:241
+#: ../raphodo/backuppanel.py:242
 msgid "No backup devices detected"
 msgstr "Nenhum dispositivo de backup detectado"
 
-#: ../raphodo/backuppanel.py:243
+#: ../raphodo/backuppanel.py:244
 msgid "Valid backup locations not yet specified"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:401
+#: ../raphodo/backuppanel.py:404
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
@@ -44,97 +395,106 @@ msgstr ""
 "uma cópia de segurança em vários locais diferentes, como, por exemplo, em "
 "discos rígidos externos."
 
-#: ../raphodo/backuppanel.py:407
+#: ../raphodo/backuppanel.py:412
 msgid "Back up photos and videos when downloading"
 msgstr "Fazer backup de fotografias e vídeos ao transferir"
 
-#: ../raphodo/backuppanel.py:413
+#: ../raphodo/backuppanel.py:418
 msgid "Automatically detect backup devices"
 msgstr "Detectar automaticamente dispositivos de backup"
 
-#: ../raphodo/backuppanel.py:417
+#: ../raphodo/backuppanel.py:424
 msgid ""
-"Specify the folder in which backups are stored on the device."
-"<br><br><i>Note: the presence of a folder with this name is used to "
+"Specify the folder in which backups are stored on the "
+"device.<br><br><i>Note: the presence of a folder with this name is used to "
 "determine if 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 folder names. By "
 "adding both folders, the same device can be used to back up both photos and "
 "videos.</i>"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:428
+#: ../raphodo/backuppanel.py:439
 msgid "Photo folder name:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:433
+#: ../raphodo/backuppanel.py:444
 msgid "Video folder name:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:438 ../raphodo/nameeditor.py:883
+#: ../raphodo/backuppanel.py:449 ../raphodo/nameeditor.py:890
 #: ../raphodo/renamepanel.py:123
 msgid "Example:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:448
-msgid "If you disable automatic detection, choose the exact backup locations."
+#: ../raphodo/backuppanel.py:460
+msgid ""
+"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."
 
-#: ../raphodo/backuppanel.py:452
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:468
 msgid "Photo backup location:"
 msgstr "Local do backup de fotografias:"
 
-#: ../raphodo/backuppanel.py:454
+#: ../raphodo/backuppanel.py:474
 msgid "Select Photo Backup Location"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:460
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:485
 msgid "Video backup location:"
 msgstr "Local do backup de Vídeos:"
 
-#: ../raphodo/backuppanel.py:462
+#: ../raphodo/backuppanel.py:491
 msgid "Select Video Backup Location"
 msgstr ""
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:564
+#: ../raphodo/backuppanel.py:595
 msgid "drive1"
 msgstr ""
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:567
+#: ../raphodo/backuppanel.py:598
 msgid "drive2"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:628
+#: ../raphodo/backuppanel.py:663
 msgid "Projected Backup Storage Use"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:632
+#: ../raphodo/backuppanel.py:669
 msgid "Backup Options"
 msgstr ""
 
 #. translators: refers to the video thumbnail file that some
 #. cameras generate -- it has a .THM file extension
-#: ../raphodo/copyfiles.py:476
+#: ../raphodo/copyfiles.py:491
 msgid "video THM"
 msgstr ""
 
-#: ../raphodo/copyfiles.py:482
+#: ../raphodo/copyfiles.py:497
 msgid "audio"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:78 ../raphodo/devicedisplay.py:1079
-#: ../raphodo/rpdfile.py:321
+#: ../raphodo/rpdfile.py:342
 #, python-format
 msgid "%(no_photos)s Photos"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:82 ../raphodo/devicedisplay.py:1081
-#: ../raphodo/rpdfile.py:316
+#: ../raphodo/rpdfile.py:333
 #, python-format
 msgid "%(no_videos)s Videos"
 msgstr ""
@@ -162,15 +522,15 @@ msgid "%(size_free)s free of %(size_total)s"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:190 ../raphodo/devicedisplay.py:993
-#: ../raphodo/rapid.py:1964 ../raphodo/rapid.py:2079 ../raphodo/rapid.py:5753
-#: ../raphodo/rpdfile.py:905
+#: ../raphodo/rapid.py:2023 ../raphodo/rapid.py:2151 ../raphodo/rapid.py:6043
+#: ../raphodo/rpdfile.py:930
 msgid "Photos"
 msgstr ""
 
 #. translators: the name of the Videos folder
 #: ../raphodo/destinationdisplay.py:191 ../raphodo/devicedisplay.py:994
-#: ../raphodo/rapid.py:1967 ../raphodo/rapid.py:2080 ../raphodo/rapid.py:5754
-#: ../raphodo/rpdfile.py:933 ../raphodo/storage.py:445
+#: ../raphodo/rapid.py:2028 ../raphodo/rapid.py:2152 ../raphodo/rapid.py:6044
+#: ../raphodo/rpdfile.py:958 ../raphodo/storage.py:449
 msgid "Videos"
 msgstr ""
 
@@ -178,7 +538,7 @@ msgstr ""
 msgid "Projected storage use after download"
 msgstr ""
 
-#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:516
+#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:521
 msgid "Custom..."
 msgstr ""
 
@@ -216,57 +576,58 @@ msgstr ""
 msgid "%s full"
 msgstr ""
 
-#: ../raphodo/devices.py:459
+#: ../raphodo/devices.py:463
 msgid "Cameras"
 msgstr ""
 
-#: ../raphodo/devices.py:460 ../raphodo/devices.py:920
-#: ../raphodo/preferencedialog.py:85 ../raphodo/rapid.py:1927
+#: ../raphodo/devices.py:464 ../raphodo/devices.py:927
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/rapid.py:1979
 msgid "Devices"
 msgstr "Dispositivos"
 
-#: ../raphodo/devices.py:720
+#: ../raphodo/devices.py:724
 #, python-format
 msgid "Downloading from %(device_names)s"
 msgstr ""
 
 #. Translators: e.g. Three Devices
-#: ../raphodo/devices.py:780
+#: ../raphodo/devices.py:784
 #, python-format
 msgid "%(no_devices)s %(device_type)s"
 msgstr ""
 
-#: ../raphodo/devices.py:905 ../raphodo/rapid.py:1764
+#: ../raphodo/devices.py:912 ../raphodo/rapid.py:1807
 msgid "Select Source"
 msgstr ""
 
-#: ../raphodo/devices.py:936 ../raphodo/devices.py:947
+#: ../raphodo/devices.py:943 ../raphodo/devices.py:954
 #, python-format
 msgid "%(device1)s + %(device2)s"
 msgstr ""
 
 #. Number of cameras e.g. 3 Cameras
-#: ../raphodo/devices.py:958
+#: ../raphodo/devices.py:965
 #, python-format
 msgid "%(no_cameras)s Cameras"
 msgstr ""
 
-#: ../raphodo/devices.py:963
+#: ../raphodo/devices.py:970
 #, python-format
 msgid "%(no_devices)s Devices"
 msgstr ""
 
 #. Translators: two folder names, separated by a plus sign
-#: ../raphodo/devices.py:1258
+#: ../raphodo/devices.py:1265
 #, python-format
 msgid "%s + %s"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:44
+#: ../raphodo/didyouknow.py:45
 msgid "Click on a file's checkbox to mark or unmark it for download."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:50
+#: ../raphodo/didyouknow.py:51
 msgid ""
 "Files that have already been downloaded are remembered. You can still mark "
 "previously downloaded files to download again, but they are unchecked by "
@@ -274,34 +635,67 @@ msgid ""
 "files that are yet to be downloaded."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:59
+#: ../raphodo/didyouknow.py:60
 msgid ""
 "If more than one file is selected, they'll all take the mark of the file "
 "whose checkbox was clicked, regardless of whether they previously had a "
 "checkmark or not."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:67
+#: ../raphodo/didyouknow.py:68
 msgid ""
 "Click on a device's checkbox to quickly mark or unmark all its files for "
 "downloading."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:74
+#: ../raphodo/didyouknow.py:75
+msgid ""
+"After a download finishes, an icon replaces the thumbnail's checkbox. The "
+"icon's color indicates whether the download was successful (green), had file "
+"renaming problems (yellow/orange), or failed (red)."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:83
+msgid ""
+"\n"
+"            In case of any problems, a red icon will appear at the bottom of "
+"the window\n"
+"            indicating how many error reports there are. Clicking on it "
+"opens the Error Report \n"
+"            window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:91
+msgid ""
+"\n"
+"            The Error Report window lists any problems encountered before, "
+"during or after the \n"
+"            download. An orange triangle represents a warning, a red circle "
+"indicates a failure, \n"
+"            and a black circle indicates more serious failures. You can "
+"click on the hyperlinks to \n"
+"            open its file or device in a file manager. You can also search "
+"the reports using the \n"
+"            search box in the lower left of the Error Report window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:103
 msgid ""
 "You can simultaneously download from multiple cameras, smartphones, memory "
 "cards, and hard drives&mdash;as many devices as your computer can handle at "
 "one time."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:81
+#: ../raphodo/didyouknow.py:110
 msgid ""
 "The <b>Timeline</b> groups photos and videos based on how much time elapsed "
 "between consecutive shots. Use it to identify photos and videos taken at "
 "different periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:88
+#: ../raphodo/didyouknow.py:117
 msgid ""
 "\n"
 "<p>In the illustration above, the first row of the Timeline is black because "
@@ -313,7 +707,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:99
+#: ../raphodo/didyouknow.py:128
 msgid ""
 "To view photos and videos for a particular time range, use the mouse "
 "(optionally in combination with the <tt>Shift</tt> or <tt>Ctrl</tt> keys) to "
@@ -321,20 +715,20 @@ msgid ""
 "the left side of the main window will be highlighted."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:106
+#: ../raphodo/didyouknow.py:135
 msgid ""
 "A download always includes all files that are checked for download, "
 "including those that are not currently displayed because the Timeline is "
 "being used."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:113
+#: ../raphodo/didyouknow.py:142
 msgid ""
 "You can hide or display the download sources by clicking on the name of the "
 "device you're downloading from at the top left of the program window."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:120
+#: ../raphodo/didyouknow.py:149
 msgid ""
 "\n"
 "          Thumbnails can be sorted using a variety of criteria:\n"
@@ -353,33 +747,33 @@ msgid ""
 "</ol> "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:137
+#: ../raphodo/didyouknow.py:166
 msgid ""
 "One of Rapid Photo Downloader's most useful features is its ability to "
 "automatically generate download subfolders and rename files as it downloads, "
 "using a scheme of your choosing."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:143
+#: ../raphodo/didyouknow.py:172
 msgid ""
 "To specify where you want your files downloaded and how you want them named, "
 "open the appropriate panel on the right-side of the application window: "
 "<b>Destination</b>, <b>Rename</b>, or <b>Job Code</b>."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:150
+#: ../raphodo/didyouknow.py:179
 msgid ""
 "\n"
 "When thinking about your download directory structure, keep in mind two "
 "different types\n"
 "of directory:\n"
 "<ol>\n"
-"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, &quot;"
-"Photos&quot;, or\n"
+"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, "
+"&quot;Photos&quot;, or\n"
 "&quot;Videos&quot;. This directory should already exist on your computer. In "
 "the illustration \n"
-"below, the destination folders are &quot;Pictures&quot; and &quot;"
-"Videos&quot;. The\n"
+"below, the destination folders are &quot;Pictures&quot; and "
+"&quot;Videos&quot;. The\n"
 "name of the destination folder is displayed in the grey bar directly above "
 "the folder tree, \n"
 "with a folder icon to its left and a gear icon to its far right.</li>\n"
@@ -392,7 +786,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:167
+#: ../raphodo/didyouknow.py:196
 msgid ""
 "\n"
 "You can download photos and videos to the same destination folder, or "
@@ -405,14 +799,14 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:177
+#: ../raphodo/didyouknow.py:206
 msgid ""
 "Automatically generated download subfolders can contain further "
 "automatically generated subfolders if need be. A common scheme is to create "
 "a year subfolder and then a series of year-month-day subfolders within it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:186
+#: ../raphodo/didyouknow.py:215
 msgid ""
 "\n"
 "Whenever possible, the program previews the download subfolders of photos "
@@ -430,7 +824,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:201
+#: ../raphodo/didyouknow.py:230
 msgid ""
 "\n"
 "Download subfolder names are typically generated using some or all of the "
@@ -454,7 +848,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:219
+#: ../raphodo/didyouknow.py:248
 msgid ""
 "\n"
 "To automatically create download subfolders as you download, \n"
@@ -464,7 +858,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:227
+#: ../raphodo/didyouknow.py:256
 msgid ""
 "\n"
 "Using the drop-down menu, select a built-in preset or click on <b>Custom</b> "
@@ -474,20 +868,20 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:237
+#: ../raphodo/didyouknow.py:266
 msgid ""
 "It's easy to download raw images into one folder, and jpeg images into "
 "another. Simply use the <b>Filename Extension</b> as part of your download "
 "subfolder generation scheme:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:242
+#: ../raphodo/didyouknow.py:271
 msgid ""
 "This illustration shows a saved custom preset named &quot;My custom "
 "preset&quot;."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:246
+#: ../raphodo/didyouknow.py:275
 msgid ""
 "\n"
 "You do not have to create nested download subfolders. This illustration "
@@ -498,7 +892,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:256
+#: ../raphodo/didyouknow.py:285
 msgid ""
 "\n"
 "Although there are many built-in date/time naming options, you may find that "
@@ -512,7 +906,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:265
+#: ../raphodo/didyouknow.py:294
 msgid ""
 "\n"
 "Read more about all the ways you can generate download subfolder names and "
@@ -522,7 +916,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:273
+#: ../raphodo/didyouknow.py:302
 msgid ""
 "\n"
 "<b>Job Codes</b> let you easily enter text that describes sets of photos and "
@@ -534,7 +928,7 @@ msgid ""
 "&quot;Green Bazaar&quot;: \n"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:282
+#: ../raphodo/didyouknow.py:311
 msgid ""
 "\n"
 "You can apply new or existing Job Codes before you start a download. If "
@@ -545,36 +939,36 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:291
+#: ../raphodo/didyouknow.py:320
 msgid "Look for hints to guide you when working with Job Codes:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:295
+#: ../raphodo/didyouknow.py:324
 msgid ""
 "Hints will vary depending on the context, such as when the mouse is hovering "
 "over a button."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:301
+#: ../raphodo/didyouknow.py:330
 msgid ""
 "\n"
 "When you give your photos and videos unique filenames, you'll never be "
 "confused as to \n"
 "which file is which. Using <b>sequence numbers</b> to make filenames unique "
 "is highly \n"
-"recommended!.\n"
+"recommended!\n"
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:309
+#: ../raphodo/didyouknow.py:338
 msgid ""
 "\n"
 "<p>Four types of sequence values are available to help you assign unique "
 "names to your photos and \n"
 "videos:\n"
 "<ol>\n"
-"<li><b>Downloads today</b>: tracks downloads completed during that day.</"
-"li>\n"
+"<li><b>Downloads today</b>: tracks downloads completed during that "
+"day.</li>\n"
 "<li><b>Stored number</b>: similar to Downloads today, but it is remembered "
 "from the last time the  \n"
 "program was run.</li>\n"
@@ -588,7 +982,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:327
+#: ../raphodo/didyouknow.py:356
 msgid ""
 "\n"
 "The <b>Rename</b> panel allows you to configure file renaming. To rename "
@@ -597,7 +991,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:334
+#: ../raphodo/didyouknow.py:363
 msgid ""
 "\n"
 "<p>The <b>Synchronize RAW + JPEG</b> option is useful if you use the RAW + "
@@ -616,7 +1010,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:348
+#: ../raphodo/didyouknow.py:377
 msgid ""
 "\n"
 "You can have your photos and videos backed up to multiple locations as they "
@@ -627,13 +1021,13 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:356
+#: ../raphodo/didyouknow.py:385
 msgid ""
 "In this example, the drive <b>photobackup</b> does not contain a folder "
 "named <tt>Videos</tt>, so videos will not be backed up to it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:362
+#: ../raphodo/didyouknow.py:391
 msgid ""
 "\n"
 "Several of the program's preferences can be set from the command line, "
@@ -644,7 +1038,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:372
+#: ../raphodo/didyouknow.py:396
+msgid "You can also import program preferences from the older 0.4 version."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:401
 msgid ""
 "\n"
 "Rapid Photo Downloader deals with three types of cache:\n"
@@ -654,8 +1052,8 @@ msgid ""
 "memory cards, and other devices.</li>\n"
 "<li>A <b>temporary cache</b> of files downloaded from a camera, one for "
 "photos and another for \n"
-"videos. They are located in temporary subfolders in the download destination."
-"</li>\n"
+"videos. They are located in temporary subfolders in the download "
+"destination.</li>\n"
 "<li>The <b>desktop's thumbnail cache</b>, in which Rapid Photo Downloader "
 "stores thumbnails of \n"
 "RAW and TIFF photos once they have been downloaded. File browsers like Gnome "
@@ -670,23 +1068,23 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:431
+#: ../raphodo/didyouknow.py:460
 msgid "Tip of the Day"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:439
+#: ../raphodo/didyouknow.py:468
 msgid "Did you know...?"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:466
+#: ../raphodo/didyouknow.py:495
 msgid "Show tips on startup"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:470
+#: ../raphodo/didyouknow.py:499
 msgid "&Next"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:471
+#: ../raphodo/didyouknow.py:500
 msgid "&Previous"
 msgstr ""
 
@@ -793,68 +1191,68 @@ msgstr ""
 msgid "%(days)d days, %(hours)d hours"
 msgstr ""
 
-#: ../raphodo/errorlog.py:65
+#: ../raphodo/errorlog.py:66
 msgid "Find"
 msgstr ""
 
-#: ../raphodo/errorlog.py:135
+#: ../raphodo/errorlog.py:136
 msgid "Error Reports - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/errorlog.py:170
+#: ../raphodo/errorlog.py:171
 msgid "Find in reports"
 msgstr ""
 
-#: ../raphodo/errorlog.py:187
+#: ../raphodo/errorlog.py:188
 msgid "Find the previous occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:192
+#: ../raphodo/errorlog.py:193
 msgid "Find the next occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:194
+#: ../raphodo/errorlog.py:195
 msgid "&Highlight All"
 msgstr ""
 
-#: ../raphodo/errorlog.py:195
+#: ../raphodo/errorlog.py:196
 msgid "Highlight all occurrences of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:196
+#: ../raphodo/errorlog.py:197
 msgid "&Match Case"
 msgstr ""
 
-#: ../raphodo/errorlog.py:197
+#: ../raphodo/errorlog.py:198
 msgid "Search with case sensitivity"
 msgstr ""
 
-#: ../raphodo/errorlog.py:198
+#: ../raphodo/errorlog.py:199
 msgid "&Whole Words"
 msgstr ""
 
-#: ../raphodo/errorlog.py:199
+#: ../raphodo/errorlog.py:200
 msgid "Search whole words only"
 msgstr ""
 
-#: ../raphodo/errorlog.py:209 ../raphodo/errorlog.py:341
+#: ../raphodo/errorlog.py:210 ../raphodo/errorlog.py:345
 #, python-format
 msgid "%s of %s matches"
 msgstr ""
 
-#: ../raphodo/errorlog.py:228
+#: ../raphodo/errorlog.py:232
 msgid "Clear"
 msgstr ""
 
-#: ../raphodo/errorlog.py:328
+#: ../raphodo/errorlog.py:332
 msgid "Phrase not found"
 msgstr ""
 
-#: ../raphodo/errorlog.py:487
+#: ../raphodo/errorlog.py:491
 msgid "Search pending..."
 msgstr ""
 
-#: ../raphodo/errorlog.py:535
+#: ../raphodo/errorlog.py:539
 msgid ""
 "The number of new entries added to the Error Report since it was last open. "
 "Click to open the Error Report."
@@ -868,8 +1266,8 @@ msgstr ""
 #, python-brace-format
 msgid ""
 "<b>A problem occurred in Rapid Photo Downloader</b><br><br>\n"
-"    Please report the problem at <a href=\"{website}\">{website}</a>."
-"<br><br>\n"
+"    Please report the problem at <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
 "    Attach the log file <i>{log_file}</i> to your bug report (click\n"
 "    <a href=\"{log_path}\">here</a> to open the log directory).<br><br>If "
 "the same problem occurs\n"
@@ -890,7 +1288,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1601
+#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1643
 msgid "Open in File Browser..."
 msgstr ""
 
@@ -908,531 +1306,531 @@ msgstr ""
 msgid "%s (location does not exist)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:186
+#: ../raphodo/generatenameconfig.py:190
 msgid "Date time"
 msgstr "Data e hora"
 
-#: ../raphodo/generatenameconfig.py:187
+#: ../raphodo/generatenameconfig.py:191
 msgid "Text"
 msgstr "Texto"
 
-#: ../raphodo/generatenameconfig.py:188 ../raphodo/rapid.py:2053
+#: ../raphodo/generatenameconfig.py:192 ../raphodo/rapid.py:2125
 msgid "Filename"
 msgstr "Nome do ficheiro"
 
-#: ../raphodo/generatenameconfig.py:189 ../raphodo/preferencedialog.py:488
+#: ../raphodo/generatenameconfig.py:193 ../raphodo/preferencedialog.py:724
 msgid "Metadata"
 msgstr "Detalhes"
 
-#: ../raphodo/generatenameconfig.py:190
+#: ../raphodo/generatenameconfig.py:194
 msgid "Sequences"
 msgstr "Sequências"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: ../raphodo/generatenameconfig.py:193
+#: ../raphodo/generatenameconfig.py:197
 msgid "Job code"
 msgstr "Etiqueta"
 
-#: ../raphodo/generatenameconfig.py:194
+#: ../raphodo/generatenameconfig.py:198
 msgid "Image date"
 msgstr "Imagem de dados"
 
-#: ../raphodo/generatenameconfig.py:195
+#: ../raphodo/generatenameconfig.py:199
 msgid "Video date"
 msgstr "Dados de vídeo"
 
-#: ../raphodo/generatenameconfig.py:196
+#: ../raphodo/generatenameconfig.py:200
 msgid "Today"
 msgstr "Hoje"
 
-#: ../raphodo/generatenameconfig.py:197
+#: ../raphodo/generatenameconfig.py:201
 msgid "Yesterday"
 msgstr "Ontem"
 
 #. Translators: Download time is the time and date that the download started (when the
 #. user clicked the Download button)
-#: ../raphodo/generatenameconfig.py:200
+#: ../raphodo/generatenameconfig.py:204
 msgid "Download time"
 msgstr "Início da transferência"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:203
+#: ../raphodo/generatenameconfig.py:207
 msgid "Name"
 msgstr "Nome"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:206 ../raphodo/rapid.py:2054
+#: ../raphodo/generatenameconfig.py:210 ../raphodo/rapid.py:2126
 msgid "Extension"
 msgstr "Extensão"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:209
+#: ../raphodo/generatenameconfig.py:213
 msgid "Image number"
 msgstr "Número da imagem"
 
-#: ../raphodo/generatenameconfig.py:210
+#: ../raphodo/generatenameconfig.py:214
 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
-#: ../raphodo/generatenameconfig.py:213
+#: ../raphodo/generatenameconfig.py:217
 msgid "Aperture"
 msgstr "Abertura"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:216
+#: ../raphodo/generatenameconfig.py:220
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:219
+#: ../raphodo/generatenameconfig.py:223
 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
-#: ../raphodo/generatenameconfig.py:222
+#: ../raphodo/generatenameconfig.py:226
 msgid "Focal length"
 msgstr "Distância focal"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:225
+#: ../raphodo/generatenameconfig.py:229
 msgid "Camera make"
 msgstr "Marca da câmara"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:228
+#: ../raphodo/generatenameconfig.py:232
 msgid "Camera model"
 msgstr "Modelo da câmara"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:231
+#: ../raphodo/generatenameconfig.py:235
 msgid "Short camera model"
 msgstr "Modelo de câmara curta"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:234
+#: ../raphodo/generatenameconfig.py:238
 msgid "Hyphenated short camera model"
 msgstr "Modelo hifenizado de câmara curta"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:237
+#: ../raphodo/generatenameconfig.py:241
 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
-#: ../raphodo/generatenameconfig.py:240
+#: ../raphodo/generatenameconfig.py:244
 msgid "Shutter count"
 msgstr "Contagem de Disparos"
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: ../raphodo/generatenameconfig.py:242
+#: ../raphodo/generatenameconfig.py:246
 msgid "File number"
 msgstr "Número de ficheiro"
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:244
+#: ../raphodo/generatenameconfig.py:248
 msgid "Folder only"
 msgstr "Apenas pasta"
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:246
+#: ../raphodo/generatenameconfig.py:250
 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
-#: ../raphodo/generatenameconfig.py:249
+#: ../raphodo/generatenameconfig.py:253
 msgid "Owner name"
 msgstr "Nome do proprietário"
 
-#: ../raphodo/generatenameconfig.py:250
+#: ../raphodo/generatenameconfig.py:254
 msgid "Codec"
 msgstr "Codec"
 
-#: ../raphodo/generatenameconfig.py:251
+#: ../raphodo/generatenameconfig.py:255
 msgid "Width"
 msgstr "Largura"
 
-#: ../raphodo/generatenameconfig.py:252
+#: ../raphodo/generatenameconfig.py:256
 msgid "Height"
 msgstr "Altura"
 
-#: ../raphodo/generatenameconfig.py:253
+#: ../raphodo/generatenameconfig.py:257
 msgid "Length"
 msgstr "Duração"
 
-#: ../raphodo/generatenameconfig.py:254
+#: ../raphodo/generatenameconfig.py:258
 msgid "Frames Per Second"
 msgstr "Quadros por Segundo"
 
-#: ../raphodo/generatenameconfig.py:255
+#: ../raphodo/generatenameconfig.py:259
 msgid "Artist"
 msgstr "Artista"
 
-#: ../raphodo/generatenameconfig.py:256
+#: ../raphodo/generatenameconfig.py:260
 msgid "Copyright"
 msgstr "Direitos de Autor"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:259
+#: ../raphodo/generatenameconfig.py:263
 msgid "Downloads today"
 msgstr "Transferências hoje"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:262
+#: ../raphodo/generatenameconfig.py:266
 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
-#: ../raphodo/generatenameconfig.py:265
+#: ../raphodo/generatenameconfig.py:269
 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
-#: ../raphodo/generatenameconfig.py:268
+#: ../raphodo/generatenameconfig.py:272
 msgid "Stored number"
 msgstr "Número armazenado"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: ../raphodo/generatenameconfig.py:271
+#: ../raphodo/generatenameconfig.py:275
 msgid "Sequence letter"
 msgstr "Sequência de letras"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:274
+#: ../raphodo/generatenameconfig.py:278
 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
-#: ../raphodo/generatenameconfig.py:277
+#: ../raphodo/generatenameconfig.py:281
 msgid "Last digit"
 msgstr "Último dígito"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:280
+#: ../raphodo/generatenameconfig.py:284
 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
-#: ../raphodo/generatenameconfig.py:283
+#: ../raphodo/generatenameconfig.py:287
 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
-#: ../raphodo/generatenameconfig.py:286
+#: ../raphodo/generatenameconfig.py:290
 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
-#: ../raphodo/generatenameconfig.py:289
+#: ../raphodo/generatenameconfig.py:293
 msgid "Original Case"
 msgstr "Caixa Original"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:292
+#: ../raphodo/generatenameconfig.py:296
 msgid "UPPERCASE"
 msgstr "MAIÚSCULAS"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:295
+#: ../raphodo/generatenameconfig.py:299
 msgid "lowercase"
 msgstr "minúsculas"
 
-#: ../raphodo/generatenameconfig.py:296
+#: ../raphodo/generatenameconfig.py:300
 msgid "One digit"
 msgstr "Um dígito"
 
-#: ../raphodo/generatenameconfig.py:297
+#: ../raphodo/generatenameconfig.py:301
 msgid "Two digits"
 msgstr "Dois dígitos"
 
-#: ../raphodo/generatenameconfig.py:298
+#: ../raphodo/generatenameconfig.py:302
 msgid "Three digits"
 msgstr "Três dígitos"
 
-#: ../raphodo/generatenameconfig.py:299
+#: ../raphodo/generatenameconfig.py:303
 msgid "Four digits"
 msgstr "Quatro dígitos"
 
-#: ../raphodo/generatenameconfig.py:300
+#: ../raphodo/generatenameconfig.py:304
 msgid "Five digits"
 msgstr "Cinco dígitos"
 
-#: ../raphodo/generatenameconfig.py:301
+#: ../raphodo/generatenameconfig.py:305
 msgid "Six digits"
 msgstr "Seis dígitos"
 
-#: ../raphodo/generatenameconfig.py:302
+#: ../raphodo/generatenameconfig.py:306
 msgid "Seven digits"
 msgstr "Sete dígitos"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:305
+#: ../raphodo/generatenameconfig.py:309
 msgid "Subseconds"
 msgstr "Subsegundos"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:308 ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:312 ../raphodo/generatenameconfig.py:393
 msgid "YYYYMMDD"
 msgstr "AAAAMMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:311 ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:315 ../raphodo/generatenameconfig.py:394
 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
-#: ../raphodo/generatenameconfig.py:314 ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:318 ../raphodo/generatenameconfig.py:395
 msgid "YYYY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:317
+#: ../raphodo/generatenameconfig.py:321
 msgid "YYMMDD"
 msgstr "AAMMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:320
+#: ../raphodo/generatenameconfig.py:324
 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
-#: ../raphodo/generatenameconfig.py:323
+#: ../raphodo/generatenameconfig.py:327
 msgid "YY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:326
+#: ../raphodo/generatenameconfig.py:330
 msgid "MMDDYYYY"
 msgstr "MMDDAAAA"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:329
+#: ../raphodo/generatenameconfig.py:333
 msgid "MMDDYY"
 msgstr "MMDDAA"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:332
+#: ../raphodo/generatenameconfig.py:336
 msgid "MMDD"
 msgstr "MMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:335
+#: ../raphodo/generatenameconfig.py:339
 msgid "DDMMYYYY"
 msgstr "DDMMAAAA"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:338
+#: ../raphodo/generatenameconfig.py:342
 msgid "DDMMYY"
 msgstr "DDMMAA"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:341 ../raphodo/generatenameconfig.py:389
-#: ../raphodo/generatenameconfig.py:390 ../raphodo/generatenameconfig.py:391
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:345 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:394 ../raphodo/generatenameconfig.py:395
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:397
 msgid "YYYY"
 msgstr "AAAA"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:344
+#: ../raphodo/generatenameconfig.py:348
 msgid "YY"
 msgstr "AA"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:347
+#: ../raphodo/generatenameconfig.py:351
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:350
+#: ../raphodo/generatenameconfig.py:354
 msgid "DD"
 msgstr "DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:353
+#: ../raphodo/generatenameconfig.py:357
 msgid "Month (full)"
 msgstr "Mês (inteiro)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:356
+#: ../raphodo/generatenameconfig.py:360
 msgid "Month (abbreviated)"
 msgstr "Mês (Abreviado)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:359
+#: ../raphodo/generatenameconfig.py:363
 msgid "HHMMSS"
 msgstr "HHMMSS"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:362
+#: ../raphodo/generatenameconfig.py:366
 msgid "HHMM"
 msgstr "HHMM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:365
+#: ../raphodo/generatenameconfig.py:369
 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
-#: ../raphodo/generatenameconfig.py:368
+#: ../raphodo/generatenameconfig.py:372
 msgid "HH-MM"
 msgstr "HH-MM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:371
+#: ../raphodo/generatenameconfig.py:375
 msgid "HH"
 msgstr "HH"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:374
+#: ../raphodo/generatenameconfig.py:378
 msgid "MM (minutes)"
 msgstr "MM (minutos)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:377
+#: ../raphodo/generatenameconfig.py:381
 msgid "SS"
 msgstr "SS"
 
-#: ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:393
 msgid "Date"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:394
 msgid "Date (hyphens)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:395
 msgid "Date (underscores)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:438
-#: ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:442
+#: ../raphodo/generatenameconfig.py:537
 msgid "Date and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392
+#: ../raphodo/generatenameconfig.py:396
 msgid "YYYYMM_Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "Date and Job Code Subfolder"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "YYYYMM"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393 ../raphodo/jobcodepanel.py:198
-#: ../raphodo/nameeditor.py:827 ../raphodo/rapid.py:1809
+#: ../raphodo/generatenameconfig.py:397 ../raphodo/jobcodepanel.py:199
+#: ../raphodo/nameeditor.py:833 ../raphodo/rapid.py:1852
 #: ../raphodo/renamepanel.py:83 ../raphodo/renamepanel.py:241
 msgid "Job Code"
 msgstr "Código de Tarefa"
 
-#: ../raphodo/generatenameconfig.py:433 ../raphodo/generatenameconfig.py:512
+#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:532
 msgid "Original Filename"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "Date-Time and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "YYYYMMDD-HHMM-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "Date and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "YYYYMMDD-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "Date-Time and Image number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "YYYYMMDD-1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "Date-Time and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "YYYYMMDD-HHMM-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:442 ../raphodo/generatenameconfig.py:537
 msgid "YYYYMMDD-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "Date-Time and Video number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "YYYYMMDD_1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "Resolution"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "YYYYMMDD-HHMM-1-1920x1080"
 msgstr ""
 
@@ -1491,76 +1889,77 @@ msgstr ""
 msgid "&Remember this choice"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:185
+#: ../raphodo/jobcodepanel.py:186
 msgid ""
 "Select photos and videos to be able to apply a new or existing Job Code to "
 "them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:186
-msgid "The new Job Code will be applied to all selected photos and/or videos."
+#: ../raphodo/jobcodepanel.py:187
+msgid ""
+"The new Job Code will be applied to all selected photos and/or videos."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:187
+#: ../raphodo/jobcodepanel.py:188
 msgid ""
 "Click the Apply button to apply the current Job Code to all selected photos "
 "and/or videos. You can also simply double click the Job Code."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:189
+#: ../raphodo/jobcodepanel.py:190
 msgid ""
 "Removing a Job Code removes it only from the list of saved Job Codes, not "
 "from any photos or videos that it may have been applied to."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:191
+#: ../raphodo/jobcodepanel.py:192
 msgid ""
 "If you want to use Job Codes, configure file renaming or destination "
 "subfolder names to use them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:197
+#: ../raphodo/jobcodepanel.py:198
 msgid "Last Used"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:202
+#: ../raphodo/jobcodepanel.py:203
 msgid "Job Code Sort:"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:205 ../raphodo/rapid.py:2061
+#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2133
 msgid "Ascending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2062
+#: ../raphodo/jobcodepanel.py:207 ../raphodo/rapid.py:2134
 msgid "Descending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:216
+#: ../raphodo/jobcodepanel.py:217
 msgid "&New..."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:220
+#: ../raphodo/jobcodepanel.py:221
 msgid "&Apply"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:224
+#: ../raphodo/jobcodepanel.py:225
 msgid "&Remove"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:228 ../raphodo/preferencedialog.py:125
-#: ../raphodo/preferencedialog.py:154 ../raphodo/preferencedialog.py:433
+#: ../raphodo/jobcodepanel.py:229 ../raphodo/preferencedialog.py:200
+#: ../raphodo/preferencedialog.py:229 ../raphodo/preferencedialog.py:531
 msgid "Remove All"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:427
+#: ../raphodo/jobcodepanel.py:428
 msgid "Do you really want to remove all the Job Codes?"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:429
+#: ../raphodo/jobcodepanel.py:430
 msgid "Remove all Job Codes"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:492
+#: ../raphodo/jobcodepanel.py:493
 msgid "Job Codes"
 msgstr "Códigos de Tarefa"
 
@@ -1571,42 +1970,58 @@ msgstr "Códigos de Tarefa"
 msgid "<i><b>Hint:</b> %(message)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:418 ../raphodo/nameeditor.py:432
+#: ../raphodo/nameeditor.py:423 ../raphodo/nameeditor.py:437
 #, python-format
 msgid "%(description)s - %(elements)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:512
+#: ../raphodo/nameeditor.py:517
 msgid "Save New Custom Preset..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:513
+#: ../raphodo/nameeditor.py:518
 msgid "Remove All Custom Presets..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:559
+#: ../raphodo/nameeditor.py:564
 msgid "(New Custom Preset)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:576
+#: ../raphodo/nameeditor.py:581
 #, python-format
 msgid "%s (edited)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:579 ../raphodo/nameeditor.py:1370
+#: ../raphodo/nameeditor.py:584 ../raphodo/nameeditor.py:1379
 #, python-format
 msgid "Update Custom Preset \"%s\""
 msgstr ""
 
-#: ../raphodo/nameeditor.py:667
+#: ../raphodo/nameeditor.py:672
 msgid "Save New Custom Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:675
+#: ../raphodo/nameeditor.py:680
 msgid "Preset Name:"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:836
+#: ../raphodo/nameeditor.py:799
+msgid "Photo Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:805
+msgid "Video Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:811
+msgid "Photo Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:817
+msgid "Video Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:842
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>There is insufficient data to "
 "fully generate the name. Please use other renaming options.</i>"
@@ -1615,7 +2030,7 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees.
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:846
+#: ../raphodo/nameeditor.py:853
 #, python-format
 msgid "The character</i> %(separator)s <i>creates a new subfolder level."
 msgstr ""
@@ -1623,50 +2038,50 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:851
+#: ../raphodo/nameeditor.py:858
 #, python-format
 msgid ""
 "There is no need start or end with the folder separator </i> "
 "%(separator)s<i>, because it is added automatically."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:859
+#: ../raphodo/nameeditor.py:866
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>Unique filenames may not be "
 "generated. Make filenames unique by using Sequence values.</i>"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:882 ../raphodo/renamepanel.py:121
+#: ../raphodo/nameeditor.py:889 ../raphodo/renamepanel.py:121
 msgid "Preset:"
 msgstr ""
 
 #. Translators: appears in a combobox, e.g. Image Date (YYYY)
-#: ../raphodo/nameeditor.py:959 ../raphodo/nameeditor.py:980
+#: ../raphodo/nameeditor.py:966 ../raphodo/nameeditor.py:987
 #, python-brace-format
 msgid "{choice} ({variant})"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1005 ../raphodo/preferencedialog.py:530
+#: ../raphodo/nameeditor.py:1012 ../raphodo/preferencedialog.py:783
 msgid "Get help online..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1025
+#: ../raphodo/nameeditor.py:1034
 msgid "Insert"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1351
+#: ../raphodo/nameeditor.py:1360
 msgid "Save Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1356
+#: ../raphodo/nameeditor.py:1365
 msgid ""
-"<b>Do you want to save the changes in a new custom preset?</"
-"b><br><br>Creating a custom preset is not required, but can help you keep "
-"organized.<br><br>The changes to the preferences will still be applied "
-"regardless of whether you create a new custom preset or not."
+"<b>Do you want to save the changes in a new custom "
+"preset?</b><br><br>Creating a custom preset is not required, but can help "
+"you keep organized.<br><br>The changes to the preferences will still be "
+"applied regardless of whether you create a new custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1365
+#: ../raphodo/nameeditor.py:1374
 msgid ""
 "<b>Do you want to save the changes in a custom preset?</b><br><br>If you "
 "like, you can create a new custom preset or update the existing custom "
@@ -1674,136 +2089,167 @@ msgid ""
 "regardless of whether you save a custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1372
+#: ../raphodo/nameeditor.py:1381
 msgid "Save New Custom Preset"
 msgstr ""
 
-#: ../raphodo/newversion.py:306
+#: ../raphodo/newversion.py:312
 msgid "Checking for new version..."
 msgstr ""
 
-#: ../raphodo/newversion.py:307
+#: ../raphodo/newversion.py:313
 msgid "You are running the latest version."
 msgstr ""
 
-#: ../raphodo/newversion.py:308
+#: ../raphodo/newversion.py:314
 msgid "Failed to contact the update server."
 msgstr ""
 
-#: ../raphodo/newversion.py:310
+#: ../raphodo/newversion.py:316
 #, python-format
 msgid "A new version of Rapid Photo Downloader (%s) is available."
 msgstr ""
 
-#: ../raphodo/newversion.py:312
+#: ../raphodo/newversion.py:318
 msgid "Do you want to download the new version?"
 msgstr ""
 
-#: ../raphodo/newversion.py:313
+#: ../raphodo/newversion.py:319
 #, python-format
 msgid "Changes in the new release can be viewed <a href=\"%s\">here</a>."
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the s key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:340 ../raphodo/newversion.py:353
+#: ../raphodo/newversion.py:348 ../raphodo/newversion.py:363
 msgid "&Skip this release"
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the o key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:356
+#: ../raphodo/newversion.py:366
 msgid "&Open Download Page"
 msgstr ""
 
-#: ../raphodo/newversion.py:376
+#: ../raphodo/newversion.py:386
 msgid "Rapid Photo Downloader updates"
 msgstr ""
 
 #. Translators: shows how much of a file has been downloaded e.g  123 KB of 1.3 MB
-#: ../raphodo/newversion.py:478
+#: ../raphodo/newversion.py:488
 #, python-format
 msgid "%(downloaded)s of %(total)s"
 msgstr ""
 
-#: ../raphodo/newversion.py:495
+#: ../raphodo/newversion.py:507
 msgid "Downloading..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:76
+#: ../raphodo/preferencedialog.py:86
 msgid "Preferences"
 msgstr "Definições"
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Automation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Thumbnails"
 msgstr "Miniaturas"
 
-#: ../raphodo/preferencedialog.py:85 ../raphodo/preferencedialog.py:343
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/preferencedialog.py:428
 msgid "Error Handling"
 msgstr "Gestão de Erros"
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:109
+msgid "Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:109 ../raphodo/preferencedialog.py:119
 msgid "Miscellaneous"
 msgstr "Vários"
 
-#: ../raphodo/preferencedialog.py:94
+#: ../raphodo/preferencedialog.py:147
 msgid "Device Scanning"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:96
+#: ../raphodo/preferencedialog.py:148
 msgid "Scan only external devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:98
+#: ../raphodo/preferencedialog.py:150
 msgid ""
 "Scan for photos and videos only on devices that are external to the "
 "computer,\n"
 "including cameras, memory cards, external hard drives, and USB flash drives."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:102
-msgid "Scan non-camera devices lacking a DCIM folder"
+#: ../raphodo/preferencedialog.py:153
+msgid "Scan only specific folders on devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:104
+#: ../raphodo/preferencedialog.py:155
 msgid ""
-"Scan the entirety of a device for photos and videos, irrespective of whether "
-"it contains a DCIM folder,\n"
-"as opposed to only scanning within a DCIM folder.\n"
+"Scan for photos and videos only in the folders specified below (except "
+"paths\n"
+"specified in Ignored Paths).\n"
 "\n"
-"Changing this setting causes all devices to be scanned again.\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:161
+msgid "Folders to scan:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:164
+msgid ""
+"Folders at the base level of device file systems that will be scanned\n"
+"for photos and videos."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:167 ../raphodo/preferencedialog.py:219
+msgid "Add..."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:169
+msgid ""
+"Add a folder to the list of folders to scan for photos and videos.\n"
 "\n"
-"Note: With cameras, only the DCIM folder is scanned."
+"Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:116
+#: ../raphodo/preferencedialog.py:172 ../raphodo/preferencedialog.py:198
+#: ../raphodo/preferencedialog.py:224 ../raphodo/preferencedialog.py:529
+msgid "Remove"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:174
+msgid ""
+"Remove a folder from the list of folders to scan for photos and videos.\n"
+"\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:191
 msgid "Devices that have been set to automatically ignore or download from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:117
+#: ../raphodo/preferencedialog.py:192
 msgid "Remembered Devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:121
+#: ../raphodo/preferencedialog.py:196
 msgid ""
 "Remove a device from the list of devices to automatically ignore or download "
 "from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:123 ../raphodo/preferencedialog.py:149
-#: ../raphodo/preferencedialog.py:431
-msgid "Remove"
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:127
+#: ../raphodo/preferencedialog.py:202
 msgid ""
 "Clear the list of devices from which to automatically ignore or download "
 "from.\n"
@@ -1811,315 +2257,436 @@ msgid ""
 "Note: Changes take effect when the computer is next scanned for devices."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:140
+#: ../raphodo/preferencedialog.py:215
 msgid "Ignored Paths"
 msgstr "Caminhos Ignorados"
 
-#: ../raphodo/preferencedialog.py:141
+#: ../raphodo/preferencedialog.py:216
 msgid ""
 "The end part of a path that should never be scanned for photos or videos."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:144
-msgid "Add..."
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:146
+#: ../raphodo/preferencedialog.py:221
 msgid ""
 "Add a path to the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:151
+#: ../raphodo/preferencedialog.py:226
 msgid ""
 "Remove a path from the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:156
+#: ../raphodo/preferencedialog.py:231
 msgid ""
 "Clear the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:164
+#: ../raphodo/preferencedialog.py:239
 msgid ""
-"Use python-style <a href=\"http://damonlynch.net/rapid/documentation/"
-"#regularexpressions\">regular expressions</a>"
+"Use python-style <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">regula"
+"r expressions</a>"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:168
+#: ../raphodo/preferencedialog.py:243
 msgid ""
 "Use regular expressions in the list of ignored paths.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:208
+#: ../raphodo/preferencedialog.py:283
 msgid "Program Automation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:209
+#: ../raphodo/preferencedialog.py:284
 msgid "Start downloading at program startup"
 msgstr "Iniciar a transferência após o início do programa"
 
-#: ../raphodo/preferencedialog.py:210
+#: ../raphodo/preferencedialog.py:285
 msgid "Start downloading upon device insertion"
 msgstr "Iniciar a transferência ao conectar o dispositivo"
 
-#: ../raphodo/preferencedialog.py:211
+#: ../raphodo/preferencedialog.py:286
 msgid "Unmount (eject) device upon download completion"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:212
+#: ../raphodo/preferencedialog.py:287
 msgid "Exit program when download completes"
 msgstr "Sair do programa quando a transferência terminar"
 
-#: ../raphodo/preferencedialog.py:213
+#: ../raphodo/preferencedialog.py:288
 msgid "Exit program even if download had warnings or errors"
 msgstr "Sair do programa mesmo que o download tivesse avisos ou erros"
 
-#: ../raphodo/preferencedialog.py:240
+#: ../raphodo/preferencedialog.py:315
 msgid "Thumbnail Generation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:241
+#: ../raphodo/preferencedialog.py:316
 msgid "Generate thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:242
+#: ../raphodo/preferencedialog.py:318
 msgid "Generate thumbnails to show in the main program window"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:244
+#: ../raphodo/preferencedialog.py:320
 msgid "Cache thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:245
+#: ../raphodo/preferencedialog.py:323
 msgid ""
 "Save thumbnails shown in the main program window in a thumbnail cache unique "
 "to Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:247
+#: ../raphodo/preferencedialog.py:327
 msgid "Generate system thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:248
+#: ../raphodo/preferencedialog.py:330
 msgid ""
 "While downloading, save thumbnails that can be used by desktop file managers "
 "and other programs"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:255
+#: ../raphodo/preferencedialog.py:339
 msgid "Number of CPU cores used to generate thumbnails."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:256
+#: ../raphodo/preferencedialog.py:340
 msgid "CPU cores:"
 msgstr ""
 
 #. Translators: the * acts as an asterisk to denote a reference to an annotation
 #. such as '* Takes effect upon program restart'
-#: ../raphodo/preferencedialog.py:271 ../raphodo/preferencedialog.py:317
+#: ../raphodo/preferencedialog.py:355 ../raphodo/preferencedialog.py:401
 msgid "*"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:294
+#: ../raphodo/preferencedialog.py:378
 msgid "Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:296
+#: ../raphodo/preferencedialog.py:380
 msgid "Calculating..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:302
+#: ../raphodo/preferencedialog.py:386
 msgid "days"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:303
+#: ../raphodo/preferencedialog.py:387
 msgid "forever"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:308
+#: ../raphodo/preferencedialog.py:392
 msgid "Cache size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:310
+#: ../raphodo/preferencedialog.py:394
 msgid "Number of thumbnails:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:312
+#: ../raphodo/preferencedialog.py:396
 msgid "Database size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:314
+#: ../raphodo/preferencedialog.py:398
 msgid "Cache unaccessed thumbnails for:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:322
+#: ../raphodo/preferencedialog.py:406
 msgid "Purge Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:323
+#: ../raphodo/preferencedialog.py:408
 msgid "Optimize Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:336
+#: ../raphodo/preferencedialog.py:421
 msgid "* Takes effect upon program restart"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:346
+#: ../raphodo/preferencedialog.py:431
 msgid "Skip download"
 msgstr "Ignorar transferência"
 
-#: ../raphodo/preferencedialog.py:347
+#: ../raphodo/preferencedialog.py:432
 msgid "Don't download the file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:348
+#: ../raphodo/preferencedialog.py:433
 msgid "Add unique identifier"
 msgstr "Adicionar um identificador único"
 
-#: ../raphodo/preferencedialog.py:349
+#: ../raphodo/preferencedialog.py:436
 msgid ""
 "Add an identifier like _1 or _2 to the end of the filename, immediately "
 "before the file's extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:355
+#: ../raphodo/preferencedialog.py:444
 msgid "Overwrite"
 msgstr "Sobrescrever"
 
-#: ../raphodo/preferencedialog.py:356
+#: ../raphodo/preferencedialog.py:445
 msgid "Overwrite the previously backed up file"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:357
+#: ../raphodo/preferencedialog.py:446
 msgid "Skip"
 msgstr "Ignorar"
 
-#: ../raphodo/preferencedialog.py:358
+#: ../raphodo/preferencedialog.py:448
 msgid "Don't overwrite the backup file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:364
+#: ../raphodo/preferencedialog.py:455
 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 identifier:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:378
+#: ../raphodo/preferencedialog.py:464
+msgid ""
+"Using sequence numbers to automatically generate unique filenames is "
+"strongly recommended. Configure file renaming in the Rename panel in the "
+"main window."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:473
 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 ""
 
-#: ../raphodo/preferencedialog.py:398
+#: ../raphodo/preferencedialog.py:494
 msgid "Program Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:399
+#: ../raphodo/preferencedialog.py:495
 msgid "Show a warning when:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:402
+#: ../raphodo/preferencedialog.py:498
 msgid "Downloading files currently not displayed"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:403
+#: ../raphodo/preferencedialog.py:499
 msgid ""
 "Warn when about to download files that are not displayed in the main window."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:405
+#: ../raphodo/preferencedialog.py:501
 msgid "Backup destinations are missing"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:406
-msgid "Warn before starting a download if it is not possible to back up files."
+#: ../raphodo/preferencedialog.py:502
+msgid ""
+"Warn before starting a download if it is not possible to back up files."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:408
+#: ../raphodo/preferencedialog.py:504
 msgid "Program libraries are missing or broken"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:409
+#: ../raphodo/preferencedialog.py:505
 msgid ""
 "Warn if a software library used by Rapid Photo Downloader is missing or not "
 "functioning."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:412
+#: ../raphodo/preferencedialog.py:508
 msgid "Filesystem metadata cannot be set"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:413
+#: ../raphodo/preferencedialog.py:509
 msgid ""
 "Warn if there is an error setting a file's filesystem metadata, such as its "
 "modification time."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:416
+#: ../raphodo/preferencedialog.py:512
 msgid "Encountering unhandled files"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:417
+#: ../raphodo/preferencedialog.py:513
 msgid ""
 "Warn after scanning a device or this computer if there are unrecognized "
 "files that will not be included in the download."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:420
+#: ../raphodo/preferencedialog.py:517
 msgid "Do not warn about unhandled files with extensions:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:424
+#: ../raphodo/preferencedialog.py:522
 msgid ""
 "File extensions are case insensitive and do not need to include the leading "
 "dot."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:427
+#: ../raphodo/preferencedialog.py:525
 msgid "Add"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:428
+#: ../raphodo/preferencedialog.py:526
 msgid ""
 "Add a file extension to the list of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:430
+#: ../raphodo/preferencedialog.py:528
 msgid ""
 "Remove a file extension from the list of unhandled file types to not warn "
 "about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:434
+#: ../raphodo/preferencedialog.py:532
 msgid ""
 "Clear the list of file extensions of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:469
+#: ../raphodo/preferencedialog.py:568
+msgid "Photo and Video Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:571
+msgid "Consolidate files across devices and downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:574
+msgid ""
+"Analyze the results of device scans looking for duplicate files and matching "
+"RAW and JPEG pairs,\n"
+"comparing them across multiple devices and download sessions."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:580
+msgid "Treat matching RAW and JPEG files as:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:581
+msgid "One photo"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:582
+msgid "Two photos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:584
+msgid ""
+"Display matching pairs of RAW and JPEG photos as one photo, and if marked, "
+"download both."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:589
+msgid ""
+"Display matching pairs of RAW and JPEG photos as two different photos. You "
+"can still synchronize their sequence numbers."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:598
+msgid "With matching RAW and JPEG photos:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:600
+msgid "Do not mark JPEG for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:601
+msgid "Do not mark RAW for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:602
+msgid "Mark both for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:609
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"JPEG for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:614
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"RAW for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:619
+msgid ""
+"When matching RAW and JPEG photos are found, automatically mark both for "
+"download."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:625
+msgid ""
+"If you disable file consolidation, choose what to do when a download device "
+"is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:631
+msgid ""
+"When a download device is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:642
+msgid "Clear completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:643
+msgid "Keep displaying completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:644
+msgid "Prompt for what to do"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:649
+msgid ""
+"Automatically clear the display of completed downloads whenever a new "
+"download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:654
+msgid ""
+"Keep displaying completed downloads whenever a new download device is "
+"inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:658
+msgid ""
+"Prompt whether to keep displaying completed downloads or clear them whenever "
+"a new download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:702
 msgid "Version Check"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:470
+#: ../raphodo/preferencedialog.py:703
 msgid "Check for new version at startup"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:471
+#: ../raphodo/preferencedialog.py:705
 msgid "Check for a new version of the program each time the program starts."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:473
+#: ../raphodo/preferencedialog.py:707
 msgid "Include development releases"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:474
+#: ../raphodo/preferencedialog.py:709
 msgid ""
 "Include alpha, beta and other development releases when checking for a new "
 "version of the program.\n"
@@ -2128,11 +2695,11 @@ msgid ""
 "occur."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:489
+#: ../raphodo/preferencedialog.py:725
 msgid "Ignore DNG date/time metadata on MTP devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:490
+#: ../raphodo/preferencedialog.py:727
 msgid ""
 "Ignore date/time metadata in DNG files located on MTP devices, and use the "
 "file's modification time instead.\n"
@@ -2141,70 +2708,86 @@ msgid ""
 "metadata."
 msgstr ""
 
+#: ../raphodo/preferencedialog.py:741
+msgid "Completed Downloads"
+msgstr ""
+
 #. Translators: substituted value is a description for the set of preferences
 #. shown in the preference dialog window, e.g. Devices, Automation, etc.
 #. This string is shown in a tooltip for the "Restore Defaults" button
-#: ../raphodo/preferencedialog.py:710
+#: ../raphodo/preferencedialog.py:1067
 #, python-format
 msgid "Restores default %s preference values"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:832
+#: ../raphodo/preferencedialog.py:1208
 msgid ""
 "Do you want to purge the thumbnail cache? The cache will be purged when the "
 "program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:835
+#: ../raphodo/preferencedialog.py:1212
 msgid "Purge Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:847
+#: ../raphodo/preferencedialog.py:1225
 msgid ""
 "Do you want to optimize the thumbnail cache? The cache will be optimized "
 "when the program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:850
+#: ../raphodo/preferencedialog.py:1229
 msgid "Optimize Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1045
+#: ../raphodo/preferencedialog.py:1481
+msgid "Enter a Folder to Scan"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1482
+msgid "Specify a folder that will be scanned for photos and videos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1483
+msgid "Folder:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1497
 msgid "Enter a Path to Ignore"
 msgstr "Introduza um Caminho a ser Ignorado"
 
-#: ../raphodo/preferencedialog.py:1046
+#: ../raphodo/preferencedialog.py:1498
 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"
 
-#: ../raphodo/preferencedialog.py:1047
+#: ../raphodo/preferencedialog.py:1499
 msgid "Path:"
 msgstr "Caminho:"
 
-#: ../raphodo/preferencedialog.py:1061
+#: ../raphodo/preferencedialog.py:1513
 msgid "Enter a File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1062
+#: ../raphodo/preferencedialog.py:1514
 msgid "Specify a file extension (without the leading dot)"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1063 ../raphodo/renamepanel.py:122
+#: ../raphodo/preferencedialog.py:1515 ../raphodo/renamepanel.py:122
 msgid "Extension:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1078
+#: ../raphodo/preferencedialog.py:1530
 msgid "Invalid File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1079
+#: ../raphodo/preferencedialog.py:1531
 #, python-format
 msgid ""
 "The file extension <b>%s</b> is recognized by Rapid Photo Downloader, so it "
 "makes no sense to warn about its presence."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1081
+#: ../raphodo/preferencedialog.py:1533
 #, python-format
 msgid ""
 "Recognized file types:\n"
@@ -2230,104 +2813,103 @@ msgstr ""
 msgid "Birthday"
 msgstr ""
 
-#: ../raphodo/preferences.py:614
+#: ../raphodo/preferences.py:624
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Preferências de subpasta não devem começar com %s"
 
-#: ../raphodo/preferences.py:617
+#: ../raphodo/preferences.py:627
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Preferências de subpasta não devem terminar com %s"
 
-#: ../raphodo/preferences.py:622
+#: ../raphodo/preferences.py:632
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr "Preferências de subpasta não devem conter dois %s um após o outro"
 
-#. self.setFlat(True)
 #: ../raphodo/primarybutton.py:72
 msgid "Download 8 Photos and 10 Videos"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:86 ../raphodo/problemnotification.py:208
+#: ../raphodo/problemnotification.py:87 ../raphodo/problemnotification.py:209
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:89
+#: ../raphodo/problemnotification.py:90
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:116
+#: ../raphodo/problemnotification.py:117
 #, python-format
 msgid "GPhoto2 Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:124
+#: ../raphodo/problemnotification.py:125
 msgid ""
 "Unable to initialize the camera, probably because another program is using "
 "it. No files were copied from it."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:134
+#: ../raphodo/problemnotification.py:135
 #, python-format
 msgid "Unable to read directory %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:140
+#: ../raphodo/problemnotification.py:141
 #, python-format
 msgid "Unable to access modification time or size from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:146
+#: ../raphodo/problemnotification.py:147
 #, python-format
 msgid "Unable to read file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:152
+#: ../raphodo/problemnotification.py:153
 #, python-format
 msgid "Unable to write file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:158
+#: ../raphodo/problemnotification.py:159
 #, python-format
 msgid "Unable to move file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:164
+#: ../raphodo/problemnotification.py:165
 #, python-format
 msgid "Unable to remove file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:170
+#: ../raphodo/problemnotification.py:171
 #, python-format
 msgid "Unable to copy file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:176
+#: ../raphodo/problemnotification.py:177
 #, python-format
 msgid "Zero length file %s will not be downloaded"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:182
+#: ../raphodo/problemnotification.py:183
 #, python-format
 msgid "Could not determine filesystem modification time for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:188
+#: ../raphodo/problemnotification.py:189
 #, python-format
 msgid "Unable to load metadata from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:194
+#: ../raphodo/problemnotification.py:195
 #, python-format
 msgid ""
 "Unable to load metadata from %(name)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:202
+#: ../raphodo/problemnotification.py:203
 #, python-format
 msgid ""
 "An error occurred setting a file's filesystem metadata on the filesystem %s. "
@@ -2335,78 +2917,78 @@ msgid ""
 "again."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:216
+#: ../raphodo/problemnotification.py:217
 #, python-format
 msgid "Encountered unhandled file %s. It will not be downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:223
+#: ../raphodo/problemnotification.py:224
 #, python-format
 msgid "%(filetype)s %(destination)s already exists."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:234 ../raphodo/problemnotification.py:262
+#: ../raphodo/problemnotification.py:235 ../raphodo/problemnotification.py:263
 #, python-format
 msgid ""
 "The existing %(filetype)s %(destination)s was last modified on %(date)s at "
 "%(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:245
+#: ../raphodo/problemnotification.py:246
 #, python-format
 msgid "The %(filetype)s %(source)s was not downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:273
+#: ../raphodo/problemnotification.py:274
 #, python-format
 msgid "The %(filetype)s %(source)s was downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:282
+#: ../raphodo/problemnotification.py:283
 #, python-format
 msgid "The unique identifier '%s' was added to the filename."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:298
+#: ../raphodo/problemnotification.py:299
 #, python-format
 msgid ""
 "The existing backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:309
+#: ../raphodo/problemnotification.py:310
 #, python-format
 msgid "The %(filetype)s %(source)s was not backed up from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:326
+#: ../raphodo/problemnotification.py:327
 #, python-format
 msgid ""
 "The previous backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:337
+#: ../raphodo/problemnotification.py:338
 #, python-format
 msgid ""
 "The %(filetype)s %(source)s from %(device)s was backed up, overwriting the "
 "previous backup %(filetype)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:356
+#: ../raphodo/problemnotification.py:357
 #, python-format
 msgid ""
 "When synchronizing RAW + JPEG sequence values, a duplicate %(filetype)s "
 "%(file)s was encountered, and was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:366
+#: ../raphodo/problemnotification.py:367
 msgid ""
 "When synchronizing RAW + JPEG sequence values, photos were detected with the "
 "same filenames, but taken at different times:"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:373
+#: ../raphodo/problemnotification.py:374
 #, python-format
 msgid ""
 "%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
@@ -2415,134 +2997,134 @@ msgstr ""
 "%(image1)s foi tirada em %(image1_date)s em %(image1_time)s, e %(image2)s em "
 "%(image2_date)s em %(image2_time)s."
 
-#: ../raphodo/problemnotification.py:389
+#: ../raphodo/problemnotification.py:390
 #, python-format
 msgid "Unable to finalize the filename for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:424
+#: ../raphodo/problemnotification.py:425
 #, python-format
 msgid ""
 "The filename %(destination)s was not fully generated for %(filetype)s "
 "%(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:433
+#: ../raphodo/problemnotification.py:434
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr "Os metadados %(type)s estão em falta."
 
-#: ../raphodo/problemnotification.py:439
+#: ../raphodo/problemnotification.py:440
 #, python-format
 msgid "The following metadata is missing: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:445
+#: ../raphodo/problemnotification.py:446
 #, python-format
 msgid "Date/time conversion failed: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:451
+#: ../raphodo/problemnotification.py:452
 msgid ""
 "Could not extract valid date/time metadata or determine the file "
 "modification time."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:457
+#: ../raphodo/problemnotification.py:458
 msgid "Filename does not have an extension."
 msgstr "Nome do arquivo não tem extensão."
 
-#: ../raphodo/problemnotification.py:460
+#: ../raphodo/problemnotification.py:461
 msgid "Filename does not have a number component."
 msgstr "Nome do arquivo não tem um componente número."
 
-#: ../raphodo/problemnotification.py:464
+#: ../raphodo/problemnotification.py:465
 #, python-format
 msgid "Error generating component %(component)s. Error: %(error)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:477
+#: ../raphodo/problemnotification.py:478
 #, python-format
 msgid ""
 "The download subfolders %(folder)s were only partially generated for "
 "%(filetype)s %(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:486
+#: ../raphodo/problemnotification.py:487
 #, python-format
 msgid ""
 "There is no data with which to generate the %(subfolder_file)s for "
 "%(filename)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:499
+#: ../raphodo/problemnotification.py:500
 #, python-format
 msgid ""
 "Unable to create the %(filetype)s %(destination)s in %(folder)s. The "
 "download file was %(source)s in %(device)s. It was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:514
+#: ../raphodo/problemnotification.py:515
 #, python-format
 msgid "Unable to create the download subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:526
+#: ../raphodo/problemnotification.py:527
 #, python-format
 msgid "Unable to create the backup subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:577
+#: ../raphodo/problemnotification.py:578
 #, python-format
 msgid "Problems scanning %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:584
+#: ../raphodo/problemnotification.py:585
 #, python-format
 msgid "Problems copying from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:591
+#: ../raphodo/problemnotification.py:592
 msgid "Problems while finalizing filenames and generating subfolders"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:598
+#: ../raphodo/problemnotification.py:599
 #, python-format
 msgid "Problems backing up to %s"
 msgstr ""
 
-#. Translators: for example Nov 3 or Dec 31
-#. The start and end dates are on a different day
-#. Translators: for example Nov 3 or Dec 31
-#: ../raphodo/proximity.py:105 ../raphodo/proximity.py:221
-#: ../raphodo/proximity.py:224 ../raphodo/proximity.py:828
+#. Translators: for example Nov 3 2015, 11:25 AM
+#. Translators: for example, Nov 3, 12:15 PM
+#: ../raphodo/proximity.py:188 ../raphodo/proximity.py:213
+#: ../raphodo/proximity.py:236 ../raphodo/proximity.py:239
 #, python-format
-msgid "%(month)s %(numeric_day)s"
+msgid "%(date)s, %(time)s"
 msgstr ""
 
-#. Translators: for example Nov 15 2015
-#. Translators: for example Nov 3 2015
-#: ../raphodo/proximity.py:109 ../raphodo/proximity.py:230
-#: ../raphodo/proximity.py:231 ../raphodo/proximity.py:831
+#: ../raphodo/proximity.py:204
 #, python-format
-msgid "%(date)s %(year)s"
+msgid "%(starttime)s - %(endtime)s"
 msgstr ""
 
-#. Translators: for example Nov 3 2015, 11:25 AM
-#. Translators: for example, Nov 3, 12:15 PM
-#: ../raphodo/proximity.py:197 ../raphodo/proximity.py:215
-#: ../raphodo/proximity.py:234 ../raphodo/proximity.py:236
+#. The start and end dates are on a different day
+#. Translators: for example Nov 3 or Dec 31
+#: ../raphodo/proximity.py:221 ../raphodo/proximity.py:225
+#: ../raphodo/proximity.py:980 ../raphodo/timeutils.py:105
 #, python-format
-msgid "%(date)s, %(time)s"
+msgid "%(month)s %(numeric_day)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:209
+#. Translators: for example Nov 3 2015
+#. Translators: for example Nov 2 2015
+#. Translators: for example Nov 15 2015
+#: ../raphodo/proximity.py:232 ../raphodo/proximity.py:233
+#: ../raphodo/proximity.py:985 ../raphodo/timeutils.py:110
 #, python-format
-msgid "%(starttime)s - %(endtime)s"
+msgid "%(date)s %(year)s"
 msgstr ""
 
 #. Translators: for example, Nov 3, 12:15 PM - Nov 4, 1:00 AM
-#: ../raphodo/proximity.py:241
+#: ../raphodo/proximity.py:245
 #, python-format
 msgid "%(earlier_time)s - %(later_time)s"
 msgstr ""
@@ -2551,25 +3133,25 @@ msgstr ""
 #. Nov 3 2012, 12:15 PM -
 #. Nov 4 2012, 1:00 AM
 #. (please keep the line break signified by \n)
-#: ../raphodo/proximity.py:248
+#: ../raphodo/proximity.py:253
 #, python-format
 msgid ""
 "%(earlier_time)s -\n"
 "%(later_time)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:359
+#: ../raphodo/proximity.py:382
 #, python-format
 msgid "%(month)s  %(year)s"
 msgstr ""
 
 #. Translators: for example Nov 2015
-#: ../raphodo/proximity.py:833
+#: ../raphodo/proximity.py:987
 #, python-format
 msgid "%(month)s %(year)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:1344
+#: ../raphodo/proximity.py:1595
 msgid ""
 "The time elapsed between consecutive photos and videos that is used to build "
 "the Timeline"
@@ -2579,47 +3161,47 @@ msgstr ""
 #. Replace the very last character (after the d) with the correct
 #. localized value, keeping everything else. In other words, change
 #. only the m character.
-#: ../raphodo/proximity.py:1406
+#: ../raphodo/proximity.py:1652
 #, python-format
 msgid "%(minutes)dm"
 msgstr ""
 
 #. Translators: i.e. "1.5h", which is short for 1.5 hours.
 #. Replace the entire string with the correct localized value
-#: ../raphodo/proximity.py:1410
+#: ../raphodo/proximity.py:1656
 msgid "1.5h"
 msgstr ""
 
 #. Translators: e.g. "5h", which is short for 5 hours.
 #. Replace the very last character (after the d) with the correct localized value,
 #. keeping everything else. In other words, change only the h character.
-#: ../raphodo/proximity.py:1415
+#: ../raphodo/proximity.py:1661
 #, python-format
 msgid "%(hours)dh"
 msgstr ""
 
-#: ../raphodo/proximity.py:1461
+#: ../raphodo/proximity.py:1710
 msgid ""
 "The Timeline groups photos and videos based on how much time elapsed between "
 "consecutive shots. Use it to identify photos and videos taken at different "
 "periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/proximity.py:1464
+#: ../raphodo/proximity.py:1715
 msgid ""
 "Use the slider (below) to adjust the time elapsed between consecutive shots "
 "that is used to build the Timeline."
 msgstr ""
 
-#: ../raphodo/proximity.py:1466
+#: ../raphodo/proximity.py:1718
 msgid "Timeline build pending..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1467
+#: ../raphodo/proximity.py:1719
 msgid "Timeline is building..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1468
+#: ../raphodo/proximity.py:1721
 msgid ""
 "The Timeline needs to be rebuilt because the file modification time does not "
 "match the time a shot was taken for one or more shots.<br><br>The Timeline "
@@ -2631,61 +3213,61 @@ msgid ""
 "downloading, which is when the metadata is read."
 msgstr ""
 
-#: ../raphodo/rapid.py:485 ../raphodo/rapid.py:2461 ../raphodo/rapid.py:3728
-#: ../raphodo/rapid.py:3846 ../raphodo/rapid.py:3850 ../raphodo/rapid.py:3870
-#: ../raphodo/rapid.py:3874 ../raphodo/rapid.py:3998 ../raphodo/rapid.py:4007
-#: ../raphodo/rapid.py:4495 ../raphodo/rapid.py:4888 ../raphodo/rapid.py:5722
-#: ../raphodo/rememberthisdialog.py:97
+#: ../raphodo/rapid.py:493 ../raphodo/rapid.py:2555 ../raphodo/rapid.py:3934
+#: ../raphodo/rapid.py:4065 ../raphodo/rapid.py:4069 ../raphodo/rapid.py:4092
+#: ../raphodo/rapid.py:4096 ../raphodo/rapid.py:4226 ../raphodo/rapid.py:4237
+#: ../raphodo/rapid.py:4743 ../raphodo/rapid.py:5195 ../raphodo/rapid.py:5997
+#: ../raphodo/rememberthisdialog.py:99
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:3
 msgid "Rapid Photo Downloader"
 msgstr "Transferidor Rápido de Foto"
 
-#: ../raphodo/rapid.py:1100
+#: ../raphodo/rapid.py:1131
 msgid ""
 "<b>ExifTool has a problem</b><br><br> Rapid Photo Downloader uses ExifTool "
 "to get metadata from videos and photos. The program will run without it, but "
 "installing it is <b>highly</b> recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1110 ../raphodo/rapid.py:1130
+#: ../raphodo/rapid.py:1141 ../raphodo/rapid.py:1161
 msgid "Problem with libmediainfo"
 msgstr ""
 
-#: ../raphodo/rapid.py:1119
+#: ../raphodo/rapid.py:1150
 msgid ""
 "<b>The library libmediainfo appears to be missing</b><br><br> Rapid Photo "
 "Downloader uses libmediainfo to get the date and time a video was shot. The "
 "program will run  without it, but installing it is recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1417
+#: ../raphodo/rapid.py:1448
 msgid "Download failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1419
+#: ../raphodo/rapid.py:1450
 msgid ""
 "Sorry, the download of the new version of Rapid Photo Downloader failed."
 msgstr ""
 
-#: ../raphodo/rapid.py:1425
+#: ../raphodo/rapid.py:1457
 msgid ""
 "The new version was successfully downloaded. Do you want to close Rapid "
 "Photo Downloader and install it now?"
 msgstr ""
 
-#: ../raphodo/rapid.py:1428
+#: ../raphodo/rapid.py:1461
 msgid "Update Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:1432
+#: ../raphodo/rapid.py:1465
 msgid "Install"
 msgstr ""
 
-#: ../raphodo/rapid.py:1450
+#: ../raphodo/rapid.py:1483
 msgid "New version saved"
 msgstr ""
 
-#: ../raphodo/rapid.py:1451
+#: ../raphodo/rapid.py:1485
 #, python-format
 msgid ""
 "The tar file and installer script are saved at:\n"
@@ -2693,163 +3275,163 @@ msgid ""
 " %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:1468
+#: ../raphodo/rapid.py:1502
 msgid "Upgrade failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1469
+#: ../raphodo/rapid.py:1505
 msgid ""
 "Sorry, upgrading Rapid Photo Downloader failed because there was an error "
 "opening the installer."
 msgstr ""
 
-#: ../raphodo/rapid.py:1667 ../raphodo/rapid.py:2331
+#: ../raphodo/rapid.py:1709 ../raphodo/rapid.py:2425
 msgid "Download"
 msgstr "Transferir"
 
-#: ../raphodo/rapid.py:1671
+#: ../raphodo/rapid.py:1713
 msgid "&Refresh..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1675
+#: ../raphodo/rapid.py:1717
 msgid "&Preferences"
 msgstr ""
 
-#: ../raphodo/rapid.py:1679
+#: ../raphodo/rapid.py:1721
 msgid "&Quit"
 msgstr ""
 
-#: ../raphodo/rapid.py:1683
+#: ../raphodo/rapid.py:1725
 msgid "Error &Reports"
 msgstr ""
 
-#: ../raphodo/rapid.py:1687
+#: ../raphodo/rapid.py:1729
 msgid "Clear Completed Downloads"
 msgstr ""
 
-#: ../raphodo/rapid.py:1691
+#: ../raphodo/rapid.py:1733
 msgid "Get Help Online..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1695
+#: ../raphodo/rapid.py:1737
 msgid "&Tip of the Day..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1699
+#: ../raphodo/rapid.py:1741
 msgid "Report a Problem..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1703
+#: ../raphodo/rapid.py:1745
 msgid "Make a Donation..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1707
+#: ../raphodo/rapid.py:1749
 msgid "Translate this Application..."
 msgstr "Traduzir esta Aplicação..."
 
-#: ../raphodo/rapid.py:1711
+#: ../raphodo/rapid.py:1753
 msgid "&About..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1715
+#: ../raphodo/rapid.py:1757
 msgid "Check for Updates..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1797
+#: ../raphodo/rapid.py:1840
 msgid "Timeline"
 msgstr ""
 
-#: ../raphodo/rapid.py:1807
+#: ../raphodo/rapid.py:1850
 msgid "Destination"
 msgstr ""
 
-#: ../raphodo/rapid.py:1808
+#: ../raphodo/rapid.py:1851
 msgid "Rename"
 msgstr ""
 
-#: ../raphodo/rapid.py:1810
+#: ../raphodo/rapid.py:1853
 msgid "Back Up"
 msgstr ""
 
 #. Devices Header and View
-#: ../raphodo/rapid.py:1926
+#: ../raphodo/rapid.py:1977
 msgid ""
 "Turn on or off the use of devices attached to this computer as download "
 "sources"
 msgstr ""
 
 #. This Computer Header and View
-#: ../raphodo/rapid.py:1940
+#: ../raphodo/rapid.py:1994
 msgid ""
 "Turn on or off the use of a folder on this computer as a download source"
 msgstr ""
 
-#: ../raphodo/rapid.py:1941
+#: ../raphodo/rapid.py:1996
 msgid "This Computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:1952
+#: ../raphodo/rapid.py:2009
 msgid "Select a source folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:1975
+#: ../raphodo/rapid.py:2038
 msgid "Projected Storage Use"
 msgstr ""
 
-#: ../raphodo/rapid.py:1989 ../raphodo/rapid.py:1997
+#: ../raphodo/rapid.py:2056 ../raphodo/rapid.py:2068
 msgid "Select a destination folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:2045
+#: ../raphodo/rapid.py:2117
 msgid "All"
 msgstr ""
 
-#: ../raphodo/rapid.py:2046
+#: ../raphodo/rapid.py:2118
 msgid "New"
 msgstr ""
 
-#: ../raphodo/rapid.py:2048
+#: ../raphodo/rapid.py:2120
 msgid "Show:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2051
+#: ../raphodo/rapid.py:2123
 msgid "Modification Time"
 msgstr ""
 
-#: ../raphodo/rapid.py:2052
+#: ../raphodo/rapid.py:2124
 msgid "Checked State"
 msgstr ""
 
-#: ../raphodo/rapid.py:2055
+#: ../raphodo/rapid.py:2127
 msgid "File Type"
 msgstr ""
 
-#: ../raphodo/rapid.py:2056
+#: ../raphodo/rapid.py:2128
 msgid "Device"
 msgstr "Dispositivo"
 
-#: ../raphodo/rapid.py:2058
+#: ../raphodo/rapid.py:2130
 msgid "Sort:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2069
+#: ../raphodo/rapid.py:2141
 msgid "Select All:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2311
+#: ../raphodo/rapid.py:2405
 #, python-format
 msgid "Download %(files)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2327
+#: ../raphodo/rapid.py:2421
 msgid "Resume Download"
 msgstr ""
 
-#: ../raphodo/rapid.py:2329
+#: ../raphodo/rapid.py:2423
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../raphodo/rapid.py:2417
+#: ../raphodo/rapid.py:2511
 #, python-brace-format
 msgid ""
 "Please report the problem at <a href=\"{website}\">{website}</a>.<br><br>\n"
@@ -2858,11 +3440,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/rapid.py:2431
+#: ../raphodo/rapid.py:2525
 msgid "Thank you for reporting a problem in Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:2529
+#: ../raphodo/rapid.py:2624
 #, python-format
 msgid ""
 "<b>Changing This Computer source path</b><br><br>Do you really want to "
@@ -2871,30 +3453,29 @@ msgid ""
 "from This Computer will be cancelled."
 msgstr ""
 
-#: ../raphodo/rapid.py:2595
+#: ../raphodo/rapid.py:2694
 msgid "You cannot change the download destination while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:2604
+#: ../raphodo/rapid.py:2704
 #, python-format
 msgid ""
 "<b>Confirm Download Destination</b><br><br>Are you sure you want to set the "
 "%(file_type)s download destination to %(path)s?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2682
+#: ../raphodo/rapid.py:2785
 msgid ""
+"\n"
 "<b>Downloading all files</b><br><br>\n"
-"                    A download always includes all files that are checked "
-"for download,\n"
-"                    including those that are not currently displayed because "
-"the Timeline\n"
-"                    is being used or because only new files are being shown."
-"<br><br>\n"
-"                    Do you want to proceed with the download?"
+"A download always includes all files that are checked for download,\n"
+"including those that are not currently displayed because the Timeline\n"
+"is being used or because only new files are being shown.<br><br>\n"
+"Do you want to proceed with the download?\n"
+"                        "
 msgstr ""
 
-#: ../raphodo/rapid.py:2820
+#: ../raphodo/rapid.py:2937
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -2905,7 +3486,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: ../raphodo/rapid.py:2824
+#: ../raphodo/rapid.py:2940
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -2914,199 +3495,193 @@ msgstr ""
 "Essa pasta de download é inválida:\n"
 "%s"
 
-#: ../raphodo/rapid.py:2827
+#: ../raphodo/rapid.py:2943
 msgid "Download Failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:2828
+#: ../raphodo/rapid.py:2944
 msgid "The download cannot proceed."
 msgstr ""
 
-#: ../raphodo/rapid.py:2842
+#: ../raphodo/rapid.py:2962
 msgid ""
 "Photos and videos will not be backed up because there is nowhere to back "
 "them up. Do you still want to start the download?"
 msgstr ""
 
-#. Translators: filetype will be replaced with 'photos' or 'videos'
-#: ../raphodo/rapid.py:2847 ../raphodo/rapid.py:2854
+#: ../raphodo/rapid.py:2969 ../raphodo/rapid.py:2979
 #, python-format
 msgid ""
 "No backup device exists for backing up %(filetype)s. Do you still want to "
 "start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2848 ../raphodo/rpdfile.py:228
+#: ../raphodo/rapid.py:2971 ../raphodo/rpdfile.py:228
 msgid "photos"
 msgstr "fotografias"
 
-#: ../raphodo/rapid.py:2855 ../raphodo/rpdfile.py:223
+#: ../raphodo/rapid.py:2981 ../raphodo/rpdfile.py:223
 msgid "videos"
 msgstr "vídeos"
 
-#: ../raphodo/rapid.py:2861
+#: ../raphodo/rapid.py:2989
 msgid ""
 "<b>The photo and video backup destinations do not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2869 ../raphodo/rapid.py:2876
+#: ../raphodo/rapid.py:2999 ../raphodo/rapid.py:3008
 #, python-format
 msgid ""
 "<b>The %(filetype)s backup destination does not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2871 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:818
+#: ../raphodo/rapid.py:3001 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:843
 msgid "photo"
 msgstr "foto"
 
-#: ../raphodo/rapid.py:2878 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:858
+#: ../raphodo/rapid.py:3010 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:883
 msgid "video"
 msgstr "vídeo"
 
-#: ../raphodo/rapid.py:2886
+#: ../raphodo/rapid.py:3018
 msgid "Backup problem"
 msgstr "Problema no Backup"
 
-#. Translators - in the middle is a unicode em dash - please retain it
-#. This string is displayed in the status bar when the download is running
-#: ../raphodo/rapid.py:3571
+#: ../raphodo/rapid.py:3756
 #, python-format
 msgid "%(downloading_from)s — %(time_left)s left (%(speed)s)"
 msgstr ""
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3640
+#: ../raphodo/rapid.py:3828
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s descarregados"
 
-#. Translators: e.g. 2 videos failed to download
-#: ../raphodo/rapid.py:3645
+#: ../raphodo/rapid.py:3836
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "%(noFiles)s %(filetypes)s não puderam ser descarregados"
 
-#: ../raphodo/rapid.py:3650 ../raphodo/rapid.py:3723
+#: ../raphodo/rapid.py:3842 ../raphodo/rapid.py:3927
 msgid "warnings"
 msgstr "avisos"
 
-#: ../raphodo/rapid.py:3679
+#: ../raphodo/rapid.py:3873
 msgid "All downloads complete"
 msgstr "Todas transferências completas"
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3686 ../raphodo/rapid.py:3695 ../raphodo/rapid.py:3704
-#: ../raphodo/rapid.py:3713 ../raphodo/rapid.py:3721
+#: ../raphodo/rapid.py:3881 ../raphodo/rapid.py:3892 ../raphodo/rapid.py:3903
+#: ../raphodo/rapid.py:3914 ../raphodo/rapid.py:3924
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: ../raphodo/rapid.py:3688 ../raphodo/rapid.py:3706
+#: ../raphodo/rapid.py:3884 ../raphodo/rapid.py:3906
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s transferidos"
 
-#: ../raphodo/rapid.py:3697 ../raphodo/rapid.py:3715
+#: ../raphodo/rapid.py:3895 ../raphodo/rapid.py:3917
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "%(filetype)s falhou a transferência"
 
-#: ../raphodo/rapid.py:3742
+#: ../raphodo/rapid.py:3950
 msgid "1 failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:3744
+#: ../raphodo/rapid.py:3952
 #, python-format
 msgid "%d failures"
 msgstr ""
 
-#: ../raphodo/rapid.py:3749
+#: ../raphodo/rapid.py:3957
 msgid "1 warning"
 msgstr ""
 
-#: ../raphodo/rapid.py:3751
+#: ../raphodo/rapid.py:3959
 #, python-format
 msgid "%d warnings"
 msgstr ""
 
-#: ../raphodo/rapid.py:3771
+#: ../raphodo/rapid.py:3981
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3774
+#: ../raphodo/rapid.py:3985
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3779
+#: ../raphodo/rapid.py:3989
 #, python-format
 msgid "No files downloaded — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3781
+#: ../raphodo/rapid.py:3991
 msgid "No files downloaded"
 msgstr ""
 
-#: ../raphodo/rapid.py:3805
+#: ../raphodo/rapid.py:4021
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3809
+#: ../raphodo/rapid.py:4026
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3812
+#: ../raphodo/rapid.py:4031
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3820
+#: ../raphodo/rapid.py:4039
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3833
+#: ../raphodo/rapid.py:4052
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3837
+#: ../raphodo/rapid.py:4056
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3841
+#: ../raphodo/rapid.py:4060
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices"
 msgstr ""
 
-#: ../raphodo/rapid.py:3867
+#: ../raphodo/rapid.py:4087
 msgid "The Destination subfolders and Timeline have been rebuilt"
 msgstr ""
 
-#: ../raphodo/rapid.py:3922
+#: ../raphodo/rapid.py:4144
 msgid "Program preferences are invalid"
 msgstr "Preferências do programa são inválidas"
 
-#: ../raphodo/rapid.py:3999
+#: ../raphodo/rapid.py:4228
 #, python-format
 msgid ""
 "<b>All files on the %(camera)s are inaccessible</b>.<br><br>It may be locked "
@@ -3116,179 +3691,205 @@ msgid ""
 "ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4008
+#: ../raphodo/rapid.py:4239
 #, python-format
 msgid ""
-"<b>The %(camera)s appears to be in use by another application.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again.<br><br>Alternatively, you can ignore this "
-"device."
+"<b>The %(camera)s appears to be in use by another "
+"application.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again.<br><br>Alternatively, you "
+"can ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4019
+#: ../raphodo/rapid.py:4250
 msgid "&Try Again"
 msgstr ""
 
-#: ../raphodo/rapid.py:4020
+#: ../raphodo/rapid.py:4251
 msgid "&Ignore This Device"
 msgstr ""
 
-#: ../raphodo/rapid.py:4086
+#: ../raphodo/rapid.py:4323
 #, python-format
 msgid "Sorry, an unexpected problem occurred while scanning %s."
 msgstr ""
 
-#: ../raphodo/rapid.py:4087
+#: ../raphodo/rapid.py:4324
 msgid "Unfortunately you cannot download from this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4091
+#: ../raphodo/rapid.py:4328
 msgid ""
 "A possible workaround for the problem might be downloading from the camera's "
 "memory card using a card reader."
 msgstr ""
 
-#: ../raphodo/rapid.py:4096
+#: ../raphodo/rapid.py:4333
 msgid "Device scan failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:4472
+#: ../raphodo/rapid.py:4720
 #, python-format
 msgid ""
-"<b>The %(camera)s cannot be scanned because it cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again."
+"<b>The %(camera)s cannot be scanned because it cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again."
 msgstr ""
 
-#: ../raphodo/rapid.py:4496
+#: ../raphodo/rapid.py:4745
 #, python-format
 msgid ""
-"<b>The download cannot start because the %(camera)s cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again, and choose which files you want to "
-"download from it."
+"<b>The download cannot start because the %(camera)s cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again, and choose which files "
+"you want to download from it."
+msgstr ""
+
+#: ../raphodo/rapid.py:4842
+msgid "Completed Downloads Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4844
+#, python-format
+msgid "%s whose download have completed are displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4846
+msgid "Do you want to clear the completed downloads?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4848
+msgid "Completed Download Present"
 msgstr ""
 
-#: ../raphodo/rapid.py:4635
+#: ../raphodo/rapid.py:4850
+#, python-format
+msgid "%s whose download has completed is displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4852
+msgid "Do you want to clear the completed download?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4933
 #, python-format
 msgid ""
 "Do you want to download photos and videos from the device <i>%(device)s</i>?"
 msgstr ""
 
-#: ../raphodo/rapid.py:4877
+#: ../raphodo/rapid.py:5183
 #, python-format
 msgid "<b>Do you want to ignore the %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4879
+#: ../raphodo/rapid.py:5186
 msgid ""
 "All cameras, phones and tablets with the same model name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:4883
+#: ../raphodo/rapid.py:5190
 #, python-format
 msgid ""
 "<b>Do you want to ignore the device %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4885
+#: ../raphodo/rapid.py:5192
 msgid "Any device with the same name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:5178
+#: ../raphodo/rapid.py:5492
 #, python-format
 msgid "Downloading from %(location)s on This Computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5180
+#: ../raphodo/rapid.py:5496
 msgid ""
 "Do you really want to download from here?<br><br>On some systems, scanning "
 "this location can take a very long time."
 msgstr ""
 
-#: ../raphodo/rapid.py:5224
+#: ../raphodo/rapid.py:5537
 #, python-format
 msgid "Generating thumbnails for %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5227
+#: ../raphodo/rapid.py:5540
 #, python-format
 msgid "Scanning %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5237
+#: ../raphodo/rapid.py:5551
 #, python-format
 msgid ""
 "%(number)s of %(available files)s checked for download (%(hidden)s hidden)"
 msgstr ""
 
-#: ../raphodo/rapid.py:5243
+#: ../raphodo/rapid.py:5559
 #, python-format
 msgid "%(number)s of %(available files)s checked for download"
 msgstr ""
 
-#: ../raphodo/rapid.py:5494
+#: ../raphodo/rapid.py:5764
 msgid "Display program information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5496
+#: ../raphodo/rapid.py:5766
 msgid "Display debugging information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5499
+#: ../raphodo/rapid.py:5769
 msgid "List photo and video file extensions the program recognizes and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5502
+#: ../raphodo/rapid.py:5772
 msgid "Turn on or off the the renaming of photos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5504
+#: ../raphodo/rapid.py:5774
 msgid "turn on or off the the renaming of videos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5506
+#: ../raphodo/rapid.py:5776
 msgid ""
 "Turn on or off the automatic detection of devices from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5510
+#: ../raphodo/rapid.py:5780
 msgid "Turn on or off downloading from this computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5512 ../raphodo/rapid.py:5515 ../raphodo/rapid.py:5518
-#: ../raphodo/rapid.py:5539 ../raphodo/rapid.py:5543
+#: ../raphodo/rapid.py:5782 ../raphodo/rapid.py:5785 ../raphodo/rapid.py:5788
+#: ../raphodo/rapid.py:5809 ../raphodo/rapid.py:5813
 msgid "PATH"
 msgstr ""
 
-#: ../raphodo/rapid.py:5513
+#: ../raphodo/rapid.py:5783
 msgid "The PATH on this computer from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5516
+#: ../raphodo/rapid.py:5786
 msgid "The PATH where photos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5519
+#: ../raphodo/rapid.py:5789
 msgid "The PATH where videos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5521
+#: ../raphodo/rapid.py:5791
 msgid "Turn on or off the backing up of photos and videos while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:5525
+#: ../raphodo/rapid.py:5795
 msgid "Turn on or off the automatic detection of backup devices."
 msgstr ""
 
-#: ../raphodo/rapid.py:5527 ../raphodo/rapid.py:5533
+#: ../raphodo/rapid.py:5797 ../raphodo/rapid.py:5803
 msgid "FOLDER"
 msgstr ""
 
-#: ../raphodo/rapid.py:5528
+#: ../raphodo/rapid.py:5798
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected photo "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3296,7 +3897,7 @@ msgid ""
 "photos up to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5534
+#: ../raphodo/rapid.py:5804
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected video "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3304,115 +3905,124 @@ msgid ""
 "up videos to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5540
+#: ../raphodo/rapid.py:5810
 msgid ""
 "The PATH where photos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5544
+#: ../raphodo/rapid.py:5814
 msgid ""
 "The PATH where videos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5547
+#: ../raphodo/rapid.py:5817
 #, python-format
 msgid "Ignore photos with the following extensions: %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5551
-msgid "Turn on or off starting downloads as soon as the program itself starts."
+#: ../raphodo/rapid.py:5821
+msgid ""
+"Turn on or off starting downloads as soon as the program itself starts."
 msgstr ""
 
-#: ../raphodo/rapid.py:5554
+#: ../raphodo/rapid.py:5824
 msgid "Turn on or off starting downloads as soon as a device is inserted."
 msgstr ""
 
-#: ../raphodo/rapid.py:5557
+#: ../raphodo/rapid.py:5827
 msgid ""
 "Turn on or off use of the Rapid Photo Downloader Thumbnail Cache. Turning it "
 "off does not delete existing cache contents."
 msgstr ""
 
-#: ../raphodo/rapid.py:5561
+#: ../raphodo/rapid.py:5831
 msgid ""
 "Delete all thumbnails in the Rapid Photo Downloader Thumbnail Cache, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5565
+#: ../raphodo/rapid.py:5835
 msgid "Forget which files have been previously downloaded, and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5568
+#: ../raphodo/rapid.py:5838
 msgid ""
 "Import preferences from an old program version and exit. Requires the "
 "command line program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5571
+#: ../raphodo/rapid.py:5841
 msgid ""
 "Reset all program settings to their default values, delete all thumbnails in "
 "the Thumbnail cache, forget which files have been previously downloaded, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5575
+#: ../raphodo/rapid.py:5845
 msgid "Include gphoto2 debugging information in log files."
 msgstr ""
 
-#: ../raphodo/rapid.py:5579
+#: ../raphodo/rapid.py:5849
 msgid "Print information to the terminal about attached cameras and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5640
+#: ../raphodo/rapid.py:5911
 msgid ""
 "To import preferences from the old version of Rapid Photo Downloader, you "
 "must install the program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5649
+#: ../raphodo/rapid.py:5920
 msgid "No prior program preferences detected: exiting"
 msgstr ""
 
-#: ../raphodo/rapid.py:5652
+#: ../raphodo/rapid.py:5923
 #, python-format
 msgid "Importing preferences from Rapid Photo Downloader %(version)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5714
+#: ../raphodo/rapid.py:5989
 #, python-format
-msgid "Do you want to copy the stored sequence number, which has the value %d?"
+msgid ""
+"Do you want to copy the stored sequence number, which has the value %d?"
 msgstr ""
 
-#: ../raphodo/rapid.py:5726
+#: ../raphodo/rapid.py:6000
 msgid "Program aborting."
 msgstr ""
 
-#: ../raphodo/rapid.py:5736
+#: ../raphodo/rapid.py:6010
 msgid "Never run this program as the sudo / root user."
 msgstr ""
 
-#: ../raphodo/rapid.py:5740
+#: ../raphodo/rapid.py:6014
 msgid "You must install ExifTool to run Rapid Photo Downloader."
 msgstr ""
 
-#: ../raphodo/rapid.py:5794
+#: ../raphodo/rapid.py:6026
+msgid ""
+"Rapid Photo Downloader is installed in multiple locations.\n"
+"\n"
+"Uninstall all copies except the version you want to run."
+msgstr ""
+
+#: ../raphodo/rapid.py:6083
 msgid ""
 "When specifying a path on the command line, do not also specify an\n"
 "option for device auto detection or a path on \"This Computer\"."
 msgstr ""
 
-#: ../raphodo/rapid.py:5950
+#: ../raphodo/rapid.py:6243
 msgid "All settings and caches have been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5958
+#: ../raphodo/rapid.py:6251
 msgid "Thumbnail Cache has been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5964
+#: ../raphodo/rapid.py:6257
 msgid "Remembered files have been forgotten"
 msgstr ""
 
@@ -3428,15 +4038,15 @@ msgstr ""
 msgid "&Don't warn me again about missing or broken program libraries"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:546
+#: ../raphodo/renameandmovefile.py:554
 msgid "subfolder and filename"
 msgstr "subdiretório e nome do ficheiro"
 
-#: ../raphodo/renameandmovefile.py:548
+#: ../raphodo/renameandmovefile.py:556
 msgid "filename"
 msgstr "nome do ficheiro"
 
-#: ../raphodo/renameandmovefile.py:550
+#: ../raphodo/renameandmovefile.py:558
 msgid "subfolder"
 msgstr "subpasta"
 
@@ -3516,160 +4126,237 @@ msgstr "fotos e vídeos"
 msgid "photos or videos"
 msgstr "fotos ou vídeos"
 
-#: ../raphodo/rpdfile.py:306
+#: ../raphodo/rpdfile.py:315
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: ../raphodo/rpdfile.py:318
+#. translators: natural language expression signifying a single video
+#: ../raphodo/rpdfile.py:337
+msgid "a video"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:339
 msgid "1 Video"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:323
+#. translators: natural language expression signifying a single photo
+#: ../raphodo/rpdfile.py:346
+msgid "a photo"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:348
 msgid "1 Photo"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:803
+#: ../raphodo/rpdfile.py:828
 #, python-format
 msgid "%(path)s on %(camera)s"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:819
+#: ../raphodo/rpdfile.py:844
 msgid "Photo"
 msgstr "Fotografia"
 
-#: ../raphodo/rpdfile.py:859
+#: ../raphodo/rpdfile.py:884
 msgid "Video"
 msgstr "Vídeo"
 
-#: ../raphodo/storage.py:138
+#: ../raphodo/storage.py:141
 msgid "File system root"
 msgstr ""
 
 #. translators: the name of the Pictures folder
-#: ../raphodo/storage.py:433
+#: ../raphodo/storage.py:437
 msgid "Pictures"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:426
+#: ../raphodo/thumbnaildisplay.py:432
 #, python-format
 msgid "Taken on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:431
+#: ../raphodo/thumbnaildisplay.py:439
 #, python-format
 msgid "Modified on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:437 ../raphodo/thumbnaildisplay.py:466
+#: ../raphodo/thumbnaildisplay.py:447 ../raphodo/thumbnaildisplay.py:481
 #, python-format
 msgid "%(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:451
+#: ../raphodo/thumbnaildisplay.py:464
 #, python-format
 msgid "Memory cards: %s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:457
+#: ../raphodo/thumbnaildisplay.py:468
+#, python-format
+msgid "Memory card: %s"
+msgstr ""
+
+#: ../raphodo/thumbnaildisplay.py:473
 msgid "Downloaded as:"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:472
+#: ../raphodo/thumbnaildisplay.py:489
 #, python-format
 msgid "<br><br>Previous download:<br>%(filename)s<br>%(path)s<br>%(date)s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:1603
+#: ../raphodo/thumbnaildisplay.py:1645
 msgid "Copy Path"
 msgstr ""
 
+#. Translators: these values are file size suffixes like B representing bytes, KB representing
+#. kilobytes, etc.
+#: ../raphodo/utilities.py:170
+msgid "B"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "KB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "MB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "GB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "TB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "PB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "EB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "ZB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "YB"
+msgstr ""
+
 #. two things in a list e.g. "device1 and device2"
-#: ../raphodo/utilities.py:391
+#: ../raphodo/utilities.py:394
 #, python-format
 msgid "%(first_item)s and %(last_item)s"
 msgstr ""
 
-#: ../raphodo/utilities.py:464
+#: ../raphodo/utilities.py:468
 msgid "one"
 msgstr ""
 
-#: ../raphodo/utilities.py:465
+#: ../raphodo/utilities.py:469
 msgid "two"
 msgstr ""
 
-#: ../raphodo/utilities.py:466
+#: ../raphodo/utilities.py:470
 msgid "three"
 msgstr ""
 
-#: ../raphodo/utilities.py:467
+#: ../raphodo/utilities.py:471
 msgid "four"
 msgstr ""
 
-#: ../raphodo/utilities.py:468
+#: ../raphodo/utilities.py:472
 msgid "five"
 msgstr ""
 
-#: ../raphodo/utilities.py:469
+#: ../raphodo/utilities.py:473
 msgid "six"
 msgstr ""
 
-#: ../raphodo/utilities.py:470
+#: ../raphodo/utilities.py:474
 msgid "seven"
 msgstr ""
 
-#: ../raphodo/utilities.py:471
+#: ../raphodo/utilities.py:475
 msgid "eight"
 msgstr ""
 
-#: ../raphodo/utilities.py:472
+#: ../raphodo/utilities.py:476
 msgid "nine"
 msgstr ""
 
-#: ../raphodo/utilities.py:473
+#: ../raphodo/utilities.py:477
 msgid "ten"
 msgstr ""
 
-#: ../raphodo/utilities.py:474
+#: ../raphodo/utilities.py:478
 msgid "eleven"
 msgstr ""
 
-#: ../raphodo/utilities.py:475
+#: ../raphodo/utilities.py:479
 msgid "twelve"
 msgstr ""
 
-#: ../raphodo/utilities.py:476
+#: ../raphodo/utilities.py:480
 msgid "thirteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:477
+#: ../raphodo/utilities.py:481
 msgid "fourteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:478
+#: ../raphodo/utilities.py:482
 msgid "fifteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:479
+#: ../raphodo/utilities.py:483
 msgid "sixteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:480
+#: ../raphodo/utilities.py:484
 msgid "seventeen"
 msgstr ""
 
-#: ../raphodo/utilities.py:481
+#: ../raphodo/utilities.py:485
 msgid "eighteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:482
+#: ../raphodo/utilities.py:486
 msgid "ninenteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:483
+#: ../raphodo/utilities.py:487
 msgid "twenty"
 msgstr ""
 
+#: ../raphodo/viewutils.py:240
+msgid "&OK"
+msgstr ""
+
+#: ../raphodo/viewutils.py:243
+msgid "&Save"
+msgstr ""
+
+#: ../raphodo/viewutils.py:244
+msgid "&Help"
+msgstr ""
+
+#: ../raphodo/viewutils.py:245
+msgid "Restore Defaults"
+msgstr ""
+
+#: ../raphodo/viewutils.py:246
+msgid "&Yes"
+msgstr ""
+
+#: ../raphodo/viewutils.py:247
+msgid "&No"
+msgstr ""
+
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:1
 msgid ""
 "Rapid Photo Downloader imports photos and videos from cameras, phones, "
@@ -3723,8 +4410,8 @@ msgstr ""
 #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:5
 msgid ""
-"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;"
-"memory;card;"
+"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;memory"
+";card;"
 msgstr ""
 
 #: ../data/kde/net.damonlynch.rapid-photo-downloader.desktop.in.h:1
@@ -3761,9 +4448,11 @@ msgstr ""
 #~ msgid "the root of the file system"
 #~ msgstr "a raiz do sistema de ficheiros"
 
+#, python-format
 #~ msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
+#, python-format
 #~ msgid ""
 #~ "%(date)s\n"
 #~ "%(time)s"
@@ -3771,9 +4460,11 @@ msgstr ""
 #~ "%(date)s\n"
 #~ "%(time)s"
 
+#, python-format
 #~ msgid "%(date)s %(time)s"
 #~ msgstr "%(date)s %(time)s"
 
+#, python-format
 #~ msgid "%(device)s did not unmount"
 #~ msgstr "%(device)s did not unmount"
 
@@ -3786,12 +4477,15 @@ msgstr ""
 #~ msgid "scanning..."
 #~ msgstr "a analisar..."
 
+#, python-format
 #~ msgid "Downloading from %(location)s."
 #~ msgstr "A transferir de %(location)s."
 
+#, python-format
 #~ msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 #~ msgstr "Falta aproximadamente %(minutes)i:%(seconds)02i minutos"
 
+#, python-format
 #~ msgid "About %i seconds remaining"
 #~ msgstr "Falta aproximadamente %i segundos"
 
@@ -3805,13 +4499,14 @@ msgstr ""
 #~ "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."
+#~ "Quer realmente transferir deste local? Em alguns sistemas, varrer este local "
+#~ "pode levar muito tempo."
 
+#, python-format
 #~ 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"
+#~ "Nenhum dispositivo de backup contém uma pasta válida para fazer o backup de "
+#~ "%(filetype)s"
 
 #~ msgid "Download cannot proceed"
 #~ msgstr "A transferência não pôde continuar"
@@ -3834,18 +4529,22 @@ msgstr ""
 #~ msgid "To"
 #~ msgstr "Para:"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s"
 #~ msgstr "%(number)s de %(total)s %(filetypes)s"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 #~ msgstr "%(number)s de %(total)s %(filetypes)s (%(remaining)s restantes)"
 
 #~ msgid "Select a folder to download photos to"
 #~ msgstr "Seleccione o diretório para onde transferir as fotos"
 
+#, python-format
 #~ msgid "Select a folder containing %(file_types)s"
 #~ msgstr "Escolha um diretório que contenha %(file_types)s"
 
+#, python-format
 #~ msgid "(%(file_type)s)"
 #~ msgstr "(%(file_type)s)"
 
@@ -3861,6 +4560,7 @@ msgstr ""
 #~ msgid "Select a folder to download videos to"
 #~ msgstr "Seleccione o diretório para baixar os vídeos para"
 
+#, python-format
 #~ msgid "%(free)s %(file_type)s"
 #~ msgstr "%(free)s %(file_type)s"
 
@@ -3873,33 +4573,42 @@ msgstr ""
 #~ msgid "Using backup devices"
 #~ msgstr "A usar dispositivos de backup"
 
+#, python-format
 #~ msgid "%(file_type)s download folder does not exist"
 #~ msgstr "%(file_type)s pasta de download não existe"
 
 #~ msgid "."
 #~ msgstr "."
 
+#, python-format
 #~ msgid "%(free)s free"
 #~ msgstr "%(free)s livres"
 
+#, python-format
 #~ 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"
 
+#, python-format
 #~ msgid "Backing up photos and videos to %(path)s"
 #~ msgstr "A criar o backup das fotos e vídeos em %(path)s"
 
+#, python-format
 #~ msgid "Backing up to %(path)s"
 #~ msgstr "A criar cópias de segurança em %(path)s"
 
+#, python-format
 #~ msgid "%(freespace)s. %(backuppaths)s."
 #~ msgstr "%(freespace)s. %(backuppaths)s."
 
+#, python-format
 #~ msgid "%(file_type)s download folder is not writable"
 #~ msgstr "%(file_type)s pasta de transferência não é gravável"
 
+#, python-format
 #~ msgid "Folder: %s"
 #~ msgstr "Pasta: %s"
 
+#, python-format
 #~ msgid "%(file_type)s download folder is invalid"
 #~ msgstr "%(file_type)s pasta de transferência é inválida"
 
@@ -3909,6 +4618,7 @@ msgstr ""
 #~ msgid "only output errors to the command line"
 #~ msgstr "mostrar erros apenas na linha de comando"
 
+#, python-format
 #~ msgid ""
 #~ "display program information on the command line as the program runs "
 #~ "(default: %default)"
@@ -3924,6 +4634,7 @@ msgstr ""
 #~ msgid "All settings and preferences have been reset"
 #~ msgstr "Todas as configurações e preferências foram redefinidas"
 
+#, python-format
 #~ msgid "Backup %(file_type)s overwritten"
 #~ msgstr "%(file_type)s do backup sobreescritos"
 
@@ -3931,21 +4642,26 @@ msgstr ""
 #~ msgstr ""
 #~ "Restabelecer todas as configurações e preferências do programa e fechá-lo"
 
+#, python-format
 #~ msgid "%(file_type)s not backed up"
 #~ msgstr "%(file_type)s ainda não estão no backup"
 
+#, 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"
 
+#, python-format
 #~ msgid "and %s"
 #~ msgstr "e %s"
 
+#, python-format
 #~ msgid "Error: %(inst)s"
 #~ msgstr "Erro: %(inst)s"
 
 #~ msgid "Backing up error"
 #~ msgstr "Erro ao criar cópias de segurança"
 
+#, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
 #~ "Destination: %(destination)s"
@@ -3956,9 +4672,10 @@ msgstr ""
 #~ 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?"
+#~ "Deverá ser feita uma tranferência das fotografias ou vídeos presentes neste "
+#~ "dispositivo ou partição?"
 
+#, python-format
 #~ msgid ""
 #~ "%(problem)s\n"
 #~ "File: %(file)s"
@@ -3985,16 +4702,16 @@ msgstr ""
 #~ "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."
+#~ "Erro: especificar a auto-detecção do dispositivo ou especificar manualmente "
+#~ "o caminho de um dispositivo para o qual transferir, mas não ambos."
 
+#, python-format
 #~ msgid "Backup of %(file_type)s already exists"
 #~ msgstr "O backup de %(file_type)s já existe"
 
 #~ msgid ""
-#~ "manually specify the PATH of the device from which to download, "
-#~ "overwriting existing program preferences"
+#~ "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"
@@ -4045,6 +4762,7 @@ msgstr ""
 #~ msgid "Error in Photo Rename preferences"
 #~ msgstr "Erro causado pelas preferêcias de \"renomear fotografias\""
 
+#, python-format
 #~ msgid ""
 #~ "The following regular expressions are invalid, and will be removed unless "
 #~ "you correct them:\n"
@@ -4054,9 +4772,10 @@ msgstr ""
 #~ "ser que sejam corrigidas:\n"
 #~ "%s"
 
+#, python-format
 #~ msgid ""
-#~ "This regular expression is invalid, and will be removed unless you "
-#~ "correct it:\n"
+#~ "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 "
@@ -4081,9 +4800,10 @@ msgstr ""
 #~ "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>"
+#~ "gerar nomes de subdiretórios. Por favor, use de outras opções de "
+#~ "nomeação.</i>"
 
+#, python-format
 #~ msgid ""
 #~ "The %(filetype)s subfolder preferences entered are invalid and cannot be "
 #~ "used.\n"
@@ -4093,6 +4813,7 @@ msgstr ""
 #~ "inválidas e não poderão ser usadas.\n"
 #~ "Elas serão redefinidas para seus valores padrão."
 
+#, python-format
 #~ msgid "<i>Example: %s</i>"
 #~ msgstr "<i>Exemplo: %s</i>"
 
@@ -4129,58 +4850,72 @@ msgstr ""
 #~ msgid "Stockholm"
 #~ msgstr "Estocolmo"
 
+#, python-format
 #~ msgid "%(filetype)s metadata cannot be read"
 #~ msgstr "Os metadados de %(filetype)s não podem ser lidos"
 
+#, python-format
 #~ msgid "Error generating component %s."
 #~ msgstr "Erro ao gerar o componente %s"
 
 #~ msgid "Madrid"
 #~ msgstr "Madrid"
 
+#, python-format
 #~ msgid "Date time value %s appears invalid."
 #~ msgstr "O valor %s de data e hora parece inválido."
 
+#, python-format
 #~ msgid "%(filetype)s %(area)s could not be generated"
 #~ msgstr "%(filetype)s %(area)s não pode ser gerado"
 
+#, python-format
 #~ msgid ""
 #~ "%(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."
+#~ "%(filetype)s não pôde ser guardado em backup porque nenhum local de backup "
+#~ "foi encontrado."
 
+#, python-format
 #~ msgid "%(filetype)s already exists"
 #~ msgstr "%(filetype)s já existe."
 
+#, python-format
 #~ msgid "An error occurred when copying the %(filetype)s"
 #~ msgstr "Ocorreu um erro ao copiar %(filetype)s"
 
+#, 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."
 
+#, python-format
 #~ msgid "%(filetype)s was already downloaded"
 #~ msgstr "%(filetype)s já foi transferido."
 
+#, 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."
 
+#, python-format
 #~ msgid "Error: %(errorno)s %(strerror)s"
 #~ msgstr "Erro: %(errorno)s %(strerror)s"
 
+#, python-format
 #~ msgid ""
-#~ "The existing %(filetype)s was last modified on %(date)s at %(time)s. "
-#~ "Unique identifier '%(identifier)s' added."
+#~ "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."
+#~ "O actual%(filetype)s foi modificado pela última vez em%(date)s em%(time)s. "
+#~ "Identificador exclusivo '%(identifier)s'' acrescentado."
 
+#, python-format
 #~ msgid "The %(filetype)s did not download correctly"
 #~ msgstr "%(filetype)s não foram transferidos correctamente."
 
+#, python-format
 #~ msgid ""
 #~ "Photos detected with the same filenames, but taken at different times: "
 #~ "%(details)s"
@@ -4188,9 +4923,11 @@ msgstr ""
 #~ "Fotos detectadas com o mesmo nome, mas tiradas em momentos diferentes: "
 #~ "%(details)s"
 
+#, python-format
 #~ msgid "An error occurred when backing up on %(volume)s."
 #~ msgstr "Ocorreu um erro ao fazer backup em %(volume)s."
 
+#, 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."
 
@@ -4204,15 +4941,18 @@ msgstr ""
 #~ "O nome e extensão do ficheiro e informações Exif indicam que já foi "
 #~ "transferido."
 
+#, python-format
 #~ msgid " It was backed up to %(volume)s"
 #~ msgstr " Foi feito backup para %(volume)s"
 
 #~ msgid " It was backed up to these devices: "
 #~ msgstr " Foi feito backup destes dispositivos: "
 
+#, python-format
 #~ msgid "%s, "
 #~ msgstr "%s, "
 
+#, python-format
 #~ msgid "%(volumes)s and %(final_volume)s."
 #~ msgstr "%(volumes)s e %(final_volume)s."
 
@@ -4220,18 +4960,20 @@ msgstr ""
 #~ "File verification failed. The downloaded version is different from the "
 #~ "original."
 #~ msgstr ""
-#~ "Verificação do ficheiro falhou. A versão transferida é diferente da "
-#~ "original."
+#~ "Verificação do ficheiro falhou. A versão transferida é diferente da original."
 
 #~ msgid "Backups overwritten on these devices: "
 #~ msgstr "Backups substituídos nestes dispositivos: "
 
+#, python-format
 #~ msgid "Backup overwritten on %(volume)s."
 #~ msgstr "Backup substituído em %(volume)s."
 
+#, python-format
 #~ msgid "%(volume)s, "
 #~ msgstr "%(volume)s, "
 
+#, python-format
 #~ msgid "%(volume)s (%(inst)s), "
 #~ msgstr "%(volume)s (%(inst)s), "
 
@@ -4242,15 +4984,19 @@ msgstr ""
 #~ msgid "Backups already exist in these locations: "
 #~ msgstr "Os backups já existem nestes locais: "
 
+#, python-format
 #~ msgid "Backup already exists on %(volume)s."
 #~ msgstr "Um backup já existe no %(volume)s."
 
+#, python-format
 #~ msgid "%(volumes)s and %(volume)s."
 #~ msgstr "%(volumes)s e %(volume)s."
 
+#, python-format
 #~ msgid "%(volumes)s and %(volume)s (%(inst)s)."
 #~ msgstr "%(volumes)s e %(volume)s (%(inst)s)."
 
+#, 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."
 
@@ -4260,46 +5006,51 @@ msgstr ""
 #~ msgid "The following metadata is missing: "
 #~ msgstr "Os metadados seguinte estão em falta: "
 
-#~ msgid ""
-#~ "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
+#, python-format
+#~ msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
 #~ msgstr "%(missing_metadata_elements)s e %(final_missing_metadata_element)s."
 
+#, python-format
 #~ msgid " Furthermore, there was a %(problem)s."
 #~ msgstr " Além disso, houve um %(problem)s."
 
+#, python-format
 #~ msgid "%(previousproblem)s Additionally, %(newproblem)s"
 #~ msgstr "%(previousproblem)s Adicionalmente, %(newproblem)s"
 
+#, python-format
 #~ msgid " Furthermore, there were %(problems)s."
 #~ msgstr " Além disso, houve %(problems)s."
 
 #~ msgid ""
-#~ "Errors occurred when creating directories on the following backup "
-#~ "devices: "
+#~ "Errors occurred when creating directories on the following backup devices: "
 #~ msgstr ""
-#~ "Ocorreram erros ao criar directórios nos dispositivos de backup "
-#~ "seguintes: "
+#~ "Ocorreram erros ao criar directórios nos dispositivos de backup seguintes: "
 
 #~ msgid "File verification failed on these devices: "
 #~ msgstr "A verificação de ficheiros falhou nestes dispositivos: "
 
+#, python-format
 #~ msgid ""
-#~ "File verification failed on %(volume)s. The backed up version is "
-#~ "different from the downloaded version."
+#~ "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."
+#~ "A verificação de ficheiros falhou em %(volume)s. A versão guardada em backup "
+#~ "é diferente da versão transferida."
 
+#, python-format
 #~ msgid "Problem in %s generation"
 #~ msgstr "Problema na criação de %s"
 
+#, python-format
 #~ msgid "Problems in %s generation"
 #~ msgstr "Problemas na criação de %s"
 
-#~ msgid ""
-#~ "An error occurred when copying the %(filetype)s, but it was backed up"
+#, 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"
 
+#, python-format
 #~ msgid "%(filetype)s already exists, but it was backed up"
 #~ msgstr "%(filetype)s já existe, mas foi feito backup"
 
@@ -4315,32 +5066,36 @@ msgstr ""
 #~ msgid "there were errors backing up"
 #~ msgstr "Ocorreram erros ao gazer o backup"
 
-#~ msgid ""
-#~ "Photos detected with the same filenames, but taken at different times"
+#~ msgid "Photos detected with the same filenames, but taken at different times"
 #~ msgstr ""
 #~ "Foram detectadas fotografias com o mesmo nome, mas com tempos diferentes"
 
 #~ msgid "Multiple problems were encountered"
 #~ msgstr "Vários problemas foram encontrados"
 
+#, python-format
 #~ msgid "Source: %(source)s"
 #~ msgstr "Origem: %(source)s"
 
+#, python-format
 #~ msgid "%(previousproblem)s, and %(backinguperror)s"
 #~ msgstr "%(previousproblem)s, e %(backinguperror)s"
 
 #~ msgid "There was an error backing up"
 #~ msgstr "Ocorreu um erro ao fazer backup"
 
+#, python-format
 #~ msgid "Path: %s"
 #~ msgstr "Caminho: %s"
 
+#, python-format
 #~ msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
 #~ msgid "Failed to create download subfolder"
 #~ msgstr "Falha ao criar subpasta descarga"
 
+#, python-format
 #~ msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
 #~ msgstr ""
 #~ "a analisar (encontradas %(photos)s fotografias e %(videos)s vídeos)..."
@@ -4422,8 +5177,7 @@ msgstr ""
 
 #~ 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>"
+#~ "<span weight=\"bold\" size=\"x-large\">Pasta de Transferência de Fotos</span>"
 
 #~ msgid "Next File"
 #~ msgstr "Ficheiro Seguinte"
@@ -4472,14 +5226,13 @@ msgstr ""
 #~ msgstr "<span weight=\"bold\" size=\"x-large\">Renomear Opções</span>"
 
 #~ 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>."
+#~ "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 ""
 #~ "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>."
+#~ "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>."
 
 #~ msgid "Video Rename"
 #~ msgstr "Renomear Vídeo"
@@ -4489,16 +5242,16 @@ msgstr ""
 
 #~ 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>"
+#~ "<span weight=\"bold\" size=\"x-large\">Pasta de Transferência de "
+#~ "Vídeos</span>"
 
 #~ msgid ""
 #~ "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."
+#~ "Escolher pasta de transferência. Subpastas para os vídeos transferidos serão "
+#~ "criadas automaticamente nesta pasta usando a estrutura especificada em "
+#~ "seguida."
 
 #~ msgid "<b>Example</b>"
 #~ msgstr "<b>Exemplo</b>"
@@ -4516,8 +5269,8 @@ msgstr ""
 #~ "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."
+#~ "Especifique o tempo no formato de 24 horas no qual a sequência numérica de  "
+#~ "<i>Transferência de Hoje</i> devem reiniciar."
 
 #~ msgid "Synchronize RAW + JPEG sequence numbers"
 #~ msgstr "Sincronizar números de sequência RAW+JPEG"
@@ -4535,9 +5288,9 @@ msgstr ""
 #~ "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."
+#~ "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."
 
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Job Codes</span>"
 #~ msgstr "<span weight=\"bold\" size=\"x-large\">Códigos de Tarefa</span>"
@@ -4549,24 +5302,23 @@ msgstr ""
 #~ "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"
+#~ "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>"
+#~ "<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"
+#~ "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>"
+#~ "<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>"
 
 #~ msgid "Automatically detect Portable Storage Devices"
 #~ msgstr "Detectar automaticamente Dispositivos de Armazenamento Portátil"
@@ -4590,11 +5342,11 @@ msgstr ""
 #~ msgstr "Localização:"
 
 #~ msgid ""
-#~ "If you disable automatic detection, choose the exact location of the "
-#~ "photos and videos."
+#~ "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."
+#~ "Se desactivar a detecção automática, escolha o local exacto das fotografias "
+#~ "e vídeos."
 
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Device Options</span>"
 #~ msgstr "<span weight=\"bold\" size=\"x-large\">Opções do Dispositivo</span>"
@@ -4612,15 +5364,14 @@ msgstr ""
 #~ "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>"
+#~ "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"
+#~ "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>"
+#~ "não utilizado para backups. Para cada dispositivo que deseja usar para fazer "
+#~ "backup, criar uma pasta com um desses nomes.</i>"
 
 #~ msgid "Device Options"
 #~ msgstr "Opções do Dispositivo"
@@ -4651,8 +5402,7 @@ msgstr ""
 
 #~ msgid "Unmount (\"eject\") device upon download completion"
 #~ msgstr ""
-#~ "Desmontar ou ejetar o dispositivo após a conclusão da tarefa de "
-#~ "transferência"
+#~ "Desmontar ou ejetar o dispositivo após a conclusão da tarefa de transferência"
 
 #~ msgid "<b>Photo and Video Name Conflicts</b>"
 #~ msgstr "<b>Conflitos de Nomes de Fotos e Vídeos</b>"
@@ -4673,9 +5423,8 @@ msgstr ""
 #~ msgstr "Verificar os ficheiros assim que são transferidos"
 
 #~ 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."
+#~ "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."
@@ -4684,26 +5433,26 @@ msgstr ""
 #~ "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."
+#~ "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."
+#~ "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."
 
 #~ 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."
+#~ "Escolha como o programa deverá proceder caso ao fazer uma cópia de segurança "
+#~ "haja um arquivo de mesmo nome."
 
 #~ 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."
+#~ "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 "
@@ -4714,11 +5463,11 @@ msgstr ""
 
 #~ 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."
+#~ "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 "
+#~ "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."
 
 #~ msgid "Backup"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4a361f1..9faa8a3 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,35 +7,390 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: damonlynch@gmail.com\n"
-"POT-Creation-Date: 2017-07-08 19:16-0500\n"
-"PO-Revision-Date: 2017-07-04 11:06+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2017-09-12 17:01-0400\n"
+"PO-Revision-Date: 2017-09-13 18:41+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
-"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-07-05 23:04+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-09-26 22:04+0000\n"
+"X-Generator: Launchpad (build 18463)\n"
+"Language: pt_BR\n"
+
+#: ../install.py:65
+msgid "Rapid Photo Downloader installer"
+msgstr ""
+
+#: ../install.py:66
+msgid "Download and install latest version of Rapid Photo Downloader."
+msgstr "Baixar e instalar a última versão do Rapid Photo Downloader."
+
+#: ../install.py:236 ../install.py:1732
+msgid "Installer not found:"
+msgstr ""
+
+#. Translators: do not translate the term tar.gz
+#: ../install.py:240 ../install.py:1736
+msgid "Installer not in tar.gz format:"
+msgstr ""
+
+#: ../install.py:465
+msgid ""
+"Incorrect folder ownership detected. Changing ownership of and resetting "
+"permissions for"
+msgstr ""
+
+#: ../install.py:540
+msgid "The following command will be run:"
+msgstr ""
+
+#: ../install.py:543 ../install.py:1479 ../install.py:1484
+msgid "sudo may prompt you for the sudo password."
+msgstr ""
+
+#: ../install.py:547
+msgid "Would you like to run the command now?"
+msgstr ""
+
+#: ../install.py:549
+msgid "Answer is not yes, exiting."
+msgstr ""
+
+#: ../install.py:559 ../install.py:751 ../install.py:966
+msgid "Command failed"
+msgstr "O comando falhou"
+
+#: ../install.py:561 ../install.py:752 ../install.py:967
+msgid "Exiting"
+msgstr "Saindo"
+
+#: ../install.py:582
+msgid "The Universe repository must be enabled."
+msgstr "O repositório Universe deve ser habilitado."
+
+#: ../install.py:606
+msgid ""
+"Do you want to to uninstall the previous version of Rapid Photo Downloader:"
+msgstr "Você deseja desentalar a versão anterior do Rapid Photo Downloader:"
+
+#: ../install.py:715 ../install.py:740
+msgid ""
+"Querying package system to see if an older version of Rapid Photo Downloader "
+"is installed (this may take a while)..."
+msgstr ""
+
+#: ../install.py:726
+msgid ""
+"Unable to query package system. Please check your Internet connection and "
+"try again"
+msgstr ""
+
+#: ../install.py:756
+msgid "Checking if previous version installed with pip..."
+msgstr ""
+
+#: ../install.py:850
+msgid "The following package is unknown on your system: {}\n"
+msgstr "O seguinte pacote é desconhecido no seu sistema: {}\n"
+
+#: ../install.py:857 ../install.py:929 ../install.py:974
+msgid ""
+"To continue, some packages required to run the application will be installed."
+msgstr ""
+"Para continuar, alguns pacotes necessários pela aplicação sego instalados."
+
+#: ../install.py:886
+msgid "Querying installed and available packages (this may take a while)"
+msgstr ""
+"Pesquisando pacotes disponíveis e instalados (Isso pode levar algum tempo)"
+
+#: ../install.py:958
+msgid ""
+"Querying zypper to see if any required packages are already installed (this "
+"may take a while)... "
+msgstr ""
+"Pesquisando com zypper para verificar se pacotes necessários já estão "
+"instalados (Isso pode lev)ar algum tempo... "
+
+#: ../install.py:1004
+msgid "Query to confirm action at each step."
+msgstr ""
+
+#: ../install.py:1011
+msgid ""
+"When downloading the latest version, install the development version if it "
+"is newer than the stable version."
+msgstr ""
+
+#: ../install.py:1020
+msgid ""
+"Optional tar.gz Rapid Photo Downloader installer archive. If not specified, "
+"the latest version is downloaded from the Internet."
+msgstr ""
+
+#: ../install.py:1043
+msgid ""
+"Do not run the installer in the tar.gz Rapid Photo Downloader installer "
+"archive if it is newer than this version ({}). The default is to run "
+"whichever installer is newer."
+msgstr ""
+
+#: ../install.py:1050
+msgid ""
+"Uninstall Rapid Photo Downloader that was installed with pip, keeping its "
+"dependencies."
+msgstr ""
+
+#: ../install.py:1054
+msgid ""
+"Uninstall the dependencies installed by pip during Rapid Photo Downloader's "
+"installation, and Rapid Photo Downloader itself, then exit."
+msgstr ""
+
+#: ../install.py:1059
+msgid ""
+"Note: this will not uninstall any version of Rapid Photo Downloader "
+"installed by your Linux distribution's package manager."
+msgstr ""
+
+#: ../install.py:1066
+msgid ""
+"Dependencies will only be removed if they are not required by other programs."
+msgstr ""
+
+#: ../install.py:1072
+msgid ""
+"Note: this option will remove the dependencies regardless of whether they "
+"are required by another program pip has installed. Upgrade to pip 9.0 or "
+"above if you want to avoid this behavior. You can do so using the command "
+"'python3 -m pip install pip -U --user'. Also note that any version of Rapid "
+"Photo Downloader installed by your Linux distribution's package manager will "
+"not be uninstalled."
+msgstr ""
+
+#: ../install.py:1122
+msgid "Failed to download versions file"
+msgstr ""
+
+#: ../install.py:1126
+msgid "Got error code {} while accessing versions file"
+msgstr ""
+
+#: ../install.py:1234
+msgid ""
+"Sorry, could not locate installer. Please check your Internet connection and "
+"verify if you can reach https://www.damonlynch.net\n"
+"\n"
+"Exiting.\n"
+msgstr ""
+
+#: ../install.py:1408
+msgid "Installing application requirements..."
+msgstr ""
+
+#: ../install.py:1424
+msgid "Received error code"
+msgstr ""
+
+#: ../install.py:1425
+msgid "Failed to install application requirements: exiting"
+msgstr ""
+
+#: ../install.py:1428
+msgid "Installing application..."
+msgstr ""
+
+#: ../install.py:1441
+msgid "Failed to install application: exiting..."
+msgstr ""
+
+#: ../install.py:1465
+msgid ""
+"You may have to restart the computer to be able to run the program from the "
+"commmand line or application launcher."
+msgstr ""
+
+#: ../install.py:1476
+msgid "Do you want to install the application's man pages?"
+msgstr ""
+
+#: ../install.py:1477
+msgid "They will be installed into {}"
+msgstr ""
+
+#: ../install.py:1478 ../install.py:1483
+msgid "If you uninstall the application, remove these manpages yourself."
+msgstr ""
+
+#: ../install.py:1480
+msgid "Do want to install the man pages?"
+msgstr ""
+
+#: ../install.py:1482
+msgid "Installing man pages into {}"
+msgstr ""
+
+#: ../install.py:1499
+msgid "Failed to create man page directory: exiting"
+msgstr ""
+
+#: ../install.py:1511
+msgid "Failed to copy man page."
+msgstr ""
+
+#: ../install.py:1521
+msgid "(If a segmentation fault occurs at exit, you can ignore it...)"
+msgstr ""
+
+#: ../install.py:1534
+msgid ""
+"The python3 tool pip is required to uninstall a version of Rapid Photo "
+"Downloader that was installed with pip.\n"
+"Cannot continue. Exiting."
+msgstr ""
+
+#: ../install.py:1575
+msgid ""
+"Do not run this installer script as sudo / root user.\n"
+"Run it using the user who will run the program.\n"
+msgstr ""
+
+#: ../install.py:1585 ../install.py:1599
+msgid "Do not include any other command line arguments when specifying"
+msgstr ""
+
+#: ../install.py:1614
+msgid ""
+"Sorry, this installer does not support a custom python installation.\n"
+"Exiting..."
+msgstr ""
+
+#: ../install.py:1620
+msgid "Restarting script using system python..."
+msgstr ""
+
+#: ../install.py:1651
+msgid "Exiting..."
+msgstr ""
+
+#. Translators: do not translate the term python3-apt
+#: ../install.py:1670
+msgid "To continue, the package python3-apt must be installed."
+msgstr ""
+
+#: ../install.py:1689
+msgid ""
+"Install the following packages using your Linux distribution's standard "
+"package manager, and then rerun this installer"
+msgstr ""
+
+#: ../install.py:1698
+msgid ""
+"To run this program, programs to assist Python 3 and its package management "
+"must be installed."
+msgstr ""
+
+#. Translators: do not translate the terms Python 3, pip and setuptools
+#: ../install.py:1713
+msgid "Python 3's pip and setuptools must be upgraded for your user."
+msgstr ""
+
+#. Translators: do not translate the term python or requests
+#: ../install.py:1726
+msgid "Installing python requests"
+msgstr ""
+
+#: ../upgrade.py:79
+msgid "Upgrade Rapid Photo Downloader"
+msgstr ""
+
+#: ../upgrade.py:401 ../raphodo/viewutils.py:242
+msgid "&Cancel"
+msgstr ""
+
+#: ../upgrade.py:405
+msgid "&Upgrade"
+msgstr ""
+
+#: ../upgrade.py:410
+#, python-format
+msgid "Click the Upgrade button to upgrade to version %s."
+msgstr ""
+
+#: ../upgrade.py:413
+msgid "Click the Upgrade button to start the upgrade."
+msgstr ""
+
+#: ../upgrade.py:416 ../upgrade.py:422 ../raphodo/viewutils.py:241
+msgid "&Close"
+msgstr ""
 
-#. type: QPushButton
-#: ../raphodo/aboutdialog.py:217
+#: ../upgrade.py:417
+msgid "&Run"
+msgstr ""
+
+#: ../upgrade.py:447
+msgid "Close Rapid Photo Downloader before running this upgrade"
+msgstr ""
+
+#: ../upgrade.py:450
+msgid "Upgrade running..."
+msgstr ""
+
+#: ../upgrade.py:486
+#, python-format
+msgid ""
+"Successfully upgraded to %s. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:491
+msgid ""
+"Upgrade finished successfully. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:495
+msgid "Upgrade failed. Click Close to exit."
+msgstr ""
+
+#: ../upgrade.py:6967
+#, python-format
+msgid "Upgrading %s..."
+msgstr ""
+
+#: ../upgrade.py:6969
+msgid "Press any key to continue..."
+msgstr ""
+
+#: ../upgrade.py:6982
+msgid "Rapid Photo Downloader upgrade failed"
+msgstr ""
+
+#: ../upgrade.py:6984
+#, python-format
+msgid ""
+"The python package %s could not be updated. The upgrade cannot continue."
+msgstr ""
+
+#: ../raphodo/aboutdialog.py:225
 msgid "Credits"
 msgstr "Créditos"
 
-#: ../raphodo/backuppanel.py:239
+#: ../raphodo/backuppanel.py:240
 msgid "Backups are not configured"
 msgstr "Backups não foram configurados"
 
-#: ../raphodo/backuppanel.py:241
+#: ../raphodo/backuppanel.py:242
 msgid "No backup devices detected"
 msgstr "Nenhum dispositivo de backup detectado"
 
-#: ../raphodo/backuppanel.py:243
+#: ../raphodo/backuppanel.py:244
 msgid "Valid backup locations not yet specified"
 msgstr "Locais válidos de backup ainda não especificados"
 
-#: ../raphodo/backuppanel.py:401
+#: ../raphodo/backuppanel.py:404
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
@@ -44,103 +399,112 @@ msgstr ""
 "uma cópia de segurança em vários locais diferentes, como, por exemplo, em "
 "discos rígidos externos."
 
-#: ../raphodo/backuppanel.py:407
+#: ../raphodo/backuppanel.py:412
 msgid "Back up photos and videos when downloading"
 msgstr "Fazer backup de fotos e vídeos ao baixar"
 
-#: ../raphodo/backuppanel.py:413
+#: ../raphodo/backuppanel.py:418
 msgid "Automatically detect backup devices"
 msgstr "Detectar automaticamente dispositivos de backup"
 
-#: ../raphodo/backuppanel.py:417
+#: ../raphodo/backuppanel.py:424
 msgid ""
-"Specify the folder in which backups are stored on the device."
-"<br><br><i>Note: the presence of a folder with this name is used to "
+"Specify the folder in which backups are stored on the "
+"device.<br><br><i>Note: the presence of a folder with this name is used to "
 "determine if 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 folder names. By "
 "adding both folders, the same device can be used to back up both photos and "
 "videos.</i>"
 msgstr ""
-"Especifique a pasta onde os backups serão salvos no dispositivo."
-"<br><br><i>Observação: a presença de uma pasta com este nome é usada para "
-"determinar se o dispositivo é usado para backups. Crie uma pasta com um "
-"destes nomes em cada dispositivo designado para salvar backups. Ao adicionar "
-"ambas as pastas, o dispositivo poderá ser utilizado para backups tanto de "
-"fotos como de vídeos.</i>"
+"Especifique a pasta onde os backups serão salvos no "
+"dispositivo.<br><br><i>Observação: a presença de uma pasta com este nome é "
+"usada para determinar se o dispositivo é usado para backups. Crie uma pasta "
+"com um destes nomes em cada dispositivo designado para salvar backups. Ao "
+"adicionar ambas as pastas, o dispositivo poderá ser utilizado para backups "
+"tanto de fotos como de vídeos.</i>"
 
-#: ../raphodo/backuppanel.py:428
+#: ../raphodo/backuppanel.py:439
 msgid "Photo folder name:"
 msgstr "Nome da pasta de fotos:"
 
-#: ../raphodo/backuppanel.py:433
+#: ../raphodo/backuppanel.py:444
 msgid "Video folder name:"
 msgstr "Nome da pasta de vídeos"
 
-#: ../raphodo/backuppanel.py:438 ../raphodo/nameeditor.py:883
+#: ../raphodo/backuppanel.py:449 ../raphodo/nameeditor.py:890
 #: ../raphodo/renamepanel.py:123
 msgid "Example:"
 msgstr "Exemplo:"
 
-#: ../raphodo/backuppanel.py:448
-msgid "If you disable automatic detection, choose the exact backup locations."
+#: ../raphodo/backuppanel.py:460
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
 "Se você desabilitar a detecção automática, selecione o caminho exato do "
 "local do backup."
 
-#: ../raphodo/backuppanel.py:452
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:468
 msgid "Photo backup location:"
 msgstr "Local do backup de Fotos:"
 
-#: ../raphodo/backuppanel.py:454
+#: ../raphodo/backuppanel.py:474
 msgid "Select Photo Backup Location"
 msgstr "Selecione Local de Backup para Fotos"
 
-#: ../raphodo/backuppanel.py:460
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:485
 msgid "Video backup location:"
 msgstr "Local do backup de Vídeos:"
 
-#: ../raphodo/backuppanel.py:462
+#: ../raphodo/backuppanel.py:491
 msgid "Select Video Backup Location"
 msgstr "Selecione Local de Backup para Vídeos"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:564
+#: ../raphodo/backuppanel.py:595
 msgid "drive1"
 msgstr ""
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:567
+#: ../raphodo/backuppanel.py:598
 msgid "drive2"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:628
+#: ../raphodo/backuppanel.py:663
 msgid "Projected Backup Storage Use"
 msgstr "Projeção de Uso do disco para Backup"
 
-#: ../raphodo/backuppanel.py:632
+#: ../raphodo/backuppanel.py:669
 msgid "Backup Options"
 msgstr "Opções de Backup"
 
 #. translators: refers to the video thumbnail file that some
 #. cameras generate -- it has a .THM file extension
-#: ../raphodo/copyfiles.py:476
+#: ../raphodo/copyfiles.py:491
 msgid "video THM"
 msgstr ""
 
-#: ../raphodo/copyfiles.py:482
+#: ../raphodo/copyfiles.py:497
 msgid "audio"
 msgstr "áudio"
 
 #: ../raphodo/destinationdisplay.py:78 ../raphodo/devicedisplay.py:1079
-#: ../raphodo/rpdfile.py:321
+#: ../raphodo/rpdfile.py:342
 #, python-format
 msgid "%(no_photos)s Photos"
 msgstr "%(no_photos)s Fotos"
 
 #: ../raphodo/destinationdisplay.py:82 ../raphodo/devicedisplay.py:1081
-#: ../raphodo/rpdfile.py:316
+#: ../raphodo/rpdfile.py:333
 #, python-format
 msgid "%(no_videos)s Videos"
 msgstr "%(no_videos)s Vídeos"
@@ -168,15 +532,15 @@ msgid "%(size_free)s free of %(size_total)s"
 msgstr "%(size_free)s livre de %(size_total)s"
 
 #: ../raphodo/destinationdisplay.py:190 ../raphodo/devicedisplay.py:993
-#: ../raphodo/rapid.py:1964 ../raphodo/rapid.py:2079 ../raphodo/rapid.py:5753
-#: ../raphodo/rpdfile.py:905
+#: ../raphodo/rapid.py:2023 ../raphodo/rapid.py:2151 ../raphodo/rapid.py:6043
+#: ../raphodo/rpdfile.py:930
 msgid "Photos"
 msgstr "Fotos"
 
 #. translators: the name of the Videos folder
 #: ../raphodo/destinationdisplay.py:191 ../raphodo/devicedisplay.py:994
-#: ../raphodo/rapid.py:1967 ../raphodo/rapid.py:2080 ../raphodo/rapid.py:5754
-#: ../raphodo/rpdfile.py:933 ../raphodo/storage.py:445
+#: ../raphodo/rapid.py:2028 ../raphodo/rapid.py:2152 ../raphodo/rapid.py:6044
+#: ../raphodo/rpdfile.py:958 ../raphodo/storage.py:449
 msgid "Videos"
 msgstr "Vídeos"
 
@@ -184,7 +548,7 @@ msgstr "Vídeos"
 msgid "Projected storage use after download"
 msgstr "Projeção de uso de disco depois do download"
 
-#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:516
+#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:521
 msgid "Custom..."
 msgstr ""
 
@@ -222,57 +586,58 @@ msgstr ""
 msgid "%s full"
 msgstr "%s cheio"
 
-#: ../raphodo/devices.py:459
+#: ../raphodo/devices.py:463
 msgid "Cameras"
 msgstr ""
 
-#: ../raphodo/devices.py:460 ../raphodo/devices.py:920
-#: ../raphodo/preferencedialog.py:85 ../raphodo/rapid.py:1927
+#: ../raphodo/devices.py:464 ../raphodo/devices.py:927
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/rapid.py:1979
 msgid "Devices"
 msgstr "Dispositivos"
 
-#: ../raphodo/devices.py:720
+#: ../raphodo/devices.py:724
 #, python-format
 msgid "Downloading from %(device_names)s"
 msgstr "Descarregando de %(device_names)s"
 
 #. Translators: e.g. Three Devices
-#: ../raphodo/devices.py:780
+#: ../raphodo/devices.py:784
 #, python-format
 msgid "%(no_devices)s %(device_type)s"
 msgstr ""
 
-#: ../raphodo/devices.py:905 ../raphodo/rapid.py:1764
+#: ../raphodo/devices.py:912 ../raphodo/rapid.py:1807
 msgid "Select Source"
 msgstr "Selecionar Fonte"
 
-#: ../raphodo/devices.py:936 ../raphodo/devices.py:947
+#: ../raphodo/devices.py:943 ../raphodo/devices.py:954
 #, python-format
 msgid "%(device1)s + %(device2)s"
 msgstr ""
 
 #. Number of cameras e.g. 3 Cameras
-#: ../raphodo/devices.py:958
+#: ../raphodo/devices.py:965
 #, python-format
 msgid "%(no_cameras)s Cameras"
 msgstr ""
 
-#: ../raphodo/devices.py:963
+#: ../raphodo/devices.py:970
 #, python-format
 msgid "%(no_devices)s Devices"
 msgstr "%(no_devices)s Dispositivos"
 
 #. Translators: two folder names, separated by a plus sign
-#: ../raphodo/devices.py:1258
+#: ../raphodo/devices.py:1265
 #, python-format
 msgid "%s + %s"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:44
+#: ../raphodo/didyouknow.py:45
 msgid "Click on a file's checkbox to mark or unmark it for download."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:50
+#: ../raphodo/didyouknow.py:51
 msgid ""
 "Files that have already been downloaded are remembered. You can still mark "
 "previously downloaded files to download again, but they are unchecked by "
@@ -280,34 +645,67 @@ msgid ""
 "files that are yet to be downloaded."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:59
+#: ../raphodo/didyouknow.py:60
 msgid ""
 "If more than one file is selected, they'll all take the mark of the file "
 "whose checkbox was clicked, regardless of whether they previously had a "
 "checkmark or not."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:67
+#: ../raphodo/didyouknow.py:68
 msgid ""
 "Click on a device's checkbox to quickly mark or unmark all its files for "
 "downloading."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:74
+#: ../raphodo/didyouknow.py:75
+msgid ""
+"After a download finishes, an icon replaces the thumbnail's checkbox. The "
+"icon's color indicates whether the download was successful (green), had file "
+"renaming problems (yellow/orange), or failed (red)."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:83
+msgid ""
+"\n"
+"            In case of any problems, a red icon will appear at the bottom of "
+"the window\n"
+"            indicating how many error reports there are. Clicking on it "
+"opens the Error Report \n"
+"            window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:91
+msgid ""
+"\n"
+"            The Error Report window lists any problems encountered before, "
+"during or after the \n"
+"            download. An orange triangle represents a warning, a red circle "
+"indicates a failure, \n"
+"            and a black circle indicates more serious failures. You can "
+"click on the hyperlinks to \n"
+"            open its file or device in a file manager. You can also search "
+"the reports using the \n"
+"            search box in the lower left of the Error Report window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:103
 msgid ""
 "You can simultaneously download from multiple cameras, smartphones, memory "
 "cards, and hard drives&mdash;as many devices as your computer can handle at "
 "one time."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:81
+#: ../raphodo/didyouknow.py:110
 msgid ""
 "The <b>Timeline</b> groups photos and videos based on how much time elapsed "
 "between consecutive shots. Use it to identify photos and videos taken at "
 "different periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:88
+#: ../raphodo/didyouknow.py:117
 msgid ""
 "\n"
 "<p>In the illustration above, the first row of the Timeline is black because "
@@ -319,7 +717,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:99
+#: ../raphodo/didyouknow.py:128
 msgid ""
 "To view photos and videos for a particular time range, use the mouse "
 "(optionally in combination with the <tt>Shift</tt> or <tt>Ctrl</tt> keys) to "
@@ -327,20 +725,20 @@ msgid ""
 "the left side of the main window will be highlighted."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:106
+#: ../raphodo/didyouknow.py:135
 msgid ""
 "A download always includes all files that are checked for download, "
 "including those that are not currently displayed because the Timeline is "
 "being used."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:113
+#: ../raphodo/didyouknow.py:142
 msgid ""
 "You can hide or display the download sources by clicking on the name of the "
 "device you're downloading from at the top left of the program window."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:120
+#: ../raphodo/didyouknow.py:149
 msgid ""
 "\n"
 "          Thumbnails can be sorted using a variety of criteria:\n"
@@ -359,33 +757,33 @@ msgid ""
 "</ol> "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:137
+#: ../raphodo/didyouknow.py:166
 msgid ""
 "One of Rapid Photo Downloader's most useful features is its ability to "
 "automatically generate download subfolders and rename files as it downloads, "
 "using a scheme of your choosing."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:143
+#: ../raphodo/didyouknow.py:172
 msgid ""
 "To specify where you want your files downloaded and how you want them named, "
 "open the appropriate panel on the right-side of the application window: "
 "<b>Destination</b>, <b>Rename</b>, or <b>Job Code</b>."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:150
+#: ../raphodo/didyouknow.py:179
 msgid ""
 "\n"
 "When thinking about your download directory structure, keep in mind two "
 "different types\n"
 "of directory:\n"
 "<ol>\n"
-"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, &quot;"
-"Photos&quot;, or\n"
+"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, "
+"&quot;Photos&quot;, or\n"
 "&quot;Videos&quot;. This directory should already exist on your computer. In "
 "the illustration \n"
-"below, the destination folders are &quot;Pictures&quot; and &quot;"
-"Videos&quot;. The\n"
+"below, the destination folders are &quot;Pictures&quot; and "
+"&quot;Videos&quot;. The\n"
 "name of the destination folder is displayed in the grey bar directly above "
 "the folder tree, \n"
 "with a folder icon to its left and a gear icon to its far right.</li>\n"
@@ -398,7 +796,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:167
+#: ../raphodo/didyouknow.py:196
 msgid ""
 "\n"
 "You can download photos and videos to the same destination folder, or "
@@ -411,14 +809,14 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:177
+#: ../raphodo/didyouknow.py:206
 msgid ""
 "Automatically generated download subfolders can contain further "
 "automatically generated subfolders if need be. A common scheme is to create "
 "a year subfolder and then a series of year-month-day subfolders within it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:186
+#: ../raphodo/didyouknow.py:215
 msgid ""
 "\n"
 "Whenever possible, the program previews the download subfolders of photos "
@@ -436,7 +834,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:201
+#: ../raphodo/didyouknow.py:230
 msgid ""
 "\n"
 "Download subfolder names are typically generated using some or all of the "
@@ -460,7 +858,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:219
+#: ../raphodo/didyouknow.py:248
 msgid ""
 "\n"
 "To automatically create download subfolders as you download, \n"
@@ -470,7 +868,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:227
+#: ../raphodo/didyouknow.py:256
 msgid ""
 "\n"
 "Using the drop-down menu, select a built-in preset or click on <b>Custom</b> "
@@ -480,20 +878,20 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:237
+#: ../raphodo/didyouknow.py:266
 msgid ""
 "It's easy to download raw images into one folder, and jpeg images into "
 "another. Simply use the <b>Filename Extension</b> as part of your download "
 "subfolder generation scheme:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:242
+#: ../raphodo/didyouknow.py:271
 msgid ""
 "This illustration shows a saved custom preset named &quot;My custom "
 "preset&quot;."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:246
+#: ../raphodo/didyouknow.py:275
 msgid ""
 "\n"
 "You do not have to create nested download subfolders. This illustration "
@@ -504,7 +902,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:256
+#: ../raphodo/didyouknow.py:285
 msgid ""
 "\n"
 "Although there are many built-in date/time naming options, you may find that "
@@ -518,7 +916,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:265
+#: ../raphodo/didyouknow.py:294
 msgid ""
 "\n"
 "Read more about all the ways you can generate download subfolder names and "
@@ -528,7 +926,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:273
+#: ../raphodo/didyouknow.py:302
 msgid ""
 "\n"
 "<b>Job Codes</b> let you easily enter text that describes sets of photos and "
@@ -540,7 +938,7 @@ msgid ""
 "&quot;Green Bazaar&quot;: \n"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:282
+#: ../raphodo/didyouknow.py:311
 msgid ""
 "\n"
 "You can apply new or existing Job Codes before you start a download. If "
@@ -551,36 +949,36 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:291
+#: ../raphodo/didyouknow.py:320
 msgid "Look for hints to guide you when working with Job Codes:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:295
+#: ../raphodo/didyouknow.py:324
 msgid ""
 "Hints will vary depending on the context, such as when the mouse is hovering "
 "over a button."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:301
+#: ../raphodo/didyouknow.py:330
 msgid ""
 "\n"
 "When you give your photos and videos unique filenames, you'll never be "
 "confused as to \n"
 "which file is which. Using <b>sequence numbers</b> to make filenames unique "
 "is highly \n"
-"recommended!.\n"
+"recommended!\n"
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:309
+#: ../raphodo/didyouknow.py:338
 msgid ""
 "\n"
 "<p>Four types of sequence values are available to help you assign unique "
 "names to your photos and \n"
 "videos:\n"
 "<ol>\n"
-"<li><b>Downloads today</b>: tracks downloads completed during that day.</"
-"li>\n"
+"<li><b>Downloads today</b>: tracks downloads completed during that "
+"day.</li>\n"
 "<li><b>Stored number</b>: similar to Downloads today, but it is remembered "
 "from the last time the  \n"
 "program was run.</li>\n"
@@ -594,7 +992,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:327
+#: ../raphodo/didyouknow.py:356
 msgid ""
 "\n"
 "The <b>Rename</b> panel allows you to configure file renaming. To rename "
@@ -603,7 +1001,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:334
+#: ../raphodo/didyouknow.py:363
 msgid ""
 "\n"
 "<p>The <b>Synchronize RAW + JPEG</b> option is useful if you use the RAW + "
@@ -622,7 +1020,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:348
+#: ../raphodo/didyouknow.py:377
 msgid ""
 "\n"
 "You can have your photos and videos backed up to multiple locations as they "
@@ -633,13 +1031,13 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:356
+#: ../raphodo/didyouknow.py:385
 msgid ""
 "In this example, the drive <b>photobackup</b> does not contain a folder "
 "named <tt>Videos</tt>, so videos will not be backed up to it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:362
+#: ../raphodo/didyouknow.py:391
 msgid ""
 "\n"
 "Several of the program's preferences can be set from the command line, "
@@ -650,7 +1048,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:372
+#: ../raphodo/didyouknow.py:396
+msgid "You can also import program preferences from the older 0.4 version."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:401
 msgid ""
 "\n"
 "Rapid Photo Downloader deals with three types of cache:\n"
@@ -660,8 +1062,8 @@ msgid ""
 "memory cards, and other devices.</li>\n"
 "<li>A <b>temporary cache</b> of files downloaded from a camera, one for "
 "photos and another for \n"
-"videos. They are located in temporary subfolders in the download destination."
-"</li>\n"
+"videos. They are located in temporary subfolders in the download "
+"destination.</li>\n"
 "<li>The <b>desktop's thumbnail cache</b>, in which Rapid Photo Downloader "
 "stores thumbnails of \n"
 "RAW and TIFF photos once they have been downloaded. File browsers like Gnome "
@@ -676,23 +1078,23 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:431
+#: ../raphodo/didyouknow.py:460
 msgid "Tip of the Day"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:439
+#: ../raphodo/didyouknow.py:468
 msgid "Did you know...?"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:466
+#: ../raphodo/didyouknow.py:495
 msgid "Show tips on startup"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:470
+#: ../raphodo/didyouknow.py:499
 msgid "&Next"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:471
+#: ../raphodo/didyouknow.py:500
 msgid "&Previous"
 msgstr ""
 
@@ -799,68 +1201,68 @@ msgstr ""
 msgid "%(days)d days, %(hours)d hours"
 msgstr ""
 
-#: ../raphodo/errorlog.py:65
+#: ../raphodo/errorlog.py:66
 msgid "Find"
 msgstr ""
 
-#: ../raphodo/errorlog.py:135
+#: ../raphodo/errorlog.py:136
 msgid "Error Reports - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/errorlog.py:170
+#: ../raphodo/errorlog.py:171
 msgid "Find in reports"
 msgstr ""
 
-#: ../raphodo/errorlog.py:187
+#: ../raphodo/errorlog.py:188
 msgid "Find the previous occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:192
+#: ../raphodo/errorlog.py:193
 msgid "Find the next occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:194
+#: ../raphodo/errorlog.py:195
 msgid "&Highlight All"
 msgstr ""
 
-#: ../raphodo/errorlog.py:195
+#: ../raphodo/errorlog.py:196
 msgid "Highlight all occurrences of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:196
+#: ../raphodo/errorlog.py:197
 msgid "&Match Case"
 msgstr ""
 
-#: ../raphodo/errorlog.py:197
+#: ../raphodo/errorlog.py:198
 msgid "Search with case sensitivity"
 msgstr ""
 
-#: ../raphodo/errorlog.py:198
+#: ../raphodo/errorlog.py:199
 msgid "&Whole Words"
 msgstr ""
 
-#: ../raphodo/errorlog.py:199
+#: ../raphodo/errorlog.py:200
 msgid "Search whole words only"
 msgstr ""
 
-#: ../raphodo/errorlog.py:209 ../raphodo/errorlog.py:341
+#: ../raphodo/errorlog.py:210 ../raphodo/errorlog.py:345
 #, python-format
 msgid "%s of %s matches"
 msgstr ""
 
-#: ../raphodo/errorlog.py:228
+#: ../raphodo/errorlog.py:232
 msgid "Clear"
 msgstr ""
 
-#: ../raphodo/errorlog.py:328
+#: ../raphodo/errorlog.py:332
 msgid "Phrase not found"
 msgstr ""
 
-#: ../raphodo/errorlog.py:487
+#: ../raphodo/errorlog.py:491
 msgid "Search pending..."
 msgstr ""
 
-#: ../raphodo/errorlog.py:535
+#: ../raphodo/errorlog.py:539
 msgid ""
 "The number of new entries added to the Error Report since it was last open. "
 "Click to open the Error Report."
@@ -874,8 +1276,8 @@ msgstr ""
 #, python-brace-format
 msgid ""
 "<b>A problem occurred in Rapid Photo Downloader</b><br><br>\n"
-"    Please report the problem at <a href=\"{website}\">{website}</a>."
-"<br><br>\n"
+"    Please report the problem at <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
 "    Attach the log file <i>{log_file}</i> to your bug report (click\n"
 "    <a href=\"{log_path}\">here</a> to open the log directory).<br><br>If "
 "the same problem occurs\n"
@@ -896,7 +1298,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1601
+#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1643
 msgid "Open in File Browser..."
 msgstr ""
 
@@ -914,531 +1316,531 @@ msgstr ""
 msgid "%s (location does not exist)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:186
+#: ../raphodo/generatenameconfig.py:190
 msgid "Date time"
 msgstr "Data e hora"
 
-#: ../raphodo/generatenameconfig.py:187
+#: ../raphodo/generatenameconfig.py:191
 msgid "Text"
 msgstr "Texto"
 
-#: ../raphodo/generatenameconfig.py:188 ../raphodo/rapid.py:2053
+#: ../raphodo/generatenameconfig.py:192 ../raphodo/rapid.py:2125
 msgid "Filename"
 msgstr "Nome do arquivo"
 
-#: ../raphodo/generatenameconfig.py:189 ../raphodo/preferencedialog.py:488
+#: ../raphodo/generatenameconfig.py:193 ../raphodo/preferencedialog.py:724
 msgid "Metadata"
 msgstr "Metadados"
 
-#: ../raphodo/generatenameconfig.py:190
+#: ../raphodo/generatenameconfig.py:194
 msgid "Sequences"
 msgstr "Seqüências"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: ../raphodo/generatenameconfig.py:193
+#: ../raphodo/generatenameconfig.py:197
 msgid "Job code"
 msgstr "Etiqueta"
 
-#: ../raphodo/generatenameconfig.py:194
+#: ../raphodo/generatenameconfig.py:198
 msgid "Image date"
 msgstr "Imagem de dados"
 
-#: ../raphodo/generatenameconfig.py:195
+#: ../raphodo/generatenameconfig.py:199
 msgid "Video date"
 msgstr "Dados de vídeo"
 
-#: ../raphodo/generatenameconfig.py:196
+#: ../raphodo/generatenameconfig.py:200
 msgid "Today"
 msgstr "Hoje"
 
-#: ../raphodo/generatenameconfig.py:197
+#: ../raphodo/generatenameconfig.py:201
 msgid "Yesterday"
 msgstr "Ontem"
 
 #. Translators: Download time is the time and date that the download started (when the
 #. user clicked the Download button)
-#: ../raphodo/generatenameconfig.py:200
+#: ../raphodo/generatenameconfig.py:204
 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
-#: ../raphodo/generatenameconfig.py:203
+#: ../raphodo/generatenameconfig.py:207
 msgid "Name"
 msgstr "Nome"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:206 ../raphodo/rapid.py:2054
+#: ../raphodo/generatenameconfig.py:210 ../raphodo/rapid.py:2126
 msgid "Extension"
 msgstr "Extensão"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:209
+#: ../raphodo/generatenameconfig.py:213
 msgid "Image number"
 msgstr "Número da imagem"
 
-#: ../raphodo/generatenameconfig.py:210
+#: ../raphodo/generatenameconfig.py:214
 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
-#: ../raphodo/generatenameconfig.py:213
+#: ../raphodo/generatenameconfig.py:217
 msgid "Aperture"
 msgstr "Abertura"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:216
+#: ../raphodo/generatenameconfig.py:220
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:219
+#: ../raphodo/generatenameconfig.py:223
 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
-#: ../raphodo/generatenameconfig.py:222
+#: ../raphodo/generatenameconfig.py:226
 msgid "Focal length"
 msgstr "Distância focal"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:225
+#: ../raphodo/generatenameconfig.py:229
 msgid "Camera make"
 msgstr "Filmar"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:228
+#: ../raphodo/generatenameconfig.py:232
 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
-#: ../raphodo/generatenameconfig.py:231
+#: ../raphodo/generatenameconfig.py:235
 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
-#: ../raphodo/generatenameconfig.py:234
+#: ../raphodo/generatenameconfig.py:238
 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
-#: ../raphodo/generatenameconfig.py:237
+#: ../raphodo/generatenameconfig.py:241
 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
-#: ../raphodo/generatenameconfig.py:240
+#: ../raphodo/generatenameconfig.py:244
 msgid "Shutter count"
 msgstr "Contagem de Disparos"
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: ../raphodo/generatenameconfig.py:242
+#: ../raphodo/generatenameconfig.py:246
 msgid "File number"
 msgstr "Numero do arquivo"
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:244
+#: ../raphodo/generatenameconfig.py:248
 msgid "Folder only"
 msgstr "Apenas pasta"
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:246
+#: ../raphodo/generatenameconfig.py:250
 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
-#: ../raphodo/generatenameconfig.py:249
+#: ../raphodo/generatenameconfig.py:253
 msgid "Owner name"
 msgstr "Nome do dono"
 
-#: ../raphodo/generatenameconfig.py:250
+#: ../raphodo/generatenameconfig.py:254
 msgid "Codec"
 msgstr "Codec"
 
-#: ../raphodo/generatenameconfig.py:251
+#: ../raphodo/generatenameconfig.py:255
 msgid "Width"
 msgstr "Largura"
 
-#: ../raphodo/generatenameconfig.py:252
+#: ../raphodo/generatenameconfig.py:256
 msgid "Height"
 msgstr "Altura"
 
-#: ../raphodo/generatenameconfig.py:253
+#: ../raphodo/generatenameconfig.py:257
 msgid "Length"
 msgstr "Comprimento"
 
-#: ../raphodo/generatenameconfig.py:254
+#: ../raphodo/generatenameconfig.py:258
 msgid "Frames Per Second"
 msgstr "Quadros Por Segundo"
 
-#: ../raphodo/generatenameconfig.py:255
+#: ../raphodo/generatenameconfig.py:259
 msgid "Artist"
 msgstr "Artista"
 
-#: ../raphodo/generatenameconfig.py:256
+#: ../raphodo/generatenameconfig.py:260
 msgid "Copyright"
 msgstr "Direitos autorais"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:259
+#: ../raphodo/generatenameconfig.py:263
 msgid "Downloads today"
 msgstr "Downloads de hoje"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:262
+#: ../raphodo/generatenameconfig.py:266
 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
-#: ../raphodo/generatenameconfig.py:265
+#: ../raphodo/generatenameconfig.py:269
 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
-#: ../raphodo/generatenameconfig.py:268
+#: ../raphodo/generatenameconfig.py:272
 msgid "Stored number"
 msgstr "Número armazenado"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: ../raphodo/generatenameconfig.py:271
+#: ../raphodo/generatenameconfig.py:275
 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
-#: ../raphodo/generatenameconfig.py:274
+#: ../raphodo/generatenameconfig.py:278
 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
-#: ../raphodo/generatenameconfig.py:277
+#: ../raphodo/generatenameconfig.py:281
 msgid "Last digit"
 msgstr "Último dígito"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:280
+#: ../raphodo/generatenameconfig.py:284
 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
-#: ../raphodo/generatenameconfig.py:283
+#: ../raphodo/generatenameconfig.py:287
 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
-#: ../raphodo/generatenameconfig.py:286
+#: ../raphodo/generatenameconfig.py:290
 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
-#: ../raphodo/generatenameconfig.py:289
+#: ../raphodo/generatenameconfig.py:293
 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
-#: ../raphodo/generatenameconfig.py:292
+#: ../raphodo/generatenameconfig.py:296
 msgid "UPPERCASE"
 msgstr "CAIXA ALTA"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:295
+#: ../raphodo/generatenameconfig.py:299
 msgid "lowercase"
 msgstr "caixa baixa"
 
-#: ../raphodo/generatenameconfig.py:296
+#: ../raphodo/generatenameconfig.py:300
 msgid "One digit"
 msgstr "Um dígito"
 
-#: ../raphodo/generatenameconfig.py:297
+#: ../raphodo/generatenameconfig.py:301
 msgid "Two digits"
 msgstr "Dois dígitos"
 
-#: ../raphodo/generatenameconfig.py:298
+#: ../raphodo/generatenameconfig.py:302
 msgid "Three digits"
 msgstr "Três dígitos"
 
-#: ../raphodo/generatenameconfig.py:299
+#: ../raphodo/generatenameconfig.py:303
 msgid "Four digits"
 msgstr "Quatro dígitos"
 
-#: ../raphodo/generatenameconfig.py:300
+#: ../raphodo/generatenameconfig.py:304
 msgid "Five digits"
 msgstr "Cinco dígitos"
 
-#: ../raphodo/generatenameconfig.py:301
+#: ../raphodo/generatenameconfig.py:305
 msgid "Six digits"
 msgstr "Seis dígitos"
 
-#: ../raphodo/generatenameconfig.py:302
+#: ../raphodo/generatenameconfig.py:306
 msgid "Seven digits"
 msgstr "Sete dígitos"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:305
+#: ../raphodo/generatenameconfig.py:309
 msgid "Subseconds"
 msgstr "Subsegundos"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:308 ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:312 ../raphodo/generatenameconfig.py:393
 msgid "YYYYMMDD"
 msgstr "AAAAMMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:311 ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:315 ../raphodo/generatenameconfig.py:394
 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
-#: ../raphodo/generatenameconfig.py:314 ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:318 ../raphodo/generatenameconfig.py:395
 msgid "YYYY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:317
+#: ../raphodo/generatenameconfig.py:321
 msgid "YYMMDD"
 msgstr "AAMMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:320
+#: ../raphodo/generatenameconfig.py:324
 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
-#: ../raphodo/generatenameconfig.py:323
+#: ../raphodo/generatenameconfig.py:327
 msgid "YY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:326
+#: ../raphodo/generatenameconfig.py:330
 msgid "MMDDYYYY"
 msgstr "MMDDAAAA"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:329
+#: ../raphodo/generatenameconfig.py:333
 msgid "MMDDYY"
 msgstr "MMDDAA"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:332
+#: ../raphodo/generatenameconfig.py:336
 msgid "MMDD"
 msgstr "MMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:335
+#: ../raphodo/generatenameconfig.py:339
 msgid "DDMMYYYY"
 msgstr "DDMMAAAA"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:338
+#: ../raphodo/generatenameconfig.py:342
 msgid "DDMMYY"
 msgstr "DDMMAA"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:341 ../raphodo/generatenameconfig.py:389
-#: ../raphodo/generatenameconfig.py:390 ../raphodo/generatenameconfig.py:391
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:345 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:394 ../raphodo/generatenameconfig.py:395
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:397
 msgid "YYYY"
 msgstr "AAAA"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:344
+#: ../raphodo/generatenameconfig.py:348
 msgid "YY"
 msgstr "AA"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:347
+#: ../raphodo/generatenameconfig.py:351
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:350
+#: ../raphodo/generatenameconfig.py:354
 msgid "DD"
 msgstr "DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:353
+#: ../raphodo/generatenameconfig.py:357
 msgid "Month (full)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:356
+#: ../raphodo/generatenameconfig.py:360
 msgid "Month (abbreviated)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:359
+#: ../raphodo/generatenameconfig.py:363
 msgid "HHMMSS"
 msgstr "HHMMSS"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:362
+#: ../raphodo/generatenameconfig.py:366
 msgid "HHMM"
 msgstr "HHMM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:365
+#: ../raphodo/generatenameconfig.py:369
 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
-#: ../raphodo/generatenameconfig.py:368
+#: ../raphodo/generatenameconfig.py:372
 msgid "HH-MM"
 msgstr "HH-MM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:371
+#: ../raphodo/generatenameconfig.py:375
 msgid "HH"
 msgstr "HH"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:374
+#: ../raphodo/generatenameconfig.py:378
 msgid "MM (minutes)"
 msgstr "MM (minutos)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:377
+#: ../raphodo/generatenameconfig.py:381
 msgid "SS"
 msgstr "SS"
 
-#: ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:393
 msgid "Date"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:394
 msgid "Date (hyphens)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:395
 msgid "Date (underscores)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:438
-#: ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:442
+#: ../raphodo/generatenameconfig.py:537
 msgid "Date and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392
+#: ../raphodo/generatenameconfig.py:396
 msgid "YYYYMM_Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "Date and Job Code Subfolder"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "YYYYMM"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393 ../raphodo/jobcodepanel.py:198
-#: ../raphodo/nameeditor.py:827 ../raphodo/rapid.py:1809
+#: ../raphodo/generatenameconfig.py:397 ../raphodo/jobcodepanel.py:199
+#: ../raphodo/nameeditor.py:833 ../raphodo/rapid.py:1852
 #: ../raphodo/renamepanel.py:83 ../raphodo/renamepanel.py:241
 msgid "Job Code"
 msgstr "Etiqueta"
 
-#: ../raphodo/generatenameconfig.py:433 ../raphodo/generatenameconfig.py:512
+#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:532
 msgid "Original Filename"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "Date-Time and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "YYYYMMDD-HHMM-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "Date and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "YYYYMMDD-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "Date-Time and Image number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "YYYYMMDD-1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "Date-Time and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "YYYYMMDD-HHMM-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:442 ../raphodo/generatenameconfig.py:537
 msgid "YYYYMMDD-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "Date-Time and Video number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "YYYYMMDD_1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "Resolution"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "YYYYMMDD-HHMM-1-1920x1080"
 msgstr ""
 
@@ -1497,76 +1899,77 @@ msgstr ""
 msgid "&Remember this choice"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:185
+#: ../raphodo/jobcodepanel.py:186
 msgid ""
 "Select photos and videos to be able to apply a new or existing Job Code to "
 "them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:186
-msgid "The new Job Code will be applied to all selected photos and/or videos."
+#: ../raphodo/jobcodepanel.py:187
+msgid ""
+"The new Job Code will be applied to all selected photos and/or videos."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:187
+#: ../raphodo/jobcodepanel.py:188
 msgid ""
 "Click the Apply button to apply the current Job Code to all selected photos "
 "and/or videos. You can also simply double click the Job Code."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:189
+#: ../raphodo/jobcodepanel.py:190
 msgid ""
 "Removing a Job Code removes it only from the list of saved Job Codes, not "
 "from any photos or videos that it may have been applied to."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:191
+#: ../raphodo/jobcodepanel.py:192
 msgid ""
 "If you want to use Job Codes, configure file renaming or destination "
 "subfolder names to use them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:197
+#: ../raphodo/jobcodepanel.py:198
 msgid "Last Used"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:202
+#: ../raphodo/jobcodepanel.py:203
 msgid "Job Code Sort:"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:205 ../raphodo/rapid.py:2061
+#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2133
 msgid "Ascending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2062
+#: ../raphodo/jobcodepanel.py:207 ../raphodo/rapid.py:2134
 msgid "Descending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:216
+#: ../raphodo/jobcodepanel.py:217
 msgid "&New..."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:220
+#: ../raphodo/jobcodepanel.py:221
 msgid "&Apply"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:224
+#: ../raphodo/jobcodepanel.py:225
 msgid "&Remove"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:228 ../raphodo/preferencedialog.py:125
-#: ../raphodo/preferencedialog.py:154 ../raphodo/preferencedialog.py:433
+#: ../raphodo/jobcodepanel.py:229 ../raphodo/preferencedialog.py:200
+#: ../raphodo/preferencedialog.py:229 ../raphodo/preferencedialog.py:531
 msgid "Remove All"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:427
+#: ../raphodo/jobcodepanel.py:428
 msgid "Do you really want to remove all the Job Codes?"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:429
+#: ../raphodo/jobcodepanel.py:430
 msgid "Remove all Job Codes"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:492
+#: ../raphodo/jobcodepanel.py:493
 msgid "Job Codes"
 msgstr "Job Códigos"
 
@@ -1577,42 +1980,58 @@ msgstr "Job Códigos"
 msgid "<i><b>Hint:</b> %(message)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:418 ../raphodo/nameeditor.py:432
+#: ../raphodo/nameeditor.py:423 ../raphodo/nameeditor.py:437
 #, python-format
 msgid "%(description)s - %(elements)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:512
+#: ../raphodo/nameeditor.py:517
 msgid "Save New Custom Preset..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:513
+#: ../raphodo/nameeditor.py:518
 msgid "Remove All Custom Presets..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:559
+#: ../raphodo/nameeditor.py:564
 msgid "(New Custom Preset)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:576
+#: ../raphodo/nameeditor.py:581
 #, python-format
 msgid "%s (edited)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:579 ../raphodo/nameeditor.py:1370
+#: ../raphodo/nameeditor.py:584 ../raphodo/nameeditor.py:1379
 #, python-format
 msgid "Update Custom Preset \"%s\""
 msgstr ""
 
-#: ../raphodo/nameeditor.py:667
+#: ../raphodo/nameeditor.py:672
 msgid "Save New Custom Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:675
+#: ../raphodo/nameeditor.py:680
 msgid "Preset Name:"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:836
+#: ../raphodo/nameeditor.py:799
+msgid "Photo Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:805
+msgid "Video Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:811
+msgid "Photo Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:817
+msgid "Video Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:842
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>There is insufficient data to "
 "fully generate the name. Please use other renaming options.</i>"
@@ -1621,7 +2040,7 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees.
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:846
+#: ../raphodo/nameeditor.py:853
 #, python-format
 msgid "The character</i> %(separator)s <i>creates a new subfolder level."
 msgstr ""
@@ -1629,50 +2048,50 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:851
+#: ../raphodo/nameeditor.py:858
 #, python-format
 msgid ""
 "There is no need start or end with the folder separator </i> "
 "%(separator)s<i>, because it is added automatically."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:859
+#: ../raphodo/nameeditor.py:866
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>Unique filenames may not be "
 "generated. Make filenames unique by using Sequence values.</i>"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:882 ../raphodo/renamepanel.py:121
+#: ../raphodo/nameeditor.py:889 ../raphodo/renamepanel.py:121
 msgid "Preset:"
 msgstr ""
 
 #. Translators: appears in a combobox, e.g. Image Date (YYYY)
-#: ../raphodo/nameeditor.py:959 ../raphodo/nameeditor.py:980
+#: ../raphodo/nameeditor.py:966 ../raphodo/nameeditor.py:987
 #, python-brace-format
 msgid "{choice} ({variant})"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1005 ../raphodo/preferencedialog.py:530
+#: ../raphodo/nameeditor.py:1012 ../raphodo/preferencedialog.py:783
 msgid "Get help online..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1025
+#: ../raphodo/nameeditor.py:1034
 msgid "Insert"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1351
+#: ../raphodo/nameeditor.py:1360
 msgid "Save Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1356
+#: ../raphodo/nameeditor.py:1365
 msgid ""
-"<b>Do you want to save the changes in a new custom preset?</"
-"b><br><br>Creating a custom preset is not required, but can help you keep "
-"organized.<br><br>The changes to the preferences will still be applied "
-"regardless of whether you create a new custom preset or not."
+"<b>Do you want to save the changes in a new custom "
+"preset?</b><br><br>Creating a custom preset is not required, but can help "
+"you keep organized.<br><br>The changes to the preferences will still be "
+"applied regardless of whether you create a new custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1365
+#: ../raphodo/nameeditor.py:1374
 msgid ""
 "<b>Do you want to save the changes in a custom preset?</b><br><br>If you "
 "like, you can create a new custom preset or update the existing custom "
@@ -1680,136 +2099,167 @@ msgid ""
 "regardless of whether you save a custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1372
+#: ../raphodo/nameeditor.py:1381
 msgid "Save New Custom Preset"
 msgstr ""
 
-#: ../raphodo/newversion.py:306
+#: ../raphodo/newversion.py:312
 msgid "Checking for new version..."
 msgstr ""
 
-#: ../raphodo/newversion.py:307
+#: ../raphodo/newversion.py:313
 msgid "You are running the latest version."
 msgstr ""
 
-#: ../raphodo/newversion.py:308
+#: ../raphodo/newversion.py:314
 msgid "Failed to contact the update server."
 msgstr ""
 
-#: ../raphodo/newversion.py:310
+#: ../raphodo/newversion.py:316
 #, python-format
 msgid "A new version of Rapid Photo Downloader (%s) is available."
 msgstr ""
 
-#: ../raphodo/newversion.py:312
+#: ../raphodo/newversion.py:318
 msgid "Do you want to download the new version?"
 msgstr ""
 
-#: ../raphodo/newversion.py:313
+#: ../raphodo/newversion.py:319
 #, python-format
 msgid "Changes in the new release can be viewed <a href=\"%s\">here</a>."
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the s key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:340 ../raphodo/newversion.py:353
+#: ../raphodo/newversion.py:348 ../raphodo/newversion.py:363
 msgid "&Skip this release"
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the o key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:356
+#: ../raphodo/newversion.py:366
 msgid "&Open Download Page"
 msgstr ""
 
-#: ../raphodo/newversion.py:376
+#: ../raphodo/newversion.py:386
 msgid "Rapid Photo Downloader updates"
 msgstr ""
 
 #. Translators: shows how much of a file has been downloaded e.g  123 KB of 1.3 MB
-#: ../raphodo/newversion.py:478
+#: ../raphodo/newversion.py:488
 #, python-format
 msgid "%(downloaded)s of %(total)s"
 msgstr ""
 
-#: ../raphodo/newversion.py:495
+#: ../raphodo/newversion.py:507
 msgid "Downloading..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:76
+#: ../raphodo/preferencedialog.py:86
 msgid "Preferences"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Automation"
 msgstr "Automatização"
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Thumbnails"
 msgstr "Miniaturas"
 
-#: ../raphodo/preferencedialog.py:85 ../raphodo/preferencedialog.py:343
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/preferencedialog.py:428
 msgid "Error Handling"
 msgstr "Tratamento de Erros"
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:109
+msgid "Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:109 ../raphodo/preferencedialog.py:119
 msgid "Miscellaneous"
 msgstr "Diversos"
 
-#: ../raphodo/preferencedialog.py:94
+#: ../raphodo/preferencedialog.py:147
 msgid "Device Scanning"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:96
+#: ../raphodo/preferencedialog.py:148
 msgid "Scan only external devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:98
+#: ../raphodo/preferencedialog.py:150
 msgid ""
 "Scan for photos and videos only on devices that are external to the "
 "computer,\n"
 "including cameras, memory cards, external hard drives, and USB flash drives."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:102
-msgid "Scan non-camera devices lacking a DCIM folder"
+#: ../raphodo/preferencedialog.py:153
+msgid "Scan only specific folders on devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:104
+#: ../raphodo/preferencedialog.py:155
 msgid ""
-"Scan the entirety of a device for photos and videos, irrespective of whether "
-"it contains a DCIM folder,\n"
-"as opposed to only scanning within a DCIM folder.\n"
+"Scan for photos and videos only in the folders specified below (except "
+"paths\n"
+"specified in Ignored Paths).\n"
 "\n"
-"Changing this setting causes all devices to be scanned again.\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:161
+msgid "Folders to scan:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:164
+msgid ""
+"Folders at the base level of device file systems that will be scanned\n"
+"for photos and videos."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:167 ../raphodo/preferencedialog.py:219
+msgid "Add..."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:169
+msgid ""
+"Add a folder to the list of folders to scan for photos and videos.\n"
 "\n"
-"Note: With cameras, only the DCIM folder is scanned."
+"Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:116
+#: ../raphodo/preferencedialog.py:172 ../raphodo/preferencedialog.py:198
+#: ../raphodo/preferencedialog.py:224 ../raphodo/preferencedialog.py:529
+msgid "Remove"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:174
+msgid ""
+"Remove a folder from the list of folders to scan for photos and videos.\n"
+"\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:191
 msgid "Devices that have been set to automatically ignore or download from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:117
+#: ../raphodo/preferencedialog.py:192
 msgid "Remembered Devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:121
+#: ../raphodo/preferencedialog.py:196
 msgid ""
 "Remove a device from the list of devices to automatically ignore or download "
 "from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:123 ../raphodo/preferencedialog.py:149
-#: ../raphodo/preferencedialog.py:431
-msgid "Remove"
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:127
+#: ../raphodo/preferencedialog.py:202
 msgid ""
 "Clear the list of devices from which to automatically ignore or download "
 "from.\n"
@@ -1817,315 +2267,436 @@ msgid ""
 "Note: Changes take effect when the computer is next scanned for devices."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:140
+#: ../raphodo/preferencedialog.py:215
 msgid "Ignored Paths"
 msgstr "Caminhos Ignorados"
 
-#: ../raphodo/preferencedialog.py:141
+#: ../raphodo/preferencedialog.py:216
 msgid ""
 "The end part of a path that should never be scanned for photos or videos."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:144
-msgid "Add..."
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:146
+#: ../raphodo/preferencedialog.py:221
 msgid ""
 "Add a path to the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:151
+#: ../raphodo/preferencedialog.py:226
 msgid ""
 "Remove a path from the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:156
+#: ../raphodo/preferencedialog.py:231
 msgid ""
 "Clear the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:164
+#: ../raphodo/preferencedialog.py:239
 msgid ""
-"Use python-style <a href=\"http://damonlynch.net/rapid/documentation/"
-"#regularexpressions\">regular expressions</a>"
+"Use python-style <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">regula"
+"r expressions</a>"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:168
+#: ../raphodo/preferencedialog.py:243
 msgid ""
 "Use regular expressions in the list of ignored paths.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:208
+#: ../raphodo/preferencedialog.py:283
 msgid "Program Automation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:209
+#: ../raphodo/preferencedialog.py:284
 msgid "Start downloading at program startup"
 msgstr "Iniciar a descarga após o início do programa"
 
-#: ../raphodo/preferencedialog.py:210
+#: ../raphodo/preferencedialog.py:285
 msgid "Start downloading upon device insertion"
 msgstr "Iniciar a descarga ao conectar o dispositivo"
 
-#: ../raphodo/preferencedialog.py:211
+#: ../raphodo/preferencedialog.py:286
 msgid "Unmount (eject) device upon download completion"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:212
+#: ../raphodo/preferencedialog.py:287
 msgid "Exit program when download completes"
 msgstr "Sair do programa quando o download terminar"
 
-#: ../raphodo/preferencedialog.py:213
+#: ../raphodo/preferencedialog.py:288
 msgid "Exit program even if download had warnings or errors"
 msgstr "Sair do programa mesmo que o download tivesse avisos ou erros"
 
-#: ../raphodo/preferencedialog.py:240
+#: ../raphodo/preferencedialog.py:315
 msgid "Thumbnail Generation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:241
+#: ../raphodo/preferencedialog.py:316
 msgid "Generate thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:242
+#: ../raphodo/preferencedialog.py:318
 msgid "Generate thumbnails to show in the main program window"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:244
+#: ../raphodo/preferencedialog.py:320
 msgid "Cache thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:245
+#: ../raphodo/preferencedialog.py:323
 msgid ""
 "Save thumbnails shown in the main program window in a thumbnail cache unique "
 "to Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:247
+#: ../raphodo/preferencedialog.py:327
 msgid "Generate system thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:248
+#: ../raphodo/preferencedialog.py:330
 msgid ""
 "While downloading, save thumbnails that can be used by desktop file managers "
 "and other programs"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:255
+#: ../raphodo/preferencedialog.py:339
 msgid "Number of CPU cores used to generate thumbnails."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:256
+#: ../raphodo/preferencedialog.py:340
 msgid "CPU cores:"
 msgstr ""
 
 #. Translators: the * acts as an asterisk to denote a reference to an annotation
 #. such as '* Takes effect upon program restart'
-#: ../raphodo/preferencedialog.py:271 ../raphodo/preferencedialog.py:317
+#: ../raphodo/preferencedialog.py:355 ../raphodo/preferencedialog.py:401
 msgid "*"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:294
+#: ../raphodo/preferencedialog.py:378
 msgid "Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:296
+#: ../raphodo/preferencedialog.py:380
 msgid "Calculating..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:302
+#: ../raphodo/preferencedialog.py:386
 msgid "days"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:303
+#: ../raphodo/preferencedialog.py:387
 msgid "forever"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:308
+#: ../raphodo/preferencedialog.py:392
 msgid "Cache size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:310
+#: ../raphodo/preferencedialog.py:394
 msgid "Number of thumbnails:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:312
+#: ../raphodo/preferencedialog.py:396
 msgid "Database size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:314
+#: ../raphodo/preferencedialog.py:398
 msgid "Cache unaccessed thumbnails for:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:322
+#: ../raphodo/preferencedialog.py:406
 msgid "Purge Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:323
+#: ../raphodo/preferencedialog.py:408
 msgid "Optimize Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:336
+#: ../raphodo/preferencedialog.py:421
 msgid "* Takes effect upon program restart"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:346
+#: ../raphodo/preferencedialog.py:431
 msgid "Skip download"
 msgstr "Pular download"
 
-#: ../raphodo/preferencedialog.py:347
+#: ../raphodo/preferencedialog.py:432
 msgid "Don't download the file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:348
+#: ../raphodo/preferencedialog.py:433
 msgid "Add unique identifier"
 msgstr "Adicionar identificador único"
 
-#: ../raphodo/preferencedialog.py:349
+#: ../raphodo/preferencedialog.py:436
 msgid ""
 "Add an identifier like _1 or _2 to the end of the filename, immediately "
 "before the file's extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:355
+#: ../raphodo/preferencedialog.py:444
 msgid "Overwrite"
 msgstr "Sobrescrever"
 
-#: ../raphodo/preferencedialog.py:356
+#: ../raphodo/preferencedialog.py:445
 msgid "Overwrite the previously backed up file"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:357
+#: ../raphodo/preferencedialog.py:446
 msgid "Skip"
 msgstr "Pular"
 
-#: ../raphodo/preferencedialog.py:358
+#: ../raphodo/preferencedialog.py:448
 msgid "Don't overwrite the backup file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:364
+#: ../raphodo/preferencedialog.py:455
 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 identifier:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:378
+#: ../raphodo/preferencedialog.py:464
+msgid ""
+"Using sequence numbers to automatically generate unique filenames is "
+"strongly recommended. Configure file renaming in the Rename panel in the "
+"main window."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:473
 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 ""
 
-#: ../raphodo/preferencedialog.py:398
+#: ../raphodo/preferencedialog.py:494
 msgid "Program Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:399
+#: ../raphodo/preferencedialog.py:495
 msgid "Show a warning when:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:402
+#: ../raphodo/preferencedialog.py:498
 msgid "Downloading files currently not displayed"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:403
+#: ../raphodo/preferencedialog.py:499
 msgid ""
 "Warn when about to download files that are not displayed in the main window."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:405
+#: ../raphodo/preferencedialog.py:501
 msgid "Backup destinations are missing"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:406
-msgid "Warn before starting a download if it is not possible to back up files."
+#: ../raphodo/preferencedialog.py:502
+msgid ""
+"Warn before starting a download if it is not possible to back up files."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:408
+#: ../raphodo/preferencedialog.py:504
 msgid "Program libraries are missing or broken"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:409
+#: ../raphodo/preferencedialog.py:505
 msgid ""
 "Warn if a software library used by Rapid Photo Downloader is missing or not "
 "functioning."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:412
+#: ../raphodo/preferencedialog.py:508
 msgid "Filesystem metadata cannot be set"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:413
+#: ../raphodo/preferencedialog.py:509
 msgid ""
 "Warn if there is an error setting a file's filesystem metadata, such as its "
 "modification time."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:416
+#: ../raphodo/preferencedialog.py:512
 msgid "Encountering unhandled files"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:417
+#: ../raphodo/preferencedialog.py:513
 msgid ""
 "Warn after scanning a device or this computer if there are unrecognized "
 "files that will not be included in the download."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:420
+#: ../raphodo/preferencedialog.py:517
 msgid "Do not warn about unhandled files with extensions:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:424
+#: ../raphodo/preferencedialog.py:522
 msgid ""
 "File extensions are case insensitive and do not need to include the leading "
 "dot."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:427
+#: ../raphodo/preferencedialog.py:525
 msgid "Add"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:428
+#: ../raphodo/preferencedialog.py:526
 msgid ""
 "Add a file extension to the list of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:430
+#: ../raphodo/preferencedialog.py:528
 msgid ""
 "Remove a file extension from the list of unhandled file types to not warn "
 "about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:434
+#: ../raphodo/preferencedialog.py:532
 msgid ""
 "Clear the list of file extensions of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:469
+#: ../raphodo/preferencedialog.py:568
+msgid "Photo and Video Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:571
+msgid "Consolidate files across devices and downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:574
+msgid ""
+"Analyze the results of device scans looking for duplicate files and matching "
+"RAW and JPEG pairs,\n"
+"comparing them across multiple devices and download sessions."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:580
+msgid "Treat matching RAW and JPEG files as:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:581
+msgid "One photo"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:582
+msgid "Two photos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:584
+msgid ""
+"Display matching pairs of RAW and JPEG photos as one photo, and if marked, "
+"download both."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:589
+msgid ""
+"Display matching pairs of RAW and JPEG photos as two different photos. You "
+"can still synchronize their sequence numbers."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:598
+msgid "With matching RAW and JPEG photos:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:600
+msgid "Do not mark JPEG for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:601
+msgid "Do not mark RAW for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:602
+msgid "Mark both for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:609
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"JPEG for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:614
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"RAW for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:619
+msgid ""
+"When matching RAW and JPEG photos are found, automatically mark both for "
+"download."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:625
+msgid ""
+"If you disable file consolidation, choose what to do when a download device "
+"is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:631
+msgid ""
+"When a download device is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:642
+msgid "Clear completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:643
+msgid "Keep displaying completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:644
+msgid "Prompt for what to do"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:649
+msgid ""
+"Automatically clear the display of completed downloads whenever a new "
+"download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:654
+msgid ""
+"Keep displaying completed downloads whenever a new download device is "
+"inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:658
+msgid ""
+"Prompt whether to keep displaying completed downloads or clear them whenever "
+"a new download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:702
 msgid "Version Check"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:470
+#: ../raphodo/preferencedialog.py:703
 msgid "Check for new version at startup"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:471
+#: ../raphodo/preferencedialog.py:705
 msgid "Check for a new version of the program each time the program starts."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:473
+#: ../raphodo/preferencedialog.py:707
 msgid "Include development releases"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:474
+#: ../raphodo/preferencedialog.py:709
 msgid ""
 "Include alpha, beta and other development releases when checking for a new "
 "version of the program.\n"
@@ -2134,11 +2705,11 @@ msgid ""
 "occur."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:489
+#: ../raphodo/preferencedialog.py:725
 msgid "Ignore DNG date/time metadata on MTP devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:490
+#: ../raphodo/preferencedialog.py:727
 msgid ""
 "Ignore date/time metadata in DNG files located on MTP devices, and use the "
 "file's modification time instead.\n"
@@ -2147,70 +2718,86 @@ msgid ""
 "metadata."
 msgstr ""
 
+#: ../raphodo/preferencedialog.py:741
+msgid "Completed Downloads"
+msgstr ""
+
 #. Translators: substituted value is a description for the set of preferences
 #. shown in the preference dialog window, e.g. Devices, Automation, etc.
 #. This string is shown in a tooltip for the "Restore Defaults" button
-#: ../raphodo/preferencedialog.py:710
+#: ../raphodo/preferencedialog.py:1067
 #, python-format
 msgid "Restores default %s preference values"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:832
+#: ../raphodo/preferencedialog.py:1208
 msgid ""
 "Do you want to purge the thumbnail cache? The cache will be purged when the "
 "program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:835
+#: ../raphodo/preferencedialog.py:1212
 msgid "Purge Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:847
+#: ../raphodo/preferencedialog.py:1225
 msgid ""
 "Do you want to optimize the thumbnail cache? The cache will be optimized "
 "when the program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:850
+#: ../raphodo/preferencedialog.py:1229
 msgid "Optimize Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1045
+#: ../raphodo/preferencedialog.py:1481
+msgid "Enter a Folder to Scan"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1482
+msgid "Specify a folder that will be scanned for photos and videos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1483
+msgid "Folder:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1497
 msgid "Enter a Path to Ignore"
 msgstr "Entre um Caminho a ser Ignorado"
 
-#: ../raphodo/preferencedialog.py:1046
+#: ../raphodo/preferencedialog.py:1498
 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"
 
-#: ../raphodo/preferencedialog.py:1047
+#: ../raphodo/preferencedialog.py:1499
 msgid "Path:"
 msgstr "Caminho:"
 
-#: ../raphodo/preferencedialog.py:1061
+#: ../raphodo/preferencedialog.py:1513
 msgid "Enter a File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1062
+#: ../raphodo/preferencedialog.py:1514
 msgid "Specify a file extension (without the leading dot)"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1063 ../raphodo/renamepanel.py:122
+#: ../raphodo/preferencedialog.py:1515 ../raphodo/renamepanel.py:122
 msgid "Extension:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1078
+#: ../raphodo/preferencedialog.py:1530
 msgid "Invalid File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1079
+#: ../raphodo/preferencedialog.py:1531
 #, python-format
 msgid ""
 "The file extension <b>%s</b> is recognized by Rapid Photo Downloader, so it "
 "makes no sense to warn about its presence."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1081
+#: ../raphodo/preferencedialog.py:1533
 #, python-format
 msgid ""
 "Recognized file types:\n"
@@ -2236,104 +2823,103 @@ msgstr ""
 msgid "Birthday"
 msgstr ""
 
-#: ../raphodo/preferences.py:614
+#: ../raphodo/preferences.py:624
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Preferências de subpasta não deve começar com uma %s"
 
-#: ../raphodo/preferences.py:617
+#: ../raphodo/preferences.py:627
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Preferências subpasta não deve terminar com uma %s"
 
-#: ../raphodo/preferences.py:622
+#: ../raphodo/preferences.py:632
 #, 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"
 
-#. self.setFlat(True)
 #: ../raphodo/primarybutton.py:72
 msgid "Download 8 Photos and 10 Videos"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:86 ../raphodo/problemnotification.py:208
+#: ../raphodo/problemnotification.py:87 ../raphodo/problemnotification.py:209
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:89
+#: ../raphodo/problemnotification.py:90
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:116
+#: ../raphodo/problemnotification.py:117
 #, python-format
 msgid "GPhoto2 Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:124
+#: ../raphodo/problemnotification.py:125
 msgid ""
 "Unable to initialize the camera, probably because another program is using "
 "it. No files were copied from it."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:134
+#: ../raphodo/problemnotification.py:135
 #, python-format
 msgid "Unable to read directory %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:140
+#: ../raphodo/problemnotification.py:141
 #, python-format
 msgid "Unable to access modification time or size from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:146
+#: ../raphodo/problemnotification.py:147
 #, python-format
 msgid "Unable to read file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:152
+#: ../raphodo/problemnotification.py:153
 #, python-format
 msgid "Unable to write file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:158
+#: ../raphodo/problemnotification.py:159
 #, python-format
 msgid "Unable to move file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:164
+#: ../raphodo/problemnotification.py:165
 #, python-format
 msgid "Unable to remove file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:170
+#: ../raphodo/problemnotification.py:171
 #, python-format
 msgid "Unable to copy file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:176
+#: ../raphodo/problemnotification.py:177
 #, python-format
 msgid "Zero length file %s will not be downloaded"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:182
+#: ../raphodo/problemnotification.py:183
 #, python-format
 msgid "Could not determine filesystem modification time for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:188
+#: ../raphodo/problemnotification.py:189
 #, python-format
 msgid "Unable to load metadata from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:194
+#: ../raphodo/problemnotification.py:195
 #, python-format
 msgid ""
 "Unable to load metadata from %(name)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:202
+#: ../raphodo/problemnotification.py:203
 #, python-format
 msgid ""
 "An error occurred setting a file's filesystem metadata on the filesystem %s. "
@@ -2341,78 +2927,78 @@ msgid ""
 "again."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:216
+#: ../raphodo/problemnotification.py:217
 #, python-format
 msgid "Encountered unhandled file %s. It will not be downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:223
+#: ../raphodo/problemnotification.py:224
 #, python-format
 msgid "%(filetype)s %(destination)s already exists."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:234 ../raphodo/problemnotification.py:262
+#: ../raphodo/problemnotification.py:235 ../raphodo/problemnotification.py:263
 #, python-format
 msgid ""
 "The existing %(filetype)s %(destination)s was last modified on %(date)s at "
 "%(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:245
+#: ../raphodo/problemnotification.py:246
 #, python-format
 msgid "The %(filetype)s %(source)s was not downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:273
+#: ../raphodo/problemnotification.py:274
 #, python-format
 msgid "The %(filetype)s %(source)s was downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:282
+#: ../raphodo/problemnotification.py:283
 #, python-format
 msgid "The unique identifier '%s' was added to the filename."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:298
+#: ../raphodo/problemnotification.py:299
 #, python-format
 msgid ""
 "The existing backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:309
+#: ../raphodo/problemnotification.py:310
 #, python-format
 msgid "The %(filetype)s %(source)s was not backed up from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:326
+#: ../raphodo/problemnotification.py:327
 #, python-format
 msgid ""
 "The previous backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:337
+#: ../raphodo/problemnotification.py:338
 #, python-format
 msgid ""
 "The %(filetype)s %(source)s from %(device)s was backed up, overwriting the "
 "previous backup %(filetype)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:356
+#: ../raphodo/problemnotification.py:357
 #, python-format
 msgid ""
 "When synchronizing RAW + JPEG sequence values, a duplicate %(filetype)s "
 "%(file)s was encountered, and was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:366
+#: ../raphodo/problemnotification.py:367
 msgid ""
 "When synchronizing RAW + JPEG sequence values, photos were detected with the "
 "same filenames, but taken at different times:"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:373
+#: ../raphodo/problemnotification.py:374
 #, python-format
 msgid ""
 "%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
@@ -2421,134 +3007,134 @@ msgstr ""
 "%(image1)s foi tomada em %(image1_date)s em %(image1_time)s, e %(image2)s em "
 "%(image2_date)s em %(image2_time)s."
 
-#: ../raphodo/problemnotification.py:389
+#: ../raphodo/problemnotification.py:390
 #, python-format
 msgid "Unable to finalize the filename for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:424
+#: ../raphodo/problemnotification.py:425
 #, python-format
 msgid ""
 "The filename %(destination)s was not fully generated for %(filetype)s "
 "%(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:433
+#: ../raphodo/problemnotification.py:434
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr "Os metadados %(type)s estão faltando."
 
-#: ../raphodo/problemnotification.py:439
+#: ../raphodo/problemnotification.py:440
 #, python-format
 msgid "The following metadata is missing: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:445
+#: ../raphodo/problemnotification.py:446
 #, python-format
 msgid "Date/time conversion failed: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:451
+#: ../raphodo/problemnotification.py:452
 msgid ""
 "Could not extract valid date/time metadata or determine the file "
 "modification time."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:457
+#: ../raphodo/problemnotification.py:458
 msgid "Filename does not have an extension."
 msgstr "Nome do arquivo não tem extensão."
 
-#: ../raphodo/problemnotification.py:460
+#: ../raphodo/problemnotification.py:461
 msgid "Filename does not have a number component."
 msgstr "Nome do arquivo não tem um componente número."
 
-#: ../raphodo/problemnotification.py:464
+#: ../raphodo/problemnotification.py:465
 #, python-format
 msgid "Error generating component %(component)s. Error: %(error)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:477
+#: ../raphodo/problemnotification.py:478
 #, python-format
 msgid ""
 "The download subfolders %(folder)s were only partially generated for "
 "%(filetype)s %(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:486
+#: ../raphodo/problemnotification.py:487
 #, python-format
 msgid ""
 "There is no data with which to generate the %(subfolder_file)s for "
 "%(filename)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:499
+#: ../raphodo/problemnotification.py:500
 #, python-format
 msgid ""
 "Unable to create the %(filetype)s %(destination)s in %(folder)s. The "
 "download file was %(source)s in %(device)s. It was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:514
+#: ../raphodo/problemnotification.py:515
 #, python-format
 msgid "Unable to create the download subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:526
+#: ../raphodo/problemnotification.py:527
 #, python-format
 msgid "Unable to create the backup subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:577
+#: ../raphodo/problemnotification.py:578
 #, python-format
 msgid "Problems scanning %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:584
+#: ../raphodo/problemnotification.py:585
 #, python-format
 msgid "Problems copying from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:591
+#: ../raphodo/problemnotification.py:592
 msgid "Problems while finalizing filenames and generating subfolders"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:598
+#: ../raphodo/problemnotification.py:599
 #, python-format
 msgid "Problems backing up to %s"
 msgstr ""
 
-#. Translators: for example Nov 3 or Dec 31
-#. The start and end dates are on a different day
-#. Translators: for example Nov 3 or Dec 31
-#: ../raphodo/proximity.py:105 ../raphodo/proximity.py:221
-#: ../raphodo/proximity.py:224 ../raphodo/proximity.py:828
+#. Translators: for example Nov 3 2015, 11:25 AM
+#. Translators: for example, Nov 3, 12:15 PM
+#: ../raphodo/proximity.py:188 ../raphodo/proximity.py:213
+#: ../raphodo/proximity.py:236 ../raphodo/proximity.py:239
 #, python-format
-msgid "%(month)s %(numeric_day)s"
+msgid "%(date)s, %(time)s"
 msgstr ""
 
-#. Translators: for example Nov 15 2015
-#. Translators: for example Nov 3 2015
-#: ../raphodo/proximity.py:109 ../raphodo/proximity.py:230
-#: ../raphodo/proximity.py:231 ../raphodo/proximity.py:831
+#: ../raphodo/proximity.py:204
 #, python-format
-msgid "%(date)s %(year)s"
+msgid "%(starttime)s - %(endtime)s"
 msgstr ""
 
-#. Translators: for example Nov 3 2015, 11:25 AM
-#. Translators: for example, Nov 3, 12:15 PM
-#: ../raphodo/proximity.py:197 ../raphodo/proximity.py:215
-#: ../raphodo/proximity.py:234 ../raphodo/proximity.py:236
+#. The start and end dates are on a different day
+#. Translators: for example Nov 3 or Dec 31
+#: ../raphodo/proximity.py:221 ../raphodo/proximity.py:225
+#: ../raphodo/proximity.py:980 ../raphodo/timeutils.py:105
 #, python-format
-msgid "%(date)s, %(time)s"
+msgid "%(month)s %(numeric_day)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:209
+#. Translators: for example Nov 3 2015
+#. Translators: for example Nov 2 2015
+#. Translators: for example Nov 15 2015
+#: ../raphodo/proximity.py:232 ../raphodo/proximity.py:233
+#: ../raphodo/proximity.py:985 ../raphodo/timeutils.py:110
 #, python-format
-msgid "%(starttime)s - %(endtime)s"
+msgid "%(date)s %(year)s"
 msgstr ""
 
 #. Translators: for example, Nov 3, 12:15 PM - Nov 4, 1:00 AM
-#: ../raphodo/proximity.py:241
+#: ../raphodo/proximity.py:245
 #, python-format
 msgid "%(earlier_time)s - %(later_time)s"
 msgstr ""
@@ -2557,25 +3143,25 @@ msgstr ""
 #. Nov 3 2012, 12:15 PM -
 #. Nov 4 2012, 1:00 AM
 #. (please keep the line break signified by \n)
-#: ../raphodo/proximity.py:248
+#: ../raphodo/proximity.py:253
 #, python-format
 msgid ""
 "%(earlier_time)s -\n"
 "%(later_time)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:359
+#: ../raphodo/proximity.py:382
 #, python-format
 msgid "%(month)s  %(year)s"
 msgstr ""
 
 #. Translators: for example Nov 2015
-#: ../raphodo/proximity.py:833
+#: ../raphodo/proximity.py:987
 #, python-format
 msgid "%(month)s %(year)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:1344
+#: ../raphodo/proximity.py:1595
 msgid ""
 "The time elapsed between consecutive photos and videos that is used to build "
 "the Timeline"
@@ -2585,47 +3171,47 @@ msgstr ""
 #. Replace the very last character (after the d) with the correct
 #. localized value, keeping everything else. In other words, change
 #. only the m character.
-#: ../raphodo/proximity.py:1406
+#: ../raphodo/proximity.py:1652
 #, python-format
 msgid "%(minutes)dm"
 msgstr ""
 
 #. Translators: i.e. "1.5h", which is short for 1.5 hours.
 #. Replace the entire string with the correct localized value
-#: ../raphodo/proximity.py:1410
+#: ../raphodo/proximity.py:1656
 msgid "1.5h"
 msgstr ""
 
 #. Translators: e.g. "5h", which is short for 5 hours.
 #. Replace the very last character (after the d) with the correct localized value,
 #. keeping everything else. In other words, change only the h character.
-#: ../raphodo/proximity.py:1415
+#: ../raphodo/proximity.py:1661
 #, python-format
 msgid "%(hours)dh"
 msgstr ""
 
-#: ../raphodo/proximity.py:1461
+#: ../raphodo/proximity.py:1710
 msgid ""
 "The Timeline groups photos and videos based on how much time elapsed between "
 "consecutive shots. Use it to identify photos and videos taken at different "
 "periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/proximity.py:1464
+#: ../raphodo/proximity.py:1715
 msgid ""
 "Use the slider (below) to adjust the time elapsed between consecutive shots "
 "that is used to build the Timeline."
 msgstr ""
 
-#: ../raphodo/proximity.py:1466
+#: ../raphodo/proximity.py:1718
 msgid "Timeline build pending..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1467
+#: ../raphodo/proximity.py:1719
 msgid "Timeline is building..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1468
+#: ../raphodo/proximity.py:1721
 msgid ""
 "The Timeline needs to be rebuilt because the file modification time does not "
 "match the time a shot was taken for one or more shots.<br><br>The Timeline "
@@ -2637,61 +3223,61 @@ msgid ""
 "downloading, which is when the metadata is read."
 msgstr ""
 
-#: ../raphodo/rapid.py:485 ../raphodo/rapid.py:2461 ../raphodo/rapid.py:3728
-#: ../raphodo/rapid.py:3846 ../raphodo/rapid.py:3850 ../raphodo/rapid.py:3870
-#: ../raphodo/rapid.py:3874 ../raphodo/rapid.py:3998 ../raphodo/rapid.py:4007
-#: ../raphodo/rapid.py:4495 ../raphodo/rapid.py:4888 ../raphodo/rapid.py:5722
-#: ../raphodo/rememberthisdialog.py:97
+#: ../raphodo/rapid.py:493 ../raphodo/rapid.py:2555 ../raphodo/rapid.py:3934
+#: ../raphodo/rapid.py:4065 ../raphodo/rapid.py:4069 ../raphodo/rapid.py:4092
+#: ../raphodo/rapid.py:4096 ../raphodo/rapid.py:4226 ../raphodo/rapid.py:4237
+#: ../raphodo/rapid.py:4743 ../raphodo/rapid.py:5195 ../raphodo/rapid.py:5997
+#: ../raphodo/rememberthisdialog.py:99
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:3
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: ../raphodo/rapid.py:1100
+#: ../raphodo/rapid.py:1131
 msgid ""
 "<b>ExifTool has a problem</b><br><br> Rapid Photo Downloader uses ExifTool "
 "to get metadata from videos and photos. The program will run without it, but "
 "installing it is <b>highly</b> recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1110 ../raphodo/rapid.py:1130
+#: ../raphodo/rapid.py:1141 ../raphodo/rapid.py:1161
 msgid "Problem with libmediainfo"
 msgstr ""
 
-#: ../raphodo/rapid.py:1119
+#: ../raphodo/rapid.py:1150
 msgid ""
 "<b>The library libmediainfo appears to be missing</b><br><br> Rapid Photo "
 "Downloader uses libmediainfo to get the date and time a video was shot. The "
 "program will run  without it, but installing it is recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1417
+#: ../raphodo/rapid.py:1448
 msgid "Download failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1419
+#: ../raphodo/rapid.py:1450
 msgid ""
 "Sorry, the download of the new version of Rapid Photo Downloader failed."
 msgstr ""
 
-#: ../raphodo/rapid.py:1425
+#: ../raphodo/rapid.py:1457
 msgid ""
 "The new version was successfully downloaded. Do you want to close Rapid "
 "Photo Downloader and install it now?"
 msgstr ""
 
-#: ../raphodo/rapid.py:1428
+#: ../raphodo/rapid.py:1461
 msgid "Update Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:1432
+#: ../raphodo/rapid.py:1465
 msgid "Install"
 msgstr ""
 
-#: ../raphodo/rapid.py:1450
+#: ../raphodo/rapid.py:1483
 msgid "New version saved"
 msgstr ""
 
-#: ../raphodo/rapid.py:1451
+#: ../raphodo/rapid.py:1485
 #, python-format
 msgid ""
 "The tar file and installer script are saved at:\n"
@@ -2699,163 +3285,163 @@ msgid ""
 " %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:1468
+#: ../raphodo/rapid.py:1502
 msgid "Upgrade failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1469
+#: ../raphodo/rapid.py:1505
 msgid ""
 "Sorry, upgrading Rapid Photo Downloader failed because there was an error "
 "opening the installer."
 msgstr ""
 
-#: ../raphodo/rapid.py:1667 ../raphodo/rapid.py:2331
+#: ../raphodo/rapid.py:1709 ../raphodo/rapid.py:2425
 msgid "Download"
 msgstr "Download"
 
-#: ../raphodo/rapid.py:1671
+#: ../raphodo/rapid.py:1713
 msgid "&Refresh..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1675
+#: ../raphodo/rapid.py:1717
 msgid "&Preferences"
 msgstr ""
 
-#: ../raphodo/rapid.py:1679
+#: ../raphodo/rapid.py:1721
 msgid "&Quit"
 msgstr ""
 
-#: ../raphodo/rapid.py:1683
+#: ../raphodo/rapid.py:1725
 msgid "Error &Reports"
 msgstr ""
 
-#: ../raphodo/rapid.py:1687
+#: ../raphodo/rapid.py:1729
 msgid "Clear Completed Downloads"
 msgstr ""
 
-#: ../raphodo/rapid.py:1691
+#: ../raphodo/rapid.py:1733
 msgid "Get Help Online..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1695
+#: ../raphodo/rapid.py:1737
 msgid "&Tip of the Day..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1699
+#: ../raphodo/rapid.py:1741
 msgid "Report a Problem..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1703
+#: ../raphodo/rapid.py:1745
 msgid "Make a Donation..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1707
+#: ../raphodo/rapid.py:1749
 msgid "Translate this Application..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1711
+#: ../raphodo/rapid.py:1753
 msgid "&About..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1715
+#: ../raphodo/rapid.py:1757
 msgid "Check for Updates..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1797
+#: ../raphodo/rapid.py:1840
 msgid "Timeline"
 msgstr ""
 
-#: ../raphodo/rapid.py:1807
+#: ../raphodo/rapid.py:1850
 msgid "Destination"
 msgstr ""
 
-#: ../raphodo/rapid.py:1808
+#: ../raphodo/rapid.py:1851
 msgid "Rename"
 msgstr ""
 
-#: ../raphodo/rapid.py:1810
+#: ../raphodo/rapid.py:1853
 msgid "Back Up"
 msgstr ""
 
 #. Devices Header and View
-#: ../raphodo/rapid.py:1926
+#: ../raphodo/rapid.py:1977
 msgid ""
 "Turn on or off the use of devices attached to this computer as download "
 "sources"
 msgstr ""
 
 #. This Computer Header and View
-#: ../raphodo/rapid.py:1940
+#: ../raphodo/rapid.py:1994
 msgid ""
 "Turn on or off the use of a folder on this computer as a download source"
 msgstr ""
 
-#: ../raphodo/rapid.py:1941
+#: ../raphodo/rapid.py:1996
 msgid "This Computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:1952
+#: ../raphodo/rapid.py:2009
 msgid "Select a source folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:1975
+#: ../raphodo/rapid.py:2038
 msgid "Projected Storage Use"
 msgstr ""
 
-#: ../raphodo/rapid.py:1989 ../raphodo/rapid.py:1997
+#: ../raphodo/rapid.py:2056 ../raphodo/rapid.py:2068
 msgid "Select a destination folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:2045
+#: ../raphodo/rapid.py:2117
 msgid "All"
 msgstr ""
 
-#: ../raphodo/rapid.py:2046
+#: ../raphodo/rapid.py:2118
 msgid "New"
 msgstr ""
 
-#: ../raphodo/rapid.py:2048
+#: ../raphodo/rapid.py:2120
 msgid "Show:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2051
+#: ../raphodo/rapid.py:2123
 msgid "Modification Time"
 msgstr ""
 
-#: ../raphodo/rapid.py:2052
+#: ../raphodo/rapid.py:2124
 msgid "Checked State"
 msgstr ""
 
-#: ../raphodo/rapid.py:2055
+#: ../raphodo/rapid.py:2127
 msgid "File Type"
 msgstr ""
 
-#: ../raphodo/rapid.py:2056
+#: ../raphodo/rapid.py:2128
 msgid "Device"
 msgstr "Dispositivo"
 
-#: ../raphodo/rapid.py:2058
+#: ../raphodo/rapid.py:2130
 msgid "Sort:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2069
+#: ../raphodo/rapid.py:2141
 msgid "Select All:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2311
+#: ../raphodo/rapid.py:2405
 #, python-format
 msgid "Download %(files)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2327
+#: ../raphodo/rapid.py:2421
 msgid "Resume Download"
 msgstr ""
 
-#: ../raphodo/rapid.py:2329
+#: ../raphodo/rapid.py:2423
 msgid "Pause"
 msgstr "Pausar"
 
-#: ../raphodo/rapid.py:2417
+#: ../raphodo/rapid.py:2511
 #, python-brace-format
 msgid ""
 "Please report the problem at <a href=\"{website}\">{website}</a>.<br><br>\n"
@@ -2864,11 +3450,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/rapid.py:2431
+#: ../raphodo/rapid.py:2525
 msgid "Thank you for reporting a problem in Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:2529
+#: ../raphodo/rapid.py:2624
 #, python-format
 msgid ""
 "<b>Changing This Computer source path</b><br><br>Do you really want to "
@@ -2877,30 +3463,29 @@ msgid ""
 "from This Computer will be cancelled."
 msgstr ""
 
-#: ../raphodo/rapid.py:2595
+#: ../raphodo/rapid.py:2694
 msgid "You cannot change the download destination while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:2604
+#: ../raphodo/rapid.py:2704
 #, python-format
 msgid ""
 "<b>Confirm Download Destination</b><br><br>Are you sure you want to set the "
 "%(file_type)s download destination to %(path)s?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2682
+#: ../raphodo/rapid.py:2785
 msgid ""
+"\n"
 "<b>Downloading all files</b><br><br>\n"
-"                    A download always includes all files that are checked "
-"for download,\n"
-"                    including those that are not currently displayed because "
-"the Timeline\n"
-"                    is being used or because only new files are being shown."
-"<br><br>\n"
-"                    Do you want to proceed with the download?"
+"A download always includes all files that are checked for download,\n"
+"including those that are not currently displayed because the Timeline\n"
+"is being used or because only new files are being shown.<br><br>\n"
+"Do you want to proceed with the download?\n"
+"                        "
 msgstr ""
 
-#: ../raphodo/rapid.py:2820
+#: ../raphodo/rapid.py:2937
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -2911,7 +3496,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: ../raphodo/rapid.py:2824
+#: ../raphodo/rapid.py:2940
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -2920,199 +3505,193 @@ msgstr ""
 "Essa pasta de download é inválida:\n"
 "%s"
 
-#: ../raphodo/rapid.py:2827
+#: ../raphodo/rapid.py:2943
 msgid "Download Failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:2828
+#: ../raphodo/rapid.py:2944
 msgid "The download cannot proceed."
 msgstr ""
 
-#: ../raphodo/rapid.py:2842
+#: ../raphodo/rapid.py:2962
 msgid ""
 "Photos and videos will not be backed up because there is nowhere to back "
 "them up. Do you still want to start the download?"
 msgstr ""
 
-#. Translators: filetype will be replaced with 'photos' or 'videos'
-#: ../raphodo/rapid.py:2847 ../raphodo/rapid.py:2854
+#: ../raphodo/rapid.py:2969 ../raphodo/rapid.py:2979
 #, python-format
 msgid ""
 "No backup device exists for backing up %(filetype)s. Do you still want to "
 "start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2848 ../raphodo/rpdfile.py:228
+#: ../raphodo/rapid.py:2971 ../raphodo/rpdfile.py:228
 msgid "photos"
 msgstr "fotos"
 
-#: ../raphodo/rapid.py:2855 ../raphodo/rpdfile.py:223
+#: ../raphodo/rapid.py:2981 ../raphodo/rpdfile.py:223
 msgid "videos"
 msgstr "vídeos"
 
-#: ../raphodo/rapid.py:2861
+#: ../raphodo/rapid.py:2989
 msgid ""
 "<b>The photo and video backup destinations do not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2869 ../raphodo/rapid.py:2876
+#: ../raphodo/rapid.py:2999 ../raphodo/rapid.py:3008
 #, python-format
 msgid ""
 "<b>The %(filetype)s backup destination does not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2871 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:818
+#: ../raphodo/rapid.py:3001 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:843
 msgid "photo"
 msgstr "foto"
 
-#: ../raphodo/rapid.py:2878 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:858
+#: ../raphodo/rapid.py:3010 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:883
 msgid "video"
 msgstr "vídeo"
 
-#: ../raphodo/rapid.py:2886
+#: ../raphodo/rapid.py:3018
 msgid "Backup problem"
 msgstr ""
 
-#. Translators - in the middle is a unicode em dash - please retain it
-#. This string is displayed in the status bar when the download is running
-#: ../raphodo/rapid.py:3571
+#: ../raphodo/rapid.py:3756
 #, python-format
 msgid "%(downloading_from)s — %(time_left)s left (%(speed)s)"
 msgstr ""
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3640
+#: ../raphodo/rapid.py:3828
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s descarregados"
 
-#. Translators: e.g. 2 videos failed to download
-#: ../raphodo/rapid.py:3645
+#: ../raphodo/rapid.py:3836
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "%(noFiles)s %(filetypes)s não puderam ser descarregados"
 
-#: ../raphodo/rapid.py:3650 ../raphodo/rapid.py:3723
+#: ../raphodo/rapid.py:3842 ../raphodo/rapid.py:3927
 msgid "warnings"
 msgstr "avisos"
 
-#: ../raphodo/rapid.py:3679
+#: ../raphodo/rapid.py:3873
 msgid "All downloads complete"
 msgstr "Todos os downloads completos"
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3686 ../raphodo/rapid.py:3695 ../raphodo/rapid.py:3704
-#: ../raphodo/rapid.py:3713 ../raphodo/rapid.py:3721
+#: ../raphodo/rapid.py:3881 ../raphodo/rapid.py:3892 ../raphodo/rapid.py:3903
+#: ../raphodo/rapid.py:3914 ../raphodo/rapid.py:3924
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: ../raphodo/rapid.py:3688 ../raphodo/rapid.py:3706
+#: ../raphodo/rapid.py:3884 ../raphodo/rapid.py:3906
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s downloaded"
 
-#: ../raphodo/rapid.py:3697 ../raphodo/rapid.py:3715
+#: ../raphodo/rapid.py:3895 ../raphodo/rapid.py:3917
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "%(filetype)s falhou em baixar"
 
-#: ../raphodo/rapid.py:3742
+#: ../raphodo/rapid.py:3950
 msgid "1 failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:3744
+#: ../raphodo/rapid.py:3952
 #, python-format
 msgid "%d failures"
 msgstr ""
 
-#: ../raphodo/rapid.py:3749
+#: ../raphodo/rapid.py:3957
 msgid "1 warning"
 msgstr ""
 
-#: ../raphodo/rapid.py:3751
+#: ../raphodo/rapid.py:3959
 #, python-format
 msgid "%d warnings"
 msgstr ""
 
-#: ../raphodo/rapid.py:3771
+#: ../raphodo/rapid.py:3981
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3774
+#: ../raphodo/rapid.py:3985
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3779
+#: ../raphodo/rapid.py:3989
 #, python-format
 msgid "No files downloaded — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3781
+#: ../raphodo/rapid.py:3991
 msgid "No files downloaded"
 msgstr ""
 
-#: ../raphodo/rapid.py:3805
+#: ../raphodo/rapid.py:4021
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3809
+#: ../raphodo/rapid.py:4026
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3812
+#: ../raphodo/rapid.py:4031
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3820
+#: ../raphodo/rapid.py:4039
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3833
+#: ../raphodo/rapid.py:4052
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3837
+#: ../raphodo/rapid.py:4056
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3841
+#: ../raphodo/rapid.py:4060
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices"
 msgstr ""
 
-#: ../raphodo/rapid.py:3867
+#: ../raphodo/rapid.py:4087
 msgid "The Destination subfolders and Timeline have been rebuilt"
 msgstr ""
 
-#: ../raphodo/rapid.py:3922
+#: ../raphodo/rapid.py:4144
 msgid "Program preferences are invalid"
 msgstr "Preferências do programa são inválidas"
 
-#: ../raphodo/rapid.py:3999
+#: ../raphodo/rapid.py:4228
 #, python-format
 msgid ""
 "<b>All files on the %(camera)s are inaccessible</b>.<br><br>It may be locked "
@@ -3122,179 +3701,205 @@ msgid ""
 "ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4008
+#: ../raphodo/rapid.py:4239
 #, python-format
 msgid ""
-"<b>The %(camera)s appears to be in use by another application.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again.<br><br>Alternatively, you can ignore this "
-"device."
+"<b>The %(camera)s appears to be in use by another "
+"application.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again.<br><br>Alternatively, you "
+"can ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4019
+#: ../raphodo/rapid.py:4250
 msgid "&Try Again"
 msgstr ""
 
-#: ../raphodo/rapid.py:4020
+#: ../raphodo/rapid.py:4251
 msgid "&Ignore This Device"
 msgstr ""
 
-#: ../raphodo/rapid.py:4086
+#: ../raphodo/rapid.py:4323
 #, python-format
 msgid "Sorry, an unexpected problem occurred while scanning %s."
 msgstr ""
 
-#: ../raphodo/rapid.py:4087
+#: ../raphodo/rapid.py:4324
 msgid "Unfortunately you cannot download from this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4091
+#: ../raphodo/rapid.py:4328
 msgid ""
 "A possible workaround for the problem might be downloading from the camera's "
 "memory card using a card reader."
 msgstr ""
 
-#: ../raphodo/rapid.py:4096
+#: ../raphodo/rapid.py:4333
 msgid "Device scan failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:4472
+#: ../raphodo/rapid.py:4720
 #, python-format
 msgid ""
-"<b>The %(camera)s cannot be scanned because it cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again."
+"<b>The %(camera)s cannot be scanned because it cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again."
 msgstr ""
 
-#: ../raphodo/rapid.py:4496
+#: ../raphodo/rapid.py:4745
 #, python-format
 msgid ""
-"<b>The download cannot start because the %(camera)s cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again, and choose which files you want to "
-"download from it."
+"<b>The download cannot start because the %(camera)s cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again, and choose which files "
+"you want to download from it."
+msgstr ""
+
+#: ../raphodo/rapid.py:4842
+msgid "Completed Downloads Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4844
+#, python-format
+msgid "%s whose download have completed are displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4846
+msgid "Do you want to clear the completed downloads?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4848
+msgid "Completed Download Present"
 msgstr ""
 
-#: ../raphodo/rapid.py:4635
+#: ../raphodo/rapid.py:4850
+#, python-format
+msgid "%s whose download has completed is displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4852
+msgid "Do you want to clear the completed download?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4933
 #, python-format
 msgid ""
 "Do you want to download photos and videos from the device <i>%(device)s</i>?"
 msgstr ""
 
-#: ../raphodo/rapid.py:4877
+#: ../raphodo/rapid.py:5183
 #, python-format
 msgid "<b>Do you want to ignore the %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4879
+#: ../raphodo/rapid.py:5186
 msgid ""
 "All cameras, phones and tablets with the same model name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:4883
+#: ../raphodo/rapid.py:5190
 #, python-format
 msgid ""
 "<b>Do you want to ignore the device %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4885
+#: ../raphodo/rapid.py:5192
 msgid "Any device with the same name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:5178
+#: ../raphodo/rapid.py:5492
 #, python-format
 msgid "Downloading from %(location)s on This Computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5180
+#: ../raphodo/rapid.py:5496
 msgid ""
 "Do you really want to download from here?<br><br>On some systems, scanning "
 "this location can take a very long time."
 msgstr ""
 
-#: ../raphodo/rapid.py:5224
+#: ../raphodo/rapid.py:5537
 #, python-format
 msgid "Generating thumbnails for %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5227
+#: ../raphodo/rapid.py:5540
 #, python-format
 msgid "Scanning %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5237
+#: ../raphodo/rapid.py:5551
 #, python-format
 msgid ""
 "%(number)s of %(available files)s checked for download (%(hidden)s hidden)"
 msgstr ""
 
-#: ../raphodo/rapid.py:5243
+#: ../raphodo/rapid.py:5559
 #, python-format
 msgid "%(number)s of %(available files)s checked for download"
 msgstr ""
 
-#: ../raphodo/rapid.py:5494
+#: ../raphodo/rapid.py:5764
 msgid "Display program information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5496
+#: ../raphodo/rapid.py:5766
 msgid "Display debugging information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5499
+#: ../raphodo/rapid.py:5769
 msgid "List photo and video file extensions the program recognizes and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5502
+#: ../raphodo/rapid.py:5772
 msgid "Turn on or off the the renaming of photos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5504
+#: ../raphodo/rapid.py:5774
 msgid "turn on or off the the renaming of videos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5506
+#: ../raphodo/rapid.py:5776
 msgid ""
 "Turn on or off the automatic detection of devices from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5510
+#: ../raphodo/rapid.py:5780
 msgid "Turn on or off downloading from this computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5512 ../raphodo/rapid.py:5515 ../raphodo/rapid.py:5518
-#: ../raphodo/rapid.py:5539 ../raphodo/rapid.py:5543
+#: ../raphodo/rapid.py:5782 ../raphodo/rapid.py:5785 ../raphodo/rapid.py:5788
+#: ../raphodo/rapid.py:5809 ../raphodo/rapid.py:5813
 msgid "PATH"
 msgstr ""
 
-#: ../raphodo/rapid.py:5513
+#: ../raphodo/rapid.py:5783
 msgid "The PATH on this computer from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5516
+#: ../raphodo/rapid.py:5786
 msgid "The PATH where photos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5519
+#: ../raphodo/rapid.py:5789
 msgid "The PATH where videos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5521
+#: ../raphodo/rapid.py:5791
 msgid "Turn on or off the backing up of photos and videos while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:5525
+#: ../raphodo/rapid.py:5795
 msgid "Turn on or off the automatic detection of backup devices."
 msgstr ""
 
-#: ../raphodo/rapid.py:5527 ../raphodo/rapid.py:5533
+#: ../raphodo/rapid.py:5797 ../raphodo/rapid.py:5803
 msgid "FOLDER"
 msgstr ""
 
-#: ../raphodo/rapid.py:5528
+#: ../raphodo/rapid.py:5798
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected photo "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3302,7 +3907,7 @@ msgid ""
 "photos up to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5534
+#: ../raphodo/rapid.py:5804
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected video "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3310,115 +3915,124 @@ msgid ""
 "up videos to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5540
+#: ../raphodo/rapid.py:5810
 msgid ""
 "The PATH where photos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5544
+#: ../raphodo/rapid.py:5814
 msgid ""
 "The PATH where videos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5547
+#: ../raphodo/rapid.py:5817
 #, python-format
 msgid "Ignore photos with the following extensions: %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5551
-msgid "Turn on or off starting downloads as soon as the program itself starts."
+#: ../raphodo/rapid.py:5821
+msgid ""
+"Turn on or off starting downloads as soon as the program itself starts."
 msgstr ""
 
-#: ../raphodo/rapid.py:5554
+#: ../raphodo/rapid.py:5824
 msgid "Turn on or off starting downloads as soon as a device is inserted."
 msgstr ""
 
-#: ../raphodo/rapid.py:5557
+#: ../raphodo/rapid.py:5827
 msgid ""
 "Turn on or off use of the Rapid Photo Downloader Thumbnail Cache. Turning it "
 "off does not delete existing cache contents."
 msgstr ""
 
-#: ../raphodo/rapid.py:5561
+#: ../raphodo/rapid.py:5831
 msgid ""
 "Delete all thumbnails in the Rapid Photo Downloader Thumbnail Cache, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5565
+#: ../raphodo/rapid.py:5835
 msgid "Forget which files have been previously downloaded, and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5568
+#: ../raphodo/rapid.py:5838
 msgid ""
 "Import preferences from an old program version and exit. Requires the "
 "command line program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5571
+#: ../raphodo/rapid.py:5841
 msgid ""
 "Reset all program settings to their default values, delete all thumbnails in "
 "the Thumbnail cache, forget which files have been previously downloaded, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5575
+#: ../raphodo/rapid.py:5845
 msgid "Include gphoto2 debugging information in log files."
 msgstr ""
 
-#: ../raphodo/rapid.py:5579
+#: ../raphodo/rapid.py:5849
 msgid "Print information to the terminal about attached cameras and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5640
+#: ../raphodo/rapid.py:5911
 msgid ""
 "To import preferences from the old version of Rapid Photo Downloader, you "
 "must install the program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5649
+#: ../raphodo/rapid.py:5920
 msgid "No prior program preferences detected: exiting"
 msgstr ""
 
-#: ../raphodo/rapid.py:5652
+#: ../raphodo/rapid.py:5923
 #, python-format
 msgid "Importing preferences from Rapid Photo Downloader %(version)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5714
+#: ../raphodo/rapid.py:5989
 #, python-format
-msgid "Do you want to copy the stored sequence number, which has the value %d?"
+msgid ""
+"Do you want to copy the stored sequence number, which has the value %d?"
 msgstr ""
 
-#: ../raphodo/rapid.py:5726
+#: ../raphodo/rapid.py:6000
 msgid "Program aborting."
 msgstr ""
 
-#: ../raphodo/rapid.py:5736
+#: ../raphodo/rapid.py:6010
 msgid "Never run this program as the sudo / root user."
 msgstr ""
 
-#: ../raphodo/rapid.py:5740
+#: ../raphodo/rapid.py:6014
 msgid "You must install ExifTool to run Rapid Photo Downloader."
 msgstr ""
 
-#: ../raphodo/rapid.py:5794
+#: ../raphodo/rapid.py:6026
+msgid ""
+"Rapid Photo Downloader is installed in multiple locations.\n"
+"\n"
+"Uninstall all copies except the version you want to run."
+msgstr ""
+
+#: ../raphodo/rapid.py:6083
 msgid ""
 "When specifying a path on the command line, do not also specify an\n"
 "option for device auto detection or a path on \"This Computer\"."
 msgstr ""
 
-#: ../raphodo/rapid.py:5950
+#: ../raphodo/rapid.py:6243
 msgid "All settings and caches have been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5958
+#: ../raphodo/rapid.py:6251
 msgid "Thumbnail Cache has been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5964
+#: ../raphodo/rapid.py:6257
 msgid "Remembered files have been forgotten"
 msgstr ""
 
@@ -3434,15 +4048,15 @@ msgstr ""
 msgid "&Don't warn me again about missing or broken program libraries"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:546
+#: ../raphodo/renameandmovefile.py:554
 msgid "subfolder and filename"
 msgstr "subdiretório e nome de arquivo"
 
-#: ../raphodo/renameandmovefile.py:548
+#: ../raphodo/renameandmovefile.py:556
 msgid "filename"
 msgstr "nome de arquivo"
 
-#: ../raphodo/renameandmovefile.py:550
+#: ../raphodo/renameandmovefile.py:558
 msgid "subfolder"
 msgstr "subdiretório"
 
@@ -3522,160 +4136,237 @@ msgstr "fotos e vídeos"
 msgid "photos or videos"
 msgstr "fotos ou vídeos"
 
-#: ../raphodo/rpdfile.py:306
+#: ../raphodo/rpdfile.py:315
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: ../raphodo/rpdfile.py:318
+#. translators: natural language expression signifying a single video
+#: ../raphodo/rpdfile.py:337
+msgid "a video"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:339
 msgid "1 Video"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:323
+#. translators: natural language expression signifying a single photo
+#: ../raphodo/rpdfile.py:346
+msgid "a photo"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:348
 msgid "1 Photo"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:803
+#: ../raphodo/rpdfile.py:828
 #, python-format
 msgid "%(path)s on %(camera)s"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:819
+#: ../raphodo/rpdfile.py:844
 msgid "Photo"
 msgstr "Fotografia"
 
-#: ../raphodo/rpdfile.py:859
+#: ../raphodo/rpdfile.py:884
 msgid "Video"
 msgstr "Vídeo"
 
-#: ../raphodo/storage.py:138
+#: ../raphodo/storage.py:141
 msgid "File system root"
 msgstr ""
 
 #. translators: the name of the Pictures folder
-#: ../raphodo/storage.py:433
+#: ../raphodo/storage.py:437
 msgid "Pictures"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:426
+#: ../raphodo/thumbnaildisplay.py:432
 #, python-format
 msgid "Taken on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:431
+#: ../raphodo/thumbnaildisplay.py:439
 #, python-format
 msgid "Modified on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:437 ../raphodo/thumbnaildisplay.py:466
+#: ../raphodo/thumbnaildisplay.py:447 ../raphodo/thumbnaildisplay.py:481
 #, python-format
 msgid "%(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:451
+#: ../raphodo/thumbnaildisplay.py:464
 #, python-format
 msgid "Memory cards: %s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:457
+#: ../raphodo/thumbnaildisplay.py:468
+#, python-format
+msgid "Memory card: %s"
+msgstr ""
+
+#: ../raphodo/thumbnaildisplay.py:473
 msgid "Downloaded as:"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:472
+#: ../raphodo/thumbnaildisplay.py:489
 #, python-format
 msgid "<br><br>Previous download:<br>%(filename)s<br>%(path)s<br>%(date)s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:1603
+#: ../raphodo/thumbnaildisplay.py:1645
 msgid "Copy Path"
 msgstr ""
 
+#. Translators: these values are file size suffixes like B representing bytes, KB representing
+#. kilobytes, etc.
+#: ../raphodo/utilities.py:170
+msgid "B"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "KB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "MB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "GB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "TB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "PB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "EB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "ZB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "YB"
+msgstr ""
+
 #. two things in a list e.g. "device1 and device2"
-#: ../raphodo/utilities.py:391
+#: ../raphodo/utilities.py:394
 #, python-format
 msgid "%(first_item)s and %(last_item)s"
 msgstr ""
 
-#: ../raphodo/utilities.py:464
+#: ../raphodo/utilities.py:468
 msgid "one"
 msgstr ""
 
-#: ../raphodo/utilities.py:465
+#: ../raphodo/utilities.py:469
 msgid "two"
 msgstr ""
 
-#: ../raphodo/utilities.py:466
+#: ../raphodo/utilities.py:470
 msgid "three"
 msgstr ""
 
-#: ../raphodo/utilities.py:467
+#: ../raphodo/utilities.py:471
 msgid "four"
 msgstr ""
 
-#: ../raphodo/utilities.py:468
+#: ../raphodo/utilities.py:472
 msgid "five"
 msgstr ""
 
-#: ../raphodo/utilities.py:469
+#: ../raphodo/utilities.py:473
 msgid "six"
 msgstr ""
 
-#: ../raphodo/utilities.py:470
+#: ../raphodo/utilities.py:474
 msgid "seven"
 msgstr ""
 
-#: ../raphodo/utilities.py:471
+#: ../raphodo/utilities.py:475
 msgid "eight"
 msgstr ""
 
-#: ../raphodo/utilities.py:472
+#: ../raphodo/utilities.py:476
 msgid "nine"
 msgstr ""
 
-#: ../raphodo/utilities.py:473
+#: ../raphodo/utilities.py:477
 msgid "ten"
 msgstr ""
 
-#: ../raphodo/utilities.py:474
+#: ../raphodo/utilities.py:478
 msgid "eleven"
 msgstr ""
 
-#: ../raphodo/utilities.py:475
+#: ../raphodo/utilities.py:479
 msgid "twelve"
 msgstr ""
 
-#: ../raphodo/utilities.py:476
+#: ../raphodo/utilities.py:480
 msgid "thirteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:477
+#: ../raphodo/utilities.py:481
 msgid "fourteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:478
+#: ../raphodo/utilities.py:482
 msgid "fifteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:479
+#: ../raphodo/utilities.py:483
 msgid "sixteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:480
+#: ../raphodo/utilities.py:484
 msgid "seventeen"
 msgstr ""
 
-#: ../raphodo/utilities.py:481
+#: ../raphodo/utilities.py:485
 msgid "eighteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:482
+#: ../raphodo/utilities.py:486
 msgid "ninenteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:483
+#: ../raphodo/utilities.py:487
 msgid "twenty"
 msgstr ""
 
+#: ../raphodo/viewutils.py:240
+msgid "&OK"
+msgstr ""
+
+#: ../raphodo/viewutils.py:243
+msgid "&Save"
+msgstr ""
+
+#: ../raphodo/viewutils.py:244
+msgid "&Help"
+msgstr ""
+
+#: ../raphodo/viewutils.py:245
+msgid "Restore Defaults"
+msgstr ""
+
+#: ../raphodo/viewutils.py:246
+msgid "&Yes"
+msgstr ""
+
+#: ../raphodo/viewutils.py:247
+msgid "&No"
+msgstr ""
+
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:1
 msgid ""
 "Rapid Photo Downloader imports photos and videos from cameras, phones, "
@@ -3729,8 +4420,8 @@ msgstr ""
 #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:5
 msgid ""
-"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;"
-"memory;card;"
+"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;memory"
+";card;"
 msgstr ""
 
 #: ../data/kde/net.damonlynch.rapid-photo-downloader.desktop.in.h:1
@@ -3825,9 +4516,8 @@ msgstr ""
 #~ msgstr "Registro de _Erros"
 
 #~ 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."
+#~ "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."
@@ -3842,8 +4532,8 @@ msgstr ""
 #~ "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."
+#~ "Escolha como o programa deverá proceder caso ao fazer uma cópia de segurança "
+#~ "haja um arquivo de mesmo nome."
 
 #~ msgid "Unmount (\"eject\") device upon download completion"
 #~ msgstr ""
@@ -3874,12 +4564,15 @@ msgstr ""
 #~ msgid "Error in Photo Rename preferences"
 #~ msgstr "Erro causado pelas preferêcias em \"renomear fotografias\""
 
+#, python-format
 #~ msgid "Select a folder containing %(file_types)s"
 #~ msgstr "Escolha um diretório que contenha %(file_types)s"
 
+#, python-format
 #~ msgid "<i>Example: %s</i>"
 #~ msgstr "<i>Exemplo: %s</i>"
 
+#, python-format
 #~ msgid ""
 #~ "%(date)s\n"
 #~ "%(time)s"
@@ -3893,15 +4586,19 @@ msgstr ""
 #~ msgid "externaldrive2"
 #~ msgstr "disco_externo_2"
 
+#, python-format
 #~ msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
+#, python-format
 #~ msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
+#, python-format
 #~ msgid "%(date)s %(time)s"
 #~ msgstr "%(date)s %(time)s"
 
+#, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
 #~ "Destination: %(destination)s"
@@ -3909,26 +4606,29 @@ msgstr ""
 #~ "Origem: %(source)s\n"
 #~ "Destino: %(destination)s"
 
+#, python-format
 #~ msgid "Source: %(source)s"
 #~ msgstr "Origem: %(source)s"
 
 #~ msgid "Backing up error"
 #~ msgstr "Erro ao criar cópias de segurança"
 
-#~ msgid ""
-#~ "Photos detected with the same filenames, but taken at different times"
+#~ msgid "Photos detected with the same filenames, but taken at different times"
 #~ msgstr ""
 #~ "Foram detectadas fotografias de mesmo nome, mas de horários diferentes"
 
+#, python-format
 #~ msgid "Error: %(inst)s"
 #~ msgstr "Erro: %(inst)s"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 #~ msgstr "%(number)s de %(total)s %(filetypes)s (%(remaining)s restantes)"
 
 #~ msgid "Size"
 #~ msgstr "Tamanho"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s"
 #~ msgstr "%(number)s de %(total)s %(filetypes)s"
 
@@ -3957,10 +4657,10 @@ msgstr ""
 #~ "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 foto, vídeo ou diretório deverá "
-#~ "ser omitido, caso o mesmo não seja suportado por outros sistemas "
-#~ "operacionais."
+#~ "Escolha se um caractere do nome de uma foto, vídeo ou diretório deverá ser "
+#~ "omitido, caso o mesmo não seja suportado por outros sistemas operacionais."
 
+#, python-format
 #~ msgid "Backing up to %(path)s"
 #~ msgstr "A criar cópias de segurança em %(path)s"
 
@@ -3979,6 +4679,7 @@ msgstr ""
 #~ msgid "Photo has already been downloaded"
 #~ msgstr "A foto já foi baixada"
 
+#, 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"
 
@@ -3988,6 +4689,7 @@ msgstr ""
 #~ msgid "Download Progress"
 #~ msgstr "Progresso da transferência"
 
+#, python-format
 #~ msgid "%(freespace)s. %(backuppaths)s."
 #~ msgstr "%(freespace)s. %(backuppaths)s."
 
@@ -4000,9 +4702,11 @@ msgstr ""
 #~ msgid "Using backup devices"
 #~ msgstr "Usando dispositivos de backup"
 
+#, python-format
 #~ msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 #~ msgstr "Faltando %(minutes)i:%(seconds)02i minutos aproximadamente"
 
+#, python-format
 #~ msgid "About %i seconds remaining"
 #~ msgstr "Faltando %i segundos aproximadamente"
 
@@ -4030,15 +4734,18 @@ msgstr ""
 #~ msgid "Videos:"
 #~ msgstr "Vídeos:"
 
+#, python-format
 #~ msgid "%(free)s free"
 #~ msgstr "%(free)s livres"
 
 #~ msgid "All settings and preferences have been reset"
 #~ msgstr "Todas as configurações e preferências foram redefinidas"
 
+#, python-format
 #~ msgid "and %s"
 #~ msgstr "e %s"
 
+#, python-format
 #~ msgid ""
 #~ "The %(filetype)s subfolder preferences entered are invalid and cannot be "
 #~ "used.\n"
@@ -4060,36 +4767,45 @@ msgstr ""
 #~ "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>"
+#~ "gerar nomes de subdiretórios. Por favor, use de outras opções de "
+#~ "nomeação.</i>"
 
+#, python-format
 #~ msgid "%(filetype)s already exists"
 #~ msgstr "%(filetype)s já existe."
 
+#, python-format
 #~ msgid "%s, "
 #~ msgstr "%s, "
 
+#, python-format
 #~ msgid "%(device)s did not unmount"
 #~ msgstr "%(device)s não desmontado"
 
+#, python-format
 #~ msgid "(%(file_type)s)"
 #~ msgstr "(%(file_type)s)"
 
+#, python-format
 #~ msgid "%(free)s %(file_type)s"
 #~ msgstr "%(free)s %(file_type)s"
 
+#, python-format
 #~ msgid "%(file_type)s download folder is not writable"
 #~ msgstr "%(file_type)s pasta de download não é gravável"
 
+#, python-format
 #~ msgid "Folder: %s"
 #~ msgstr "Pasta: %s"
 
+#, python-format
 #~ msgid "%(file_type)s download folder is invalid"
 #~ msgstr "%(file_type)s pasta de download e inválida"
 
 #~ 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"
 
+#, python-format
 #~ msgid ""
 #~ "%(problem)s\n"
 #~ "File: %(file)s"
@@ -4097,6 +4813,7 @@ msgstr ""
 #~ "%(problem)s\n"
 #~ "Arquivo: %(file)s"
 
+#, python-format
 #~ msgid "%(file_type)s download folder does not exist"
 #~ msgstr "%(file_type)s pasta de download não existe"
 
@@ -4108,6 +4825,7 @@ msgstr ""
 #~ "mostrar informações de depuração quando executado a partir da linha de "
 #~ "comando"
 
+#, python-format
 #~ msgid ""
 #~ "display program information on the command line as the program runs "
 #~ "(default: %default)"
@@ -4118,9 +4836,11 @@ msgstr ""
 #~ msgid "Name + extension"
 #~ msgstr "Nome + extensão"
 
+#, python-format
 #~ msgid "Date time value %s appears invalid."
 #~ msgstr "Data e hora %s valor aparece inválido."
 
+#, python-format
 #~ msgid ""
 #~ "%(filetype)s could not be backed up because no suitable backup locations "
 #~ "were found."
@@ -4128,28 +4848,35 @@ msgstr ""
 #~ "%(filetype)s não pôde ser feito backup porque nenhum local de backup foi "
 #~ "encontrado."
 
+#, python-format
 #~ msgid "%(filetype)s metadata cannot be read"
 #~ msgstr "%(filetype)s metadados não podem ser lidos"
 
+#, python-format
 #~ msgid "Error generating component %s."
 #~ msgstr "Erro ao gerar o componente %s"
 
+#, python-format
 #~ msgid "An error occurred when copying the %(filetype)s"
 #~ msgstr "Ocorreu um erro ao copiar %(filetype)s"
 
+#, python-format
 #~ msgid "%(filetype)s was already downloaded"
 #~ msgstr "%(filetype)s já foi baixado"
 
+#, python-format
 #~ msgid "%(filetype)s %(area)s could not be generated"
 #~ msgstr "%(filetype)s %(area)s não pode ser gerado"
 
+#, python-format
 #~ msgid ""
-#~ "The existing %(filetype)s was last modified on %(date)s at %(time)s. "
-#~ "Unique identifier '%(identifier)s' added."
+#~ "The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
+#~ "identifier '%(identifier)s' added."
 #~ msgstr ""
 #~ "O atual%(filetype)s foi modificada pela última vez em%(date)s em%(time)s. "
 #~ "Identificador exclusivo '%(identifier)s'' acrescentou."
 
+#, python-format
 #~ msgid ""
 #~ "Photos detected with the same filenames, but taken at different times: "
 #~ "%(details)s"
@@ -4157,17 +4884,21 @@ msgstr ""
 #~ "Fotos detectadas com o mesmo nome, mas tiradas em momentos diferentes: "
 #~ "%(details)s"
 
+#, 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."
 
+#, python-format
 #~ msgid " It was backed up to %(volume)s"
 #~ msgstr " Foi feito backup para %(volume)s"
 
+#, python-format
 #~ msgid "Error: %(errorno)s %(strerror)s"
 #~ msgstr "Erro: %(errorno)s %(strerror)s"
 
+#, 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."
 
@@ -4177,6 +4908,7 @@ msgstr ""
 #~ msgstr ""
 #~ "A extensão do arquivo e informações Exif indicam que já foram baixados."
 
+#, 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."
 
@@ -4186,37 +4918,44 @@ msgstr ""
 #~ msgid " It was backed up to these devices: "
 #~ msgstr " Foi feito backup destes dispositivos: "
 
+#, python-format
 #~ msgid "%(volumes)s and %(final_volume)s."
 #~ msgstr "%(volumes)s e %(final_volume)s."
 
 #~ msgid "Backups overwritten on these devices: "
 #~ msgstr "Backups substituídos nestes dispositivos: "
 
+#, python-format
 #~ msgid "Backup overwritten on %(volume)s."
 #~ msgstr "Backup substituído em %(volume)s."
 
+#, python-format
 #~ msgid "%(volume)s, "
 #~ msgstr "%(volume)s, "
 
+#, python-format
 #~ msgid "%(volume)s (%(inst)s), "
 #~ msgstr "%(volume)s (%(inst)s), "
 
 #~ msgid "Errors occurred when backing up on the following backup devices: "
-#~ msgstr ""
-#~ "Ocorreram erros ao fazer backup em dispositivos de backup a seguir: "
+#~ msgstr "Ocorreram erros ao fazer backup em dispositivos de backup a seguir: "
 
 #~ msgid "Backups already exist in these locations: "
 #~ msgstr "Os backups já existem nestes locais: "
 
+#, python-format
 #~ msgid "Backup already exists on %(volume)s."
 #~ msgstr "Backup já existe no %(volume)s."
 
+#, python-format
 #~ msgid "%(volumes)s and %(volume)s."
 #~ msgstr "%(volumes)s e %(volume)s."
 
+#, python-format
 #~ msgid "%(volumes)s and %(volume)s (%(inst)s)."
 #~ msgstr "%(volumes)s e %(volume)s (%(inst)s)."
 
+#, python-format
 #~ msgid "An error occurred when backing up on %(volume)s."
 #~ msgstr "Ouvir Ocorreu um erro ao fazer backup em %(volume)s."
 
@@ -4229,38 +4968,44 @@ msgstr ""
 #~ msgid "The following metadata is missing: "
 #~ msgstr "Os metadados seguinte estão em falta: "
 
-#~ msgid ""
-#~ "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
+#, python-format
+#~ msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
 #~ msgstr "%(missing_metadata_elements)s e %(final_missing_metadata_element)s."
 
+#, python-format
 #~ msgid " Furthermore, there was a %(problem)s."
 #~ msgstr " Além disso, houve um %(problem)s."
 
+#, python-format
 #~ msgid "%(previousproblem)s Additionally, %(newproblem)s"
 #~ msgstr "%(previousproblem)s Adicionalmente, %(newproblem)s"
 
+#, python-format
 #~ msgid " Furthermore, there were %(problems)s."
 #~ msgstr " Além disso, houve %(problems)s."
 
+#, 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."
 
 #~ msgid ""
-#~ "Errors occurred when creating directories on the following backup "
-#~ "devices: "
+#~ "Errors occurred when creating directories on the following backup devices: "
 #~ msgstr ""
 #~ "Ocorreram erros ao criar diretórios nos dispositivos de backup a seguir: "
 
+#, python-format
 #~ msgid "Problem in %s generation"
 #~ msgstr "Problema na geração de %s"
 
+#, python-format
 #~ msgid "Problems in %s generation"
 #~ msgstr "Problemas na geração de %s"
 
-#~ msgid ""
-#~ "An error occurred when copying the %(filetype)s, but it was backed up"
+#, 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"
 
+#, python-format
 #~ msgid "%(filetype)s already exists, but it was backed up"
 #~ msgstr "%(filetype)s já existe, mas foi feito backup"
 
@@ -4276,6 +5021,7 @@ msgstr ""
 #~ msgid "There were errors backing up"
 #~ msgstr "Houve erros de backup"
 
+#, python-format
 #~ msgid "%(previousproblem)s, and %(backinguperror)s"
 #~ msgstr "%(previousproblem)s, e %(backinguperror)s"
 
@@ -4285,6 +5031,7 @@ msgstr ""
 #~ msgid "Download / Pause"
 #~ msgstr "Download / Pausa"
 
+#, python-format
 #~ msgid "Path: %s"
 #~ msgstr "Caminho: %s"
 
@@ -4418,9 +5165,8 @@ msgstr ""
 #~ "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 download. Subpastas para os vídeos baixados serão "
-#~ "criados automaticamente nesta pasta usando a estrutura a seguir "
-#~ "especificados."
+#~ "Escolher pasta de download. Subpastas para os vídeos baixados serão criados "
+#~ "automaticamente nesta pasta usando a estrutura a seguir especificados."
 
 #~ msgid "Download folder:"
 #~ msgstr "Pasta de Downloads:"
@@ -4444,15 +5190,14 @@ msgstr ""
 #~ "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>"
+#~ "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"
+#~ "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>"
+#~ "não utilizado para backups. Para cada dispositivo que deseja usar para fazer "
+#~ "backup, criar uma pasta com um desses nomes.</i>"
 
 #~ msgid "Rename Options"
 #~ msgstr "Renomear Opções"
@@ -4467,8 +5212,8 @@ msgstr ""
 #~ "Specify the time in 24 hour format at which the <i>Downloads today</i> "
 #~ "sequence number should be reset."
 #~ msgstr ""
-#~ "Especifique o tempo em formato de 24 horas em que a sequência numérica "
-#~ "de  <i> Downloads de Hoje </i> devem reiniciar."
+#~ "Especifique o tempo em formato de 24 horas em que a sequência numérica de  "
+#~ "<i> Downloads de Hoje </i> devem reiniciar."
 
 #~ msgid "R_emove All"
 #~ msgstr "R_emover Tudo"
@@ -4483,23 +5228,23 @@ msgstr ""
 #~ "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"
+#~ "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>"
+#~ "<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 baixados, como câmeras, "
 #~ "cartões de memória ou dispositivos de armazenamento portátil.\n"
 #~ "\n"
-#~ "Você pode baixar de vários dispositivos simultaneamente, ou pode "
-#~ "especificar um local em seu disco rígido.\n"
+#~ "Você pode baixar de vários dispositivos simultaneamente, ou pode especificar "
+#~ "um local em seu disco rígido.\n"
 #~ "\n"
-#~ "<i>Baixar diretamente de câmeras é atualmente um recurso experimental. "
-#~ "Caso ele não funcione corretamente, tente ativar o modo PTP. Caso isso "
-#~ "não seja possível, um leitor de cartões deve ser utilizado.</i>"
+#~ "<i>Baixar diretamente de câmeras é atualmente um recurso experimental. Caso "
+#~ "ele não funcione corretamente, tente ativar o modo PTP. Caso isso não seja "
+#~ "possível, um leitor de cartões deve ser utilizado.</i>"
 
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Device Options</span>"
 #~ msgstr "<span weight=\"bold\" size=\"x-large\">Opções do dispositivo</span>"
@@ -4513,6 +5258,7 @@ msgstr ""
 #~ msgid "the root of the file system"
 #~ msgstr "a raiz do sistema de arquivos"
 
+#, python-format
 #~ msgid "Downloading from %(location)s."
 #~ msgstr "Tranferindo de %(location)s."
 
@@ -4523,12 +5269,14 @@ msgstr ""
 #~ "Do you really want to download from here? On some systems, scanning this "
 #~ "location can take a very long time."
 #~ msgstr ""
-#~ "Você realmente deseja realizar o download deste local? Em alguns "
-#~ "sistemas, varrer este local pode leavar muito tempo."
+#~ "Você realmente deseja realizar o download deste local? Em alguns sistemas, "
+#~ "varrer este local pode leavar muito tempo."
 
+#, 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"
 
+#, python-format
 #~ msgid "Backing up photos and videos to %(path)s"
 #~ msgstr "Criando o backup das fotos e vídeos em %(path)s"
 
@@ -4553,6 +5301,7 @@ msgstr ""
 #~ msgid "Remembered Paths"
 #~ msgstr "Caminhos Lembrados"
 
+#, python-format
 #~ msgid ""
 #~ "The following regular expressions are invalid, and will be removed unless "
 #~ "you correct them:\n"
@@ -4562,9 +5311,10 @@ msgstr ""
 #~ "ser que sejam corrigidas:\n"
 #~ "%s"
 
+#, python-format
 #~ msgid ""
-#~ "This regular expression is invalid, and will be removed unless you "
-#~ "correct it:\n"
+#~ "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 "
@@ -4572,27 +5322,27 @@ msgstr ""
 #~ "%s"
 
 #~ 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>."
+#~ "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 ""
 #~ "Desculpe, a funcionalidade de download de vídeo foi desabilitada. Para "
 #~ "executar o download de vídeos, por favor instale os pacotes <i>hachoir "
 #~ "metadata</i> e <i>kaa metadata</i> do python, ou <i>exiftool</i>."
 
 #~ msgid ""
-#~ "If you disable automatic detection, choose the exact location of the "
-#~ "photos and videos."
+#~ "If you disable automatic detection, choose the exact location of the photos "
+#~ "and videos."
 #~ msgstr ""
-#~ "Se você desabilitar a detecção automática, escolha o local exato das "
-#~ "fotos e vídeos."
+#~ "Se você desabilitar a detecção automática, escolha o local exato das fotos e "
+#~ "vídeos."
 
 #~ 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."
+#~ "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 vovê habilitar a detecção de Dispositivos de Armazenamento Portateis, "
 #~ "todo o dispositivo será varrido. Em dispositivos muito grandes, isso pode "
diff --git a/po/rapid-photo-downloader.pot b/po/rapid-photo-downloader.pot
index c5cdb22..c7943eb 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: damonlynch@gmail.com\n"
-"POT-Creation-Date: 2017-07-08 19:16-0500\n"
+"POT-Creation-Date: 2017-09-12 17:01-0400\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"
@@ -17,38 +17,389 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. type: QPushButton
-#: ../raphodo/aboutdialog.py:217
+#: ../install.py:65
+msgid "Rapid Photo Downloader installer"
+msgstr ""
+
+#: ../install.py:66
+msgid "Download and install latest version of Rapid Photo Downloader."
+msgstr ""
+
+#: ../install.py:236 ../install.py:1732
+msgid "Installer not found:"
+msgstr ""
+
+#. Translators: do not translate the term tar.gz
+#: ../install.py:240 ../install.py:1736
+msgid "Installer not in tar.gz format:"
+msgstr ""
+
+#: ../install.py:465
+msgid ""
+"Incorrect folder ownership detected. Changing ownership of and resetting "
+"permissions for"
+msgstr ""
+
+#: ../install.py:540
+msgid "The following command will be run:"
+msgstr ""
+
+#: ../install.py:543 ../install.py:1479 ../install.py:1484
+msgid "sudo may prompt you for the sudo password."
+msgstr ""
+
+#: ../install.py:547
+msgid "Would you like to run the command now?"
+msgstr ""
+
+#: ../install.py:549
+msgid "Answer is not yes, exiting."
+msgstr ""
+
+#: ../install.py:559 ../install.py:751 ../install.py:966
+msgid "Command failed"
+msgstr ""
+
+#: ../install.py:561 ../install.py:752 ../install.py:967
+msgid "Exiting"
+msgstr ""
+
+#: ../install.py:582
+msgid "The Universe repository must be enabled."
+msgstr ""
+
+#: ../install.py:606
+msgid ""
+"Do you want to to uninstall the previous version of Rapid Photo Downloader:"
+msgstr ""
+
+#: ../install.py:715 ../install.py:740
+msgid ""
+"Querying package system to see if an older version of Rapid Photo Downloader "
+"is installed (this may take a while)..."
+msgstr ""
+
+#: ../install.py:726
+msgid ""
+"Unable to query package system. Please check your Internet connection and "
+"try again"
+msgstr ""
+
+#: ../install.py:756
+msgid "Checking if previous version installed with pip..."
+msgstr ""
+
+#: ../install.py:850
+msgid "The following package is unknown on your system: {}\n"
+msgstr ""
+
+#: ../install.py:857 ../install.py:929 ../install.py:974
+msgid ""
+"To continue, some packages required to run the application will be installed."
+msgstr ""
+
+#: ../install.py:886
+msgid "Querying installed and available packages (this may take a while)"
+msgstr ""
+
+#: ../install.py:958
+msgid ""
+"Querying zypper to see if any required packages are already installed (this "
+"may take a while)... "
+msgstr ""
+
+#: ../install.py:1004
+msgid "Query to confirm action at each step."
+msgstr ""
+
+#: ../install.py:1011
+msgid ""
+"When downloading the latest version, install the development version if it "
+"is newer than the stable version."
+msgstr ""
+
+#: ../install.py:1020
+msgid ""
+"Optional tar.gz Rapid Photo Downloader installer archive. If not specified, "
+"the latest version is downloaded from the Internet."
+msgstr ""
+
+#: ../install.py:1043
+msgid ""
+"Do not run the installer in the tar.gz Rapid Photo Downloader installer "
+"archive if it is newer than this version ({}). The default is to run "
+"whichever installer is newer."
+msgstr ""
+
+#: ../install.py:1050
+msgid ""
+"Uninstall Rapid Photo Downloader that was installed with pip, keeping its "
+"dependencies."
+msgstr ""
+
+#: ../install.py:1054
+msgid ""
+"Uninstall the dependencies installed by pip during Rapid Photo Downloader's "
+"installation, and Rapid Photo Downloader itself, then exit."
+msgstr ""
+
+#: ../install.py:1059
+msgid ""
+"Note: this will not uninstall any version of Rapid Photo Downloader "
+"installed by your Linux distribution's package manager."
+msgstr ""
+
+#: ../install.py:1066
+msgid ""
+"Dependencies will only be removed if they are not required by other programs."
+msgstr ""
+
+#: ../install.py:1072
+msgid ""
+"Note: this option will remove the dependencies regardless of whether they "
+"are required by another program pip has installed. Upgrade to pip 9.0 or "
+"above if you want to avoid this behavior. You can do so using the command "
+"'python3 -m pip install pip -U --user'. Also note that any version of Rapid "
+"Photo Downloader installed by your Linux distribution's package manager will "
+"not be uninstalled."
+msgstr ""
+
+#: ../install.py:1122
+msgid "Failed to download versions file"
+msgstr ""
+
+#: ../install.py:1126
+msgid "Got error code {} while accessing versions file"
+msgstr ""
+
+#: ../install.py:1234
+msgid ""
+"Sorry, could not locate installer. Please check your Internet connection and "
+"verify if you can reach https://www.damonlynch.net\n"
+"\n"
+"Exiting.\n"
+msgstr ""
+
+#: ../install.py:1408
+msgid "Installing application requirements..."
+msgstr ""
+
+#: ../install.py:1424
+msgid "Received error code"
+msgstr ""
+
+#: ../install.py:1425
+msgid "Failed to install application requirements: exiting"
+msgstr ""
+
+#: ../install.py:1428
+msgid "Installing application..."
+msgstr ""
+
+#: ../install.py:1441
+msgid "Failed to install application: exiting..."
+msgstr ""
+
+#: ../install.py:1465
+msgid ""
+"You may have to restart the computer to be able to run the program from the "
+"commmand line or application launcher."
+msgstr ""
+
+#: ../install.py:1476
+msgid "Do you want to install the application's man pages?"
+msgstr ""
+
+#: ../install.py:1477
+msgid "They will be installed into {}"
+msgstr ""
+
+#: ../install.py:1478 ../install.py:1483
+msgid "If you uninstall the application, remove these manpages yourself."
+msgstr ""
+
+#: ../install.py:1480
+msgid "Do want to install the man pages?"
+msgstr ""
+
+#: ../install.py:1482
+msgid "Installing man pages into {}"
+msgstr ""
+
+#: ../install.py:1499
+msgid "Failed to create man page directory: exiting"
+msgstr ""
+
+#: ../install.py:1511
+msgid "Failed to copy man page."
+msgstr ""
+
+#: ../install.py:1521
+msgid "(If a segmentation fault occurs at exit, you can ignore it...)"
+msgstr ""
+
+#: ../install.py:1534
+msgid ""
+"The python3 tool pip is required to uninstall a version of Rapid Photo "
+"Downloader that was installed with pip.\n"
+"Cannot continue. Exiting."
+msgstr ""
+
+#: ../install.py:1575
+msgid ""
+"Do not run this installer script as sudo / root user.\n"
+"Run it using the user who will run the program.\n"
+msgstr ""
+
+#: ../install.py:1585 ../install.py:1599
+msgid "Do not include any other command line arguments when specifying"
+msgstr ""
+
+#: ../install.py:1614
+msgid ""
+"Sorry, this installer does not support a custom python installation.\n"
+"Exiting..."
+msgstr ""
+
+#: ../install.py:1620
+msgid "Restarting script using system python..."
+msgstr ""
+
+#: ../install.py:1651
+msgid "Exiting..."
+msgstr ""
+
+#. Translators: do not translate the term python3-apt
+#: ../install.py:1670
+msgid "To continue, the package python3-apt must be installed."
+msgstr ""
+
+#: ../install.py:1689
+msgid ""
+"Install the following packages using your Linux distribution's standard "
+"package manager, and then rerun this installer"
+msgstr ""
+
+#: ../install.py:1698
+msgid ""
+"To run this program, programs to assist Python 3 and its package management "
+"must be installed."
+msgstr ""
+
+#. Translators: do not translate the terms Python 3, pip and setuptools
+#: ../install.py:1713
+msgid "Python 3's pip and setuptools must be upgraded for your user."
+msgstr ""
+
+#. Translators: do not translate the term python or requests
+#: ../install.py:1726
+msgid "Installing python requests"
+msgstr ""
+
+#: ../upgrade.py:79
+msgid "Upgrade Rapid Photo Downloader"
+msgstr ""
+
+#: ../upgrade.py:401 ../raphodo/viewutils.py:242
+msgid "&Cancel"
+msgstr ""
+
+#: ../upgrade.py:405
+msgid "&Upgrade"
+msgstr ""
+
+#: ../upgrade.py:410
+#, python-format
+msgid "Click the Upgrade button to upgrade to version %s."
+msgstr ""
+
+#: ../upgrade.py:413
+msgid "Click the Upgrade button to start the upgrade."
+msgstr ""
+
+#: ../upgrade.py:416 ../upgrade.py:422 ../raphodo/viewutils.py:241
+msgid "&Close"
+msgstr ""
+
+#: ../upgrade.py:417
+msgid "&Run"
+msgstr ""
+
+#: ../upgrade.py:447
+msgid "Close Rapid Photo Downloader before running this upgrade"
+msgstr ""
+
+#: ../upgrade.py:450
+msgid "Upgrade running..."
+msgstr ""
+
+#: ../upgrade.py:486
+#, python-format
+msgid ""
+"Successfully upgraded to %s. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:491
+msgid ""
+"Upgrade finished successfully. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:495
+msgid "Upgrade failed. Click Close to exit."
+msgstr ""
+
+#: ../upgrade.py:6967
+#, python-format
+msgid "Upgrading %s..."
+msgstr ""
+
+#: ../upgrade.py:6969
+msgid "Press any key to continue..."
+msgstr ""
+
+#: ../upgrade.py:6982
+msgid "Rapid Photo Downloader upgrade failed"
+msgstr ""
+
+#: ../upgrade.py:6984
+#, python-format
+msgid ""
+"The python package %s could not be updated. The upgrade cannot continue."
+msgstr ""
+
+#: ../raphodo/aboutdialog.py:225
 msgid "Credits"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:239
+#: ../raphodo/backuppanel.py:240
 msgid "Backups are not configured"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:241
+#: ../raphodo/backuppanel.py:242
 msgid "No backup devices detected"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:243
+#: ../raphodo/backuppanel.py:244
 msgid "Valid backup locations not yet specified"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:401
+#: ../raphodo/backuppanel.py:404
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
 msgstr ""
 
-#: ../raphodo/backuppanel.py:407
+#: ../raphodo/backuppanel.py:412
 msgid "Back up photos and videos when downloading"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:413
+#: ../raphodo/backuppanel.py:418
 msgid "Automatically detect backup devices"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:417
+#: ../raphodo/backuppanel.py:424
 msgid ""
 "Specify the folder in which backups are stored on the device."
 "<br><br><i>Note: the presence of a folder with this name is used to "
@@ -58,77 +409,85 @@ msgid ""
 "videos.</i>"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:428
+#: ../raphodo/backuppanel.py:439
 msgid "Photo folder name:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:433
+#: ../raphodo/backuppanel.py:444
 msgid "Video folder name:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:438 ../raphodo/nameeditor.py:883
+#: ../raphodo/backuppanel.py:449 ../raphodo/nameeditor.py:890
 #: ../raphodo/renamepanel.py:123
 msgid "Example:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:448
+#: ../raphodo/backuppanel.py:460
 msgid "If you disable automatic detection, choose the exact backup locations."
 msgstr ""
 
-#: ../raphodo/backuppanel.py:452
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:468
 msgid "Photo backup location:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:454
+#: ../raphodo/backuppanel.py:474
 msgid "Select Photo Backup Location"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:460
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:485
 msgid "Video backup location:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:462
+#: ../raphodo/backuppanel.py:491
 msgid "Select Video Backup Location"
 msgstr ""
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:564
+#: ../raphodo/backuppanel.py:595
 msgid "drive1"
 msgstr ""
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:567
+#: ../raphodo/backuppanel.py:598
 msgid "drive2"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:628
+#: ../raphodo/backuppanel.py:663
 msgid "Projected Backup Storage Use"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:632
+#: ../raphodo/backuppanel.py:669
 msgid "Backup Options"
 msgstr ""
 
 #. translators: refers to the video thumbnail file that some
 #. cameras generate -- it has a .THM file extension
-#: ../raphodo/copyfiles.py:476
+#: ../raphodo/copyfiles.py:491
 msgid "video THM"
 msgstr ""
 
-#: ../raphodo/copyfiles.py:482
+#: ../raphodo/copyfiles.py:497
 msgid "audio"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:78 ../raphodo/devicedisplay.py:1079
-#: ../raphodo/rpdfile.py:321
+#: ../raphodo/rpdfile.py:342
 #, python-format
 msgid "%(no_photos)s Photos"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:82 ../raphodo/devicedisplay.py:1081
-#: ../raphodo/rpdfile.py:316
+#: ../raphodo/rpdfile.py:333
 #, python-format
 msgid "%(no_videos)s Videos"
 msgstr ""
@@ -156,15 +515,15 @@ msgid "%(size_free)s free of %(size_total)s"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:190 ../raphodo/devicedisplay.py:993
-#: ../raphodo/rapid.py:1964 ../raphodo/rapid.py:2079 ../raphodo/rapid.py:5753
-#: ../raphodo/rpdfile.py:905
+#: ../raphodo/rapid.py:2023 ../raphodo/rapid.py:2151 ../raphodo/rapid.py:6043
+#: ../raphodo/rpdfile.py:930
 msgid "Photos"
 msgstr ""
 
 #. translators: the name of the Videos folder
 #: ../raphodo/destinationdisplay.py:191 ../raphodo/devicedisplay.py:994
-#: ../raphodo/rapid.py:1967 ../raphodo/rapid.py:2080 ../raphodo/rapid.py:5754
-#: ../raphodo/rpdfile.py:933 ../raphodo/storage.py:445
+#: ../raphodo/rapid.py:2028 ../raphodo/rapid.py:2152 ../raphodo/rapid.py:6044
+#: ../raphodo/rpdfile.py:958 ../raphodo/storage.py:449
 msgid "Videos"
 msgstr ""
 
@@ -172,7 +531,7 @@ msgstr ""
 msgid "Projected storage use after download"
 msgstr ""
 
-#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:516
+#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:521
 msgid "Custom..."
 msgstr ""
 
@@ -210,57 +569,58 @@ msgstr ""
 msgid "%s full"
 msgstr ""
 
-#: ../raphodo/devices.py:459
+#: ../raphodo/devices.py:463
 msgid "Cameras"
 msgstr ""
 
-#: ../raphodo/devices.py:460 ../raphodo/devices.py:920
-#: ../raphodo/preferencedialog.py:85 ../raphodo/rapid.py:1927
+#: ../raphodo/devices.py:464 ../raphodo/devices.py:927
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/rapid.py:1979
 msgid "Devices"
 msgstr ""
 
-#: ../raphodo/devices.py:720
+#: ../raphodo/devices.py:724
 #, python-format
 msgid "Downloading from %(device_names)s"
 msgstr ""
 
 #. Translators: e.g. Three Devices
-#: ../raphodo/devices.py:780
+#: ../raphodo/devices.py:784
 #, python-format
 msgid "%(no_devices)s %(device_type)s"
 msgstr ""
 
-#: ../raphodo/devices.py:905 ../raphodo/rapid.py:1764
+#: ../raphodo/devices.py:912 ../raphodo/rapid.py:1807
 msgid "Select Source"
 msgstr ""
 
-#: ../raphodo/devices.py:936 ../raphodo/devices.py:947
+#: ../raphodo/devices.py:943 ../raphodo/devices.py:954
 #, python-format
 msgid "%(device1)s + %(device2)s"
 msgstr ""
 
 #. Number of cameras e.g. 3 Cameras
-#: ../raphodo/devices.py:958
+#: ../raphodo/devices.py:965
 #, python-format
 msgid "%(no_cameras)s Cameras"
 msgstr ""
 
-#: ../raphodo/devices.py:963
+#: ../raphodo/devices.py:970
 #, python-format
 msgid "%(no_devices)s Devices"
 msgstr ""
 
 #. Translators: two folder names, separated by a plus sign
-#: ../raphodo/devices.py:1258
+#: ../raphodo/devices.py:1265
 #, python-format
 msgid "%s + %s"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:44
+#: ../raphodo/didyouknow.py:45
 msgid "Click on a file's checkbox to mark or unmark it for download."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:50
+#: ../raphodo/didyouknow.py:51
 msgid ""
 "Files that have already been downloaded are remembered. You can still mark "
 "previously downloaded files to download again, but they are unchecked by "
@@ -268,34 +628,67 @@ msgid ""
 "files that are yet to be downloaded."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:59
+#: ../raphodo/didyouknow.py:60
 msgid ""
 "If more than one file is selected, they'll all take the mark of the file "
 "whose checkbox was clicked, regardless of whether they previously had a "
 "checkmark or not."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:67
+#: ../raphodo/didyouknow.py:68
 msgid ""
 "Click on a device's checkbox to quickly mark or unmark all its files for "
 "downloading."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:74
+#: ../raphodo/didyouknow.py:75
+msgid ""
+"After a download finishes, an icon replaces the thumbnail's checkbox. The "
+"icon's color indicates whether the download was successful (green), had file "
+"renaming problems (yellow/orange), or failed (red)."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:83
+msgid ""
+"\n"
+"            In case of any problems, a red icon will appear at the bottom of "
+"the window\n"
+"            indicating how many error reports there are. Clicking on it "
+"opens the Error Report \n"
+"            window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:91
+msgid ""
+"\n"
+"            The Error Report window lists any problems encountered before, "
+"during or after the \n"
+"            download. An orange triangle represents a warning, a red circle "
+"indicates a failure, \n"
+"            and a black circle indicates more serious failures. You can "
+"click on the hyperlinks to \n"
+"            open its file or device in a file manager. You can also search "
+"the reports using the \n"
+"            search box in the lower left of the Error Report window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:103
 msgid ""
 "You can simultaneously download from multiple cameras, smartphones, memory "
 "cards, and hard drives&mdash;as many devices as your computer can handle at "
 "one time."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:81
+#: ../raphodo/didyouknow.py:110
 msgid ""
 "The <b>Timeline</b> groups photos and videos based on how much time elapsed "
 "between consecutive shots. Use it to identify photos and videos taken at "
 "different periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:88
+#: ../raphodo/didyouknow.py:117
 msgid ""
 "\n"
 "<p>In the illustration above, the first row of the Timeline is black because "
@@ -307,7 +700,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:99
+#: ../raphodo/didyouknow.py:128
 msgid ""
 "To view photos and videos for a particular time range, use the mouse "
 "(optionally in combination with the <tt>Shift</tt> or <tt>Ctrl</tt> keys) to "
@@ -315,20 +708,20 @@ msgid ""
 "the left side of the main window will be highlighted."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:106
+#: ../raphodo/didyouknow.py:135
 msgid ""
 "A download always includes all files that are checked for download, "
 "including those that are not currently displayed because the Timeline is "
 "being used."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:113
+#: ../raphodo/didyouknow.py:142
 msgid ""
 "You can hide or display the download sources by clicking on the name of the "
 "device you're downloading from at the top left of the program window."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:120
+#: ../raphodo/didyouknow.py:149
 msgid ""
 "\n"
 "          Thumbnails can be sorted using a variety of criteria:\n"
@@ -347,21 +740,21 @@ msgid ""
 "</ol> "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:137
+#: ../raphodo/didyouknow.py:166
 msgid ""
 "One of Rapid Photo Downloader's most useful features is its ability to "
 "automatically generate download subfolders and rename files as it downloads, "
 "using a scheme of your choosing."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:143
+#: ../raphodo/didyouknow.py:172
 msgid ""
 "To specify where you want your files downloaded and how you want them named, "
 "open the appropriate panel on the right-side of the application window: "
 "<b>Destination</b>, <b>Rename</b>, or <b>Job Code</b>."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:150
+#: ../raphodo/didyouknow.py:179
 msgid ""
 "\n"
 "When thinking about your download directory structure, keep in mind two "
@@ -386,7 +779,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:167
+#: ../raphodo/didyouknow.py:196
 msgid ""
 "\n"
 "You can download photos and videos to the same destination folder, or "
@@ -399,14 +792,14 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:177
+#: ../raphodo/didyouknow.py:206
 msgid ""
 "Automatically generated download subfolders can contain further "
 "automatically generated subfolders if need be. A common scheme is to create "
 "a year subfolder and then a series of year-month-day subfolders within it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:186
+#: ../raphodo/didyouknow.py:215
 msgid ""
 "\n"
 "Whenever possible, the program previews the download subfolders of photos "
@@ -424,7 +817,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:201
+#: ../raphodo/didyouknow.py:230
 msgid ""
 "\n"
 "Download subfolder names are typically generated using some or all of the "
@@ -448,7 +841,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:219
+#: ../raphodo/didyouknow.py:248
 msgid ""
 "\n"
 "To automatically create download subfolders as you download, \n"
@@ -458,7 +851,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:227
+#: ../raphodo/didyouknow.py:256
 msgid ""
 "\n"
 "Using the drop-down menu, select a built-in preset or click on <b>Custom</b> "
@@ -468,20 +861,20 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:237
+#: ../raphodo/didyouknow.py:266
 msgid ""
 "It's easy to download raw images into one folder, and jpeg images into "
 "another. Simply use the <b>Filename Extension</b> as part of your download "
 "subfolder generation scheme:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:242
+#: ../raphodo/didyouknow.py:271
 msgid ""
 "This illustration shows a saved custom preset named &quot;My custom "
 "preset&quot;."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:246
+#: ../raphodo/didyouknow.py:275
 msgid ""
 "\n"
 "You do not have to create nested download subfolders. This illustration "
@@ -492,7 +885,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:256
+#: ../raphodo/didyouknow.py:285
 msgid ""
 "\n"
 "Although there are many built-in date/time naming options, you may find that "
@@ -506,7 +899,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:265
+#: ../raphodo/didyouknow.py:294
 msgid ""
 "\n"
 "Read more about all the ways you can generate download subfolder names and "
@@ -516,7 +909,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:273
+#: ../raphodo/didyouknow.py:302
 msgid ""
 "\n"
 "<b>Job Codes</b> let you easily enter text that describes sets of photos and "
@@ -528,7 +921,7 @@ msgid ""
 "&quot;Green Bazaar&quot;: \n"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:282
+#: ../raphodo/didyouknow.py:311
 msgid ""
 "\n"
 "You can apply new or existing Job Codes before you start a download. If "
@@ -539,28 +932,28 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:291
+#: ../raphodo/didyouknow.py:320
 msgid "Look for hints to guide you when working with Job Codes:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:295
+#: ../raphodo/didyouknow.py:324
 msgid ""
 "Hints will vary depending on the context, such as when the mouse is hovering "
 "over a button."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:301
+#: ../raphodo/didyouknow.py:330
 msgid ""
 "\n"
 "When you give your photos and videos unique filenames, you'll never be "
 "confused as to \n"
 "which file is which. Using <b>sequence numbers</b> to make filenames unique "
 "is highly \n"
-"recommended!.\n"
+"recommended!\n"
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:309
+#: ../raphodo/didyouknow.py:338
 msgid ""
 "\n"
 "<p>Four types of sequence values are available to help you assign unique "
@@ -582,7 +975,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:327
+#: ../raphodo/didyouknow.py:356
 msgid ""
 "\n"
 "The <b>Rename</b> panel allows you to configure file renaming. To rename "
@@ -591,7 +984,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:334
+#: ../raphodo/didyouknow.py:363
 msgid ""
 "\n"
 "<p>The <b>Synchronize RAW + JPEG</b> option is useful if you use the RAW + "
@@ -610,7 +1003,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:348
+#: ../raphodo/didyouknow.py:377
 msgid ""
 "\n"
 "You can have your photos and videos backed up to multiple locations as they "
@@ -621,13 +1014,13 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:356
+#: ../raphodo/didyouknow.py:385
 msgid ""
 "In this example, the drive <b>photobackup</b> does not contain a folder "
 "named <tt>Videos</tt>, so videos will not be backed up to it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:362
+#: ../raphodo/didyouknow.py:391
 msgid ""
 "\n"
 "Several of the program's preferences can be set from the command line, "
@@ -638,7 +1031,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:372
+#: ../raphodo/didyouknow.py:396
+msgid "You can also import program preferences from the older 0.4 version."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:401
 msgid ""
 "\n"
 "Rapid Photo Downloader deals with three types of cache:\n"
@@ -664,23 +1061,23 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:431
+#: ../raphodo/didyouknow.py:460
 msgid "Tip of the Day"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:439
+#: ../raphodo/didyouknow.py:468
 msgid "Did you know...?"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:466
+#: ../raphodo/didyouknow.py:495
 msgid "Show tips on startup"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:470
+#: ../raphodo/didyouknow.py:499
 msgid "&Next"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:471
+#: ../raphodo/didyouknow.py:500
 msgid "&Previous"
 msgstr ""
 
@@ -787,68 +1184,68 @@ msgstr ""
 msgid "%(days)d days, %(hours)d hours"
 msgstr ""
 
-#: ../raphodo/errorlog.py:65
+#: ../raphodo/errorlog.py:66
 msgid "Find"
 msgstr ""
 
-#: ../raphodo/errorlog.py:135
+#: ../raphodo/errorlog.py:136
 msgid "Error Reports - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/errorlog.py:170
+#: ../raphodo/errorlog.py:171
 msgid "Find in reports"
 msgstr ""
 
-#: ../raphodo/errorlog.py:187
+#: ../raphodo/errorlog.py:188
 msgid "Find the previous occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:192
+#: ../raphodo/errorlog.py:193
 msgid "Find the next occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:194
+#: ../raphodo/errorlog.py:195
 msgid "&Highlight All"
 msgstr ""
 
-#: ../raphodo/errorlog.py:195
+#: ../raphodo/errorlog.py:196
 msgid "Highlight all occurrences of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:196
+#: ../raphodo/errorlog.py:197
 msgid "&Match Case"
 msgstr ""
 
-#: ../raphodo/errorlog.py:197
+#: ../raphodo/errorlog.py:198
 msgid "Search with case sensitivity"
 msgstr ""
 
-#: ../raphodo/errorlog.py:198
+#: ../raphodo/errorlog.py:199
 msgid "&Whole Words"
 msgstr ""
 
-#: ../raphodo/errorlog.py:199
+#: ../raphodo/errorlog.py:200
 msgid "Search whole words only"
 msgstr ""
 
-#: ../raphodo/errorlog.py:209 ../raphodo/errorlog.py:341
+#: ../raphodo/errorlog.py:210 ../raphodo/errorlog.py:345
 #, python-format
 msgid "%s of %s matches"
 msgstr ""
 
-#: ../raphodo/errorlog.py:228
+#: ../raphodo/errorlog.py:232
 msgid "Clear"
 msgstr ""
 
-#: ../raphodo/errorlog.py:328
+#: ../raphodo/errorlog.py:332
 msgid "Phrase not found"
 msgstr ""
 
-#: ../raphodo/errorlog.py:487
+#: ../raphodo/errorlog.py:491
 msgid "Search pending..."
 msgstr ""
 
-#: ../raphodo/errorlog.py:535
+#: ../raphodo/errorlog.py:539
 msgid ""
 "The number of new entries added to the Error Report since it was last open. "
 "Click to open the Error Report."
@@ -884,7 +1281,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1601
+#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1643
 msgid "Open in File Browser..."
 msgstr ""
 
@@ -902,531 +1299,531 @@ msgstr ""
 msgid "%s (location does not exist)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:186
+#: ../raphodo/generatenameconfig.py:190
 msgid "Date time"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:187
+#: ../raphodo/generatenameconfig.py:191
 msgid "Text"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:188 ../raphodo/rapid.py:2053
+#: ../raphodo/generatenameconfig.py:192 ../raphodo/rapid.py:2125
 msgid "Filename"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:189 ../raphodo/preferencedialog.py:488
+#: ../raphodo/generatenameconfig.py:193 ../raphodo/preferencedialog.py:724
 msgid "Metadata"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:190
+#: ../raphodo/generatenameconfig.py:194
 msgid "Sequences"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: ../raphodo/generatenameconfig.py:193
+#: ../raphodo/generatenameconfig.py:197
 msgid "Job code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:194
+#: ../raphodo/generatenameconfig.py:198
 msgid "Image date"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:195
+#: ../raphodo/generatenameconfig.py:199
 msgid "Video date"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:196
+#: ../raphodo/generatenameconfig.py:200
 msgid "Today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:197
+#: ../raphodo/generatenameconfig.py:201
 msgid "Yesterday"
 msgstr ""
 
 #. Translators: Download time is the time and date that the download started (when the
 #. user clicked the Download button)
-#: ../raphodo/generatenameconfig.py:200
+#: ../raphodo/generatenameconfig.py:204
 msgid "Download time"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:203
+#: ../raphodo/generatenameconfig.py:207
 msgid "Name"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:206 ../raphodo/rapid.py:2054
+#: ../raphodo/generatenameconfig.py:210 ../raphodo/rapid.py:2126
 msgid "Extension"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:209
+#: ../raphodo/generatenameconfig.py:213
 msgid "Image number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:210
+#: ../raphodo/generatenameconfig.py:214
 msgid "Video number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:213
+#: ../raphodo/generatenameconfig.py:217
 msgid "Aperture"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:216
+#: ../raphodo/generatenameconfig.py:220
 msgid "ISO"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:219
+#: ../raphodo/generatenameconfig.py:223
 msgid "Exposure time"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:222
+#: ../raphodo/generatenameconfig.py:226
 msgid "Focal length"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:225
+#: ../raphodo/generatenameconfig.py:229
 msgid "Camera make"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:228
+#: ../raphodo/generatenameconfig.py:232
 msgid "Camera model"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:231
+#: ../raphodo/generatenameconfig.py:235
 msgid "Short camera model"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:234
+#: ../raphodo/generatenameconfig.py:238
 msgid "Hyphenated short camera model"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:237
+#: ../raphodo/generatenameconfig.py:241
 msgid "Serial number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:240
+#: ../raphodo/generatenameconfig.py:244
 msgid "Shutter count"
 msgstr ""
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: ../raphodo/generatenameconfig.py:242
+#: ../raphodo/generatenameconfig.py:246
 msgid "File number"
 msgstr ""
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:244
+#: ../raphodo/generatenameconfig.py:248
 msgid "Folder only"
 msgstr ""
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:246
+#: ../raphodo/generatenameconfig.py:250
 msgid "Folder and file"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:249
+#: ../raphodo/generatenameconfig.py:253
 msgid "Owner name"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:250
+#: ../raphodo/generatenameconfig.py:254
 msgid "Codec"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:251
+#: ../raphodo/generatenameconfig.py:255
 msgid "Width"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:252
+#: ../raphodo/generatenameconfig.py:256
 msgid "Height"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:253
+#: ../raphodo/generatenameconfig.py:257
 msgid "Length"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:254
+#: ../raphodo/generatenameconfig.py:258
 msgid "Frames Per Second"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:255
+#: ../raphodo/generatenameconfig.py:259
 msgid "Artist"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:256
+#: ../raphodo/generatenameconfig.py:260
 msgid "Copyright"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:259
+#: ../raphodo/generatenameconfig.py:263
 msgid "Downloads today"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:262
+#: ../raphodo/generatenameconfig.py:266
 msgid "Session number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:265
+#: ../raphodo/generatenameconfig.py:269
 msgid "Subfolder number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:268
+#: ../raphodo/generatenameconfig.py:272
 msgid "Stored number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: ../raphodo/generatenameconfig.py:271
+#: ../raphodo/generatenameconfig.py:275
 msgid "Sequence letter"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:274
+#: ../raphodo/generatenameconfig.py:278
 msgid "All digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:277
+#: ../raphodo/generatenameconfig.py:281
 msgid "Last digit"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:280
+#: ../raphodo/generatenameconfig.py:284
 msgid "Last 2 digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:283
+#: ../raphodo/generatenameconfig.py:287
 msgid "Last 3 digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:286
+#: ../raphodo/generatenameconfig.py:290
 msgid "Last 4 digits"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:289
+#: ../raphodo/generatenameconfig.py:293
 msgid "Original Case"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:292
+#: ../raphodo/generatenameconfig.py:296
 msgid "UPPERCASE"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:295
+#: ../raphodo/generatenameconfig.py:299
 msgid "lowercase"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:296
+#: ../raphodo/generatenameconfig.py:300
 msgid "One digit"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:297
+#: ../raphodo/generatenameconfig.py:301
 msgid "Two digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:298
+#: ../raphodo/generatenameconfig.py:302
 msgid "Three digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:299
+#: ../raphodo/generatenameconfig.py:303
 msgid "Four digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:300
+#: ../raphodo/generatenameconfig.py:304
 msgid "Five digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:301
+#: ../raphodo/generatenameconfig.py:305
 msgid "Six digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:302
+#: ../raphodo/generatenameconfig.py:306
 msgid "Seven digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:305
+#: ../raphodo/generatenameconfig.py:309
 msgid "Subseconds"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:308 ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:312 ../raphodo/generatenameconfig.py:393
 msgid "YYYYMMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:311 ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:315 ../raphodo/generatenameconfig.py:394
 msgid "YYYY-MM-DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:314 ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:318 ../raphodo/generatenameconfig.py:395
 msgid "YYYY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:317
+#: ../raphodo/generatenameconfig.py:321
 msgid "YYMMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:320
+#: ../raphodo/generatenameconfig.py:324
 msgid "YY-MM-DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:323
+#: ../raphodo/generatenameconfig.py:327
 msgid "YY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:326
+#: ../raphodo/generatenameconfig.py:330
 msgid "MMDDYYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:329
+#: ../raphodo/generatenameconfig.py:333
 msgid "MMDDYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:332
+#: ../raphodo/generatenameconfig.py:336
 msgid "MMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:335
+#: ../raphodo/generatenameconfig.py:339
 msgid "DDMMYYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:338
+#: ../raphodo/generatenameconfig.py:342
 msgid "DDMMYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:341 ../raphodo/generatenameconfig.py:389
-#: ../raphodo/generatenameconfig.py:390 ../raphodo/generatenameconfig.py:391
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:345 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:394 ../raphodo/generatenameconfig.py:395
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:397
 msgid "YYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:344
+#: ../raphodo/generatenameconfig.py:348
 msgid "YY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:347
+#: ../raphodo/generatenameconfig.py:351
 msgid "MM"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:350
+#: ../raphodo/generatenameconfig.py:354
 msgid "DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:353
+#: ../raphodo/generatenameconfig.py:357
 msgid "Month (full)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:356
+#: ../raphodo/generatenameconfig.py:360
 msgid "Month (abbreviated)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:359
+#: ../raphodo/generatenameconfig.py:363
 msgid "HHMMSS"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:362
+#: ../raphodo/generatenameconfig.py:366
 msgid "HHMM"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:365
+#: ../raphodo/generatenameconfig.py:369
 msgid "HH-MM-SS"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:368
+#: ../raphodo/generatenameconfig.py:372
 msgid "HH-MM"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:371
+#: ../raphodo/generatenameconfig.py:375
 msgid "HH"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:374
+#: ../raphodo/generatenameconfig.py:378
 msgid "MM (minutes)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:377
+#: ../raphodo/generatenameconfig.py:381
 msgid "SS"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:393
 msgid "Date"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:394
 msgid "Date (hyphens)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:395
 msgid "Date (underscores)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:438
-#: ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:442
+#: ../raphodo/generatenameconfig.py:537
 msgid "Date and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392
+#: ../raphodo/generatenameconfig.py:396
 msgid "YYYYMM_Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "Date and Job Code Subfolder"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "YYYYMM"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393 ../raphodo/jobcodepanel.py:198
-#: ../raphodo/nameeditor.py:827 ../raphodo/rapid.py:1809
+#: ../raphodo/generatenameconfig.py:397 ../raphodo/jobcodepanel.py:199
+#: ../raphodo/nameeditor.py:833 ../raphodo/rapid.py:1852
 #: ../raphodo/renamepanel.py:83 ../raphodo/renamepanel.py:241
 msgid "Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:433 ../raphodo/generatenameconfig.py:512
+#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:532
 msgid "Original Filename"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "Date-Time and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "YYYYMMDD-HHMM-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "Date and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "YYYYMMDD-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "Date-Time and Image number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "YYYYMMDD-1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "Date-Time and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "YYYYMMDD-HHMM-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:442 ../raphodo/generatenameconfig.py:537
 msgid "YYYYMMDD-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "Date-Time and Video number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "YYYYMMDD_1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "Resolution"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "YYYYMMDD-HHMM-1-1920x1080"
 msgstr ""
 
@@ -1485,76 +1882,76 @@ msgstr ""
 msgid "&Remember this choice"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:185
+#: ../raphodo/jobcodepanel.py:186
 msgid ""
 "Select photos and videos to be able to apply a new or existing Job Code to "
 "them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:186
+#: ../raphodo/jobcodepanel.py:187
 msgid "The new Job Code will be applied to all selected photos and/or videos."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:187
+#: ../raphodo/jobcodepanel.py:188
 msgid ""
 "Click the Apply button to apply the current Job Code to all selected photos "
 "and/or videos. You can also simply double click the Job Code."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:189
+#: ../raphodo/jobcodepanel.py:190
 msgid ""
 "Removing a Job Code removes it only from the list of saved Job Codes, not "
 "from any photos or videos that it may have been applied to."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:191
+#: ../raphodo/jobcodepanel.py:192
 msgid ""
 "If you want to use Job Codes, configure file renaming or destination "
 "subfolder names to use them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:197
+#: ../raphodo/jobcodepanel.py:198
 msgid "Last Used"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:202
+#: ../raphodo/jobcodepanel.py:203
 msgid "Job Code Sort:"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:205 ../raphodo/rapid.py:2061
+#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2133
 msgid "Ascending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2062
+#: ../raphodo/jobcodepanel.py:207 ../raphodo/rapid.py:2134
 msgid "Descending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:216
+#: ../raphodo/jobcodepanel.py:217
 msgid "&New..."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:220
+#: ../raphodo/jobcodepanel.py:221
 msgid "&Apply"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:224
+#: ../raphodo/jobcodepanel.py:225
 msgid "&Remove"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:228 ../raphodo/preferencedialog.py:125
-#: ../raphodo/preferencedialog.py:154 ../raphodo/preferencedialog.py:433
+#: ../raphodo/jobcodepanel.py:229 ../raphodo/preferencedialog.py:200
+#: ../raphodo/preferencedialog.py:229 ../raphodo/preferencedialog.py:531
 msgid "Remove All"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:427
+#: ../raphodo/jobcodepanel.py:428
 msgid "Do you really want to remove all the Job Codes?"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:429
+#: ../raphodo/jobcodepanel.py:430
 msgid "Remove all Job Codes"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:492
+#: ../raphodo/jobcodepanel.py:493
 msgid "Job Codes"
 msgstr ""
 
@@ -1565,42 +1962,58 @@ msgstr ""
 msgid "<i><b>Hint:</b> %(message)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:418 ../raphodo/nameeditor.py:432
+#: ../raphodo/nameeditor.py:423 ../raphodo/nameeditor.py:437
 #, python-format
 msgid "%(description)s - %(elements)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:512
+#: ../raphodo/nameeditor.py:517
 msgid "Save New Custom Preset..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:513
+#: ../raphodo/nameeditor.py:518
 msgid "Remove All Custom Presets..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:559
+#: ../raphodo/nameeditor.py:564
 msgid "(New Custom Preset)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:576
+#: ../raphodo/nameeditor.py:581
 #, python-format
 msgid "%s (edited)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:579 ../raphodo/nameeditor.py:1370
+#: ../raphodo/nameeditor.py:584 ../raphodo/nameeditor.py:1379
 #, python-format
 msgid "Update Custom Preset \"%s\""
 msgstr ""
 
-#: ../raphodo/nameeditor.py:667
+#: ../raphodo/nameeditor.py:672
 msgid "Save New Custom Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:675
+#: ../raphodo/nameeditor.py:680
 msgid "Preset Name:"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:836
+#: ../raphodo/nameeditor.py:799
+msgid "Photo Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:805
+msgid "Video Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:811
+msgid "Photo Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:817
+msgid "Video Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:842
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>There is insufficient data to "
 "fully generate the name. Please use other renaming options.</i>"
@@ -1609,7 +2022,7 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees.
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:846
+#: ../raphodo/nameeditor.py:853
 #, python-format
 msgid "The character</i> %(separator)s <i>creates a new subfolder level."
 msgstr ""
@@ -1617,42 +2030,42 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:851
+#: ../raphodo/nameeditor.py:858
 #, python-format
 msgid ""
 "There is no need start or end with the folder separator </i> "
 "%(separator)s<i>, because it is added automatically."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:859
+#: ../raphodo/nameeditor.py:866
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>Unique filenames may not be "
 "generated. Make filenames unique by using Sequence values.</i>"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:882 ../raphodo/renamepanel.py:121
+#: ../raphodo/nameeditor.py:889 ../raphodo/renamepanel.py:121
 msgid "Preset:"
 msgstr ""
 
 #. Translators: appears in a combobox, e.g. Image Date (YYYY)
-#: ../raphodo/nameeditor.py:959 ../raphodo/nameeditor.py:980
+#: ../raphodo/nameeditor.py:966 ../raphodo/nameeditor.py:987
 #, python-brace-format
 msgid "{choice} ({variant})"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1005 ../raphodo/preferencedialog.py:530
+#: ../raphodo/nameeditor.py:1012 ../raphodo/preferencedialog.py:783
 msgid "Get help online..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1025
+#: ../raphodo/nameeditor.py:1034
 msgid "Insert"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1351
+#: ../raphodo/nameeditor.py:1360
 msgid "Save Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1356
+#: ../raphodo/nameeditor.py:1365
 msgid ""
 "<b>Do you want to save the changes in a new custom preset?</"
 "b><br><br>Creating a custom preset is not required, but can help you keep "
@@ -1660,7 +2073,7 @@ msgid ""
 "regardless of whether you create a new custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1365
+#: ../raphodo/nameeditor.py:1374
 msgid ""
 "<b>Do you want to save the changes in a custom preset?</b><br><br>If you "
 "like, you can create a new custom preset or update the existing custom "
@@ -1668,136 +2081,167 @@ msgid ""
 "regardless of whether you save a custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1372
+#: ../raphodo/nameeditor.py:1381
 msgid "Save New Custom Preset"
 msgstr ""
 
-#: ../raphodo/newversion.py:306
+#: ../raphodo/newversion.py:312
 msgid "Checking for new version..."
 msgstr ""
 
-#: ../raphodo/newversion.py:307
+#: ../raphodo/newversion.py:313
 msgid "You are running the latest version."
 msgstr ""
 
-#: ../raphodo/newversion.py:308
+#: ../raphodo/newversion.py:314
 msgid "Failed to contact the update server."
 msgstr ""
 
-#: ../raphodo/newversion.py:310
+#: ../raphodo/newversion.py:316
 #, python-format
 msgid "A new version of Rapid Photo Downloader (%s) is available."
 msgstr ""
 
-#: ../raphodo/newversion.py:312
+#: ../raphodo/newversion.py:318
 msgid "Do you want to download the new version?"
 msgstr ""
 
-#: ../raphodo/newversion.py:313
+#: ../raphodo/newversion.py:319
 #, python-format
 msgid "Changes in the new release can be viewed <a href=\"%s\">here</a>."
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the s key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:340 ../raphodo/newversion.py:353
+#: ../raphodo/newversion.py:348 ../raphodo/newversion.py:363
 msgid "&Skip this release"
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the o key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:356
+#: ../raphodo/newversion.py:366
 msgid "&Open Download Page"
 msgstr ""
 
-#: ../raphodo/newversion.py:376
+#: ../raphodo/newversion.py:386
 msgid "Rapid Photo Downloader updates"
 msgstr ""
 
 #. Translators: shows how much of a file has been downloaded e.g  123 KB of 1.3 MB
-#: ../raphodo/newversion.py:478
+#: ../raphodo/newversion.py:488
 #, python-format
 msgid "%(downloaded)s of %(total)s"
 msgstr ""
 
-#: ../raphodo/newversion.py:495
+#: ../raphodo/newversion.py:507
 msgid "Downloading..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:76
+#: ../raphodo/preferencedialog.py:86
 msgid "Preferences"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Automation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85 ../raphodo/preferencedialog.py:343
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/preferencedialog.py:428
 msgid "Error Handling"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:109
+msgid "Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:109 ../raphodo/preferencedialog.py:119
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:94
+#: ../raphodo/preferencedialog.py:147
 msgid "Device Scanning"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:96
+#: ../raphodo/preferencedialog.py:148
 msgid "Scan only external devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:98
+#: ../raphodo/preferencedialog.py:150
 msgid ""
 "Scan for photos and videos only on devices that are external to the "
 "computer,\n"
 "including cameras, memory cards, external hard drives, and USB flash drives."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:102
-msgid "Scan non-camera devices lacking a DCIM folder"
+#: ../raphodo/preferencedialog.py:153
+msgid "Scan only specific folders on devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:104
+#: ../raphodo/preferencedialog.py:155
 msgid ""
-"Scan the entirety of a device for photos and videos, irrespective of whether "
-"it contains a DCIM folder,\n"
-"as opposed to only scanning within a DCIM folder.\n"
+"Scan for photos and videos only in the folders specified below (except "
+"paths\n"
+"specified in Ignored Paths).\n"
 "\n"
-"Changing this setting causes all devices to be scanned again.\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:161
+msgid "Folders to scan:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:164
+msgid ""
+"Folders at the base level of device file systems that will be scanned\n"
+"for photos and videos."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:167 ../raphodo/preferencedialog.py:219
+msgid "Add..."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:169
+msgid ""
+"Add a folder to the list of folders to scan for photos and videos.\n"
 "\n"
-"Note: With cameras, only the DCIM folder is scanned."
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:172 ../raphodo/preferencedialog.py:198
+#: ../raphodo/preferencedialog.py:224 ../raphodo/preferencedialog.py:529
+msgid "Remove"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:174
+msgid ""
+"Remove a folder from the list of folders to scan for photos and videos.\n"
+"\n"
+"Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:116
+#: ../raphodo/preferencedialog.py:191
 msgid "Devices that have been set to automatically ignore or download from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:117
+#: ../raphodo/preferencedialog.py:192
 msgid "Remembered Devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:121
+#: ../raphodo/preferencedialog.py:196
 msgid ""
 "Remove a device from the list of devices to automatically ignore or download "
 "from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:123 ../raphodo/preferencedialog.py:149
-#: ../raphodo/preferencedialog.py:431
-msgid "Remove"
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:127
+#: ../raphodo/preferencedialog.py:202
 msgid ""
 "Clear the list of devices from which to automatically ignore or download "
 "from.\n"
@@ -1805,315 +2249,434 @@ msgid ""
 "Note: Changes take effect when the computer is next scanned for devices."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:140
+#: ../raphodo/preferencedialog.py:215
 msgid "Ignored Paths"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:141
+#: ../raphodo/preferencedialog.py:216
 msgid ""
 "The end part of a path that should never be scanned for photos or videos."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:144
-msgid "Add..."
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:146
+#: ../raphodo/preferencedialog.py:221
 msgid ""
 "Add a path to the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:151
+#: ../raphodo/preferencedialog.py:226
 msgid ""
 "Remove a path from the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:156
+#: ../raphodo/preferencedialog.py:231
 msgid ""
 "Clear the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:164
+#: ../raphodo/preferencedialog.py:239
 msgid ""
 "Use python-style <a href=\"http://damonlynch.net/rapid/documentation/"
 "#regularexpressions\">regular expressions</a>"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:168
+#: ../raphodo/preferencedialog.py:243
 msgid ""
 "Use regular expressions in the list of ignored paths.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:208
+#: ../raphodo/preferencedialog.py:283
 msgid "Program Automation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:209
+#: ../raphodo/preferencedialog.py:284
 msgid "Start downloading at program startup"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:210
+#: ../raphodo/preferencedialog.py:285
 msgid "Start downloading upon device insertion"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:211
+#: ../raphodo/preferencedialog.py:286
 msgid "Unmount (eject) device upon download completion"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:212
+#: ../raphodo/preferencedialog.py:287
 msgid "Exit program when download completes"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:213
+#: ../raphodo/preferencedialog.py:288
 msgid "Exit program even if download had warnings or errors"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:240
+#: ../raphodo/preferencedialog.py:315
 msgid "Thumbnail Generation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:241
+#: ../raphodo/preferencedialog.py:316
 msgid "Generate thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:242
+#: ../raphodo/preferencedialog.py:318
 msgid "Generate thumbnails to show in the main program window"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:244
+#: ../raphodo/preferencedialog.py:320
 msgid "Cache thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:245
+#: ../raphodo/preferencedialog.py:323
 msgid ""
 "Save thumbnails shown in the main program window in a thumbnail cache unique "
 "to Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:247
+#: ../raphodo/preferencedialog.py:327
 msgid "Generate system thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:248
+#: ../raphodo/preferencedialog.py:330
 msgid ""
 "While downloading, save thumbnails that can be used by desktop file managers "
 "and other programs"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:255
+#: ../raphodo/preferencedialog.py:339
 msgid "Number of CPU cores used to generate thumbnails."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:256
+#: ../raphodo/preferencedialog.py:340
 msgid "CPU cores:"
 msgstr ""
 
 #. Translators: the * acts as an asterisk to denote a reference to an annotation
 #. such as '* Takes effect upon program restart'
-#: ../raphodo/preferencedialog.py:271 ../raphodo/preferencedialog.py:317
+#: ../raphodo/preferencedialog.py:355 ../raphodo/preferencedialog.py:401
 msgid "*"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:294
+#: ../raphodo/preferencedialog.py:378
 msgid "Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:296
+#: ../raphodo/preferencedialog.py:380
 msgid "Calculating..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:302
+#: ../raphodo/preferencedialog.py:386
 msgid "days"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:303
+#: ../raphodo/preferencedialog.py:387
 msgid "forever"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:308
+#: ../raphodo/preferencedialog.py:392
 msgid "Cache size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:310
+#: ../raphodo/preferencedialog.py:394
 msgid "Number of thumbnails:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:312
+#: ../raphodo/preferencedialog.py:396
 msgid "Database size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:314
+#: ../raphodo/preferencedialog.py:398
 msgid "Cache unaccessed thumbnails for:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:322
+#: ../raphodo/preferencedialog.py:406
 msgid "Purge Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:323
+#: ../raphodo/preferencedialog.py:408
 msgid "Optimize Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:336
+#: ../raphodo/preferencedialog.py:421
 msgid "* Takes effect upon program restart"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:346
+#: ../raphodo/preferencedialog.py:431
 msgid "Skip download"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:347
+#: ../raphodo/preferencedialog.py:432
 msgid "Don't download the file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:348
+#: ../raphodo/preferencedialog.py:433
 msgid "Add unique identifier"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:349
+#: ../raphodo/preferencedialog.py:436
 msgid ""
 "Add an identifier like _1 or _2 to the end of the filename, immediately "
 "before the file's extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:355
+#: ../raphodo/preferencedialog.py:444
 msgid "Overwrite"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:356
+#: ../raphodo/preferencedialog.py:445
 msgid "Overwrite the previously backed up file"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:357
+#: ../raphodo/preferencedialog.py:446
 msgid "Skip"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:358
+#: ../raphodo/preferencedialog.py:448
 msgid "Don't overwrite the backup file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:364
+#: ../raphodo/preferencedialog.py:455
 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 identifier:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:378
+#: ../raphodo/preferencedialog.py:464
+msgid ""
+"Using sequence numbers to automatically generate unique filenames is "
+"strongly recommended. Configure file renaming in the Rename panel in the "
+"main window."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:473
 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 ""
 
-#: ../raphodo/preferencedialog.py:398
+#: ../raphodo/preferencedialog.py:494
 msgid "Program Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:399
+#: ../raphodo/preferencedialog.py:495
 msgid "Show a warning when:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:402
+#: ../raphodo/preferencedialog.py:498
 msgid "Downloading files currently not displayed"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:403
+#: ../raphodo/preferencedialog.py:499
 msgid ""
 "Warn when about to download files that are not displayed in the main window."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:405
+#: ../raphodo/preferencedialog.py:501
 msgid "Backup destinations are missing"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:406
+#: ../raphodo/preferencedialog.py:502
 msgid "Warn before starting a download if it is not possible to back up files."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:408
+#: ../raphodo/preferencedialog.py:504
 msgid "Program libraries are missing or broken"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:409
+#: ../raphodo/preferencedialog.py:505
 msgid ""
 "Warn if a software library used by Rapid Photo Downloader is missing or not "
 "functioning."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:412
+#: ../raphodo/preferencedialog.py:508
 msgid "Filesystem metadata cannot be set"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:413
+#: ../raphodo/preferencedialog.py:509
 msgid ""
 "Warn if there is an error setting a file's filesystem metadata, such as its "
 "modification time."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:416
+#: ../raphodo/preferencedialog.py:512
 msgid "Encountering unhandled files"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:417
+#: ../raphodo/preferencedialog.py:513
 msgid ""
 "Warn after scanning a device or this computer if there are unrecognized "
 "files that will not be included in the download."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:420
+#: ../raphodo/preferencedialog.py:517
 msgid "Do not warn about unhandled files with extensions:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:424
+#: ../raphodo/preferencedialog.py:522
 msgid ""
 "File extensions are case insensitive and do not need to include the leading "
 "dot."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:427
+#: ../raphodo/preferencedialog.py:525
 msgid "Add"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:428
+#: ../raphodo/preferencedialog.py:526
 msgid ""
 "Add a file extension to the list of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:430
+#: ../raphodo/preferencedialog.py:528
 msgid ""
 "Remove a file extension from the list of unhandled file types to not warn "
 "about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:434
+#: ../raphodo/preferencedialog.py:532
 msgid ""
 "Clear the list of file extensions of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:469
+#: ../raphodo/preferencedialog.py:568
+msgid "Photo and Video Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:571
+msgid "Consolidate files across devices and downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:574
+msgid ""
+"Analyze the results of device scans looking for duplicate files and matching "
+"RAW and JPEG pairs,\n"
+"comparing them across multiple devices and download sessions."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:580
+msgid "Treat matching RAW and JPEG files as:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:581
+msgid "One photo"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:582
+msgid "Two photos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:584
+msgid ""
+"Display matching pairs of RAW and JPEG photos as one photo, and if marked, "
+"download both."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:589
+msgid ""
+"Display matching pairs of RAW and JPEG photos as two different photos. You "
+"can still synchronize their sequence numbers."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:598
+msgid "With matching RAW and JPEG photos:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:600
+msgid "Do not mark JPEG for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:601
+msgid "Do not mark RAW for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:602
+msgid "Mark both for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:609
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"JPEG for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:614
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"RAW for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:619
+msgid ""
+"When matching RAW and JPEG photos are found, automatically mark both for "
+"download."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:625
+msgid ""
+"If you disable file consolidation, choose what to do when a download device "
+"is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:631
+msgid ""
+"When a download device is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:642
+msgid "Clear completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:643
+msgid "Keep displaying completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:644
+msgid "Prompt for what to do"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:649
+msgid ""
+"Automatically clear the display of completed downloads whenever a new "
+"download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:654
+msgid ""
+"Keep displaying completed downloads whenever a new download device is "
+"inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:658
+msgid ""
+"Prompt whether to keep displaying completed downloads or clear them whenever "
+"a new download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:702
 msgid "Version Check"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:470
+#: ../raphodo/preferencedialog.py:703
 msgid "Check for new version at startup"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:471
+#: ../raphodo/preferencedialog.py:705
 msgid "Check for a new version of the program each time the program starts."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:473
+#: ../raphodo/preferencedialog.py:707
 msgid "Include development releases"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:474
+#: ../raphodo/preferencedialog.py:709
 msgid ""
 "Include alpha, beta and other development releases when checking for a new "
 "version of the program.\n"
@@ -2122,11 +2685,11 @@ msgid ""
 "occur."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:489
+#: ../raphodo/preferencedialog.py:725
 msgid "Ignore DNG date/time metadata on MTP devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:490
+#: ../raphodo/preferencedialog.py:727
 msgid ""
 "Ignore date/time metadata in DNG files located on MTP devices, and use the "
 "file's modification time instead.\n"
@@ -2135,70 +2698,86 @@ msgid ""
 "metadata."
 msgstr ""
 
+#: ../raphodo/preferencedialog.py:741
+msgid "Completed Downloads"
+msgstr ""
+
 #. Translators: substituted value is a description for the set of preferences
 #. shown in the preference dialog window, e.g. Devices, Automation, etc.
 #. This string is shown in a tooltip for the "Restore Defaults" button
-#: ../raphodo/preferencedialog.py:710
+#: ../raphodo/preferencedialog.py:1067
 #, python-format
 msgid "Restores default %s preference values"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:832
+#: ../raphodo/preferencedialog.py:1208
 msgid ""
 "Do you want to purge the thumbnail cache? The cache will be purged when the "
 "program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:835
+#: ../raphodo/preferencedialog.py:1212
 msgid "Purge Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:847
+#: ../raphodo/preferencedialog.py:1225
 msgid ""
 "Do you want to optimize the thumbnail cache? The cache will be optimized "
 "when the program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:850
+#: ../raphodo/preferencedialog.py:1229
 msgid "Optimize Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1045
+#: ../raphodo/preferencedialog.py:1481
+msgid "Enter a Folder to Scan"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1482
+msgid "Specify a folder that will be scanned for photos and videos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1483
+msgid "Folder:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1497
 msgid "Enter a Path to Ignore"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1046
+#: ../raphodo/preferencedialog.py:1498
 msgid "Specify a path that will never be scanned for photos or videos"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1047
+#: ../raphodo/preferencedialog.py:1499
 msgid "Path:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1061
+#: ../raphodo/preferencedialog.py:1513
 msgid "Enter a File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1062
+#: ../raphodo/preferencedialog.py:1514
 msgid "Specify a file extension (without the leading dot)"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1063 ../raphodo/renamepanel.py:122
+#: ../raphodo/preferencedialog.py:1515 ../raphodo/renamepanel.py:122
 msgid "Extension:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1078
+#: ../raphodo/preferencedialog.py:1530
 msgid "Invalid File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1079
+#: ../raphodo/preferencedialog.py:1531
 #, python-format
 msgid ""
 "The file extension <b>%s</b> is recognized by Rapid Photo Downloader, so it "
 "makes no sense to warn about its presence."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1081
+#: ../raphodo/preferencedialog.py:1533
 #, python-format
 msgid ""
 "Recognized file types:\n"
@@ -2224,104 +2803,103 @@ msgstr ""
 msgid "Birthday"
 msgstr ""
 
-#: ../raphodo/preferences.py:614
+#: ../raphodo/preferences.py:624
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr ""
 
-#: ../raphodo/preferences.py:617
+#: ../raphodo/preferences.py:627
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr ""
 
-#: ../raphodo/preferences.py:622
+#: ../raphodo/preferences.py:632
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
 
-#. self.setFlat(True)
 #: ../raphodo/primarybutton.py:72
 msgid "Download 8 Photos and 10 Videos"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:86 ../raphodo/problemnotification.py:208
+#: ../raphodo/problemnotification.py:87 ../raphodo/problemnotification.py:209
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:89
+#: ../raphodo/problemnotification.py:90
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:116
+#: ../raphodo/problemnotification.py:117
 #, python-format
 msgid "GPhoto2 Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:124
+#: ../raphodo/problemnotification.py:125
 msgid ""
 "Unable to initialize the camera, probably because another program is using "
 "it. No files were copied from it."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:134
+#: ../raphodo/problemnotification.py:135
 #, python-format
 msgid "Unable to read directory %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:140
+#: ../raphodo/problemnotification.py:141
 #, python-format
 msgid "Unable to access modification time or size from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:146
+#: ../raphodo/problemnotification.py:147
 #, python-format
 msgid "Unable to read file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:152
+#: ../raphodo/problemnotification.py:153
 #, python-format
 msgid "Unable to write file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:158
+#: ../raphodo/problemnotification.py:159
 #, python-format
 msgid "Unable to move file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:164
+#: ../raphodo/problemnotification.py:165
 #, python-format
 msgid "Unable to remove file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:170
+#: ../raphodo/problemnotification.py:171
 #, python-format
 msgid "Unable to copy file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:176
+#: ../raphodo/problemnotification.py:177
 #, python-format
 msgid "Zero length file %s will not be downloaded"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:182
+#: ../raphodo/problemnotification.py:183
 #, python-format
 msgid "Could not determine filesystem modification time for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:188
+#: ../raphodo/problemnotification.py:189
 #, python-format
 msgid "Unable to load metadata from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:194
+#: ../raphodo/problemnotification.py:195
 #, python-format
 msgid ""
 "Unable to load metadata from %(name)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:202
+#: ../raphodo/problemnotification.py:203
 #, python-format
 msgid ""
 "An error occurred setting a file's filesystem metadata on the filesystem %s. "
@@ -2329,212 +2907,212 @@ msgid ""
 "again."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:216
+#: ../raphodo/problemnotification.py:217
 #, python-format
 msgid "Encountered unhandled file %s. It will not be downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:223
+#: ../raphodo/problemnotification.py:224
 #, python-format
 msgid "%(filetype)s %(destination)s already exists."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:234 ../raphodo/problemnotification.py:262
+#: ../raphodo/problemnotification.py:235 ../raphodo/problemnotification.py:263
 #, python-format
 msgid ""
 "The existing %(filetype)s %(destination)s was last modified on %(date)s at "
 "%(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:245
+#: ../raphodo/problemnotification.py:246
 #, python-format
 msgid "The %(filetype)s %(source)s was not downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:273
+#: ../raphodo/problemnotification.py:274
 #, python-format
 msgid "The %(filetype)s %(source)s was downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:282
+#: ../raphodo/problemnotification.py:283
 #, python-format
 msgid "The unique identifier '%s' was added to the filename."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:298
+#: ../raphodo/problemnotification.py:299
 #, python-format
 msgid ""
 "The existing backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:309
+#: ../raphodo/problemnotification.py:310
 #, python-format
 msgid "The %(filetype)s %(source)s was not backed up from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:326
+#: ../raphodo/problemnotification.py:327
 #, python-format
 msgid ""
 "The previous backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:337
+#: ../raphodo/problemnotification.py:338
 #, python-format
 msgid ""
 "The %(filetype)s %(source)s from %(device)s was backed up, overwriting the "
 "previous backup %(filetype)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:356
+#: ../raphodo/problemnotification.py:357
 #, python-format
 msgid ""
 "When synchronizing RAW + JPEG sequence values, a duplicate %(filetype)s "
 "%(file)s was encountered, and was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:366
+#: ../raphodo/problemnotification.py:367
 msgid ""
 "When synchronizing RAW + JPEG sequence values, photos were detected with the "
 "same filenames, but taken at different times:"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:373
+#: ../raphodo/problemnotification.py:374
 #, 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 ""
 
-#: ../raphodo/problemnotification.py:389
+#: ../raphodo/problemnotification.py:390
 #, python-format
 msgid "Unable to finalize the filename for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:424
+#: ../raphodo/problemnotification.py:425
 #, python-format
 msgid ""
 "The filename %(destination)s was not fully generated for %(filetype)s "
 "%(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:433
+#: ../raphodo/problemnotification.py:434
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:439
+#: ../raphodo/problemnotification.py:440
 #, python-format
 msgid "The following metadata is missing: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:445
+#: ../raphodo/problemnotification.py:446
 #, python-format
 msgid "Date/time conversion failed: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:451
+#: ../raphodo/problemnotification.py:452
 msgid ""
 "Could not extract valid date/time metadata or determine the file "
 "modification time."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:457
+#: ../raphodo/problemnotification.py:458
 msgid "Filename does not have an extension."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:460
+#: ../raphodo/problemnotification.py:461
 msgid "Filename does not have a number component."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:464
+#: ../raphodo/problemnotification.py:465
 #, python-format
 msgid "Error generating component %(component)s. Error: %(error)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:477
+#: ../raphodo/problemnotification.py:478
 #, python-format
 msgid ""
 "The download subfolders %(folder)s were only partially generated for "
 "%(filetype)s %(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:486
+#: ../raphodo/problemnotification.py:487
 #, python-format
 msgid ""
 "There is no data with which to generate the %(subfolder_file)s for "
 "%(filename)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:499
+#: ../raphodo/problemnotification.py:500
 #, python-format
 msgid ""
 "Unable to create the %(filetype)s %(destination)s in %(folder)s. The "
 "download file was %(source)s in %(device)s. It was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:514
+#: ../raphodo/problemnotification.py:515
 #, python-format
 msgid "Unable to create the download subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:526
+#: ../raphodo/problemnotification.py:527
 #, python-format
 msgid "Unable to create the backup subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:577
+#: ../raphodo/problemnotification.py:578
 #, python-format
 msgid "Problems scanning %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:584
+#: ../raphodo/problemnotification.py:585
 #, python-format
 msgid "Problems copying from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:591
+#: ../raphodo/problemnotification.py:592
 msgid "Problems while finalizing filenames and generating subfolders"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:598
+#: ../raphodo/problemnotification.py:599
 #, python-format
 msgid "Problems backing up to %s"
 msgstr ""
 
-#. Translators: for example Nov 3 or Dec 31
-#. The start and end dates are on a different day
-#. Translators: for example Nov 3 or Dec 31
-#: ../raphodo/proximity.py:105 ../raphodo/proximity.py:221
-#: ../raphodo/proximity.py:224 ../raphodo/proximity.py:828
+#. Translators: for example Nov 3 2015, 11:25 AM
+#. Translators: for example, Nov 3, 12:15 PM
+#: ../raphodo/proximity.py:188 ../raphodo/proximity.py:213
+#: ../raphodo/proximity.py:236 ../raphodo/proximity.py:239
 #, python-format
-msgid "%(month)s %(numeric_day)s"
+msgid "%(date)s, %(time)s"
 msgstr ""
 
-#. Translators: for example Nov 15 2015
-#. Translators: for example Nov 3 2015
-#: ../raphodo/proximity.py:109 ../raphodo/proximity.py:230
-#: ../raphodo/proximity.py:231 ../raphodo/proximity.py:831
+#: ../raphodo/proximity.py:204
 #, python-format
-msgid "%(date)s %(year)s"
+msgid "%(starttime)s - %(endtime)s"
 msgstr ""
 
-#. Translators: for example Nov 3 2015, 11:25 AM
-#. Translators: for example, Nov 3, 12:15 PM
-#: ../raphodo/proximity.py:197 ../raphodo/proximity.py:215
-#: ../raphodo/proximity.py:234 ../raphodo/proximity.py:236
+#. The start and end dates are on a different day
+#. Translators: for example Nov 3 or Dec 31
+#: ../raphodo/proximity.py:221 ../raphodo/proximity.py:225
+#: ../raphodo/proximity.py:980 ../raphodo/timeutils.py:105
 #, python-format
-msgid "%(date)s, %(time)s"
+msgid "%(month)s %(numeric_day)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:209
+#. Translators: for example Nov 3 2015
+#. Translators: for example Nov 2 2015
+#. Translators: for example Nov 15 2015
+#: ../raphodo/proximity.py:232 ../raphodo/proximity.py:233
+#: ../raphodo/proximity.py:985 ../raphodo/timeutils.py:110
 #, python-format
-msgid "%(starttime)s - %(endtime)s"
+msgid "%(date)s %(year)s"
 msgstr ""
 
 #. Translators: for example, Nov 3, 12:15 PM - Nov 4, 1:00 AM
-#: ../raphodo/proximity.py:241
+#: ../raphodo/proximity.py:245
 #, python-format
 msgid "%(earlier_time)s - %(later_time)s"
 msgstr ""
@@ -2543,25 +3121,25 @@ msgstr ""
 #. Nov 3 2012, 12:15 PM -
 #. Nov 4 2012, 1:00 AM
 #. (please keep the line break signified by \n)
-#: ../raphodo/proximity.py:248
+#: ../raphodo/proximity.py:253
 #, python-format
 msgid ""
 "%(earlier_time)s -\n"
 "%(later_time)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:359
+#: ../raphodo/proximity.py:382
 #, python-format
 msgid "%(month)s  %(year)s"
 msgstr ""
 
 #. Translators: for example Nov 2015
-#: ../raphodo/proximity.py:833
+#: ../raphodo/proximity.py:987
 #, python-format
 msgid "%(month)s %(year)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:1344
+#: ../raphodo/proximity.py:1595
 msgid ""
 "The time elapsed between consecutive photos and videos that is used to build "
 "the Timeline"
@@ -2571,47 +3149,47 @@ msgstr ""
 #. Replace the very last character (after the d) with the correct
 #. localized value, keeping everything else. In other words, change
 #. only the m character.
-#: ../raphodo/proximity.py:1406
+#: ../raphodo/proximity.py:1652
 #, python-format
 msgid "%(minutes)dm"
 msgstr ""
 
 #. Translators: i.e. "1.5h", which is short for 1.5 hours.
 #. Replace the entire string with the correct localized value
-#: ../raphodo/proximity.py:1410
+#: ../raphodo/proximity.py:1656
 msgid "1.5h"
 msgstr ""
 
 #. Translators: e.g. "5h", which is short for 5 hours.
 #. Replace the very last character (after the d) with the correct localized value,
 #. keeping everything else. In other words, change only the h character.
-#: ../raphodo/proximity.py:1415
+#: ../raphodo/proximity.py:1661
 #, python-format
 msgid "%(hours)dh"
 msgstr ""
 
-#: ../raphodo/proximity.py:1461
+#: ../raphodo/proximity.py:1710
 msgid ""
 "The Timeline groups photos and videos based on how much time elapsed between "
 "consecutive shots. Use it to identify photos and videos taken at different "
 "periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/proximity.py:1464
+#: ../raphodo/proximity.py:1715
 msgid ""
 "Use the slider (below) to adjust the time elapsed between consecutive shots "
 "that is used to build the Timeline."
 msgstr ""
 
-#: ../raphodo/proximity.py:1466
+#: ../raphodo/proximity.py:1718
 msgid "Timeline build pending..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1467
+#: ../raphodo/proximity.py:1719
 msgid "Timeline is building..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1468
+#: ../raphodo/proximity.py:1721
 msgid ""
 "The Timeline needs to be rebuilt because the file modification time does not "
 "match the time a shot was taken for one or more shots.<br><br>The Timeline "
@@ -2623,61 +3201,61 @@ msgid ""
 "downloading, which is when the metadata is read."
 msgstr ""
 
-#: ../raphodo/rapid.py:485 ../raphodo/rapid.py:2461 ../raphodo/rapid.py:3728
-#: ../raphodo/rapid.py:3846 ../raphodo/rapid.py:3850 ../raphodo/rapid.py:3870
-#: ../raphodo/rapid.py:3874 ../raphodo/rapid.py:3998 ../raphodo/rapid.py:4007
-#: ../raphodo/rapid.py:4495 ../raphodo/rapid.py:4888 ../raphodo/rapid.py:5722
-#: ../raphodo/rememberthisdialog.py:97
+#: ../raphodo/rapid.py:493 ../raphodo/rapid.py:2555 ../raphodo/rapid.py:3934
+#: ../raphodo/rapid.py:4065 ../raphodo/rapid.py:4069 ../raphodo/rapid.py:4092
+#: ../raphodo/rapid.py:4096 ../raphodo/rapid.py:4226 ../raphodo/rapid.py:4237
+#: ../raphodo/rapid.py:4743 ../raphodo/rapid.py:5195 ../raphodo/rapid.py:5997
+#: ../raphodo/rememberthisdialog.py:99
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:3
 msgid "Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:1100
+#: ../raphodo/rapid.py:1131
 msgid ""
 "<b>ExifTool has a problem</b><br><br> Rapid Photo Downloader uses ExifTool "
 "to get metadata from videos and photos. The program will run without it, but "
 "installing it is <b>highly</b> recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1110 ../raphodo/rapid.py:1130
+#: ../raphodo/rapid.py:1141 ../raphodo/rapid.py:1161
 msgid "Problem with libmediainfo"
 msgstr ""
 
-#: ../raphodo/rapid.py:1119
+#: ../raphodo/rapid.py:1150
 msgid ""
 "<b>The library libmediainfo appears to be missing</b><br><br> Rapid Photo "
 "Downloader uses libmediainfo to get the date and time a video was shot. The "
 "program will run  without it, but installing it is recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1417
+#: ../raphodo/rapid.py:1448
 msgid "Download failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1419
+#: ../raphodo/rapid.py:1450
 msgid ""
 "Sorry, the download of the new version of Rapid Photo Downloader failed."
 msgstr ""
 
-#: ../raphodo/rapid.py:1425
+#: ../raphodo/rapid.py:1457
 msgid ""
 "The new version was successfully downloaded. Do you want to close Rapid "
 "Photo Downloader and install it now?"
 msgstr ""
 
-#: ../raphodo/rapid.py:1428
+#: ../raphodo/rapid.py:1461
 msgid "Update Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:1432
+#: ../raphodo/rapid.py:1465
 msgid "Install"
 msgstr ""
 
-#: ../raphodo/rapid.py:1450
+#: ../raphodo/rapid.py:1483
 msgid "New version saved"
 msgstr ""
 
-#: ../raphodo/rapid.py:1451
+#: ../raphodo/rapid.py:1485
 #, python-format
 msgid ""
 "The tar file and installer script are saved at:\n"
@@ -2685,163 +3263,163 @@ msgid ""
 " %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:1468
+#: ../raphodo/rapid.py:1502
 msgid "Upgrade failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1469
+#: ../raphodo/rapid.py:1505
 msgid ""
 "Sorry, upgrading Rapid Photo Downloader failed because there was an error "
 "opening the installer."
 msgstr ""
 
-#: ../raphodo/rapid.py:1667 ../raphodo/rapid.py:2331
+#: ../raphodo/rapid.py:1709 ../raphodo/rapid.py:2425
 msgid "Download"
 msgstr ""
 
-#: ../raphodo/rapid.py:1671
+#: ../raphodo/rapid.py:1713
 msgid "&Refresh..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1675
+#: ../raphodo/rapid.py:1717
 msgid "&Preferences"
 msgstr ""
 
-#: ../raphodo/rapid.py:1679
+#: ../raphodo/rapid.py:1721
 msgid "&Quit"
 msgstr ""
 
-#: ../raphodo/rapid.py:1683
+#: ../raphodo/rapid.py:1725
 msgid "Error &Reports"
 msgstr ""
 
-#: ../raphodo/rapid.py:1687
+#: ../raphodo/rapid.py:1729
 msgid "Clear Completed Downloads"
 msgstr ""
 
-#: ../raphodo/rapid.py:1691
+#: ../raphodo/rapid.py:1733
 msgid "Get Help Online..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1695
+#: ../raphodo/rapid.py:1737
 msgid "&Tip of the Day..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1699
+#: ../raphodo/rapid.py:1741
 msgid "Report a Problem..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1703
+#: ../raphodo/rapid.py:1745
 msgid "Make a Donation..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1707
+#: ../raphodo/rapid.py:1749
 msgid "Translate this Application..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1711
+#: ../raphodo/rapid.py:1753
 msgid "&About..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1715
+#: ../raphodo/rapid.py:1757
 msgid "Check for Updates..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1797
+#: ../raphodo/rapid.py:1840
 msgid "Timeline"
 msgstr ""
 
-#: ../raphodo/rapid.py:1807
+#: ../raphodo/rapid.py:1850
 msgid "Destination"
 msgstr ""
 
-#: ../raphodo/rapid.py:1808
+#: ../raphodo/rapid.py:1851
 msgid "Rename"
 msgstr ""
 
-#: ../raphodo/rapid.py:1810
+#: ../raphodo/rapid.py:1853
 msgid "Back Up"
 msgstr ""
 
 #. Devices Header and View
-#: ../raphodo/rapid.py:1926
+#: ../raphodo/rapid.py:1977
 msgid ""
 "Turn on or off the use of devices attached to this computer as download "
 "sources"
 msgstr ""
 
 #. This Computer Header and View
-#: ../raphodo/rapid.py:1940
+#: ../raphodo/rapid.py:1994
 msgid ""
 "Turn on or off the use of a folder on this computer as a download source"
 msgstr ""
 
-#: ../raphodo/rapid.py:1941
+#: ../raphodo/rapid.py:1996
 msgid "This Computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:1952
+#: ../raphodo/rapid.py:2009
 msgid "Select a source folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:1975
+#: ../raphodo/rapid.py:2038
 msgid "Projected Storage Use"
 msgstr ""
 
-#: ../raphodo/rapid.py:1989 ../raphodo/rapid.py:1997
+#: ../raphodo/rapid.py:2056 ../raphodo/rapid.py:2068
 msgid "Select a destination folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:2045
+#: ../raphodo/rapid.py:2117
 msgid "All"
 msgstr ""
 
-#: ../raphodo/rapid.py:2046
+#: ../raphodo/rapid.py:2118
 msgid "New"
 msgstr ""
 
-#: ../raphodo/rapid.py:2048
+#: ../raphodo/rapid.py:2120
 msgid "Show:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2051
+#: ../raphodo/rapid.py:2123
 msgid "Modification Time"
 msgstr ""
 
-#: ../raphodo/rapid.py:2052
+#: ../raphodo/rapid.py:2124
 msgid "Checked State"
 msgstr ""
 
-#: ../raphodo/rapid.py:2055
+#: ../raphodo/rapid.py:2127
 msgid "File Type"
 msgstr ""
 
-#: ../raphodo/rapid.py:2056
+#: ../raphodo/rapid.py:2128
 msgid "Device"
 msgstr ""
 
-#: ../raphodo/rapid.py:2058
+#: ../raphodo/rapid.py:2130
 msgid "Sort:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2069
+#: ../raphodo/rapid.py:2141
 msgid "Select All:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2311
+#: ../raphodo/rapid.py:2405
 #, python-format
 msgid "Download %(files)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2327
+#: ../raphodo/rapid.py:2421
 msgid "Resume Download"
 msgstr ""
 
-#: ../raphodo/rapid.py:2329
+#: ../raphodo/rapid.py:2423
 msgid "Pause"
 msgstr ""
 
-#: ../raphodo/rapid.py:2417
+#: ../raphodo/rapid.py:2511
 #, python-brace-format
 msgid ""
 "Please report the problem at <a href=\"{website}\">{website}</a>.<br><br>\n"
@@ -2850,11 +3428,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/rapid.py:2431
+#: ../raphodo/rapid.py:2525
 msgid "Thank you for reporting a problem in Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:2529
+#: ../raphodo/rapid.py:2624
 #, python-format
 msgid ""
 "<b>Changing This Computer source path</b><br><br>Do you really want to "
@@ -2863,30 +3441,29 @@ msgid ""
 "from This Computer will be cancelled."
 msgstr ""
 
-#: ../raphodo/rapid.py:2595
+#: ../raphodo/rapid.py:2694
 msgid "You cannot change the download destination while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:2604
+#: ../raphodo/rapid.py:2704
 #, python-format
 msgid ""
 "<b>Confirm Download Destination</b><br><br>Are you sure you want to set the "
 "%(file_type)s download destination to %(path)s?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2682
+#: ../raphodo/rapid.py:2785
 msgid ""
+"\n"
 "<b>Downloading all files</b><br><br>\n"
-"                    A download always includes all files that are checked "
-"for download,\n"
-"                    including those that are not currently displayed because "
-"the Timeline\n"
-"                    is being used or because only new files are being shown."
-"<br><br>\n"
-"                    Do you want to proceed with the download?"
+"A download always includes all files that are checked for download,\n"
+"including those that are not currently displayed because the Timeline\n"
+"is being used or because only new files are being shown.<br><br>\n"
+"Do you want to proceed with the download?\n"
+"                        "
 msgstr ""
 
-#: ../raphodo/rapid.py:2820
+#: ../raphodo/rapid.py:2937
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -2894,206 +3471,200 @@ msgid ""
 "%(folder2)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2824
+#: ../raphodo/rapid.py:2940
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
 "%s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2827
+#: ../raphodo/rapid.py:2943
 msgid "Download Failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:2828
+#: ../raphodo/rapid.py:2944
 msgid "The download cannot proceed."
 msgstr ""
 
-#: ../raphodo/rapid.py:2842
+#: ../raphodo/rapid.py:2962
 msgid ""
 "Photos and videos will not be backed up because there is nowhere to back "
 "them up. Do you still want to start the download?"
 msgstr ""
 
-#. Translators: filetype will be replaced with 'photos' or 'videos'
-#: ../raphodo/rapid.py:2847 ../raphodo/rapid.py:2854
+#: ../raphodo/rapid.py:2969 ../raphodo/rapid.py:2979
 #, python-format
 msgid ""
 "No backup device exists for backing up %(filetype)s. Do you still want to "
 "start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2848 ../raphodo/rpdfile.py:228
+#: ../raphodo/rapid.py:2971 ../raphodo/rpdfile.py:228
 msgid "photos"
 msgstr ""
 
-#: ../raphodo/rapid.py:2855 ../raphodo/rpdfile.py:223
+#: ../raphodo/rapid.py:2981 ../raphodo/rpdfile.py:223
 msgid "videos"
 msgstr ""
 
-#: ../raphodo/rapid.py:2861
+#: ../raphodo/rapid.py:2989
 msgid ""
 "<b>The photo and video backup destinations do not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2869 ../raphodo/rapid.py:2876
+#: ../raphodo/rapid.py:2999 ../raphodo/rapid.py:3008
 #, python-format
 msgid ""
 "<b>The %(filetype)s backup destination does not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2871 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:818
+#: ../raphodo/rapid.py:3001 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:843
 msgid "photo"
 msgstr ""
 
-#: ../raphodo/rapid.py:2878 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:858
+#: ../raphodo/rapid.py:3010 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:883
 msgid "video"
 msgstr ""
 
-#: ../raphodo/rapid.py:2886
+#: ../raphodo/rapid.py:3018
 msgid "Backup problem"
 msgstr ""
 
-#. Translators - in the middle is a unicode em dash - please retain it
-#. This string is displayed in the status bar when the download is running
-#: ../raphodo/rapid.py:3571
+#: ../raphodo/rapid.py:3756
 #, python-format
 msgid "%(downloading_from)s — %(time_left)s left (%(speed)s)"
 msgstr ""
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3640
+#: ../raphodo/rapid.py:3828
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr ""
 
-#. Translators: e.g. 2 videos failed to download
-#: ../raphodo/rapid.py:3645
+#: ../raphodo/rapid.py:3836
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr ""
 
-#: ../raphodo/rapid.py:3650 ../raphodo/rapid.py:3723
+#: ../raphodo/rapid.py:3842 ../raphodo/rapid.py:3927
 msgid "warnings"
 msgstr ""
 
-#: ../raphodo/rapid.py:3679
+#: ../raphodo/rapid.py:3873
 msgid "All downloads complete"
 msgstr ""
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3686 ../raphodo/rapid.py:3695 ../raphodo/rapid.py:3704
-#: ../raphodo/rapid.py:3713 ../raphodo/rapid.py:3721
+#: ../raphodo/rapid.py:3881 ../raphodo/rapid.py:3892 ../raphodo/rapid.py:3903
+#: ../raphodo/rapid.py:3914 ../raphodo/rapid.py:3924
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3688 ../raphodo/rapid.py:3706
+#: ../raphodo/rapid.py:3884 ../raphodo/rapid.py:3906
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr ""
 
-#: ../raphodo/rapid.py:3697 ../raphodo/rapid.py:3715
+#: ../raphodo/rapid.py:3895 ../raphodo/rapid.py:3917
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr ""
 
-#: ../raphodo/rapid.py:3742
+#: ../raphodo/rapid.py:3950
 msgid "1 failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:3744
+#: ../raphodo/rapid.py:3952
 #, python-format
 msgid "%d failures"
 msgstr ""
 
-#: ../raphodo/rapid.py:3749
+#: ../raphodo/rapid.py:3957
 msgid "1 warning"
 msgstr ""
 
-#: ../raphodo/rapid.py:3751
+#: ../raphodo/rapid.py:3959
 #, python-format
 msgid "%d warnings"
 msgstr ""
 
-#: ../raphodo/rapid.py:3771
+#: ../raphodo/rapid.py:3981
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3774
+#: ../raphodo/rapid.py:3985
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3779
+#: ../raphodo/rapid.py:3989
 #, python-format
 msgid "No files downloaded — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3781
+#: ../raphodo/rapid.py:3991
 msgid "No files downloaded"
 msgstr ""
 
-#: ../raphodo/rapid.py:3805
+#: ../raphodo/rapid.py:4021
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3809
+#: ../raphodo/rapid.py:4026
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3812
+#: ../raphodo/rapid.py:4031
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3820
+#: ../raphodo/rapid.py:4039
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3833
+#: ../raphodo/rapid.py:4052
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3837
+#: ../raphodo/rapid.py:4056
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3841
+#: ../raphodo/rapid.py:4060
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices"
 msgstr ""
 
-#: ../raphodo/rapid.py:3867
+#: ../raphodo/rapid.py:4087
 msgid "The Destination subfolders and Timeline have been rebuilt"
 msgstr ""
 
-#: ../raphodo/rapid.py:3922
+#: ../raphodo/rapid.py:4144
 msgid "Program preferences are invalid"
 msgstr ""
 
-#: ../raphodo/rapid.py:3999
+#: ../raphodo/rapid.py:4228
 #, python-format
 msgid ""
 "<b>All files on the %(camera)s are inaccessible</b>.<br><br>It may be locked "
@@ -3103,7 +3674,7 @@ msgid ""
 "ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4008
+#: ../raphodo/rapid.py:4239
 #, python-format
 msgid ""
 "<b>The %(camera)s appears to be in use by another application.</"
@@ -3113,34 +3684,34 @@ msgid ""
 "device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4019
+#: ../raphodo/rapid.py:4250
 msgid "&Try Again"
 msgstr ""
 
-#: ../raphodo/rapid.py:4020
+#: ../raphodo/rapid.py:4251
 msgid "&Ignore This Device"
 msgstr ""
 
-#: ../raphodo/rapid.py:4086
+#: ../raphodo/rapid.py:4323
 #, python-format
 msgid "Sorry, an unexpected problem occurred while scanning %s."
 msgstr ""
 
-#: ../raphodo/rapid.py:4087
+#: ../raphodo/rapid.py:4324
 msgid "Unfortunately you cannot download from this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4091
+#: ../raphodo/rapid.py:4328
 msgid ""
 "A possible workaround for the problem might be downloading from the camera's "
 "memory card using a card reader."
 msgstr ""
 
-#: ../raphodo/rapid.py:4096
+#: ../raphodo/rapid.py:4333
 msgid "Device scan failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:4472
+#: ../raphodo/rapid.py:4720
 #, python-format
 msgid ""
 "<b>The %(camera)s cannot be scanned because it cannot be unmounted.</"
@@ -3149,7 +3720,7 @@ msgid ""
 "the computer and plug it in again."
 msgstr ""
 
-#: ../raphodo/rapid.py:4496
+#: ../raphodo/rapid.py:4745
 #, python-format
 msgid ""
 "<b>The download cannot start because the %(camera)s cannot be unmounted.</"
@@ -3159,123 +3730,149 @@ msgid ""
 "download from it."
 msgstr ""
 
-#: ../raphodo/rapid.py:4635
+#: ../raphodo/rapid.py:4842
+msgid "Completed Downloads Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4844
+#, python-format
+msgid "%s whose download have completed are displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4846
+msgid "Do you want to clear the completed downloads?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4848
+msgid "Completed Download Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4850
+#, python-format
+msgid "%s whose download has completed is displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4852
+msgid "Do you want to clear the completed download?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4933
 #, python-format
 msgid ""
 "Do you want to download photos and videos from the device <i>%(device)s</i>?"
 msgstr ""
 
-#: ../raphodo/rapid.py:4877
+#: ../raphodo/rapid.py:5183
 #, python-format
 msgid "<b>Do you want to ignore the %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4879
+#: ../raphodo/rapid.py:5186
 msgid ""
 "All cameras, phones and tablets with the same model name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:4883
+#: ../raphodo/rapid.py:5190
 #, python-format
 msgid ""
 "<b>Do you want to ignore the device %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4885
+#: ../raphodo/rapid.py:5192
 msgid "Any device with the same name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:5178
+#: ../raphodo/rapid.py:5492
 #, python-format
 msgid "Downloading from %(location)s on This Computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5180
+#: ../raphodo/rapid.py:5496
 msgid ""
 "Do you really want to download from here?<br><br>On some systems, scanning "
 "this location can take a very long time."
 msgstr ""
 
-#: ../raphodo/rapid.py:5224
+#: ../raphodo/rapid.py:5537
 #, python-format
 msgid "Generating thumbnails for %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5227
+#: ../raphodo/rapid.py:5540
 #, python-format
 msgid "Scanning %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5237
+#: ../raphodo/rapid.py:5551
 #, python-format
 msgid ""
 "%(number)s of %(available files)s checked for download (%(hidden)s hidden)"
 msgstr ""
 
-#: ../raphodo/rapid.py:5243
+#: ../raphodo/rapid.py:5559
 #, python-format
 msgid "%(number)s of %(available files)s checked for download"
 msgstr ""
 
-#: ../raphodo/rapid.py:5494
+#: ../raphodo/rapid.py:5764
 msgid "Display program information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5496
+#: ../raphodo/rapid.py:5766
 msgid "Display debugging information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5499
+#: ../raphodo/rapid.py:5769
 msgid "List photo and video file extensions the program recognizes and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5502
+#: ../raphodo/rapid.py:5772
 msgid "Turn on or off the the renaming of photos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5504
+#: ../raphodo/rapid.py:5774
 msgid "turn on or off the the renaming of videos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5506
+#: ../raphodo/rapid.py:5776
 msgid ""
 "Turn on or off the automatic detection of devices from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5510
+#: ../raphodo/rapid.py:5780
 msgid "Turn on or off downloading from this computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5512 ../raphodo/rapid.py:5515 ../raphodo/rapid.py:5518
-#: ../raphodo/rapid.py:5539 ../raphodo/rapid.py:5543
+#: ../raphodo/rapid.py:5782 ../raphodo/rapid.py:5785 ../raphodo/rapid.py:5788
+#: ../raphodo/rapid.py:5809 ../raphodo/rapid.py:5813
 msgid "PATH"
 msgstr ""
 
-#: ../raphodo/rapid.py:5513
+#: ../raphodo/rapid.py:5783
 msgid "The PATH on this computer from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5516
+#: ../raphodo/rapid.py:5786
 msgid "The PATH where photos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5519
+#: ../raphodo/rapid.py:5789
 msgid "The PATH where videos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5521
+#: ../raphodo/rapid.py:5791
 msgid "Turn on or off the backing up of photos and videos while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:5525
+#: ../raphodo/rapid.py:5795
 msgid "Turn on or off the automatic detection of backup devices."
 msgstr ""
 
-#: ../raphodo/rapid.py:5527 ../raphodo/rapid.py:5533
+#: ../raphodo/rapid.py:5797 ../raphodo/rapid.py:5803
 msgid "FOLDER"
 msgstr ""
 
-#: ../raphodo/rapid.py:5528
+#: ../raphodo/rapid.py:5798
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected photo "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3283,7 +3880,7 @@ msgid ""
 "photos up to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5534
+#: ../raphodo/rapid.py:5804
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected video "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3291,115 +3888,122 @@ msgid ""
 "up videos to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5540
+#: ../raphodo/rapid.py:5810
 msgid ""
 "The PATH where photos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5544
+#: ../raphodo/rapid.py:5814
 msgid ""
 "The PATH where videos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5547
+#: ../raphodo/rapid.py:5817
 #, python-format
 msgid "Ignore photos with the following extensions: %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5551
+#: ../raphodo/rapid.py:5821
 msgid "Turn on or off starting downloads as soon as the program itself starts."
 msgstr ""
 
-#: ../raphodo/rapid.py:5554
+#: ../raphodo/rapid.py:5824
 msgid "Turn on or off starting downloads as soon as a device is inserted."
 msgstr ""
 
-#: ../raphodo/rapid.py:5557
+#: ../raphodo/rapid.py:5827
 msgid ""
 "Turn on or off use of the Rapid Photo Downloader Thumbnail Cache. Turning it "
 "off does not delete existing cache contents."
 msgstr ""
 
-#: ../raphodo/rapid.py:5561
+#: ../raphodo/rapid.py:5831
 msgid ""
 "Delete all thumbnails in the Rapid Photo Downloader Thumbnail Cache, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5565
+#: ../raphodo/rapid.py:5835
 msgid "Forget which files have been previously downloaded, and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5568
+#: ../raphodo/rapid.py:5838
 msgid ""
 "Import preferences from an old program version and exit. Requires the "
 "command line program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5571
+#: ../raphodo/rapid.py:5841
 msgid ""
 "Reset all program settings to their default values, delete all thumbnails in "
 "the Thumbnail cache, forget which files have been previously downloaded, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5575
+#: ../raphodo/rapid.py:5845
 msgid "Include gphoto2 debugging information in log files."
 msgstr ""
 
-#: ../raphodo/rapid.py:5579
+#: ../raphodo/rapid.py:5849
 msgid "Print information to the terminal about attached cameras and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5640
+#: ../raphodo/rapid.py:5911
 msgid ""
 "To import preferences from the old version of Rapid Photo Downloader, you "
 "must install the program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5649
+#: ../raphodo/rapid.py:5920
 msgid "No prior program preferences detected: exiting"
 msgstr ""
 
-#: ../raphodo/rapid.py:5652
+#: ../raphodo/rapid.py:5923
 #, python-format
 msgid "Importing preferences from Rapid Photo Downloader %(version)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5714
+#: ../raphodo/rapid.py:5989
 #, python-format
 msgid "Do you want to copy the stored sequence number, which has the value %d?"
 msgstr ""
 
-#: ../raphodo/rapid.py:5726
+#: ../raphodo/rapid.py:6000
 msgid "Program aborting."
 msgstr ""
 
-#: ../raphodo/rapid.py:5736
+#: ../raphodo/rapid.py:6010
 msgid "Never run this program as the sudo / root user."
 msgstr ""
 
-#: ../raphodo/rapid.py:5740
+#: ../raphodo/rapid.py:6014
 msgid "You must install ExifTool to run Rapid Photo Downloader."
 msgstr ""
 
-#: ../raphodo/rapid.py:5794
+#: ../raphodo/rapid.py:6026
+msgid ""
+"Rapid Photo Downloader is installed in multiple locations.\n"
+"\n"
+"Uninstall all copies except the version you want to run."
+msgstr ""
+
+#: ../raphodo/rapid.py:6083
 msgid ""
 "When specifying a path on the command line, do not also specify an\n"
 "option for device auto detection or a path on \"This Computer\"."
 msgstr ""
 
-#: ../raphodo/rapid.py:5950
+#: ../raphodo/rapid.py:6243
 msgid "All settings and caches have been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5958
+#: ../raphodo/rapid.py:6251
 msgid "Thumbnail Cache has been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5964
+#: ../raphodo/rapid.py:6257
 msgid "Remembered files have been forgotten"
 msgstr ""
 
@@ -3415,15 +4019,15 @@ msgstr ""
 msgid "&Don't warn me again about missing or broken program libraries"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:546
+#: ../raphodo/renameandmovefile.py:554
 msgid "subfolder and filename"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:548
+#: ../raphodo/renameandmovefile.py:556
 msgid "filename"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:550
+#: ../raphodo/renameandmovefile.py:558
 msgid "subfolder"
 msgstr ""
 
@@ -3503,160 +4107,237 @@ msgstr ""
 msgid "photos or videos"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:306
+#: ../raphodo/rpdfile.py:315
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:318
+#. translators: natural language expression signifying a single video
+#: ../raphodo/rpdfile.py:337
+msgid "a video"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:339
 msgid "1 Video"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:323
+#. translators: natural language expression signifying a single photo
+#: ../raphodo/rpdfile.py:346
+msgid "a photo"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:348
 msgid "1 Photo"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:803
+#: ../raphodo/rpdfile.py:828
 #, python-format
 msgid "%(path)s on %(camera)s"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:819
+#: ../raphodo/rpdfile.py:844
 msgid "Photo"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:859
+#: ../raphodo/rpdfile.py:884
 msgid "Video"
 msgstr ""
 
-#: ../raphodo/storage.py:138
+#: ../raphodo/storage.py:141
 msgid "File system root"
 msgstr ""
 
 #. translators: the name of the Pictures folder
-#: ../raphodo/storage.py:433
+#: ../raphodo/storage.py:437
 msgid "Pictures"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:426
+#: ../raphodo/thumbnaildisplay.py:432
 #, python-format
 msgid "Taken on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:431
+#: ../raphodo/thumbnaildisplay.py:439
 #, python-format
 msgid "Modified on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:437 ../raphodo/thumbnaildisplay.py:466
+#: ../raphodo/thumbnaildisplay.py:447 ../raphodo/thumbnaildisplay.py:481
 #, python-format
 msgid "%(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:451
+#: ../raphodo/thumbnaildisplay.py:464
 #, python-format
 msgid "Memory cards: %s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:457
+#: ../raphodo/thumbnaildisplay.py:468
+#, python-format
+msgid "Memory card: %s"
+msgstr ""
+
+#: ../raphodo/thumbnaildisplay.py:473
 msgid "Downloaded as:"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:472
+#: ../raphodo/thumbnaildisplay.py:489
 #, python-format
 msgid "<br><br>Previous download:<br>%(filename)s<br>%(path)s<br>%(date)s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:1603
+#: ../raphodo/thumbnaildisplay.py:1645
 msgid "Copy Path"
 msgstr ""
 
+#. Translators: these values are file size suffixes like B representing bytes, KB representing
+#. kilobytes, etc.
+#: ../raphodo/utilities.py:170
+msgid "B"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "KB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "MB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "GB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "TB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "PB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "EB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "ZB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "YB"
+msgstr ""
+
 #. two things in a list e.g. "device1 and device2"
-#: ../raphodo/utilities.py:391
+#: ../raphodo/utilities.py:394
 #, python-format
 msgid "%(first_item)s and %(last_item)s"
 msgstr ""
 
-#: ../raphodo/utilities.py:464
+#: ../raphodo/utilities.py:468
 msgid "one"
 msgstr ""
 
-#: ../raphodo/utilities.py:465
+#: ../raphodo/utilities.py:469
 msgid "two"
 msgstr ""
 
-#: ../raphodo/utilities.py:466
+#: ../raphodo/utilities.py:470
 msgid "three"
 msgstr ""
 
-#: ../raphodo/utilities.py:467
+#: ../raphodo/utilities.py:471
 msgid "four"
 msgstr ""
 
-#: ../raphodo/utilities.py:468
+#: ../raphodo/utilities.py:472
 msgid "five"
 msgstr ""
 
-#: ../raphodo/utilities.py:469
+#: ../raphodo/utilities.py:473
 msgid "six"
 msgstr ""
 
-#: ../raphodo/utilities.py:470
+#: ../raphodo/utilities.py:474
 msgid "seven"
 msgstr ""
 
-#: ../raphodo/utilities.py:471
+#: ../raphodo/utilities.py:475
 msgid "eight"
 msgstr ""
 
-#: ../raphodo/utilities.py:472
+#: ../raphodo/utilities.py:476
 msgid "nine"
 msgstr ""
 
-#: ../raphodo/utilities.py:473
+#: ../raphodo/utilities.py:477
 msgid "ten"
 msgstr ""
 
-#: ../raphodo/utilities.py:474
+#: ../raphodo/utilities.py:478
 msgid "eleven"
 msgstr ""
 
-#: ../raphodo/utilities.py:475
+#: ../raphodo/utilities.py:479
 msgid "twelve"
 msgstr ""
 
-#: ../raphodo/utilities.py:476
+#: ../raphodo/utilities.py:480
 msgid "thirteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:477
+#: ../raphodo/utilities.py:481
 msgid "fourteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:478
+#: ../raphodo/utilities.py:482
 msgid "fifteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:479
+#: ../raphodo/utilities.py:483
 msgid "sixteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:480
+#: ../raphodo/utilities.py:484
 msgid "seventeen"
 msgstr ""
 
-#: ../raphodo/utilities.py:481
+#: ../raphodo/utilities.py:485
 msgid "eighteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:482
+#: ../raphodo/utilities.py:486
 msgid "ninenteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:483
+#: ../raphodo/utilities.py:487
 msgid "twenty"
 msgstr ""
 
+#: ../raphodo/viewutils.py:240
+msgid "&OK"
+msgstr ""
+
+#: ../raphodo/viewutils.py:243
+msgid "&Save"
+msgstr ""
+
+#: ../raphodo/viewutils.py:244
+msgid "&Help"
+msgstr ""
+
+#: ../raphodo/viewutils.py:245
+msgid "Restore Defaults"
+msgstr ""
+
+#: ../raphodo/viewutils.py:246
+msgid "&Yes"
+msgstr ""
+
+#: ../raphodo/viewutils.py:247
+msgid "&No"
+msgstr ""
+
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:1
 msgid ""
 "Rapid Photo Downloader imports photos and videos from cameras, phones, "
diff --git a/po/ro.po b/po/ro.po
index 06b02f9..a603376 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,35 +7,386 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: damonlynch@gmail.com\n"
-"POT-Creation-Date: 2017-07-08 19:16-0500\n"
-"PO-Revision-Date: 2017-07-04 11:06+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2017-09-12 17:01-0400\n"
+"PO-Revision-Date: 2017-09-13 18:38+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: Romanian <ro@li.org>\n"
-"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-07-05 23:04+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-09-26 22:04+0000\n"
+"X-Generator: Launchpad (build 18463)\n"
+"Language: ro\n"
+
+#: ../install.py:65
+msgid "Rapid Photo Downloader installer"
+msgstr ""
+
+#: ../install.py:66
+msgid "Download and install latest version of Rapid Photo Downloader."
+msgstr ""
+
+#: ../install.py:236 ../install.py:1732
+msgid "Installer not found:"
+msgstr ""
+
+#. Translators: do not translate the term tar.gz
+#: ../install.py:240 ../install.py:1736
+msgid "Installer not in tar.gz format:"
+msgstr ""
+
+#: ../install.py:465
+msgid ""
+"Incorrect folder ownership detected. Changing ownership of and resetting "
+"permissions for"
+msgstr ""
+
+#: ../install.py:540
+msgid "The following command will be run:"
+msgstr ""
+
+#: ../install.py:543 ../install.py:1479 ../install.py:1484
+msgid "sudo may prompt you for the sudo password."
+msgstr ""
+
+#: ../install.py:547
+msgid "Would you like to run the command now?"
+msgstr ""
+
+#: ../install.py:549
+msgid "Answer is not yes, exiting."
+msgstr ""
+
+#: ../install.py:559 ../install.py:751 ../install.py:966
+msgid "Command failed"
+msgstr ""
+
+#: ../install.py:561 ../install.py:752 ../install.py:967
+msgid "Exiting"
+msgstr ""
+
+#: ../install.py:582
+msgid "The Universe repository must be enabled."
+msgstr ""
+
+#: ../install.py:606
+msgid ""
+"Do you want to to uninstall the previous version of Rapid Photo Downloader:"
+msgstr ""
+
+#: ../install.py:715 ../install.py:740
+msgid ""
+"Querying package system to see if an older version of Rapid Photo Downloader "
+"is installed (this may take a while)..."
+msgstr ""
+
+#: ../install.py:726
+msgid ""
+"Unable to query package system. Please check your Internet connection and "
+"try again"
+msgstr ""
+
+#: ../install.py:756
+msgid "Checking if previous version installed with pip..."
+msgstr ""
+
+#: ../install.py:850
+msgid "The following package is unknown on your system: {}\n"
+msgstr ""
+
+#: ../install.py:857 ../install.py:929 ../install.py:974
+msgid ""
+"To continue, some packages required to run the application will be installed."
+msgstr ""
+
+#: ../install.py:886
+msgid "Querying installed and available packages (this may take a while)"
+msgstr ""
+
+#: ../install.py:958
+msgid ""
+"Querying zypper to see if any required packages are already installed (this "
+"may take a while)... "
+msgstr ""
+
+#: ../install.py:1004
+msgid "Query to confirm action at each step."
+msgstr ""
+
+#: ../install.py:1011
+msgid ""
+"When downloading the latest version, install the development version if it "
+"is newer than the stable version."
+msgstr ""
+
+#: ../install.py:1020
+msgid ""
+"Optional tar.gz Rapid Photo Downloader installer archive. If not specified, "
+"the latest version is downloaded from the Internet."
+msgstr ""
+
+#: ../install.py:1043
+msgid ""
+"Do not run the installer in the tar.gz Rapid Photo Downloader installer "
+"archive if it is newer than this version ({}). The default is to run "
+"whichever installer is newer."
+msgstr ""
+
+#: ../install.py:1050
+msgid ""
+"Uninstall Rapid Photo Downloader that was installed with pip, keeping its "
+"dependencies."
+msgstr ""
+
+#: ../install.py:1054
+msgid ""
+"Uninstall the dependencies installed by pip during Rapid Photo Downloader's "
+"installation, and Rapid Photo Downloader itself, then exit."
+msgstr ""
+
+#: ../install.py:1059
+msgid ""
+"Note: this will not uninstall any version of Rapid Photo Downloader "
+"installed by your Linux distribution's package manager."
+msgstr ""
+
+#: ../install.py:1066
+msgid ""
+"Dependencies will only be removed if they are not required by other programs."
+msgstr ""
+
+#: ../install.py:1072
+msgid ""
+"Note: this option will remove the dependencies regardless of whether they "
+"are required by another program pip has installed. Upgrade to pip 9.0 or "
+"above if you want to avoid this behavior. You can do so using the command "
+"'python3 -m pip install pip -U --user'. Also note that any version of Rapid "
+"Photo Downloader installed by your Linux distribution's package manager will "
+"not be uninstalled."
+msgstr ""
+
+#: ../install.py:1122
+msgid "Failed to download versions file"
+msgstr ""
+
+#: ../install.py:1126
+msgid "Got error code {} while accessing versions file"
+msgstr ""
+
+#: ../install.py:1234
+msgid ""
+"Sorry, could not locate installer. Please check your Internet connection and "
+"verify if you can reach https://www.damonlynch.net\n"
+"\n"
+"Exiting.\n"
+msgstr ""
+
+#: ../install.py:1408
+msgid "Installing application requirements..."
+msgstr ""
+
+#: ../install.py:1424
+msgid "Received error code"
+msgstr ""
+
+#: ../install.py:1425
+msgid "Failed to install application requirements: exiting"
+msgstr ""
+
+#: ../install.py:1428
+msgid "Installing application..."
+msgstr ""
+
+#: ../install.py:1441
+msgid "Failed to install application: exiting..."
+msgstr ""
+
+#: ../install.py:1465
+msgid ""
+"You may have to restart the computer to be able to run the program from the "
+"commmand line or application launcher."
+msgstr ""
+
+#: ../install.py:1476
+msgid "Do you want to install the application's man pages?"
+msgstr ""
+
+#: ../install.py:1477
+msgid "They will be installed into {}"
+msgstr ""
+
+#: ../install.py:1478 ../install.py:1483
+msgid "If you uninstall the application, remove these manpages yourself."
+msgstr ""
+
+#: ../install.py:1480
+msgid "Do want to install the man pages?"
+msgstr ""
+
+#: ../install.py:1482
+msgid "Installing man pages into {}"
+msgstr ""
+
+#: ../install.py:1499
+msgid "Failed to create man page directory: exiting"
+msgstr ""
+
+#: ../install.py:1511
+msgid "Failed to copy man page."
+msgstr ""
+
+#: ../install.py:1521
+msgid "(If a segmentation fault occurs at exit, you can ignore it...)"
+msgstr ""
+
+#: ../install.py:1534
+msgid ""
+"The python3 tool pip is required to uninstall a version of Rapid Photo "
+"Downloader that was installed with pip.\n"
+"Cannot continue. Exiting."
+msgstr ""
+
+#: ../install.py:1575
+msgid ""
+"Do not run this installer script as sudo / root user.\n"
+"Run it using the user who will run the program.\n"
+msgstr ""
+
+#: ../install.py:1585 ../install.py:1599
+msgid "Do not include any other command line arguments when specifying"
+msgstr ""
+
+#: ../install.py:1614
+msgid ""
+"Sorry, this installer does not support a custom python installation.\n"
+"Exiting..."
+msgstr ""
+
+#: ../install.py:1620
+msgid "Restarting script using system python..."
+msgstr ""
+
+#: ../install.py:1651
+msgid "Exiting..."
+msgstr ""
+
+#. Translators: do not translate the term python3-apt
+#: ../install.py:1670
+msgid "To continue, the package python3-apt must be installed."
+msgstr ""
+
+#: ../install.py:1689
+msgid ""
+"Install the following packages using your Linux distribution's standard "
+"package manager, and then rerun this installer"
+msgstr ""
+
+#: ../install.py:1698
+msgid ""
+"To run this program, programs to assist Python 3 and its package management "
+"must be installed."
+msgstr ""
 
-#. type: QPushButton
-#: ../raphodo/aboutdialog.py:217
+#. Translators: do not translate the terms Python 3, pip and setuptools
+#: ../install.py:1713
+msgid "Python 3's pip and setuptools must be upgraded for your user."
+msgstr ""
+
+#. Translators: do not translate the term python or requests
+#: ../install.py:1726
+msgid "Installing python requests"
+msgstr ""
+
+#: ../upgrade.py:79
+msgid "Upgrade Rapid Photo Downloader"
+msgstr ""
+
+#: ../upgrade.py:401 ../raphodo/viewutils.py:242
+msgid "&Cancel"
+msgstr ""
+
+#: ../upgrade.py:405
+msgid "&Upgrade"
+msgstr ""
+
+#: ../upgrade.py:410
+#, python-format
+msgid "Click the Upgrade button to upgrade to version %s."
+msgstr ""
+
+#: ../upgrade.py:413
+msgid "Click the Upgrade button to start the upgrade."
+msgstr ""
+
+#: ../upgrade.py:416 ../upgrade.py:422 ../raphodo/viewutils.py:241
+msgid "&Close"
+msgstr ""
+
+#: ../upgrade.py:417
+msgid "&Run"
+msgstr ""
+
+#: ../upgrade.py:447
+msgid "Close Rapid Photo Downloader before running this upgrade"
+msgstr ""
+
+#: ../upgrade.py:450
+msgid "Upgrade running..."
+msgstr ""
+
+#: ../upgrade.py:486
+#, python-format
+msgid ""
+"Successfully upgraded to %s. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:491
+msgid ""
+"Upgrade finished successfully. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:495
+msgid "Upgrade failed. Click Close to exit."
+msgstr ""
+
+#: ../upgrade.py:6967
+#, python-format
+msgid "Upgrading %s..."
+msgstr ""
+
+#: ../upgrade.py:6969
+msgid "Press any key to continue..."
+msgstr ""
+
+#: ../upgrade.py:6982
+msgid "Rapid Photo Downloader upgrade failed"
+msgstr ""
+
+#: ../upgrade.py:6984
+#, python-format
+msgid ""
+"The python package %s could not be updated. The upgrade cannot continue."
+msgstr ""
+
+#: ../raphodo/aboutdialog.py:225
 msgid "Credits"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:239
+#: ../raphodo/backuppanel.py:240
 msgid "Backups are not configured"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:241
+#: ../raphodo/backuppanel.py:242
 msgid "No backup devices detected"
 msgstr "Nu am găsit copie de siguranță a dispozitivului"
 
-#: ../raphodo/backuppanel.py:243
+#: ../raphodo/backuppanel.py:244
 msgid "Valid backup locations not yet specified"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:401
+#: ../raphodo/backuppanel.py:404
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
@@ -43,95 +394,104 @@ 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."
 
-#: ../raphodo/backuppanel.py:407
+#: ../raphodo/backuppanel.py:412
 msgid "Back up photos and videos when downloading"
 msgstr "Copiază de siguranță fotografiile șî video cănd descărci"
 
-#: ../raphodo/backuppanel.py:413
+#: ../raphodo/backuppanel.py:418
 msgid "Automatically detect backup devices"
 msgstr "Detectare automată a copiilor de siguranță a dispozitivelor"
 
-#: ../raphodo/backuppanel.py:417
+#: ../raphodo/backuppanel.py:424
 msgid ""
-"Specify the folder in which backups are stored on the device."
-"<br><br><i>Note: the presence of a folder with this name is used to "
+"Specify the folder in which backups are stored on the "
+"device.<br><br><i>Note: the presence of a folder with this name is used to "
 "determine if 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 folder names. By "
 "adding both folders, the same device can be used to back up both photos and "
 "videos.</i>"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:428
+#: ../raphodo/backuppanel.py:439
 msgid "Photo folder name:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:433
+#: ../raphodo/backuppanel.py:444
 msgid "Video folder name:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:438 ../raphodo/nameeditor.py:883
+#: ../raphodo/backuppanel.py:449 ../raphodo/nameeditor.py:890
 #: ../raphodo/renamepanel.py:123
 msgid "Example:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:448
-msgid "If you disable automatic detection, choose the exact backup locations."
+#: ../raphodo/backuppanel.py:460
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
 
-#: ../raphodo/backuppanel.py:452
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:468
 msgid "Photo backup location:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:454
+#: ../raphodo/backuppanel.py:474
 msgid "Select Photo Backup Location"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:460
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:485
 msgid "Video backup location:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:462
+#: ../raphodo/backuppanel.py:491
 msgid "Select Video Backup Location"
 msgstr ""
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:564
+#: ../raphodo/backuppanel.py:595
 msgid "drive1"
 msgstr ""
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:567
+#: ../raphodo/backuppanel.py:598
 msgid "drive2"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:628
+#: ../raphodo/backuppanel.py:663
 msgid "Projected Backup Storage Use"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:632
+#: ../raphodo/backuppanel.py:669
 msgid "Backup Options"
 msgstr ""
 
 #. translators: refers to the video thumbnail file that some
 #. cameras generate -- it has a .THM file extension
-#: ../raphodo/copyfiles.py:476
+#: ../raphodo/copyfiles.py:491
 msgid "video THM"
 msgstr ""
 
-#: ../raphodo/copyfiles.py:482
+#: ../raphodo/copyfiles.py:497
 msgid "audio"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:78 ../raphodo/devicedisplay.py:1079
-#: ../raphodo/rpdfile.py:321
+#: ../raphodo/rpdfile.py:342
 #, python-format
 msgid "%(no_photos)s Photos"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:82 ../raphodo/devicedisplay.py:1081
-#: ../raphodo/rpdfile.py:316
+#: ../raphodo/rpdfile.py:333
 #, python-format
 msgid "%(no_videos)s Videos"
 msgstr ""
@@ -159,15 +519,15 @@ msgid "%(size_free)s free of %(size_total)s"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:190 ../raphodo/devicedisplay.py:993
-#: ../raphodo/rapid.py:1964 ../raphodo/rapid.py:2079 ../raphodo/rapid.py:5753
-#: ../raphodo/rpdfile.py:905
+#: ../raphodo/rapid.py:2023 ../raphodo/rapid.py:2151 ../raphodo/rapid.py:6043
+#: ../raphodo/rpdfile.py:930
 msgid "Photos"
 msgstr ""
 
 #. translators: the name of the Videos folder
 #: ../raphodo/destinationdisplay.py:191 ../raphodo/devicedisplay.py:994
-#: ../raphodo/rapid.py:1967 ../raphodo/rapid.py:2080 ../raphodo/rapid.py:5754
-#: ../raphodo/rpdfile.py:933 ../raphodo/storage.py:445
+#: ../raphodo/rapid.py:2028 ../raphodo/rapid.py:2152 ../raphodo/rapid.py:6044
+#: ../raphodo/rpdfile.py:958 ../raphodo/storage.py:449
 msgid "Videos"
 msgstr ""
 
@@ -175,7 +535,7 @@ msgstr ""
 msgid "Projected storage use after download"
 msgstr ""
 
-#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:516
+#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:521
 msgid "Custom..."
 msgstr ""
 
@@ -213,57 +573,58 @@ msgstr ""
 msgid "%s full"
 msgstr ""
 
-#: ../raphodo/devices.py:459
+#: ../raphodo/devices.py:463
 msgid "Cameras"
 msgstr ""
 
-#: ../raphodo/devices.py:460 ../raphodo/devices.py:920
-#: ../raphodo/preferencedialog.py:85 ../raphodo/rapid.py:1927
+#: ../raphodo/devices.py:464 ../raphodo/devices.py:927
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/rapid.py:1979
 msgid "Devices"
 msgstr "Dispozitive"
 
-#: ../raphodo/devices.py:720
+#: ../raphodo/devices.py:724
 #, python-format
 msgid "Downloading from %(device_names)s"
 msgstr ""
 
 #. Translators: e.g. Three Devices
-#: ../raphodo/devices.py:780
+#: ../raphodo/devices.py:784
 #, python-format
 msgid "%(no_devices)s %(device_type)s"
 msgstr ""
 
-#: ../raphodo/devices.py:905 ../raphodo/rapid.py:1764
+#: ../raphodo/devices.py:912 ../raphodo/rapid.py:1807
 msgid "Select Source"
 msgstr ""
 
-#: ../raphodo/devices.py:936 ../raphodo/devices.py:947
+#: ../raphodo/devices.py:943 ../raphodo/devices.py:954
 #, python-format
 msgid "%(device1)s + %(device2)s"
 msgstr ""
 
 #. Number of cameras e.g. 3 Cameras
-#: ../raphodo/devices.py:958
+#: ../raphodo/devices.py:965
 #, python-format
 msgid "%(no_cameras)s Cameras"
 msgstr ""
 
-#: ../raphodo/devices.py:963
+#: ../raphodo/devices.py:970
 #, python-format
 msgid "%(no_devices)s Devices"
 msgstr ""
 
 #. Translators: two folder names, separated by a plus sign
-#: ../raphodo/devices.py:1258
+#: ../raphodo/devices.py:1265
 #, python-format
 msgid "%s + %s"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:44
+#: ../raphodo/didyouknow.py:45
 msgid "Click on a file's checkbox to mark or unmark it for download."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:50
+#: ../raphodo/didyouknow.py:51
 msgid ""
 "Files that have already been downloaded are remembered. You can still mark "
 "previously downloaded files to download again, but they are unchecked by "
@@ -271,34 +632,67 @@ msgid ""
 "files that are yet to be downloaded."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:59
+#: ../raphodo/didyouknow.py:60
 msgid ""
 "If more than one file is selected, they'll all take the mark of the file "
 "whose checkbox was clicked, regardless of whether they previously had a "
 "checkmark or not."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:67
+#: ../raphodo/didyouknow.py:68
 msgid ""
 "Click on a device's checkbox to quickly mark or unmark all its files for "
 "downloading."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:74
+#: ../raphodo/didyouknow.py:75
+msgid ""
+"After a download finishes, an icon replaces the thumbnail's checkbox. The "
+"icon's color indicates whether the download was successful (green), had file "
+"renaming problems (yellow/orange), or failed (red)."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:83
+msgid ""
+"\n"
+"            In case of any problems, a red icon will appear at the bottom of "
+"the window\n"
+"            indicating how many error reports there are. Clicking on it "
+"opens the Error Report \n"
+"            window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:91
+msgid ""
+"\n"
+"            The Error Report window lists any problems encountered before, "
+"during or after the \n"
+"            download. An orange triangle represents a warning, a red circle "
+"indicates a failure, \n"
+"            and a black circle indicates more serious failures. You can "
+"click on the hyperlinks to \n"
+"            open its file or device in a file manager. You can also search "
+"the reports using the \n"
+"            search box in the lower left of the Error Report window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:103
 msgid ""
 "You can simultaneously download from multiple cameras, smartphones, memory "
 "cards, and hard drives&mdash;as many devices as your computer can handle at "
 "one time."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:81
+#: ../raphodo/didyouknow.py:110
 msgid ""
 "The <b>Timeline</b> groups photos and videos based on how much time elapsed "
 "between consecutive shots. Use it to identify photos and videos taken at "
 "different periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:88
+#: ../raphodo/didyouknow.py:117
 msgid ""
 "\n"
 "<p>In the illustration above, the first row of the Timeline is black because "
@@ -310,7 +704,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:99
+#: ../raphodo/didyouknow.py:128
 msgid ""
 "To view photos and videos for a particular time range, use the mouse "
 "(optionally in combination with the <tt>Shift</tt> or <tt>Ctrl</tt> keys) to "
@@ -318,20 +712,20 @@ msgid ""
 "the left side of the main window will be highlighted."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:106
+#: ../raphodo/didyouknow.py:135
 msgid ""
 "A download always includes all files that are checked for download, "
 "including those that are not currently displayed because the Timeline is "
 "being used."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:113
+#: ../raphodo/didyouknow.py:142
 msgid ""
 "You can hide or display the download sources by clicking on the name of the "
 "device you're downloading from at the top left of the program window."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:120
+#: ../raphodo/didyouknow.py:149
 msgid ""
 "\n"
 "          Thumbnails can be sorted using a variety of criteria:\n"
@@ -350,33 +744,33 @@ msgid ""
 "</ol> "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:137
+#: ../raphodo/didyouknow.py:166
 msgid ""
 "One of Rapid Photo Downloader's most useful features is its ability to "
 "automatically generate download subfolders and rename files as it downloads, "
 "using a scheme of your choosing."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:143
+#: ../raphodo/didyouknow.py:172
 msgid ""
 "To specify where you want your files downloaded and how you want them named, "
 "open the appropriate panel on the right-side of the application window: "
 "<b>Destination</b>, <b>Rename</b>, or <b>Job Code</b>."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:150
+#: ../raphodo/didyouknow.py:179
 msgid ""
 "\n"
 "When thinking about your download directory structure, keep in mind two "
 "different types\n"
 "of directory:\n"
 "<ol>\n"
-"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, &quot;"
-"Photos&quot;, or\n"
+"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, "
+"&quot;Photos&quot;, or\n"
 "&quot;Videos&quot;. This directory should already exist on your computer. In "
 "the illustration \n"
-"below, the destination folders are &quot;Pictures&quot; and &quot;"
-"Videos&quot;. The\n"
+"below, the destination folders are &quot;Pictures&quot; and "
+"&quot;Videos&quot;. The\n"
 "name of the destination folder is displayed in the grey bar directly above "
 "the folder tree, \n"
 "with a folder icon to its left and a gear icon to its far right.</li>\n"
@@ -389,7 +783,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:167
+#: ../raphodo/didyouknow.py:196
 msgid ""
 "\n"
 "You can download photos and videos to the same destination folder, or "
@@ -402,14 +796,14 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:177
+#: ../raphodo/didyouknow.py:206
 msgid ""
 "Automatically generated download subfolders can contain further "
 "automatically generated subfolders if need be. A common scheme is to create "
 "a year subfolder and then a series of year-month-day subfolders within it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:186
+#: ../raphodo/didyouknow.py:215
 msgid ""
 "\n"
 "Whenever possible, the program previews the download subfolders of photos "
@@ -427,7 +821,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:201
+#: ../raphodo/didyouknow.py:230
 msgid ""
 "\n"
 "Download subfolder names are typically generated using some or all of the "
@@ -451,7 +845,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:219
+#: ../raphodo/didyouknow.py:248
 msgid ""
 "\n"
 "To automatically create download subfolders as you download, \n"
@@ -461,7 +855,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:227
+#: ../raphodo/didyouknow.py:256
 msgid ""
 "\n"
 "Using the drop-down menu, select a built-in preset or click on <b>Custom</b> "
@@ -471,20 +865,20 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:237
+#: ../raphodo/didyouknow.py:266
 msgid ""
 "It's easy to download raw images into one folder, and jpeg images into "
 "another. Simply use the <b>Filename Extension</b> as part of your download "
 "subfolder generation scheme:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:242
+#: ../raphodo/didyouknow.py:271
 msgid ""
 "This illustration shows a saved custom preset named &quot;My custom "
 "preset&quot;."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:246
+#: ../raphodo/didyouknow.py:275
 msgid ""
 "\n"
 "You do not have to create nested download subfolders. This illustration "
@@ -495,7 +889,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:256
+#: ../raphodo/didyouknow.py:285
 msgid ""
 "\n"
 "Although there are many built-in date/time naming options, you may find that "
@@ -509,7 +903,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:265
+#: ../raphodo/didyouknow.py:294
 msgid ""
 "\n"
 "Read more about all the ways you can generate download subfolder names and "
@@ -519,7 +913,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:273
+#: ../raphodo/didyouknow.py:302
 msgid ""
 "\n"
 "<b>Job Codes</b> let you easily enter text that describes sets of photos and "
@@ -531,7 +925,7 @@ msgid ""
 "&quot;Green Bazaar&quot;: \n"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:282
+#: ../raphodo/didyouknow.py:311
 msgid ""
 "\n"
 "You can apply new or existing Job Codes before you start a download. If "
@@ -542,36 +936,36 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:291
+#: ../raphodo/didyouknow.py:320
 msgid "Look for hints to guide you when working with Job Codes:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:295
+#: ../raphodo/didyouknow.py:324
 msgid ""
 "Hints will vary depending on the context, such as when the mouse is hovering "
 "over a button."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:301
+#: ../raphodo/didyouknow.py:330
 msgid ""
 "\n"
 "When you give your photos and videos unique filenames, you'll never be "
 "confused as to \n"
 "which file is which. Using <b>sequence numbers</b> to make filenames unique "
 "is highly \n"
-"recommended!.\n"
+"recommended!\n"
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:309
+#: ../raphodo/didyouknow.py:338
 msgid ""
 "\n"
 "<p>Four types of sequence values are available to help you assign unique "
 "names to your photos and \n"
 "videos:\n"
 "<ol>\n"
-"<li><b>Downloads today</b>: tracks downloads completed during that day.</"
-"li>\n"
+"<li><b>Downloads today</b>: tracks downloads completed during that "
+"day.</li>\n"
 "<li><b>Stored number</b>: similar to Downloads today, but it is remembered "
 "from the last time the  \n"
 "program was run.</li>\n"
@@ -585,7 +979,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:327
+#: ../raphodo/didyouknow.py:356
 msgid ""
 "\n"
 "The <b>Rename</b> panel allows you to configure file renaming. To rename "
@@ -594,7 +988,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:334
+#: ../raphodo/didyouknow.py:363
 msgid ""
 "\n"
 "<p>The <b>Synchronize RAW + JPEG</b> option is useful if you use the RAW + "
@@ -613,7 +1007,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:348
+#: ../raphodo/didyouknow.py:377
 msgid ""
 "\n"
 "You can have your photos and videos backed up to multiple locations as they "
@@ -624,13 +1018,13 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:356
+#: ../raphodo/didyouknow.py:385
 msgid ""
 "In this example, the drive <b>photobackup</b> does not contain a folder "
 "named <tt>Videos</tt>, so videos will not be backed up to it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:362
+#: ../raphodo/didyouknow.py:391
 msgid ""
 "\n"
 "Several of the program's preferences can be set from the command line, "
@@ -641,7 +1035,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:372
+#: ../raphodo/didyouknow.py:396
+msgid "You can also import program preferences from the older 0.4 version."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:401
 msgid ""
 "\n"
 "Rapid Photo Downloader deals with three types of cache:\n"
@@ -651,8 +1049,8 @@ msgid ""
 "memory cards, and other devices.</li>\n"
 "<li>A <b>temporary cache</b> of files downloaded from a camera, one for "
 "photos and another for \n"
-"videos. They are located in temporary subfolders in the download destination."
-"</li>\n"
+"videos. They are located in temporary subfolders in the download "
+"destination.</li>\n"
 "<li>The <b>desktop's thumbnail cache</b>, in which Rapid Photo Downloader "
 "stores thumbnails of \n"
 "RAW and TIFF photos once they have been downloaded. File browsers like Gnome "
@@ -667,23 +1065,23 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:431
+#: ../raphodo/didyouknow.py:460
 msgid "Tip of the Day"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:439
+#: ../raphodo/didyouknow.py:468
 msgid "Did you know...?"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:466
+#: ../raphodo/didyouknow.py:495
 msgid "Show tips on startup"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:470
+#: ../raphodo/didyouknow.py:499
 msgid "&Next"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:471
+#: ../raphodo/didyouknow.py:500
 msgid "&Previous"
 msgstr ""
 
@@ -790,68 +1188,68 @@ msgstr ""
 msgid "%(days)d days, %(hours)d hours"
 msgstr ""
 
-#: ../raphodo/errorlog.py:65
+#: ../raphodo/errorlog.py:66
 msgid "Find"
 msgstr ""
 
-#: ../raphodo/errorlog.py:135
+#: ../raphodo/errorlog.py:136
 msgid "Error Reports - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/errorlog.py:170
+#: ../raphodo/errorlog.py:171
 msgid "Find in reports"
 msgstr ""
 
-#: ../raphodo/errorlog.py:187
+#: ../raphodo/errorlog.py:188
 msgid "Find the previous occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:192
+#: ../raphodo/errorlog.py:193
 msgid "Find the next occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:194
+#: ../raphodo/errorlog.py:195
 msgid "&Highlight All"
 msgstr ""
 
-#: ../raphodo/errorlog.py:195
+#: ../raphodo/errorlog.py:196
 msgid "Highlight all occurrences of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:196
+#: ../raphodo/errorlog.py:197
 msgid "&Match Case"
 msgstr ""
 
-#: ../raphodo/errorlog.py:197
+#: ../raphodo/errorlog.py:198
 msgid "Search with case sensitivity"
 msgstr ""
 
-#: ../raphodo/errorlog.py:198
+#: ../raphodo/errorlog.py:199
 msgid "&Whole Words"
 msgstr ""
 
-#: ../raphodo/errorlog.py:199
+#: ../raphodo/errorlog.py:200
 msgid "Search whole words only"
 msgstr ""
 
-#: ../raphodo/errorlog.py:209 ../raphodo/errorlog.py:341
+#: ../raphodo/errorlog.py:210 ../raphodo/errorlog.py:345
 #, python-format
 msgid "%s of %s matches"
 msgstr ""
 
-#: ../raphodo/errorlog.py:228
+#: ../raphodo/errorlog.py:232
 msgid "Clear"
 msgstr ""
 
-#: ../raphodo/errorlog.py:328
+#: ../raphodo/errorlog.py:332
 msgid "Phrase not found"
 msgstr ""
 
-#: ../raphodo/errorlog.py:487
+#: ../raphodo/errorlog.py:491
 msgid "Search pending..."
 msgstr ""
 
-#: ../raphodo/errorlog.py:535
+#: ../raphodo/errorlog.py:539
 msgid ""
 "The number of new entries added to the Error Report since it was last open. "
 "Click to open the Error Report."
@@ -865,8 +1263,8 @@ msgstr ""
 #, python-brace-format
 msgid ""
 "<b>A problem occurred in Rapid Photo Downloader</b><br><br>\n"
-"    Please report the problem at <a href=\"{website}\">{website}</a>."
-"<br><br>\n"
+"    Please report the problem at <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
 "    Attach the log file <i>{log_file}</i> to your bug report (click\n"
 "    <a href=\"{log_path}\">here</a> to open the log directory).<br><br>If "
 "the same problem occurs\n"
@@ -887,7 +1285,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1601
+#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1643
 msgid "Open in File Browser..."
 msgstr ""
 
@@ -905,531 +1303,531 @@ msgstr ""
 msgid "%s (location does not exist)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:186
+#: ../raphodo/generatenameconfig.py:190
 msgid "Date time"
 msgstr "Dată timp"
 
-#: ../raphodo/generatenameconfig.py:187
+#: ../raphodo/generatenameconfig.py:191
 msgid "Text"
 msgstr "Text"
 
-#: ../raphodo/generatenameconfig.py:188 ../raphodo/rapid.py:2053
+#: ../raphodo/generatenameconfig.py:192 ../raphodo/rapid.py:2125
 msgid "Filename"
 msgstr "Nume fișier"
 
-#: ../raphodo/generatenameconfig.py:189 ../raphodo/preferencedialog.py:488
+#: ../raphodo/generatenameconfig.py:193 ../raphodo/preferencedialog.py:724
 msgid "Metadata"
 msgstr "Metadata"
 
-#: ../raphodo/generatenameconfig.py:190
+#: ../raphodo/generatenameconfig.py:194
 msgid "Sequences"
 msgstr "Secvenţe"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: ../raphodo/generatenameconfig.py:193
+#: ../raphodo/generatenameconfig.py:197
 msgid "Job code"
 msgstr "Cod sarcină"
 
-#: ../raphodo/generatenameconfig.py:194
+#: ../raphodo/generatenameconfig.py:198
 msgid "Image date"
 msgstr "Dată imagine"
 
-#: ../raphodo/generatenameconfig.py:195
+#: ../raphodo/generatenameconfig.py:199
 msgid "Video date"
 msgstr "Dată video"
 
-#: ../raphodo/generatenameconfig.py:196
+#: ../raphodo/generatenameconfig.py:200
 msgid "Today"
 msgstr "Astăzi"
 
-#: ../raphodo/generatenameconfig.py:197
+#: ../raphodo/generatenameconfig.py:201
 msgid "Yesterday"
 msgstr "Ieri"
 
 #. Translators: Download time is the time and date that the download started (when the
 #. user clicked the Download button)
-#: ../raphodo/generatenameconfig.py:200
+#: ../raphodo/generatenameconfig.py:204
 msgid "Download time"
 msgstr "Timp descărcare"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:203
+#: ../raphodo/generatenameconfig.py:207
 msgid "Name"
 msgstr "Nume"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:206 ../raphodo/rapid.py:2054
+#: ../raphodo/generatenameconfig.py:210 ../raphodo/rapid.py:2126
 msgid "Extension"
 msgstr "Extensie"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:209
+#: ../raphodo/generatenameconfig.py:213
 msgid "Image number"
 msgstr "Număr imagine"
 
-#: ../raphodo/generatenameconfig.py:210
+#: ../raphodo/generatenameconfig.py:214
 msgid "Video number"
 msgstr "Număr video"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:213
+#: ../raphodo/generatenameconfig.py:217
 msgid "Aperture"
 msgstr "Diafragmă"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:216
+#: ../raphodo/generatenameconfig.py:220
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:219
+#: ../raphodo/generatenameconfig.py:223
 msgid "Exposure time"
 msgstr "Timp expunere"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:222
+#: ../raphodo/generatenameconfig.py:226
 msgid "Focal length"
 msgstr "Distanță focală"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:225
+#: ../raphodo/generatenameconfig.py:229
 msgid "Camera make"
 msgstr "Fabricant cameră foto"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:228
+#: ../raphodo/generatenameconfig.py:232
 msgid "Camera model"
 msgstr "Model cameră foto"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:231
+#: ../raphodo/generatenameconfig.py:235
 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
-#: ../raphodo/generatenameconfig.py:234
+#: ../raphodo/generatenameconfig.py:238
 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
-#: ../raphodo/generatenameconfig.py:237
+#: ../raphodo/generatenameconfig.py:241
 msgid "Serial number"
 msgstr "Număr serie"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:240
+#: ../raphodo/generatenameconfig.py:244
 msgid "Shutter count"
 msgstr "Calcul obturator"
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: ../raphodo/generatenameconfig.py:242
+#: ../raphodo/generatenameconfig.py:246
 msgid "File number"
 msgstr ""
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:244
+#: ../raphodo/generatenameconfig.py:248
 msgid "Folder only"
 msgstr ""
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:246
+#: ../raphodo/generatenameconfig.py:250
 msgid "Folder and file"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:249
+#: ../raphodo/generatenameconfig.py:253
 msgid "Owner name"
 msgstr "Nume proprietar"
 
-#: ../raphodo/generatenameconfig.py:250
+#: ../raphodo/generatenameconfig.py:254
 msgid "Codec"
 msgstr "Codec"
 
-#: ../raphodo/generatenameconfig.py:251
+#: ../raphodo/generatenameconfig.py:255
 msgid "Width"
 msgstr "Lățime"
 
-#: ../raphodo/generatenameconfig.py:252
+#: ../raphodo/generatenameconfig.py:256
 msgid "Height"
 msgstr "Înălțime"
 
-#: ../raphodo/generatenameconfig.py:253
+#: ../raphodo/generatenameconfig.py:257
 msgid "Length"
 msgstr "Lungime"
 
-#: ../raphodo/generatenameconfig.py:254
+#: ../raphodo/generatenameconfig.py:258
 msgid "Frames Per Second"
 msgstr "Cadre pe secundă"
 
-#: ../raphodo/generatenameconfig.py:255
+#: ../raphodo/generatenameconfig.py:259
 msgid "Artist"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:256
+#: ../raphodo/generatenameconfig.py:260
 msgid "Copyright"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:259
+#: ../raphodo/generatenameconfig.py:263
 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
-#: ../raphodo/generatenameconfig.py:262
+#: ../raphodo/generatenameconfig.py:266
 msgid "Session number"
 msgstr "Numărul sesiunii"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:265
+#: ../raphodo/generatenameconfig.py:269
 msgid "Subfolder number"
 msgstr "Număr subdosare"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:268
+#: ../raphodo/generatenameconfig.py:272
 msgid "Stored number"
 msgstr "Număr stocare"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: ../raphodo/generatenameconfig.py:271
+#: ../raphodo/generatenameconfig.py:275
 msgid "Sequence letter"
 msgstr "Secvență literă"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:274
+#: ../raphodo/generatenameconfig.py:278
 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
-#: ../raphodo/generatenameconfig.py:277
+#: ../raphodo/generatenameconfig.py:281
 msgid "Last digit"
 msgstr "Ultimul digit"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:280
+#: ../raphodo/generatenameconfig.py:284
 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
-#: ../raphodo/generatenameconfig.py:283
+#: ../raphodo/generatenameconfig.py:287
 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
-#: ../raphodo/generatenameconfig.py:286
+#: ../raphodo/generatenameconfig.py:290
 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
-#: ../raphodo/generatenameconfig.py:289
+#: ../raphodo/generatenameconfig.py:293
 msgid "Original Case"
 msgstr "Format original"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:292
+#: ../raphodo/generatenameconfig.py:296
 msgid "UPPERCASE"
 msgstr "MAJUSCULE"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:295
+#: ../raphodo/generatenameconfig.py:299
 msgid "lowercase"
 msgstr "minuscule"
 
-#: ../raphodo/generatenameconfig.py:296
+#: ../raphodo/generatenameconfig.py:300
 msgid "One digit"
 msgstr "Un digit"
 
-#: ../raphodo/generatenameconfig.py:297
+#: ../raphodo/generatenameconfig.py:301
 msgid "Two digits"
 msgstr "Doi digiți"
 
-#: ../raphodo/generatenameconfig.py:298
+#: ../raphodo/generatenameconfig.py:302
 msgid "Three digits"
 msgstr "Trei digiți"
 
-#: ../raphodo/generatenameconfig.py:299
+#: ../raphodo/generatenameconfig.py:303
 msgid "Four digits"
 msgstr "Patru digiți"
 
-#: ../raphodo/generatenameconfig.py:300
+#: ../raphodo/generatenameconfig.py:304
 msgid "Five digits"
 msgstr "Cinci digiți"
 
-#: ../raphodo/generatenameconfig.py:301
+#: ../raphodo/generatenameconfig.py:305
 msgid "Six digits"
 msgstr "Șase digiți"
 
-#: ../raphodo/generatenameconfig.py:302
+#: ../raphodo/generatenameconfig.py:306
 msgid "Seven digits"
 msgstr "Șapte digiți"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:305
+#: ../raphodo/generatenameconfig.py:309
 msgid "Subseconds"
 msgstr "Milisecunde"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:308 ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:312 ../raphodo/generatenameconfig.py:393
 msgid "YYYYMMDD"
 msgstr "AAAALLZZ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:311 ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:315 ../raphodo/generatenameconfig.py:394
 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
-#: ../raphodo/generatenameconfig.py:314 ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:318 ../raphodo/generatenameconfig.py:395
 msgid "YYYY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:317
+#: ../raphodo/generatenameconfig.py:321
 msgid "YYMMDD"
 msgstr "AALLZZ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:320
+#: ../raphodo/generatenameconfig.py:324
 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
-#: ../raphodo/generatenameconfig.py:323
+#: ../raphodo/generatenameconfig.py:327
 msgid "YY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:326
+#: ../raphodo/generatenameconfig.py:330
 msgid "MMDDYYYY"
 msgstr "LLZZAAAA"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:329
+#: ../raphodo/generatenameconfig.py:333
 msgid "MMDDYY"
 msgstr "LLZZAA"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:332
+#: ../raphodo/generatenameconfig.py:336
 msgid "MMDD"
 msgstr "LLZZ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:335
+#: ../raphodo/generatenameconfig.py:339
 msgid "DDMMYYYY"
 msgstr "ZZLLAAAA"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:338
+#: ../raphodo/generatenameconfig.py:342
 msgid "DDMMYY"
 msgstr "ZZLLAA"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:341 ../raphodo/generatenameconfig.py:389
-#: ../raphodo/generatenameconfig.py:390 ../raphodo/generatenameconfig.py:391
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:345 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:394 ../raphodo/generatenameconfig.py:395
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:397
 msgid "YYYY"
 msgstr "AAAA"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:344
+#: ../raphodo/generatenameconfig.py:348
 msgid "YY"
 msgstr "AA"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:347
+#: ../raphodo/generatenameconfig.py:351
 msgid "MM"
 msgstr "LL"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:350
+#: ../raphodo/generatenameconfig.py:354
 msgid "DD"
 msgstr "ZZ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:353
+#: ../raphodo/generatenameconfig.py:357
 msgid "Month (full)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:356
+#: ../raphodo/generatenameconfig.py:360
 msgid "Month (abbreviated)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:359
+#: ../raphodo/generatenameconfig.py:363
 msgid "HHMMSS"
 msgstr "OOMMSS"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:362
+#: ../raphodo/generatenameconfig.py:366
 msgid "HHMM"
 msgstr "OOMM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:365
+#: ../raphodo/generatenameconfig.py:369
 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
-#: ../raphodo/generatenameconfig.py:368
+#: ../raphodo/generatenameconfig.py:372
 msgid "HH-MM"
 msgstr "OO-MM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:371
+#: ../raphodo/generatenameconfig.py:375
 msgid "HH"
 msgstr "OO"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:374
+#: ../raphodo/generatenameconfig.py:378
 msgid "MM (minutes)"
 msgstr "MM (minute)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:377
+#: ../raphodo/generatenameconfig.py:381
 msgid "SS"
 msgstr "SS"
 
-#: ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:393
 msgid "Date"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:394
 msgid "Date (hyphens)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:395
 msgid "Date (underscores)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:438
-#: ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:442
+#: ../raphodo/generatenameconfig.py:537
 msgid "Date and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392
+#: ../raphodo/generatenameconfig.py:396
 msgid "YYYYMM_Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "Date and Job Code Subfolder"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "YYYYMM"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393 ../raphodo/jobcodepanel.py:198
-#: ../raphodo/nameeditor.py:827 ../raphodo/rapid.py:1809
+#: ../raphodo/generatenameconfig.py:397 ../raphodo/jobcodepanel.py:199
+#: ../raphodo/nameeditor.py:833 ../raphodo/rapid.py:1852
 #: ../raphodo/renamepanel.py:83 ../raphodo/renamepanel.py:241
 msgid "Job Code"
 msgstr "Cod Sarcină"
 
-#: ../raphodo/generatenameconfig.py:433 ../raphodo/generatenameconfig.py:512
+#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:532
 msgid "Original Filename"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "Date-Time and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "YYYYMMDD-HHMM-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "Date and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "YYYYMMDD-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "Date-Time and Image number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "YYYYMMDD-1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "Date-Time and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "YYYYMMDD-HHMM-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:442 ../raphodo/generatenameconfig.py:537
 msgid "YYYYMMDD-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "Date-Time and Video number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "YYYYMMDD_1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "Resolution"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "YYYYMMDD-HHMM-1-1920x1080"
 msgstr ""
 
@@ -1488,76 +1886,77 @@ msgstr ""
 msgid "&Remember this choice"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:185
+#: ../raphodo/jobcodepanel.py:186
 msgid ""
 "Select photos and videos to be able to apply a new or existing Job Code to "
 "them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:186
-msgid "The new Job Code will be applied to all selected photos and/or videos."
+#: ../raphodo/jobcodepanel.py:187
+msgid ""
+"The new Job Code will be applied to all selected photos and/or videos."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:187
+#: ../raphodo/jobcodepanel.py:188
 msgid ""
 "Click the Apply button to apply the current Job Code to all selected photos "
 "and/or videos. You can also simply double click the Job Code."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:189
+#: ../raphodo/jobcodepanel.py:190
 msgid ""
 "Removing a Job Code removes it only from the list of saved Job Codes, not "
 "from any photos or videos that it may have been applied to."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:191
+#: ../raphodo/jobcodepanel.py:192
 msgid ""
 "If you want to use Job Codes, configure file renaming or destination "
 "subfolder names to use them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:197
+#: ../raphodo/jobcodepanel.py:198
 msgid "Last Used"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:202
+#: ../raphodo/jobcodepanel.py:203
 msgid "Job Code Sort:"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:205 ../raphodo/rapid.py:2061
+#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2133
 msgid "Ascending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2062
+#: ../raphodo/jobcodepanel.py:207 ../raphodo/rapid.py:2134
 msgid "Descending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:216
+#: ../raphodo/jobcodepanel.py:217
 msgid "&New..."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:220
+#: ../raphodo/jobcodepanel.py:221
 msgid "&Apply"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:224
+#: ../raphodo/jobcodepanel.py:225
 msgid "&Remove"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:228 ../raphodo/preferencedialog.py:125
-#: ../raphodo/preferencedialog.py:154 ../raphodo/preferencedialog.py:433
+#: ../raphodo/jobcodepanel.py:229 ../raphodo/preferencedialog.py:200
+#: ../raphodo/preferencedialog.py:229 ../raphodo/preferencedialog.py:531
 msgid "Remove All"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:427
+#: ../raphodo/jobcodepanel.py:428
 msgid "Do you really want to remove all the Job Codes?"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:429
+#: ../raphodo/jobcodepanel.py:430
 msgid "Remove all Job Codes"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:492
+#: ../raphodo/jobcodepanel.py:493
 msgid "Job Codes"
 msgstr "Coduri Sarcină"
 
@@ -1568,42 +1967,58 @@ msgstr "Coduri Sarcină"
 msgid "<i><b>Hint:</b> %(message)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:418 ../raphodo/nameeditor.py:432
+#: ../raphodo/nameeditor.py:423 ../raphodo/nameeditor.py:437
 #, python-format
 msgid "%(description)s - %(elements)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:512
+#: ../raphodo/nameeditor.py:517
 msgid "Save New Custom Preset..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:513
+#: ../raphodo/nameeditor.py:518
 msgid "Remove All Custom Presets..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:559
+#: ../raphodo/nameeditor.py:564
 msgid "(New Custom Preset)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:576
+#: ../raphodo/nameeditor.py:581
 #, python-format
 msgid "%s (edited)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:579 ../raphodo/nameeditor.py:1370
+#: ../raphodo/nameeditor.py:584 ../raphodo/nameeditor.py:1379
 #, python-format
 msgid "Update Custom Preset \"%s\""
 msgstr ""
 
-#: ../raphodo/nameeditor.py:667
+#: ../raphodo/nameeditor.py:672
 msgid "Save New Custom Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:675
+#: ../raphodo/nameeditor.py:680
 msgid "Preset Name:"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:836
+#: ../raphodo/nameeditor.py:799
+msgid "Photo Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:805
+msgid "Video Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:811
+msgid "Photo Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:817
+msgid "Video Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:842
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>There is insufficient data to "
 "fully generate the name. Please use other renaming options.</i>"
@@ -1612,7 +2027,7 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees.
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:846
+#: ../raphodo/nameeditor.py:853
 #, python-format
 msgid "The character</i> %(separator)s <i>creates a new subfolder level."
 msgstr ""
@@ -1620,50 +2035,50 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:851
+#: ../raphodo/nameeditor.py:858
 #, python-format
 msgid ""
 "There is no need start or end with the folder separator </i> "
 "%(separator)s<i>, because it is added automatically."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:859
+#: ../raphodo/nameeditor.py:866
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>Unique filenames may not be "
 "generated. Make filenames unique by using Sequence values.</i>"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:882 ../raphodo/renamepanel.py:121
+#: ../raphodo/nameeditor.py:889 ../raphodo/renamepanel.py:121
 msgid "Preset:"
 msgstr ""
 
 #. Translators: appears in a combobox, e.g. Image Date (YYYY)
-#: ../raphodo/nameeditor.py:959 ../raphodo/nameeditor.py:980
+#: ../raphodo/nameeditor.py:966 ../raphodo/nameeditor.py:987
 #, python-brace-format
 msgid "{choice} ({variant})"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1005 ../raphodo/preferencedialog.py:530
+#: ../raphodo/nameeditor.py:1012 ../raphodo/preferencedialog.py:783
 msgid "Get help online..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1025
+#: ../raphodo/nameeditor.py:1034
 msgid "Insert"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1351
+#: ../raphodo/nameeditor.py:1360
 msgid "Save Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1356
+#: ../raphodo/nameeditor.py:1365
 msgid ""
-"<b>Do you want to save the changes in a new custom preset?</"
-"b><br><br>Creating a custom preset is not required, but can help you keep "
-"organized.<br><br>The changes to the preferences will still be applied "
-"regardless of whether you create a new custom preset or not."
+"<b>Do you want to save the changes in a new custom "
+"preset?</b><br><br>Creating a custom preset is not required, but can help "
+"you keep organized.<br><br>The changes to the preferences will still be "
+"applied regardless of whether you create a new custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1365
+#: ../raphodo/nameeditor.py:1374
 msgid ""
 "<b>Do you want to save the changes in a custom preset?</b><br><br>If you "
 "like, you can create a new custom preset or update the existing custom "
@@ -1671,136 +2086,167 @@ msgid ""
 "regardless of whether you save a custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1372
+#: ../raphodo/nameeditor.py:1381
 msgid "Save New Custom Preset"
 msgstr ""
 
-#: ../raphodo/newversion.py:306
+#: ../raphodo/newversion.py:312
 msgid "Checking for new version..."
 msgstr ""
 
-#: ../raphodo/newversion.py:307
+#: ../raphodo/newversion.py:313
 msgid "You are running the latest version."
 msgstr ""
 
-#: ../raphodo/newversion.py:308
+#: ../raphodo/newversion.py:314
 msgid "Failed to contact the update server."
 msgstr ""
 
-#: ../raphodo/newversion.py:310
+#: ../raphodo/newversion.py:316
 #, python-format
 msgid "A new version of Rapid Photo Downloader (%s) is available."
 msgstr ""
 
-#: ../raphodo/newversion.py:312
+#: ../raphodo/newversion.py:318
 msgid "Do you want to download the new version?"
 msgstr ""
 
-#: ../raphodo/newversion.py:313
+#: ../raphodo/newversion.py:319
 #, python-format
 msgid "Changes in the new release can be viewed <a href=\"%s\">here</a>."
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the s key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:340 ../raphodo/newversion.py:353
+#: ../raphodo/newversion.py:348 ../raphodo/newversion.py:363
 msgid "&Skip this release"
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the o key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:356
+#: ../raphodo/newversion.py:366
 msgid "&Open Download Page"
 msgstr ""
 
-#: ../raphodo/newversion.py:376
+#: ../raphodo/newversion.py:386
 msgid "Rapid Photo Downloader updates"
 msgstr ""
 
 #. Translators: shows how much of a file has been downloaded e.g  123 KB of 1.3 MB
-#: ../raphodo/newversion.py:478
+#: ../raphodo/newversion.py:488
 #, python-format
 msgid "%(downloaded)s of %(total)s"
 msgstr ""
 
-#: ../raphodo/newversion.py:495
+#: ../raphodo/newversion.py:507
 msgid "Downloading..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:76
+#: ../raphodo/preferencedialog.py:86
 msgid "Preferences"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Automation"
 msgstr "Automatizare"
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85 ../raphodo/preferencedialog.py:343
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/preferencedialog.py:428
 msgid "Error Handling"
 msgstr "Tratarea erorilor"
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:109
+msgid "Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:109 ../raphodo/preferencedialog.py:119
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:94
+#: ../raphodo/preferencedialog.py:147
 msgid "Device Scanning"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:96
+#: ../raphodo/preferencedialog.py:148
 msgid "Scan only external devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:98
+#: ../raphodo/preferencedialog.py:150
 msgid ""
 "Scan for photos and videos only on devices that are external to the "
 "computer,\n"
 "including cameras, memory cards, external hard drives, and USB flash drives."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:102
-msgid "Scan non-camera devices lacking a DCIM folder"
+#: ../raphodo/preferencedialog.py:153
+msgid "Scan only specific folders on devices"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:155
+msgid ""
+"Scan for photos and videos only in the folders specified below (except "
+"paths\n"
+"specified in Ignored Paths).\n"
+"\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:161
+msgid "Folders to scan:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:164
+msgid ""
+"Folders at the base level of device file systems that will be scanned\n"
+"for photos and videos."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:167 ../raphodo/preferencedialog.py:219
+msgid "Add..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:104
+#: ../raphodo/preferencedialog.py:169
 msgid ""
-"Scan the entirety of a device for photos and videos, irrespective of whether "
-"it contains a DCIM folder,\n"
-"as opposed to only scanning within a DCIM folder.\n"
+"Add a folder to the list of folders to scan for photos and videos.\n"
 "\n"
-"Changing this setting causes all devices to be scanned again.\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:172 ../raphodo/preferencedialog.py:198
+#: ../raphodo/preferencedialog.py:224 ../raphodo/preferencedialog.py:529
+msgid "Remove"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:174
+msgid ""
+"Remove a folder from the list of folders to scan for photos and videos.\n"
 "\n"
-"Note: With cameras, only the DCIM folder is scanned."
+"Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:116
+#: ../raphodo/preferencedialog.py:191
 msgid "Devices that have been set to automatically ignore or download from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:117
+#: ../raphodo/preferencedialog.py:192
 msgid "Remembered Devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:121
+#: ../raphodo/preferencedialog.py:196
 msgid ""
 "Remove a device from the list of devices to automatically ignore or download "
 "from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:123 ../raphodo/preferencedialog.py:149
-#: ../raphodo/preferencedialog.py:431
-msgid "Remove"
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:127
+#: ../raphodo/preferencedialog.py:202
 msgid ""
 "Clear the list of devices from which to automatically ignore or download "
 "from.\n"
@@ -1808,315 +2254,436 @@ msgid ""
 "Note: Changes take effect when the computer is next scanned for devices."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:140
+#: ../raphodo/preferencedialog.py:215
 msgid "Ignored Paths"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:141
+#: ../raphodo/preferencedialog.py:216
 msgid ""
 "The end part of a path that should never be scanned for photos or videos."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:144
-msgid "Add..."
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:146
+#: ../raphodo/preferencedialog.py:221
 msgid ""
 "Add a path to the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:151
+#: ../raphodo/preferencedialog.py:226
 msgid ""
 "Remove a path from the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:156
+#: ../raphodo/preferencedialog.py:231
 msgid ""
 "Clear the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:164
+#: ../raphodo/preferencedialog.py:239
 msgid ""
-"Use python-style <a href=\"http://damonlynch.net/rapid/documentation/"
-"#regularexpressions\">regular expressions</a>"
+"Use python-style <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">regula"
+"r expressions</a>"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:168
+#: ../raphodo/preferencedialog.py:243
 msgid ""
 "Use regular expressions in the list of ignored paths.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:208
+#: ../raphodo/preferencedialog.py:283
 msgid "Program Automation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:209
+#: ../raphodo/preferencedialog.py:284
 msgid "Start downloading at program startup"
 msgstr "Pornire descărcare la pornirea programului"
 
-#: ../raphodo/preferencedialog.py:210
+#: ../raphodo/preferencedialog.py:285
 msgid "Start downloading upon device insertion"
 msgstr "Pornire descărcare la introducerea dispozitivului"
 
-#: ../raphodo/preferencedialog.py:211
+#: ../raphodo/preferencedialog.py:286
 msgid "Unmount (eject) device upon download completion"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:212
+#: ../raphodo/preferencedialog.py:287
 msgid "Exit program when download completes"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:213
+#: ../raphodo/preferencedialog.py:288
 msgid "Exit program even if download had warnings or errors"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:240
+#: ../raphodo/preferencedialog.py:315
 msgid "Thumbnail Generation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:241
+#: ../raphodo/preferencedialog.py:316
 msgid "Generate thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:242
+#: ../raphodo/preferencedialog.py:318
 msgid "Generate thumbnails to show in the main program window"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:244
+#: ../raphodo/preferencedialog.py:320
 msgid "Cache thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:245
+#: ../raphodo/preferencedialog.py:323
 msgid ""
 "Save thumbnails shown in the main program window in a thumbnail cache unique "
 "to Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:247
+#: ../raphodo/preferencedialog.py:327
 msgid "Generate system thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:248
+#: ../raphodo/preferencedialog.py:330
 msgid ""
 "While downloading, save thumbnails that can be used by desktop file managers "
 "and other programs"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:255
+#: ../raphodo/preferencedialog.py:339
 msgid "Number of CPU cores used to generate thumbnails."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:256
+#: ../raphodo/preferencedialog.py:340
 msgid "CPU cores:"
 msgstr ""
 
 #. Translators: the * acts as an asterisk to denote a reference to an annotation
 #. such as '* Takes effect upon program restart'
-#: ../raphodo/preferencedialog.py:271 ../raphodo/preferencedialog.py:317
+#: ../raphodo/preferencedialog.py:355 ../raphodo/preferencedialog.py:401
 msgid "*"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:294
+#: ../raphodo/preferencedialog.py:378
 msgid "Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:296
+#: ../raphodo/preferencedialog.py:380
 msgid "Calculating..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:302
+#: ../raphodo/preferencedialog.py:386
 msgid "days"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:303
+#: ../raphodo/preferencedialog.py:387
 msgid "forever"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:308
+#: ../raphodo/preferencedialog.py:392
 msgid "Cache size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:310
+#: ../raphodo/preferencedialog.py:394
 msgid "Number of thumbnails:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:312
+#: ../raphodo/preferencedialog.py:396
 msgid "Database size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:314
+#: ../raphodo/preferencedialog.py:398
 msgid "Cache unaccessed thumbnails for:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:322
+#: ../raphodo/preferencedialog.py:406
 msgid "Purge Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:323
+#: ../raphodo/preferencedialog.py:408
 msgid "Optimize Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:336
+#: ../raphodo/preferencedialog.py:421
 msgid "* Takes effect upon program restart"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:346
+#: ../raphodo/preferencedialog.py:431
 msgid "Skip download"
 msgstr "Omite descărcare"
 
-#: ../raphodo/preferencedialog.py:347
+#: ../raphodo/preferencedialog.py:432
 msgid "Don't download the file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:348
+#: ../raphodo/preferencedialog.py:433
 msgid "Add unique identifier"
 msgstr "Adaugă identificator unic"
 
-#: ../raphodo/preferencedialog.py:349
+#: ../raphodo/preferencedialog.py:436
 msgid ""
 "Add an identifier like _1 or _2 to the end of the filename, immediately "
 "before the file's extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:355
+#: ../raphodo/preferencedialog.py:444
 msgid "Overwrite"
 msgstr "Suprascrie"
 
-#: ../raphodo/preferencedialog.py:356
+#: ../raphodo/preferencedialog.py:445
 msgid "Overwrite the previously backed up file"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:357
+#: ../raphodo/preferencedialog.py:446
 msgid "Skip"
 msgstr "Omite"
 
-#: ../raphodo/preferencedialog.py:358
+#: ../raphodo/preferencedialog.py:448
 msgid "Don't overwrite the backup file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:364
+#: ../raphodo/preferencedialog.py:455
 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 identifier:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:378
+#: ../raphodo/preferencedialog.py:464
+msgid ""
+"Using sequence numbers to automatically generate unique filenames is "
+"strongly recommended. Configure file renaming in the Rename panel in the "
+"main window."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:473
 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 ""
 
-#: ../raphodo/preferencedialog.py:398
+#: ../raphodo/preferencedialog.py:494
 msgid "Program Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:399
+#: ../raphodo/preferencedialog.py:495
 msgid "Show a warning when:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:402
+#: ../raphodo/preferencedialog.py:498
 msgid "Downloading files currently not displayed"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:403
+#: ../raphodo/preferencedialog.py:499
 msgid ""
 "Warn when about to download files that are not displayed in the main window."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:405
+#: ../raphodo/preferencedialog.py:501
 msgid "Backup destinations are missing"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:406
-msgid "Warn before starting a download if it is not possible to back up files."
+#: ../raphodo/preferencedialog.py:502
+msgid ""
+"Warn before starting a download if it is not possible to back up files."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:408
+#: ../raphodo/preferencedialog.py:504
 msgid "Program libraries are missing or broken"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:409
+#: ../raphodo/preferencedialog.py:505
 msgid ""
 "Warn if a software library used by Rapid Photo Downloader is missing or not "
 "functioning."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:412
+#: ../raphodo/preferencedialog.py:508
 msgid "Filesystem metadata cannot be set"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:413
+#: ../raphodo/preferencedialog.py:509
 msgid ""
 "Warn if there is an error setting a file's filesystem metadata, such as its "
 "modification time."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:416
+#: ../raphodo/preferencedialog.py:512
 msgid "Encountering unhandled files"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:417
+#: ../raphodo/preferencedialog.py:513
 msgid ""
 "Warn after scanning a device or this computer if there are unrecognized "
 "files that will not be included in the download."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:420
+#: ../raphodo/preferencedialog.py:517
 msgid "Do not warn about unhandled files with extensions:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:424
+#: ../raphodo/preferencedialog.py:522
 msgid ""
 "File extensions are case insensitive and do not need to include the leading "
 "dot."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:427
+#: ../raphodo/preferencedialog.py:525
 msgid "Add"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:428
+#: ../raphodo/preferencedialog.py:526
 msgid ""
 "Add a file extension to the list of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:430
+#: ../raphodo/preferencedialog.py:528
 msgid ""
 "Remove a file extension from the list of unhandled file types to not warn "
 "about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:434
+#: ../raphodo/preferencedialog.py:532
 msgid ""
 "Clear the list of file extensions of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:469
+#: ../raphodo/preferencedialog.py:568
+msgid "Photo and Video Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:571
+msgid "Consolidate files across devices and downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:574
+msgid ""
+"Analyze the results of device scans looking for duplicate files and matching "
+"RAW and JPEG pairs,\n"
+"comparing them across multiple devices and download sessions."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:580
+msgid "Treat matching RAW and JPEG files as:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:581
+msgid "One photo"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:582
+msgid "Two photos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:584
+msgid ""
+"Display matching pairs of RAW and JPEG photos as one photo, and if marked, "
+"download both."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:589
+msgid ""
+"Display matching pairs of RAW and JPEG photos as two different photos. You "
+"can still synchronize their sequence numbers."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:598
+msgid "With matching RAW and JPEG photos:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:600
+msgid "Do not mark JPEG for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:601
+msgid "Do not mark RAW for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:602
+msgid "Mark both for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:609
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"JPEG for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:614
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"RAW for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:619
+msgid ""
+"When matching RAW and JPEG photos are found, automatically mark both for "
+"download."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:625
+msgid ""
+"If you disable file consolidation, choose what to do when a download device "
+"is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:631
+msgid ""
+"When a download device is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:642
+msgid "Clear completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:643
+msgid "Keep displaying completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:644
+msgid "Prompt for what to do"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:649
+msgid ""
+"Automatically clear the display of completed downloads whenever a new "
+"download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:654
+msgid ""
+"Keep displaying completed downloads whenever a new download device is "
+"inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:658
+msgid ""
+"Prompt whether to keep displaying completed downloads or clear them whenever "
+"a new download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:702
 msgid "Version Check"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:470
+#: ../raphodo/preferencedialog.py:703
 msgid "Check for new version at startup"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:471
+#: ../raphodo/preferencedialog.py:705
 msgid "Check for a new version of the program each time the program starts."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:473
+#: ../raphodo/preferencedialog.py:707
 msgid "Include development releases"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:474
+#: ../raphodo/preferencedialog.py:709
 msgid ""
 "Include alpha, beta and other development releases when checking for a new "
 "version of the program.\n"
@@ -2125,11 +2692,11 @@ msgid ""
 "occur."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:489
+#: ../raphodo/preferencedialog.py:725
 msgid "Ignore DNG date/time metadata on MTP devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:490
+#: ../raphodo/preferencedialog.py:727
 msgid ""
 "Ignore date/time metadata in DNG files located on MTP devices, and use the "
 "file's modification time instead.\n"
@@ -2138,70 +2705,86 @@ msgid ""
 "metadata."
 msgstr ""
 
+#: ../raphodo/preferencedialog.py:741
+msgid "Completed Downloads"
+msgstr ""
+
 #. Translators: substituted value is a description for the set of preferences
 #. shown in the preference dialog window, e.g. Devices, Automation, etc.
 #. This string is shown in a tooltip for the "Restore Defaults" button
-#: ../raphodo/preferencedialog.py:710
+#: ../raphodo/preferencedialog.py:1067
 #, python-format
 msgid "Restores default %s preference values"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:832
+#: ../raphodo/preferencedialog.py:1208
 msgid ""
 "Do you want to purge the thumbnail cache? The cache will be purged when the "
 "program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:835
+#: ../raphodo/preferencedialog.py:1212
 msgid "Purge Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:847
+#: ../raphodo/preferencedialog.py:1225
 msgid ""
 "Do you want to optimize the thumbnail cache? The cache will be optimized "
 "when the program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:850
+#: ../raphodo/preferencedialog.py:1229
 msgid "Optimize Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1045
+#: ../raphodo/preferencedialog.py:1481
+msgid "Enter a Folder to Scan"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1482
+msgid "Specify a folder that will be scanned for photos and videos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1483
+msgid "Folder:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1497
 msgid "Enter a Path to Ignore"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1046
+#: ../raphodo/preferencedialog.py:1498
 msgid "Specify a path that will never be scanned for photos or videos"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1047
+#: ../raphodo/preferencedialog.py:1499
 msgid "Path:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1061
+#: ../raphodo/preferencedialog.py:1513
 msgid "Enter a File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1062
+#: ../raphodo/preferencedialog.py:1514
 msgid "Specify a file extension (without the leading dot)"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1063 ../raphodo/renamepanel.py:122
+#: ../raphodo/preferencedialog.py:1515 ../raphodo/renamepanel.py:122
 msgid "Extension:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1078
+#: ../raphodo/preferencedialog.py:1530
 msgid "Invalid File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1079
+#: ../raphodo/preferencedialog.py:1531
 #, python-format
 msgid ""
 "The file extension <b>%s</b> is recognized by Rapid Photo Downloader, so it "
 "makes no sense to warn about its presence."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1081
+#: ../raphodo/preferencedialog.py:1533
 #, python-format
 msgid ""
 "Recognized file types:\n"
@@ -2227,104 +2810,104 @@ msgstr ""
 msgid "Birthday"
 msgstr ""
 
-#: ../raphodo/preferences.py:614
+#: ../raphodo/preferences.py:624
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Preferințele subdosarului nu se poate începe cu %s"
 
-#: ../raphodo/preferences.py:617
+#: ../raphodo/preferences.py:627
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Preferințele subdosarului nu se pot termina cu %s"
 
-#: ../raphodo/preferences.py:622
+#: ../raphodo/preferences.py:632
 #, 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"
+msgstr ""
+"Preferințele subdosarului nu trebuie să conțină două %s una după alta"
 
-#. self.setFlat(True)
 #: ../raphodo/primarybutton.py:72
 msgid "Download 8 Photos and 10 Videos"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:86 ../raphodo/problemnotification.py:208
+#: ../raphodo/problemnotification.py:87 ../raphodo/problemnotification.py:209
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:89
+#: ../raphodo/problemnotification.py:90
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:116
+#: ../raphodo/problemnotification.py:117
 #, python-format
 msgid "GPhoto2 Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:124
+#: ../raphodo/problemnotification.py:125
 msgid ""
 "Unable to initialize the camera, probably because another program is using "
 "it. No files were copied from it."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:134
+#: ../raphodo/problemnotification.py:135
 #, python-format
 msgid "Unable to read directory %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:140
+#: ../raphodo/problemnotification.py:141
 #, python-format
 msgid "Unable to access modification time or size from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:146
+#: ../raphodo/problemnotification.py:147
 #, python-format
 msgid "Unable to read file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:152
+#: ../raphodo/problemnotification.py:153
 #, python-format
 msgid "Unable to write file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:158
+#: ../raphodo/problemnotification.py:159
 #, python-format
 msgid "Unable to move file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:164
+#: ../raphodo/problemnotification.py:165
 #, python-format
 msgid "Unable to remove file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:170
+#: ../raphodo/problemnotification.py:171
 #, python-format
 msgid "Unable to copy file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:176
+#: ../raphodo/problemnotification.py:177
 #, python-format
 msgid "Zero length file %s will not be downloaded"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:182
+#: ../raphodo/problemnotification.py:183
 #, python-format
 msgid "Could not determine filesystem modification time for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:188
+#: ../raphodo/problemnotification.py:189
 #, python-format
 msgid "Unable to load metadata from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:194
+#: ../raphodo/problemnotification.py:195
 #, python-format
 msgid ""
 "Unable to load metadata from %(name)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:202
+#: ../raphodo/problemnotification.py:203
 #, python-format
 msgid ""
 "An error occurred setting a file's filesystem metadata on the filesystem %s. "
@@ -2332,212 +2915,212 @@ msgid ""
 "again."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:216
+#: ../raphodo/problemnotification.py:217
 #, python-format
 msgid "Encountered unhandled file %s. It will not be downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:223
+#: ../raphodo/problemnotification.py:224
 #, python-format
 msgid "%(filetype)s %(destination)s already exists."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:234 ../raphodo/problemnotification.py:262
+#: ../raphodo/problemnotification.py:235 ../raphodo/problemnotification.py:263
 #, python-format
 msgid ""
 "The existing %(filetype)s %(destination)s was last modified on %(date)s at "
 "%(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:245
+#: ../raphodo/problemnotification.py:246
 #, python-format
 msgid "The %(filetype)s %(source)s was not downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:273
+#: ../raphodo/problemnotification.py:274
 #, python-format
 msgid "The %(filetype)s %(source)s was downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:282
+#: ../raphodo/problemnotification.py:283
 #, python-format
 msgid "The unique identifier '%s' was added to the filename."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:298
+#: ../raphodo/problemnotification.py:299
 #, python-format
 msgid ""
 "The existing backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:309
+#: ../raphodo/problemnotification.py:310
 #, python-format
 msgid "The %(filetype)s %(source)s was not backed up from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:326
+#: ../raphodo/problemnotification.py:327
 #, python-format
 msgid ""
 "The previous backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:337
+#: ../raphodo/problemnotification.py:338
 #, python-format
 msgid ""
 "The %(filetype)s %(source)s from %(device)s was backed up, overwriting the "
 "previous backup %(filetype)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:356
+#: ../raphodo/problemnotification.py:357
 #, python-format
 msgid ""
 "When synchronizing RAW + JPEG sequence values, a duplicate %(filetype)s "
 "%(file)s was encountered, and was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:366
+#: ../raphodo/problemnotification.py:367
 msgid ""
 "When synchronizing RAW + JPEG sequence values, photos were detected with the "
 "same filenames, but taken at different times:"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:373
+#: ../raphodo/problemnotification.py:374
 #, 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 ""
 
-#: ../raphodo/problemnotification.py:389
+#: ../raphodo/problemnotification.py:390
 #, python-format
 msgid "Unable to finalize the filename for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:424
+#: ../raphodo/problemnotification.py:425
 #, python-format
 msgid ""
 "The filename %(destination)s was not fully generated for %(filetype)s "
 "%(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:433
+#: ../raphodo/problemnotification.py:434
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:439
+#: ../raphodo/problemnotification.py:440
 #, python-format
 msgid "The following metadata is missing: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:445
+#: ../raphodo/problemnotification.py:446
 #, python-format
 msgid "Date/time conversion failed: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:451
+#: ../raphodo/problemnotification.py:452
 msgid ""
 "Could not extract valid date/time metadata or determine the file "
 "modification time."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:457
+#: ../raphodo/problemnotification.py:458
 msgid "Filename does not have an extension."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:460
+#: ../raphodo/problemnotification.py:461
 msgid "Filename does not have a number component."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:464
+#: ../raphodo/problemnotification.py:465
 #, python-format
 msgid "Error generating component %(component)s. Error: %(error)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:477
+#: ../raphodo/problemnotification.py:478
 #, python-format
 msgid ""
 "The download subfolders %(folder)s were only partially generated for "
 "%(filetype)s %(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:486
+#: ../raphodo/problemnotification.py:487
 #, python-format
 msgid ""
 "There is no data with which to generate the %(subfolder_file)s for "
 "%(filename)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:499
+#: ../raphodo/problemnotification.py:500
 #, python-format
 msgid ""
 "Unable to create the %(filetype)s %(destination)s in %(folder)s. The "
 "download file was %(source)s in %(device)s. It was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:514
+#: ../raphodo/problemnotification.py:515
 #, python-format
 msgid "Unable to create the download subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:526
+#: ../raphodo/problemnotification.py:527
 #, python-format
 msgid "Unable to create the backup subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:577
+#: ../raphodo/problemnotification.py:578
 #, python-format
 msgid "Problems scanning %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:584
+#: ../raphodo/problemnotification.py:585
 #, python-format
 msgid "Problems copying from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:591
+#: ../raphodo/problemnotification.py:592
 msgid "Problems while finalizing filenames and generating subfolders"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:598
+#: ../raphodo/problemnotification.py:599
 #, python-format
 msgid "Problems backing up to %s"
 msgstr ""
 
-#. Translators: for example Nov 3 or Dec 31
-#. The start and end dates are on a different day
-#. Translators: for example Nov 3 or Dec 31
-#: ../raphodo/proximity.py:105 ../raphodo/proximity.py:221
-#: ../raphodo/proximity.py:224 ../raphodo/proximity.py:828
+#. Translators: for example Nov 3 2015, 11:25 AM
+#. Translators: for example, Nov 3, 12:15 PM
+#: ../raphodo/proximity.py:188 ../raphodo/proximity.py:213
+#: ../raphodo/proximity.py:236 ../raphodo/proximity.py:239
 #, python-format
-msgid "%(month)s %(numeric_day)s"
+msgid "%(date)s, %(time)s"
 msgstr ""
 
-#. Translators: for example Nov 15 2015
-#. Translators: for example Nov 3 2015
-#: ../raphodo/proximity.py:109 ../raphodo/proximity.py:230
-#: ../raphodo/proximity.py:231 ../raphodo/proximity.py:831
+#: ../raphodo/proximity.py:204
 #, python-format
-msgid "%(date)s %(year)s"
+msgid "%(starttime)s - %(endtime)s"
 msgstr ""
 
-#. Translators: for example Nov 3 2015, 11:25 AM
-#. Translators: for example, Nov 3, 12:15 PM
-#: ../raphodo/proximity.py:197 ../raphodo/proximity.py:215
-#: ../raphodo/proximity.py:234 ../raphodo/proximity.py:236
+#. The start and end dates are on a different day
+#. Translators: for example Nov 3 or Dec 31
+#: ../raphodo/proximity.py:221 ../raphodo/proximity.py:225
+#: ../raphodo/proximity.py:980 ../raphodo/timeutils.py:105
 #, python-format
-msgid "%(date)s, %(time)s"
+msgid "%(month)s %(numeric_day)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:209
+#. Translators: for example Nov 3 2015
+#. Translators: for example Nov 2 2015
+#. Translators: for example Nov 15 2015
+#: ../raphodo/proximity.py:232 ../raphodo/proximity.py:233
+#: ../raphodo/proximity.py:985 ../raphodo/timeutils.py:110
 #, python-format
-msgid "%(starttime)s - %(endtime)s"
+msgid "%(date)s %(year)s"
 msgstr ""
 
 #. Translators: for example, Nov 3, 12:15 PM - Nov 4, 1:00 AM
-#: ../raphodo/proximity.py:241
+#: ../raphodo/proximity.py:245
 #, python-format
 msgid "%(earlier_time)s - %(later_time)s"
 msgstr ""
@@ -2546,25 +3129,25 @@ msgstr ""
 #. Nov 3 2012, 12:15 PM -
 #. Nov 4 2012, 1:00 AM
 #. (please keep the line break signified by \n)
-#: ../raphodo/proximity.py:248
+#: ../raphodo/proximity.py:253
 #, python-format
 msgid ""
 "%(earlier_time)s -\n"
 "%(later_time)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:359
+#: ../raphodo/proximity.py:382
 #, python-format
 msgid "%(month)s  %(year)s"
 msgstr ""
 
 #. Translators: for example Nov 2015
-#: ../raphodo/proximity.py:833
+#: ../raphodo/proximity.py:987
 #, python-format
 msgid "%(month)s %(year)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:1344
+#: ../raphodo/proximity.py:1595
 msgid ""
 "The time elapsed between consecutive photos and videos that is used to build "
 "the Timeline"
@@ -2574,47 +3157,47 @@ msgstr ""
 #. Replace the very last character (after the d) with the correct
 #. localized value, keeping everything else. In other words, change
 #. only the m character.
-#: ../raphodo/proximity.py:1406
+#: ../raphodo/proximity.py:1652
 #, python-format
 msgid "%(minutes)dm"
 msgstr ""
 
 #. Translators: i.e. "1.5h", which is short for 1.5 hours.
 #. Replace the entire string with the correct localized value
-#: ../raphodo/proximity.py:1410
+#: ../raphodo/proximity.py:1656
 msgid "1.5h"
 msgstr ""
 
 #. Translators: e.g. "5h", which is short for 5 hours.
 #. Replace the very last character (after the d) with the correct localized value,
 #. keeping everything else. In other words, change only the h character.
-#: ../raphodo/proximity.py:1415
+#: ../raphodo/proximity.py:1661
 #, python-format
 msgid "%(hours)dh"
 msgstr ""
 
-#: ../raphodo/proximity.py:1461
+#: ../raphodo/proximity.py:1710
 msgid ""
 "The Timeline groups photos and videos based on how much time elapsed between "
 "consecutive shots. Use it to identify photos and videos taken at different "
 "periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/proximity.py:1464
+#: ../raphodo/proximity.py:1715
 msgid ""
 "Use the slider (below) to adjust the time elapsed between consecutive shots "
 "that is used to build the Timeline."
 msgstr ""
 
-#: ../raphodo/proximity.py:1466
+#: ../raphodo/proximity.py:1718
 msgid "Timeline build pending..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1467
+#: ../raphodo/proximity.py:1719
 msgid "Timeline is building..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1468
+#: ../raphodo/proximity.py:1721
 msgid ""
 "The Timeline needs to be rebuilt because the file modification time does not "
 "match the time a shot was taken for one or more shots.<br><br>The Timeline "
@@ -2626,61 +3209,61 @@ msgid ""
 "downloading, which is when the metadata is read."
 msgstr ""
 
-#: ../raphodo/rapid.py:485 ../raphodo/rapid.py:2461 ../raphodo/rapid.py:3728
-#: ../raphodo/rapid.py:3846 ../raphodo/rapid.py:3850 ../raphodo/rapid.py:3870
-#: ../raphodo/rapid.py:3874 ../raphodo/rapid.py:3998 ../raphodo/rapid.py:4007
-#: ../raphodo/rapid.py:4495 ../raphodo/rapid.py:4888 ../raphodo/rapid.py:5722
-#: ../raphodo/rememberthisdialog.py:97
+#: ../raphodo/rapid.py:493 ../raphodo/rapid.py:2555 ../raphodo/rapid.py:3934
+#: ../raphodo/rapid.py:4065 ../raphodo/rapid.py:4069 ../raphodo/rapid.py:4092
+#: ../raphodo/rapid.py:4096 ../raphodo/rapid.py:4226 ../raphodo/rapid.py:4237
+#: ../raphodo/rapid.py:4743 ../raphodo/rapid.py:5195 ../raphodo/rapid.py:5997
+#: ../raphodo/rememberthisdialog.py:99
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:3
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Foto Descărcător"
 
-#: ../raphodo/rapid.py:1100
+#: ../raphodo/rapid.py:1131
 msgid ""
 "<b>ExifTool has a problem</b><br><br> Rapid Photo Downloader uses ExifTool "
 "to get metadata from videos and photos. The program will run without it, but "
 "installing it is <b>highly</b> recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1110 ../raphodo/rapid.py:1130
+#: ../raphodo/rapid.py:1141 ../raphodo/rapid.py:1161
 msgid "Problem with libmediainfo"
 msgstr ""
 
-#: ../raphodo/rapid.py:1119
+#: ../raphodo/rapid.py:1150
 msgid ""
 "<b>The library libmediainfo appears to be missing</b><br><br> Rapid Photo "
 "Downloader uses libmediainfo to get the date and time a video was shot. The "
 "program will run  without it, but installing it is recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1417
+#: ../raphodo/rapid.py:1448
 msgid "Download failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1419
+#: ../raphodo/rapid.py:1450
 msgid ""
 "Sorry, the download of the new version of Rapid Photo Downloader failed."
 msgstr ""
 
-#: ../raphodo/rapid.py:1425
+#: ../raphodo/rapid.py:1457
 msgid ""
 "The new version was successfully downloaded. Do you want to close Rapid "
 "Photo Downloader and install it now?"
 msgstr ""
 
-#: ../raphodo/rapid.py:1428
+#: ../raphodo/rapid.py:1461
 msgid "Update Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:1432
+#: ../raphodo/rapid.py:1465
 msgid "Install"
 msgstr ""
 
-#: ../raphodo/rapid.py:1450
+#: ../raphodo/rapid.py:1483
 msgid "New version saved"
 msgstr ""
 
-#: ../raphodo/rapid.py:1451
+#: ../raphodo/rapid.py:1485
 #, python-format
 msgid ""
 "The tar file and installer script are saved at:\n"
@@ -2688,163 +3271,163 @@ msgid ""
 " %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:1468
+#: ../raphodo/rapid.py:1502
 msgid "Upgrade failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1469
+#: ../raphodo/rapid.py:1505
 msgid ""
 "Sorry, upgrading Rapid Photo Downloader failed because there was an error "
 "opening the installer."
 msgstr ""
 
-#: ../raphodo/rapid.py:1667 ../raphodo/rapid.py:2331
+#: ../raphodo/rapid.py:1709 ../raphodo/rapid.py:2425
 msgid "Download"
 msgstr ""
 
-#: ../raphodo/rapid.py:1671
+#: ../raphodo/rapid.py:1713
 msgid "&Refresh..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1675
+#: ../raphodo/rapid.py:1717
 msgid "&Preferences"
 msgstr ""
 
-#: ../raphodo/rapid.py:1679
+#: ../raphodo/rapid.py:1721
 msgid "&Quit"
 msgstr ""
 
-#: ../raphodo/rapid.py:1683
+#: ../raphodo/rapid.py:1725
 msgid "Error &Reports"
 msgstr ""
 
-#: ../raphodo/rapid.py:1687
+#: ../raphodo/rapid.py:1729
 msgid "Clear Completed Downloads"
 msgstr ""
 
-#: ../raphodo/rapid.py:1691
+#: ../raphodo/rapid.py:1733
 msgid "Get Help Online..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1695
+#: ../raphodo/rapid.py:1737
 msgid "&Tip of the Day..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1699
+#: ../raphodo/rapid.py:1741
 msgid "Report a Problem..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1703
+#: ../raphodo/rapid.py:1745
 msgid "Make a Donation..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1707
+#: ../raphodo/rapid.py:1749
 msgid "Translate this Application..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1711
+#: ../raphodo/rapid.py:1753
 msgid "&About..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1715
+#: ../raphodo/rapid.py:1757
 msgid "Check for Updates..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1797
+#: ../raphodo/rapid.py:1840
 msgid "Timeline"
 msgstr ""
 
-#: ../raphodo/rapid.py:1807
+#: ../raphodo/rapid.py:1850
 msgid "Destination"
 msgstr ""
 
-#: ../raphodo/rapid.py:1808
+#: ../raphodo/rapid.py:1851
 msgid "Rename"
 msgstr ""
 
-#: ../raphodo/rapid.py:1810
+#: ../raphodo/rapid.py:1853
 msgid "Back Up"
 msgstr ""
 
 #. Devices Header and View
-#: ../raphodo/rapid.py:1926
+#: ../raphodo/rapid.py:1977
 msgid ""
 "Turn on or off the use of devices attached to this computer as download "
 "sources"
 msgstr ""
 
 #. This Computer Header and View
-#: ../raphodo/rapid.py:1940
+#: ../raphodo/rapid.py:1994
 msgid ""
 "Turn on or off the use of a folder on this computer as a download source"
 msgstr ""
 
-#: ../raphodo/rapid.py:1941
+#: ../raphodo/rapid.py:1996
 msgid "This Computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:1952
+#: ../raphodo/rapid.py:2009
 msgid "Select a source folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:1975
+#: ../raphodo/rapid.py:2038
 msgid "Projected Storage Use"
 msgstr ""
 
-#: ../raphodo/rapid.py:1989 ../raphodo/rapid.py:1997
+#: ../raphodo/rapid.py:2056 ../raphodo/rapid.py:2068
 msgid "Select a destination folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:2045
+#: ../raphodo/rapid.py:2117
 msgid "All"
 msgstr ""
 
-#: ../raphodo/rapid.py:2046
+#: ../raphodo/rapid.py:2118
 msgid "New"
 msgstr ""
 
-#: ../raphodo/rapid.py:2048
+#: ../raphodo/rapid.py:2120
 msgid "Show:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2051
+#: ../raphodo/rapid.py:2123
 msgid "Modification Time"
 msgstr ""
 
-#: ../raphodo/rapid.py:2052
+#: ../raphodo/rapid.py:2124
 msgid "Checked State"
 msgstr ""
 
-#: ../raphodo/rapid.py:2055
+#: ../raphodo/rapid.py:2127
 msgid "File Type"
 msgstr ""
 
-#: ../raphodo/rapid.py:2056
+#: ../raphodo/rapid.py:2128
 msgid "Device"
 msgstr "Dispozitiv"
 
-#: ../raphodo/rapid.py:2058
+#: ../raphodo/rapid.py:2130
 msgid "Sort:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2069
+#: ../raphodo/rapid.py:2141
 msgid "Select All:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2311
+#: ../raphodo/rapid.py:2405
 #, python-format
 msgid "Download %(files)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2327
+#: ../raphodo/rapid.py:2421
 msgid "Resume Download"
 msgstr ""
 
-#: ../raphodo/rapid.py:2329
+#: ../raphodo/rapid.py:2423
 msgid "Pause"
 msgstr ""
 
-#: ../raphodo/rapid.py:2417
+#: ../raphodo/rapid.py:2511
 #, python-brace-format
 msgid ""
 "Please report the problem at <a href=\"{website}\">{website}</a>.<br><br>\n"
@@ -2853,11 +3436,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/rapid.py:2431
+#: ../raphodo/rapid.py:2525
 msgid "Thank you for reporting a problem in Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:2529
+#: ../raphodo/rapid.py:2624
 #, python-format
 msgid ""
 "<b>Changing This Computer source path</b><br><br>Do you really want to "
@@ -2866,30 +3449,29 @@ msgid ""
 "from This Computer will be cancelled."
 msgstr ""
 
-#: ../raphodo/rapid.py:2595
+#: ../raphodo/rapid.py:2694
 msgid "You cannot change the download destination while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:2604
+#: ../raphodo/rapid.py:2704
 #, python-format
 msgid ""
 "<b>Confirm Download Destination</b><br><br>Are you sure you want to set the "
 "%(file_type)s download destination to %(path)s?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2682
+#: ../raphodo/rapid.py:2785
 msgid ""
+"\n"
 "<b>Downloading all files</b><br><br>\n"
-"                    A download always includes all files that are checked "
-"for download,\n"
-"                    including those that are not currently displayed because "
-"the Timeline\n"
-"                    is being used or because only new files are being shown."
-"<br><br>\n"
-"                    Do you want to proceed with the download?"
+"A download always includes all files that are checked for download,\n"
+"including those that are not currently displayed because the Timeline\n"
+"is being used or because only new files are being shown.<br><br>\n"
+"Do you want to proceed with the download?\n"
+"                        "
 msgstr ""
 
-#: ../raphodo/rapid.py:2820
+#: ../raphodo/rapid.py:2937
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -2897,206 +3479,200 @@ msgid ""
 "%(folder2)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2824
+#: ../raphodo/rapid.py:2940
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
 "%s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2827
+#: ../raphodo/rapid.py:2943
 msgid "Download Failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:2828
+#: ../raphodo/rapid.py:2944
 msgid "The download cannot proceed."
 msgstr ""
 
-#: ../raphodo/rapid.py:2842
+#: ../raphodo/rapid.py:2962
 msgid ""
 "Photos and videos will not be backed up because there is nowhere to back "
 "them up. Do you still want to start the download?"
 msgstr ""
 
-#. Translators: filetype will be replaced with 'photos' or 'videos'
-#: ../raphodo/rapid.py:2847 ../raphodo/rapid.py:2854
+#: ../raphodo/rapid.py:2969 ../raphodo/rapid.py:2979
 #, python-format
 msgid ""
 "No backup device exists for backing up %(filetype)s. Do you still want to "
 "start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2848 ../raphodo/rpdfile.py:228
+#: ../raphodo/rapid.py:2971 ../raphodo/rpdfile.py:228
 msgid "photos"
 msgstr "fotografii"
 
-#: ../raphodo/rapid.py:2855 ../raphodo/rpdfile.py:223
+#: ../raphodo/rapid.py:2981 ../raphodo/rpdfile.py:223
 msgid "videos"
 msgstr "video"
 
-#: ../raphodo/rapid.py:2861
+#: ../raphodo/rapid.py:2989
 msgid ""
 "<b>The photo and video backup destinations do not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2869 ../raphodo/rapid.py:2876
+#: ../raphodo/rapid.py:2999 ../raphodo/rapid.py:3008
 #, python-format
 msgid ""
 "<b>The %(filetype)s backup destination does not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2871 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:818
+#: ../raphodo/rapid.py:3001 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:843
 msgid "photo"
 msgstr "fotografie"
 
-#: ../raphodo/rapid.py:2878 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:858
+#: ../raphodo/rapid.py:3010 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:883
 msgid "video"
 msgstr "video"
 
-#: ../raphodo/rapid.py:2886
+#: ../raphodo/rapid.py:3018
 msgid "Backup problem"
 msgstr ""
 
-#. Translators - in the middle is a unicode em dash - please retain it
-#. This string is displayed in the status bar when the download is running
-#: ../raphodo/rapid.py:3571
+#: ../raphodo/rapid.py:3756
 #, python-format
 msgid "%(downloading_from)s — %(time_left)s left (%(speed)s)"
 msgstr ""
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3640
+#: ../raphodo/rapid.py:3828
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s descărcate"
 
-#. Translators: e.g. 2 videos failed to download
-#: ../raphodo/rapid.py:3645
+#: ../raphodo/rapid.py:3836
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "%(noFiles)s %(filetypes)s descărcare eșuată"
 
-#: ../raphodo/rapid.py:3650 ../raphodo/rapid.py:3723
+#: ../raphodo/rapid.py:3842 ../raphodo/rapid.py:3927
 msgid "warnings"
 msgstr "avertismente"
 
-#: ../raphodo/rapid.py:3679
+#: ../raphodo/rapid.py:3873
 msgid "All downloads complete"
 msgstr "Toate descărcările complecte"
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3686 ../raphodo/rapid.py:3695 ../raphodo/rapid.py:3704
-#: ../raphodo/rapid.py:3713 ../raphodo/rapid.py:3721
+#: ../raphodo/rapid.py:3881 ../raphodo/rapid.py:3892 ../raphodo/rapid.py:3903
+#: ../raphodo/rapid.py:3914 ../raphodo/rapid.py:3924
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: ../raphodo/rapid.py:3688 ../raphodo/rapid.py:3706
+#: ../raphodo/rapid.py:3884 ../raphodo/rapid.py:3906
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s descărcate"
 
-#: ../raphodo/rapid.py:3697 ../raphodo/rapid.py:3715
+#: ../raphodo/rapid.py:3895 ../raphodo/rapid.py:3917
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "%(filetype)s au eşuat la descărcare"
 
-#: ../raphodo/rapid.py:3742
+#: ../raphodo/rapid.py:3950
 msgid "1 failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:3744
+#: ../raphodo/rapid.py:3952
 #, python-format
 msgid "%d failures"
 msgstr ""
 
-#: ../raphodo/rapid.py:3749
+#: ../raphodo/rapid.py:3957
 msgid "1 warning"
 msgstr ""
 
-#: ../raphodo/rapid.py:3751
+#: ../raphodo/rapid.py:3959
 #, python-format
 msgid "%d warnings"
 msgstr ""
 
-#: ../raphodo/rapid.py:3771
+#: ../raphodo/rapid.py:3981
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3774
+#: ../raphodo/rapid.py:3985
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3779
+#: ../raphodo/rapid.py:3989
 #, python-format
 msgid "No files downloaded — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3781
+#: ../raphodo/rapid.py:3991
 msgid "No files downloaded"
 msgstr ""
 
-#: ../raphodo/rapid.py:3805
+#: ../raphodo/rapid.py:4021
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3809
+#: ../raphodo/rapid.py:4026
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3812
+#: ../raphodo/rapid.py:4031
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3820
+#: ../raphodo/rapid.py:4039
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3833
+#: ../raphodo/rapid.py:4052
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3837
+#: ../raphodo/rapid.py:4056
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3841
+#: ../raphodo/rapid.py:4060
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices"
 msgstr ""
 
-#: ../raphodo/rapid.py:3867
+#: ../raphodo/rapid.py:4087
 msgid "The Destination subfolders and Timeline have been rebuilt"
 msgstr ""
 
-#: ../raphodo/rapid.py:3922
+#: ../raphodo/rapid.py:4144
 msgid "Program preferences are invalid"
 msgstr ""
 
-#: ../raphodo/rapid.py:3999
+#: ../raphodo/rapid.py:4228
 #, python-format
 msgid ""
 "<b>All files on the %(camera)s are inaccessible</b>.<br><br>It may be locked "
@@ -3106,179 +3682,205 @@ msgid ""
 "ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4008
+#: ../raphodo/rapid.py:4239
 #, python-format
 msgid ""
-"<b>The %(camera)s appears to be in use by another application.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again.<br><br>Alternatively, you can ignore this "
-"device."
+"<b>The %(camera)s appears to be in use by another "
+"application.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again.<br><br>Alternatively, you "
+"can ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4019
+#: ../raphodo/rapid.py:4250
 msgid "&Try Again"
 msgstr ""
 
-#: ../raphodo/rapid.py:4020
+#: ../raphodo/rapid.py:4251
 msgid "&Ignore This Device"
 msgstr ""
 
-#: ../raphodo/rapid.py:4086
+#: ../raphodo/rapid.py:4323
 #, python-format
 msgid "Sorry, an unexpected problem occurred while scanning %s."
 msgstr ""
 
-#: ../raphodo/rapid.py:4087
+#: ../raphodo/rapid.py:4324
 msgid "Unfortunately you cannot download from this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4091
+#: ../raphodo/rapid.py:4328
 msgid ""
 "A possible workaround for the problem might be downloading from the camera's "
 "memory card using a card reader."
 msgstr ""
 
-#: ../raphodo/rapid.py:4096
+#: ../raphodo/rapid.py:4333
 msgid "Device scan failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:4472
+#: ../raphodo/rapid.py:4720
 #, python-format
 msgid ""
-"<b>The %(camera)s cannot be scanned because it cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again."
+"<b>The %(camera)s cannot be scanned because it cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again."
 msgstr ""
 
-#: ../raphodo/rapid.py:4496
+#: ../raphodo/rapid.py:4745
 #, python-format
 msgid ""
-"<b>The download cannot start because the %(camera)s cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again, and choose which files you want to "
-"download from it."
+"<b>The download cannot start because the %(camera)s cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again, and choose which files "
+"you want to download from it."
+msgstr ""
+
+#: ../raphodo/rapid.py:4842
+msgid "Completed Downloads Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4844
+#, python-format
+msgid "%s whose download have completed are displayed."
 msgstr ""
 
-#: ../raphodo/rapid.py:4635
+#: ../raphodo/rapid.py:4846
+msgid "Do you want to clear the completed downloads?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4848
+msgid "Completed Download Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4850
+#, python-format
+msgid "%s whose download has completed is displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4852
+msgid "Do you want to clear the completed download?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4933
 #, python-format
 msgid ""
 "Do you want to download photos and videos from the device <i>%(device)s</i>?"
 msgstr ""
 
-#: ../raphodo/rapid.py:4877
+#: ../raphodo/rapid.py:5183
 #, python-format
 msgid "<b>Do you want to ignore the %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4879
+#: ../raphodo/rapid.py:5186
 msgid ""
 "All cameras, phones and tablets with the same model name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:4883
+#: ../raphodo/rapid.py:5190
 #, python-format
 msgid ""
 "<b>Do you want to ignore the device %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4885
+#: ../raphodo/rapid.py:5192
 msgid "Any device with the same name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:5178
+#: ../raphodo/rapid.py:5492
 #, python-format
 msgid "Downloading from %(location)s on This Computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5180
+#: ../raphodo/rapid.py:5496
 msgid ""
 "Do you really want to download from here?<br><br>On some systems, scanning "
 "this location can take a very long time."
 msgstr ""
 
-#: ../raphodo/rapid.py:5224
+#: ../raphodo/rapid.py:5537
 #, python-format
 msgid "Generating thumbnails for %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5227
+#: ../raphodo/rapid.py:5540
 #, python-format
 msgid "Scanning %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5237
+#: ../raphodo/rapid.py:5551
 #, python-format
 msgid ""
 "%(number)s of %(available files)s checked for download (%(hidden)s hidden)"
 msgstr ""
 
-#: ../raphodo/rapid.py:5243
+#: ../raphodo/rapid.py:5559
 #, python-format
 msgid "%(number)s of %(available files)s checked for download"
 msgstr ""
 
-#: ../raphodo/rapid.py:5494
+#: ../raphodo/rapid.py:5764
 msgid "Display program information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5496
+#: ../raphodo/rapid.py:5766
 msgid "Display debugging information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5499
+#: ../raphodo/rapid.py:5769
 msgid "List photo and video file extensions the program recognizes and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5502
+#: ../raphodo/rapid.py:5772
 msgid "Turn on or off the the renaming of photos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5504
+#: ../raphodo/rapid.py:5774
 msgid "turn on or off the the renaming of videos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5506
+#: ../raphodo/rapid.py:5776
 msgid ""
 "Turn on or off the automatic detection of devices from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5510
+#: ../raphodo/rapid.py:5780
 msgid "Turn on or off downloading from this computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5512 ../raphodo/rapid.py:5515 ../raphodo/rapid.py:5518
-#: ../raphodo/rapid.py:5539 ../raphodo/rapid.py:5543
+#: ../raphodo/rapid.py:5782 ../raphodo/rapid.py:5785 ../raphodo/rapid.py:5788
+#: ../raphodo/rapid.py:5809 ../raphodo/rapid.py:5813
 msgid "PATH"
 msgstr ""
 
-#: ../raphodo/rapid.py:5513
+#: ../raphodo/rapid.py:5783
 msgid "The PATH on this computer from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5516
+#: ../raphodo/rapid.py:5786
 msgid "The PATH where photos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5519
+#: ../raphodo/rapid.py:5789
 msgid "The PATH where videos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5521
+#: ../raphodo/rapid.py:5791
 msgid "Turn on or off the backing up of photos and videos while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:5525
+#: ../raphodo/rapid.py:5795
 msgid "Turn on or off the automatic detection of backup devices."
 msgstr ""
 
-#: ../raphodo/rapid.py:5527 ../raphodo/rapid.py:5533
+#: ../raphodo/rapid.py:5797 ../raphodo/rapid.py:5803
 msgid "FOLDER"
 msgstr ""
 
-#: ../raphodo/rapid.py:5528
+#: ../raphodo/rapid.py:5798
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected photo "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3286,7 +3888,7 @@ msgid ""
 "photos up to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5534
+#: ../raphodo/rapid.py:5804
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected video "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3294,115 +3896,124 @@ msgid ""
 "up videos to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5540
+#: ../raphodo/rapid.py:5810
 msgid ""
 "The PATH where photos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5544
+#: ../raphodo/rapid.py:5814
 msgid ""
 "The PATH where videos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5547
+#: ../raphodo/rapid.py:5817
 #, python-format
 msgid "Ignore photos with the following extensions: %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5551
-msgid "Turn on or off starting downloads as soon as the program itself starts."
+#: ../raphodo/rapid.py:5821
+msgid ""
+"Turn on or off starting downloads as soon as the program itself starts."
 msgstr ""
 
-#: ../raphodo/rapid.py:5554
+#: ../raphodo/rapid.py:5824
 msgid "Turn on or off starting downloads as soon as a device is inserted."
 msgstr ""
 
-#: ../raphodo/rapid.py:5557
+#: ../raphodo/rapid.py:5827
 msgid ""
 "Turn on or off use of the Rapid Photo Downloader Thumbnail Cache. Turning it "
 "off does not delete existing cache contents."
 msgstr ""
 
-#: ../raphodo/rapid.py:5561
+#: ../raphodo/rapid.py:5831
 msgid ""
 "Delete all thumbnails in the Rapid Photo Downloader Thumbnail Cache, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5565
+#: ../raphodo/rapid.py:5835
 msgid "Forget which files have been previously downloaded, and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5568
+#: ../raphodo/rapid.py:5838
 msgid ""
 "Import preferences from an old program version and exit. Requires the "
 "command line program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5571
+#: ../raphodo/rapid.py:5841
 msgid ""
 "Reset all program settings to their default values, delete all thumbnails in "
 "the Thumbnail cache, forget which files have been previously downloaded, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5575
+#: ../raphodo/rapid.py:5845
 msgid "Include gphoto2 debugging information in log files."
 msgstr ""
 
-#: ../raphodo/rapid.py:5579
+#: ../raphodo/rapid.py:5849
 msgid "Print information to the terminal about attached cameras and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5640
+#: ../raphodo/rapid.py:5911
 msgid ""
 "To import preferences from the old version of Rapid Photo Downloader, you "
 "must install the program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5649
+#: ../raphodo/rapid.py:5920
 msgid "No prior program preferences detected: exiting"
 msgstr ""
 
-#: ../raphodo/rapid.py:5652
+#: ../raphodo/rapid.py:5923
 #, python-format
 msgid "Importing preferences from Rapid Photo Downloader %(version)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5714
+#: ../raphodo/rapid.py:5989
 #, python-format
-msgid "Do you want to copy the stored sequence number, which has the value %d?"
+msgid ""
+"Do you want to copy the stored sequence number, which has the value %d?"
 msgstr ""
 
-#: ../raphodo/rapid.py:5726
+#: ../raphodo/rapid.py:6000
 msgid "Program aborting."
 msgstr ""
 
-#: ../raphodo/rapid.py:5736
+#: ../raphodo/rapid.py:6010
 msgid "Never run this program as the sudo / root user."
 msgstr ""
 
-#: ../raphodo/rapid.py:5740
+#: ../raphodo/rapid.py:6014
 msgid "You must install ExifTool to run Rapid Photo Downloader."
 msgstr ""
 
-#: ../raphodo/rapid.py:5794
+#: ../raphodo/rapid.py:6026
+msgid ""
+"Rapid Photo Downloader is installed in multiple locations.\n"
+"\n"
+"Uninstall all copies except the version you want to run."
+msgstr ""
+
+#: ../raphodo/rapid.py:6083
 msgid ""
 "When specifying a path on the command line, do not also specify an\n"
 "option for device auto detection or a path on \"This Computer\"."
 msgstr ""
 
-#: ../raphodo/rapid.py:5950
+#: ../raphodo/rapid.py:6243
 msgid "All settings and caches have been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5958
+#: ../raphodo/rapid.py:6251
 msgid "Thumbnail Cache has been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5964
+#: ../raphodo/rapid.py:6257
 msgid "Remembered files have been forgotten"
 msgstr ""
 
@@ -3418,15 +4029,15 @@ msgstr ""
 msgid "&Don't warn me again about missing or broken program libraries"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:546
+#: ../raphodo/renameandmovefile.py:554
 msgid "subfolder and filename"
 msgstr "subdosare si nume fișiere"
 
-#: ../raphodo/renameandmovefile.py:548
+#: ../raphodo/renameandmovefile.py:556
 msgid "filename"
 msgstr "nume fișier"
 
-#: ../raphodo/renameandmovefile.py:550
+#: ../raphodo/renameandmovefile.py:558
 msgid "subfolder"
 msgstr "subdosar"
 
@@ -3506,160 +4117,237 @@ msgstr "fotografii și video"
 msgid "photos or videos"
 msgstr "fotografii și video"
 
-#: ../raphodo/rpdfile.py:306
+#: ../raphodo/rpdfile.py:315
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: ../raphodo/rpdfile.py:318
+#. translators: natural language expression signifying a single video
+#: ../raphodo/rpdfile.py:337
+msgid "a video"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:339
 msgid "1 Video"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:323
+#. translators: natural language expression signifying a single photo
+#: ../raphodo/rpdfile.py:346
+msgid "a photo"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:348
 msgid "1 Photo"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:803
+#: ../raphodo/rpdfile.py:828
 #, python-format
 msgid "%(path)s on %(camera)s"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:819
+#: ../raphodo/rpdfile.py:844
 msgid "Photo"
 msgstr "Fotografie"
 
-#: ../raphodo/rpdfile.py:859
+#: ../raphodo/rpdfile.py:884
 msgid "Video"
 msgstr "Video"
 
-#: ../raphodo/storage.py:138
+#: ../raphodo/storage.py:141
 msgid "File system root"
 msgstr ""
 
 #. translators: the name of the Pictures folder
-#: ../raphodo/storage.py:433
+#: ../raphodo/storage.py:437
 msgid "Pictures"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:426
+#: ../raphodo/thumbnaildisplay.py:432
 #, python-format
 msgid "Taken on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:431
+#: ../raphodo/thumbnaildisplay.py:439
 #, python-format
 msgid "Modified on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:437 ../raphodo/thumbnaildisplay.py:466
+#: ../raphodo/thumbnaildisplay.py:447 ../raphodo/thumbnaildisplay.py:481
 #, python-format
 msgid "%(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:451
+#: ../raphodo/thumbnaildisplay.py:464
 #, python-format
 msgid "Memory cards: %s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:457
+#: ../raphodo/thumbnaildisplay.py:468
+#, python-format
+msgid "Memory card: %s"
+msgstr ""
+
+#: ../raphodo/thumbnaildisplay.py:473
 msgid "Downloaded as:"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:472
+#: ../raphodo/thumbnaildisplay.py:489
 #, python-format
 msgid "<br><br>Previous download:<br>%(filename)s<br>%(path)s<br>%(date)s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:1603
+#: ../raphodo/thumbnaildisplay.py:1645
 msgid "Copy Path"
 msgstr ""
 
+#. Translators: these values are file size suffixes like B representing bytes, KB representing
+#. kilobytes, etc.
+#: ../raphodo/utilities.py:170
+msgid "B"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "KB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "MB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "GB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "TB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "PB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "EB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "ZB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "YB"
+msgstr ""
+
 #. two things in a list e.g. "device1 and device2"
-#: ../raphodo/utilities.py:391
+#: ../raphodo/utilities.py:394
 #, python-format
 msgid "%(first_item)s and %(last_item)s"
 msgstr ""
 
-#: ../raphodo/utilities.py:464
+#: ../raphodo/utilities.py:468
 msgid "one"
 msgstr ""
 
-#: ../raphodo/utilities.py:465
+#: ../raphodo/utilities.py:469
 msgid "two"
 msgstr ""
 
-#: ../raphodo/utilities.py:466
+#: ../raphodo/utilities.py:470
 msgid "three"
 msgstr ""
 
-#: ../raphodo/utilities.py:467
+#: ../raphodo/utilities.py:471
 msgid "four"
 msgstr ""
 
-#: ../raphodo/utilities.py:468
+#: ../raphodo/utilities.py:472
 msgid "five"
 msgstr ""
 
-#: ../raphodo/utilities.py:469
+#: ../raphodo/utilities.py:473
 msgid "six"
 msgstr ""
 
-#: ../raphodo/utilities.py:470
+#: ../raphodo/utilities.py:474
 msgid "seven"
 msgstr ""
 
-#: ../raphodo/utilities.py:471
+#: ../raphodo/utilities.py:475
 msgid "eight"
 msgstr ""
 
-#: ../raphodo/utilities.py:472
+#: ../raphodo/utilities.py:476
 msgid "nine"
 msgstr ""
 
-#: ../raphodo/utilities.py:473
+#: ../raphodo/utilities.py:477
 msgid "ten"
 msgstr ""
 
-#: ../raphodo/utilities.py:474
+#: ../raphodo/utilities.py:478
 msgid "eleven"
 msgstr ""
 
-#: ../raphodo/utilities.py:475
+#: ../raphodo/utilities.py:479
 msgid "twelve"
 msgstr ""
 
-#: ../raphodo/utilities.py:476
+#: ../raphodo/utilities.py:480
 msgid "thirteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:477
+#: ../raphodo/utilities.py:481
 msgid "fourteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:478
+#: ../raphodo/utilities.py:482
 msgid "fifteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:479
+#: ../raphodo/utilities.py:483
 msgid "sixteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:480
+#: ../raphodo/utilities.py:484
 msgid "seventeen"
 msgstr ""
 
-#: ../raphodo/utilities.py:481
+#: ../raphodo/utilities.py:485
 msgid "eighteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:482
+#: ../raphodo/utilities.py:486
 msgid "ninenteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:483
+#: ../raphodo/utilities.py:487
 msgid "twenty"
 msgstr ""
 
+#: ../raphodo/viewutils.py:240
+msgid "&OK"
+msgstr ""
+
+#: ../raphodo/viewutils.py:243
+msgid "&Save"
+msgstr ""
+
+#: ../raphodo/viewutils.py:244
+msgid "&Help"
+msgstr ""
+
+#: ../raphodo/viewutils.py:245
+msgid "Restore Defaults"
+msgstr ""
+
+#: ../raphodo/viewutils.py:246
+msgid "&Yes"
+msgstr ""
+
+#: ../raphodo/viewutils.py:247
+msgid "&No"
+msgstr ""
+
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:1
 msgid ""
 "Rapid Photo Downloader imports photos and videos from cameras, phones, "
@@ -3713,8 +4401,8 @@ msgstr ""
 #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:5
 msgid ""
-"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;"
-"memory;card;"
+"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;memory"
+";card;"
 msgstr ""
 
 #: ../data/kde/net.damonlynch.rapid-photo-downloader.desktop.in.h:1
@@ -3778,6 +4466,7 @@ msgstr ""
 #~ msgid "Select a folder to download videos to"
 #~ msgstr "Selectează un dosar unde descarc video"
 
+#, python-format
 #~ msgid "<i>Example: %s</i>"
 #~ msgstr "<i>Exemple: %s<i/>"
 
@@ -3796,11 +4485,9 @@ msgstr ""
 #~ msgid "Photo has already been downloaded"
 #~ msgstr "Fotografia este deja descărcată"
 
-#~ msgid ""
-#~ "Photos detected with the same filenames, but taken at different times"
+#~ 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"
+#~ "Fotografii detectate cu același nume de fișier, dar făcute în timpi diferiți"
 
 #~ msgid "Size"
 #~ msgstr "Mărime"
@@ -3837,6 +4524,7 @@ msgstr ""
 #~ msgid "Videos:"
 #~ msgstr "Video-uri"
 
+#, python-format
 #~ msgid "and %s"
 #~ msgstr "și %s"
 
@@ -3891,8 +4579,7 @@ msgstr ""
 #~ "<span weight=\"bold\" size=\"x-large\">Dosar Descărcări Fotografii</span>"
 
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Video Download Folders</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Dosar Descărcări Video</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Dosar Descărcări Video</span>"
 
 #~ msgid "Automatically detect Portable Storage Devices"
 #~ msgstr "Detectare automată a Dispozitivelor de Stocare Portabile"
@@ -3968,21 +4655,26 @@ msgstr ""
 #~ msgid "_Translate this Application..."
 #~ msgstr "_Tradu această aplicație..."
 
+#, 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"
 
+#, 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"
 
+#, python-format
 #~ msgid "About %i seconds remaining"
 #~ msgstr "Aproximativ %i secunde rămân"
 
@@ -4011,12 +4703,15 @@ 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."
 
+#, python-format
 #~ msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
+#, python-format
 #~ msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
+#, python-format
 #~ msgid ""
 #~ "%(date)s\n"
 #~ "%(time)s"
@@ -4024,9 +4719,11 @@ msgstr ""
 #~ "%(date)s\n"
 #~ "%(time)s"
 
+#, python-format
 #~ msgid "%(date)s %(time)s"
 #~ msgstr "%(date)s %(time)s"
 
+#, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
 #~ "Destination: %(destination)s"
@@ -4034,6 +4731,7 @@ msgstr ""
 #~ "Sursă: %(source)s\n"
 #~ "Destinație: %(destination)s"
 
+#, python-format
 #~ msgid ""
 #~ "display program information on the command line as the program runs "
 #~ "(default: %default)"
@@ -4048,13 +4746,12 @@ msgstr ""
 #~ "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."
+#~ "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."
 
 #~ 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."
+#~ "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 ""
 #~ "Atunci când o fotografie sau video cu acelaşi nume a fost deja descărcat, "
 #~ "alegeţi dacă să săriţi descărcarea fişierul, sau pentru a adăuga un "
@@ -4063,6 +4760,7 @@ msgstr ""
 #~ msgid "Synchronize RAW + JPEG sequence numbers"
 #~ msgstr "Sincronizarea RAW + JPEG numere de secvenţă"
 
+#, python-format
 #~ msgid "Select a folder containing %(file_types)s"
 #~ msgstr "Selectaţi un dosar ce conţine %(file_types)s"
 
@@ -4072,12 +4770,15 @@ msgstr ""
 #~ msgid "Error in Photo Download Subfolders preferences"
 #~ msgstr "Eroare în preferințe Subdosar Descărcări Foto"
 
+#, 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 "%(number)s of %(total)s %(filetypes)s"
 #~ msgstr "%(number)s din %(total)s %(filetypes)s"
 
+#, python-format
 #~ msgid "%(freespace)s. %(backuppaths)s."
 #~ msgstr "%(freespace)s. %(backuppaths)s."
 
@@ -4108,18 +4809,20 @@ msgstr ""
 #~ msgid "Select a folder to download photos to"
 #~ msgstr "Alegeți un dosar unde să fie descărcate fotografiile"
 
+#, 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 ""
-#~ "Preferințele %(filetype)s subdosarului introduse sunt invalide și nu pot "
-#~ "fi folosite.\n"
+#~ "Preferințele %(filetype)s subdosarului introduse sunt invalide și nu pot fi "
+#~ "folosite.\n"
 #~ "Ele vor fi resetate la valori implicte."
 
 #~ msgid "Backing up error"
 #~ msgstr "Eroare copiere de siguranță"
 
+#, python-format
 #~ msgid "Backing up to %(path)s"
 #~ msgstr "Copiez de siguranță în %(path)s"
 
@@ -4139,16 +4842,16 @@ msgstr ""
 #~ "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>"
+#~ "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 ""
-#~ "Specificaţi dosarul în care copiile de siguranță sunt stocate pe "
-#~ "dispozitiv.  \n"
+#~ "Specificaţi dosarul în care copiile de siguranță sunt stocate pe dispozitiv. "
+#~ " \n"
 #~ "\n"
 #~ "<i>Notă: acest lucru va fi, de asemenea, utilizat pentru a determina dacă "
-#~ "sau nu, dispozitivul este folosit pentru copie de siguranță. Pentru "
-#~ "fiecare dispozitiv pentru care faceți copie de siguranță, creați un dosar "
-#~ "în el cu numele lui.</i>"
+#~ "sau nu, dispozitivul este folosit pentru copie de siguranță. Pentru fiecare "
+#~ "dispozitiv pentru care faceți copie de siguranță, creați un dosar în el cu "
+#~ "numele lui.</i>"
 
 #~ msgid "Video backup folder name:"
 #~ msgstr "Nume dosar copie de siguranță video:"
@@ -4218,14 +4921,17 @@ msgstr ""
 #~ "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."
+#~ "Alegeți dosarul de descărcări. Subdosarul pentru fotografiile descărcate va "
+#~ "fi creat automat în acest dosar folosind structura de mai jos."
 
+#, python-format
 #~ msgid "Backup %(file_type)s overwritten"
 #~ msgstr "Copia de siguranță %(file_type)s va fi rescrisă"
 
+#, 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ță"
diff --git a/po/ru.po b/po/ru.po
index 462e6ae..c0d177e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,300 +7,794 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: damonlynch@gmail.com\n"
-"POT-Creation-Date: 2017-07-08 19:16-0500\n"
-"PO-Revision-Date: 2017-07-04 11:06+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2017-09-12 17:01-0400\n"
+"PO-Revision-Date: 2017-09-13 18:38+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
-"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-07-05 23:04+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-09-26 22:04+0000\n"
+"X-Generator: Launchpad (build 18463)\n"
+"Language: ru\n"
 
-#. type: QPushButton
-#: ../raphodo/aboutdialog.py:217
-msgid "Credits"
+#: ../install.py:65
+msgid "Rapid Photo Downloader installer"
+msgstr "Установщик Rapid Photo Downloader"
+
+#: ../install.py:66
+msgid "Download and install latest version of Rapid Photo Downloader."
+msgstr "Загрузить и установить последнюю версию Rapid Photo Downloader."
+
+#: ../install.py:236 ../install.py:1732
+msgid "Installer not found:"
+msgstr "Установщик не найден:"
+
+#. Translators: do not translate the term tar.gz
+#: ../install.py:240 ../install.py:1736
+msgid "Installer not in tar.gz format:"
+msgstr "Установщие не в формате tar.gz:"
+
+#: ../install.py:465
+msgid ""
+"Incorrect folder ownership detected. Changing ownership of and resetting "
+"permissions for"
 msgstr ""
+"Обнаружена некорректная принадлежность папки. Изменение принадлежности и "
+"сброс разрешений для"
 
-#: ../raphodo/backuppanel.py:239
-msgid "Backups are not configured"
+#: ../install.py:540
+msgid "The following command will be run:"
+msgstr "Будет выполнена следующая команда:"
+
+#: ../install.py:543 ../install.py:1479 ../install.py:1484
+msgid "sudo may prompt you for the sudo password."
+msgstr "команда sudo может запросить пароль администратора."
+
+#: ../install.py:547
+msgid "Would you like to run the command now?"
+msgstr "Вы хотите выполнить эту команду сейчас?"
+
+#: ../install.py:549
+msgid "Answer is not yes, exiting."
+msgstr "Ответ не Да, выход."
+
+#: ../install.py:559 ../install.py:751 ../install.py:966
+msgid "Command failed"
+msgstr "Действие не удалось"
+
+#: ../install.py:561 ../install.py:752 ../install.py:967
+msgid "Exiting"
+msgstr "Выход"
+
+#: ../install.py:582
+msgid "The Universe repository must be enabled."
+msgstr "Должны быть включены репозитории Universe."
+
+#: ../install.py:606
+msgid ""
+"Do you want to to uninstall the previous version of Rapid Photo Downloader:"
+msgstr "Вы хотите удалить предыдущую версию Rapid Photo Downloader:"
+
+#: ../install.py:715 ../install.py:740
+msgid ""
+"Querying package system to see if an older version of Rapid Photo Downloader "
+"is installed (this may take a while)..."
+msgstr ""
+"Запрос к системе пакетов по поводу наличия установленной старой версии Rapid "
+"Photo Downloader (может занять некоторое время)..."
+
+#: ../install.py:726
+msgid ""
+"Unable to query package system. Please check your Internet connection and "
+"try again"
+msgstr ""
+"Невозможно опросить систему пакетов. Пожалуйста, проверьте соединение с "
+"Интернет и попробуйте снова"
+
+#: ../install.py:756
+msgid "Checking if previous version installed with pip..."
+msgstr "Проверка, не установлена ли предыдущая версия при помощи pip..."
+
+#: ../install.py:850
+msgid "The following package is unknown on your system: {}\n"
+msgstr "Следующий пакет неизвестен на вашей системе: {}\n"
+
+#: ../install.py:857 ../install.py:929 ../install.py:974
+msgid ""
+"To continue, some packages required to run the application will be installed."
+msgstr ""
+"Для продолжения будут установлены некоторые пакеты, необходимые для запуска "
+"приложения."
+
+#: ../install.py:886
+msgid "Querying installed and available packages (this may take a while)"
+msgstr ""
+"Проверка установленных и доступных пакетов (может занять некоторое время)"
+
+#: ../install.py:958
+msgid ""
+"Querying zypper to see if any required packages are already installed (this "
+"may take a while)... "
+msgstr ""
+"Проверка, на наличие установленных пакетов из списка необходимых (может "
+"занять некоторое время)... "
+
+#: ../install.py:1004
+msgid "Query to confirm action at each step."
+msgstr "Запрос на подтверждение действий на каждом шаге."
+
+#: ../install.py:1011
+msgid ""
+"When downloading the latest version, install the development version if it "
+"is newer than the stable version."
+msgstr ""
+"При загрузке последней версии, устанавливать версию в разработке, если она "
+"новее, чем стабильная версия."
+
+#: ../install.py:1020
+msgid ""
+"Optional tar.gz Rapid Photo Downloader installer archive. If not specified, "
+"the latest version is downloaded from the Internet."
+msgstr ""
+"Необязательный tar.gz архив Rapid Photo Downloader. Если не задан, будет "
+"скачана последняя версия из Интернет."
+
+#: ../install.py:1043
+msgid ""
+"Do not run the installer in the tar.gz Rapid Photo Downloader installer "
+"archive if it is newer than this version ({}). The default is to run "
+"whichever installer is newer."
+msgstr ""
+"Не запускайте установщик из tar.gz архива Rapid Photo Downloader если он "
+"новее чем эта версия ({}). По умолчанию запускается более новый установщик."
+
+#: ../install.py:1050
+msgid ""
+"Uninstall Rapid Photo Downloader that was installed with pip, keeping its "
+"dependencies."
+msgstr ""
+"Удалить Rapid Photo Downloader, установленный при помощи pip, оставив "
+"зависимости."
+
+#: ../install.py:1054
+msgid ""
+"Uninstall the dependencies installed by pip during Rapid Photo Downloader's "
+"installation, and Rapid Photo Downloader itself, then exit."
+msgstr ""
+"Удалить зависимости, установленные при помощи pip во время установки Rapid "
+"Photo Downloader, сам Rapid Photo Downloader, затем выйти."
+
+#: ../install.py:1059
+msgid ""
+"Note: this will not uninstall any version of Rapid Photo Downloader "
+"installed by your Linux distribution's package manager."
+msgstr ""
+"Замечание: версии Rapid Photo Downloader, установленные при помощи менеджера "
+"пакетов вашего дистрибутива Linux, удалены не будут."
+
+#: ../install.py:1066
+msgid ""
+"Dependencies will only be removed if they are not required by other programs."
+msgstr ""
+"Зависимости будут удалены только если они не нужны другим программам."
+
+#: ../install.py:1072
+msgid ""
+"Note: this option will remove the dependencies regardless of whether they "
+"are required by another program pip has installed. Upgrade to pip 9.0 or "
+"above if you want to avoid this behavior. You can do so using the command "
+"'python3 -m pip install pip -U --user'. Also note that any version of Rapid "
+"Photo Downloader installed by your Linux distribution's package manager will "
+"not be uninstalled."
+msgstr ""
+"Замечание: этот параметр приведет к удалению зависимостей, независимо от "
+"того, нужны ли они другим программам, установленным pip. Чтобы исключить "
+"такое поведение обновите pip до версии 9.0 или выше. Вы можете сделать это "
+"при помощи команды 'python3 -m pip install pip -U --user'. Также учтите, что "
+"версии Rapid Photo Downloader, установленные при помощи менеджера пакетов "
+"вашего дистрибутива Linux, удалены не будут."
+
+#: ../install.py:1122
+msgid "Failed to download versions file"
+msgstr "Загрузка файла версий не удалась"
+
+#: ../install.py:1126
+msgid "Got error code {} while accessing versions file"
+msgstr "При обращении к файлу версий получен код ошибки {}"
+
+#: ../install.py:1234
+msgid ""
+"Sorry, could not locate installer. Please check your Internet connection and "
+"verify if you can reach https://www.damonlynch.net\n"
+"\n"
+"Exiting.\n"
 msgstr ""
+"Очень жаль, но невозможно обнаружить установщик. Пожалуйста, проверьте "
+"Интернет соединение и возможность доступа к https://www.damonlynch.net\n"
+"\n"
+"Выход.\n"
+
+#: ../install.py:1408
+msgid "Installing application requirements..."
+msgstr "Установка необходимых программе компонентов..."
+
+#: ../install.py:1424
+msgid "Received error code"
+msgstr "Получен код ошибки"
+
+#: ../install.py:1425
+msgid "Failed to install application requirements: exiting"
+msgstr "Установка необходимых программе компонентов не удалась: выход"
+
+#: ../install.py:1428
+msgid "Installing application..."
+msgstr "Установка программы..."
+
+#: ../install.py:1441
+msgid "Failed to install application: exiting..."
+msgstr "Установка программы не удалась: выход..."
+
+#: ../install.py:1465
+msgid ""
+"You may have to restart the computer to be able to run the program from the "
+"commmand line or application launcher."
+msgstr ""
+"Возможно, для того, чтобы вы смогли запустить программу из командной строки "
+"или лаунчера приложений, вам придется перезагрузить компьютер."
+
+#: ../install.py:1476
+msgid "Do you want to install the application's man pages?"
+msgstr "Вы хотите установить man страницы программы?"
+
+#: ../install.py:1477
+msgid "They will be installed into {}"
+msgstr "Они будут установлены в {}"
+
+#: ../install.py:1478 ../install.py:1483
+msgid "If you uninstall the application, remove these manpages yourself."
+msgstr "При удалении программы, удалите эти man страницы сами."
+
+#: ../install.py:1480
+msgid "Do want to install the man pages?"
+msgstr "Вы хотите установить man страницы?"
+
+#: ../install.py:1482
+msgid "Installing man pages into {}"
+msgstr "Установка man страниц в {}"
+
+#: ../install.py:1499
+msgid "Failed to create man page directory: exiting"
+msgstr "Создание папки для man страниц не удалось: выход"
+
+#: ../install.py:1511
+msgid "Failed to copy man page."
+msgstr "Копирование man страниц не удалось."
+
+#: ../install.py:1521
+msgid "(If a segmentation fault occurs at exit, you can ignore it...)"
+msgstr ""
+"(если при выходе возникла ошибка сегментации, вы можете игнорировать ее...)"
+
+#: ../install.py:1534
+msgid ""
+"The python3 tool pip is required to uninstall a version of Rapid Photo "
+"Downloader that was installed with pip.\n"
+"Cannot continue. Exiting."
+msgstr ""
+"Для удаления версии Rapid Photo Downloader, установленной при помощи pip "
+"необходима утилита python3 pip.\n"
+"Продолжение невозможно. Выход."
+
+#: ../install.py:1575
+msgid ""
+"Do not run this installer script as sudo / root user.\n"
+"Run it using the user who will run the program.\n"
+msgstr ""
+"Не запускайте этот скрипт от имени пользователя sudo / root.\n"
+"Запускайте его от имени пользователя, который будет использовать программу.\n"
+
+#: ../install.py:1585 ../install.py:1599
+msgid "Do not include any other command line arguments when specifying"
+msgstr "Не включайте другие параметры командной строки, когда задаете"
+
+#: ../install.py:1614
+msgid ""
+"Sorry, this installer does not support a custom python installation.\n"
+"Exiting..."
+msgstr ""
+"Очень жаль, но этот установщик не поддерживает выборочную установку python.\n"
+"Выход..."
+
+#: ../install.py:1620
+msgid "Restarting script using system python..."
+msgstr "Перезапуск скрипта с использованием сиситемного python..."
+
+#: ../install.py:1651
+msgid "Exiting..."
+msgstr "Выход..."
+
+#. Translators: do not translate the term python3-apt
+#: ../install.py:1670
+msgid "To continue, the package python3-apt must be installed."
+msgstr "Пакет python3-apt должен быть установлен для продолжения."
+
+#: ../install.py:1689
+msgid ""
+"Install the following packages using your Linux distribution's standard "
+"package manager, and then rerun this installer"
+msgstr ""
+"Используя стандартный менеджер пакетов вашего дистрибутива Linux, установите "
+"следующие пакеты и затем перезапустите установщик"
+
+#: ../install.py:1698
+msgid ""
+"To run this program, programs to assist Python 3 and its package management "
+"must be installed."
+msgstr ""
+"Для запуска этой программы должны быть установлены вспомогательные программы "
+"Python 3 и его системы управления пакетами."
+
+#. Translators: do not translate the terms Python 3, pip and setuptools
+#: ../install.py:1713
+msgid "Python 3's pip and setuptools must be upgraded for your user."
+msgstr ""
+"Программы pip и setuptools для Python 3 должны быть обновлены для вашего "
+"пользователя."
+
+#. Translators: do not translate the term python or requests
+#: ../install.py:1726
+msgid "Installing python requests"
+msgstr "Установка python requests"
+
+#: ../upgrade.py:79
+msgid "Upgrade Rapid Photo Downloader"
+msgstr "Обновить Rapid Photo Downloader"
+
+#: ../upgrade.py:401 ../raphodo/viewutils.py:242
+msgid "&Cancel"
+msgstr "Отмена"
+
+#: ../upgrade.py:405
+msgid "&Upgrade"
+msgstr "Обновить"
+
+#: ../upgrade.py:410
+#, python-format
+msgid "Click the Upgrade button to upgrade to version %s."
+msgstr "Чтобы обновить до версии %s, нажмите кнопку Обновить."
+
+#: ../upgrade.py:413
+msgid "Click the Upgrade button to start the upgrade."
+msgstr "Чтобы начать обновление нажмите кнопку Обновить."
+
+#: ../upgrade.py:416 ../upgrade.py:422 ../raphodo/viewutils.py:241
+msgid "&Close"
+msgstr "Закрыть"
+
+#: ../upgrade.py:417
+msgid "&Run"
+msgstr "Запустить"
+
+#: ../upgrade.py:447
+msgid "Close Rapid Photo Downloader before running this upgrade"
+msgstr "Закройте Rapid Photo Downloader перед запуском этого обновления"
+
+#: ../upgrade.py:450
+msgid "Upgrade running..."
+msgstr "Выполняется обновление..."
+
+#: ../upgrade.py:486
+#, python-format
+msgid ""
+"Successfully upgraded to %s. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+"Обновление до версии %s прошло успешно. Нажмите Выход для завершения или "
+"Запустить для запуска программы."
+
+#: ../upgrade.py:491
+msgid ""
+"Upgrade finished successfully. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+"Обновление успешно завершено. Нажмите Выход для завершения или Запустить для "
+"запуска программы."
+
+#: ../upgrade.py:495
+msgid "Upgrade failed. Click Close to exit."
+msgstr "Обновление не удалось. Нажмите Выход для завершения."
+
+#: ../upgrade.py:6967
+#, python-format
+msgid "Upgrading %s..."
+msgstr "Обновление %s..."
+
+#: ../upgrade.py:6969
+msgid "Press any key to continue..."
+msgstr "Для продолжения нажмите любую клавишу..."
+
+#: ../upgrade.py:6982
+msgid "Rapid Photo Downloader upgrade failed"
+msgstr "Обновление Rapid Photo Downloader не удалось"
 
-#: ../raphodo/backuppanel.py:241
+#: ../upgrade.py:6984
+#, python-format
+msgid ""
+"The python package %s could not be updated. The upgrade cannot continue."
+msgstr ""
+"Пакет python %s не может быть обновлен. Обновление не может продолжаться."
+
+#: ../raphodo/aboutdialog.py:225
+msgid "Credits"
+msgstr "Благодарности"
+
+#: ../raphodo/backuppanel.py:240
+msgid "Backups are not configured"
+msgstr "Резервное копирование не настроено"
+
+#: ../raphodo/backuppanel.py:242
 msgid "No backup devices detected"
 msgstr "Не обнаружен носитель для резервных копий"
 
-#: ../raphodo/backuppanel.py:243
+#: ../raphodo/backuppanel.py:244
 msgid "Valid backup locations not yet specified"
-msgstr ""
+msgstr "Место хранения резервных копий не указано"
 
-#: ../raphodo/backuppanel.py:401
+#: ../raphodo/backuppanel.py:404
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
 msgstr ""
-"Имеется возможность создания резервной копии ваших фотографий и видеороликов "
+"Есть возможность создания резервной копии ваших фотографий и видеороликов "
 "прямо во время загрузки, в том числе на внешних жёстких дисках."
 
-#: ../raphodo/backuppanel.py:407
+#: ../raphodo/backuppanel.py:412
 msgid "Back up photos and videos when downloading"
-msgstr "Создавать резервные копии фотографий и видеороликов во время загрузки"
+msgstr ""
+"Создавать резервные копии фотографий и видеороликов во время загрузки"
 
-#: ../raphodo/backuppanel.py:413
+#: ../raphodo/backuppanel.py:418
 msgid "Automatically detect backup devices"
 msgstr "Автоматически определять носители для резервного копирования"
 
-#: ../raphodo/backuppanel.py:417
+#: ../raphodo/backuppanel.py:424
 msgid ""
-"Specify the folder in which backups are stored on the device."
-"<br><br><i>Note: the presence of a folder with this name is used to "
+"Specify the folder in which backups are stored on the "
+"device.<br><br><i>Note: the presence of a folder with this name is used to "
 "determine if 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 folder names. By "
 "adding both folders, the same device can be used to back up both photos and "
 "videos.</i>"
 msgstr ""
+"Укажите папку на устройстве, где будут храниться резервные "
+"копии.<br><br><i>Замечание: наличие папки с таким именем будет использовано "
+"для определения, используется ли устройство для резервного копирования. "
+"Создайте папку с одним из этих имен на каждом устройстве, на котором вы "
+"хотите хранить резервные копии. При добавлении обеих папок устройство будет "
+"использоваться для резервного копирования как фото, так и видео.</i>"
 
-#: ../raphodo/backuppanel.py:428
+#: ../raphodo/backuppanel.py:439
 msgid "Photo folder name:"
-msgstr ""
+msgstr "Имя папки для фото:"
 
-#: ../raphodo/backuppanel.py:433
+#: ../raphodo/backuppanel.py:444
 msgid "Video folder name:"
-msgstr ""
+msgstr "Имя папки для видео:"
 
-#: ../raphodo/backuppanel.py:438 ../raphodo/nameeditor.py:883
+#: ../raphodo/backuppanel.py:449 ../raphodo/nameeditor.py:890
 #: ../raphodo/renamepanel.py:123
 msgid "Example:"
-msgstr ""
+msgstr "Пример:"
 
-#: ../raphodo/backuppanel.py:448
-msgid "If you disable automatic detection, choose the exact backup locations."
+#: ../raphodo/backuppanel.py:460
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
-"Если вы отключаете автоопределение, выберите место для резервного "
-"копирования."
+"Если вы отключаете автоопределение, выберите точное место для хранения "
+"резервных копий."
 
-#: ../raphodo/backuppanel.py:452
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:468
 msgid "Photo backup location:"
-msgstr "Размещение для резервного копирования фото:"
+msgstr "Место хранения резервных копий фото:"
 
-#: ../raphodo/backuppanel.py:454
+#: ../raphodo/backuppanel.py:474
 msgid "Select Photo Backup Location"
-msgstr ""
+msgstr "Выберите место хранения резервных копий фото:"
 
-#: ../raphodo/backuppanel.py:460
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:485
 msgid "Video backup location:"
-msgstr "Размещение для резервного копирования видео:"
+msgstr "Место хранения резервных копий видео:"
 
-#: ../raphodo/backuppanel.py:462
+#: ../raphodo/backuppanel.py:491
 msgid "Select Video Backup Location"
-msgstr ""
+msgstr "Выберите место хранения резервных копий видео:"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:564
+#: ../raphodo/backuppanel.py:595
 msgid "drive1"
-msgstr ""
+msgstr "Диск 1"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:567
+#: ../raphodo/backuppanel.py:598
 msgid "drive2"
-msgstr ""
+msgstr "Диск 2"
 
-#: ../raphodo/backuppanel.py:628
+#: ../raphodo/backuppanel.py:663
 msgid "Projected Backup Storage Use"
-msgstr ""
+msgstr "Использование хранилища резервных копий"
 
-#: ../raphodo/backuppanel.py:632
+#: ../raphodo/backuppanel.py:669
 msgid "Backup Options"
-msgstr ""
+msgstr "Настройки резервного копирования"
 
 #. translators: refers to the video thumbnail file that some
 #. cameras generate -- it has a .THM file extension
-#: ../raphodo/copyfiles.py:476
+#: ../raphodo/copyfiles.py:491
 msgid "video THM"
-msgstr ""
+msgstr "миниатюры видео"
 
-#: ../raphodo/copyfiles.py:482
+#: ../raphodo/copyfiles.py:497
 msgid "audio"
-msgstr ""
+msgstr "аудио"
 
 #: ../raphodo/destinationdisplay.py:78 ../raphodo/devicedisplay.py:1079
-#: ../raphodo/rpdfile.py:321
+#: ../raphodo/rpdfile.py:342
 #, python-format
 msgid "%(no_photos)s Photos"
-msgstr ""
+msgstr "%(no_photos)s Фото"
 
 #: ../raphodo/destinationdisplay.py:82 ../raphodo/devicedisplay.py:1081
-#: ../raphodo/rpdfile.py:316
+#: ../raphodo/rpdfile.py:333
 #, python-format
 msgid "%(no_videos)s Videos"
-msgstr ""
+msgstr "%(no_videos)s Видео"
 
 #: ../raphodo/destinationdisplay.py:92
 msgid "Used"
-msgstr ""
+msgstr "Занято"
 
 #: ../raphodo/destinationdisplay.py:93
 msgid "Excess"
-msgstr ""
+msgstr "Превышение"
 
 #: ../raphodo/destinationdisplay.py:102
 msgid "Device size unknown"
-msgstr ""
+msgstr "Объем устройства неизвестен"
 
 #: ../raphodo/destinationdisplay.py:112
 #, python-format
 msgid "No space free on %(size_total)s device"
-msgstr ""
+msgstr "На устройстве %(size_total)s нет свободного места"
 
 #: ../raphodo/destinationdisplay.py:119
 #, python-format
 msgid "%(size_free)s free of %(size_total)s"
-msgstr ""
+msgstr "%(size_free)s свободно из %(size_total)s"
 
 #: ../raphodo/destinationdisplay.py:190 ../raphodo/devicedisplay.py:993
-#: ../raphodo/rapid.py:1964 ../raphodo/rapid.py:2079 ../raphodo/rapid.py:5753
-#: ../raphodo/rpdfile.py:905
+#: ../raphodo/rapid.py:2023 ../raphodo/rapid.py:2151 ../raphodo/rapid.py:6043
+#: ../raphodo/rpdfile.py:930
 msgid "Photos"
-msgstr ""
+msgstr "Фото"
 
 #. translators: the name of the Videos folder
 #: ../raphodo/destinationdisplay.py:191 ../raphodo/devicedisplay.py:994
-#: ../raphodo/rapid.py:1967 ../raphodo/rapid.py:2080 ../raphodo/rapid.py:5754
-#: ../raphodo/rpdfile.py:933 ../raphodo/storage.py:445
+#: ../raphodo/rapid.py:2028 ../raphodo/rapid.py:2152 ../raphodo/rapid.py:6044
+#: ../raphodo/rpdfile.py:958 ../raphodo/storage.py:449
 msgid "Videos"
-msgstr ""
+msgstr "Видео"
 
 #: ../raphodo/destinationdisplay.py:192
 msgid "Projected storage use after download"
-msgstr ""
+msgstr "Использование хранилища после загрузки"
 
-#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:516
+#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:521
 msgid "Custom..."
-msgstr ""
+msgstr "Свой..."
 
 #: ../raphodo/destinationdisplay.py:678
 msgid "Configure photo subfolder creation"
-msgstr ""
+msgstr "Настройка создания подпапок для фото"
 
 #: ../raphodo/destinationdisplay.py:680
 msgid "Configure video subfolder creation"
-msgstr ""
+msgstr "Настройка создания подпапок для видео"
 
 #: ../raphodo/devicedisplay.py:983
 msgid "Other"
-msgstr ""
+msgstr "Другие"
 
 #: ../raphodo/devicedisplay.py:984
 msgid "Probing device..."
-msgstr ""
+msgstr "Проверка устройств..."
 
 #: ../raphodo/devicedisplay.py:1000
 msgid "Temporarily ignore this device"
-msgstr ""
+msgstr "Временно игнорировать это устройство"
 
 #: ../raphodo/devicedisplay.py:1002
 msgid "Permanently ignore this device"
-msgstr ""
+msgstr "Постоянно игнорировать это устройство"
 
 #: ../raphodo/devicedisplay.py:1004
 msgid "Rescan"
-msgstr ""
+msgstr "Обновить"
 
 #. Translators: percentage full e.g. 75% full
 #: ../raphodo/devicedisplay.py:1093
 #, python-format
 msgid "%s full"
-msgstr ""
+msgstr "Занято %s"
 
-#: ../raphodo/devices.py:459
+#: ../raphodo/devices.py:463
 msgid "Cameras"
-msgstr ""
+msgstr "Камеры"
 
-#: ../raphodo/devices.py:460 ../raphodo/devices.py:920
-#: ../raphodo/preferencedialog.py:85 ../raphodo/rapid.py:1927
+#: ../raphodo/devices.py:464 ../raphodo/devices.py:927
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/rapid.py:1979
 msgid "Devices"
-msgstr "Носители"
+msgstr "Устройства"
 
-#: ../raphodo/devices.py:720
+#: ../raphodo/devices.py:724
 #, python-format
 msgid "Downloading from %(device_names)s"
-msgstr ""
+msgstr "Загрузка с %(device_names)s"
 
 #. Translators: e.g. Three Devices
-#: ../raphodo/devices.py:780
+#: ../raphodo/devices.py:784
 #, python-format
 msgid "%(no_devices)s %(device_type)s"
-msgstr ""
+msgstr "%(no_devices)s %(device_type)s"
 
-#: ../raphodo/devices.py:905 ../raphodo/rapid.py:1764
+#: ../raphodo/devices.py:912 ../raphodo/rapid.py:1807
 msgid "Select Source"
-msgstr ""
+msgstr "Выбор источника"
 
-#: ../raphodo/devices.py:936 ../raphodo/devices.py:947
+#: ../raphodo/devices.py:943 ../raphodo/devices.py:954
 #, python-format
 msgid "%(device1)s + %(device2)s"
-msgstr ""
+msgstr "%(device1)s + %(device2)s"
 
 #. Number of cameras e.g. 3 Cameras
-#: ../raphodo/devices.py:958
+#: ../raphodo/devices.py:965
 #, python-format
 msgid "%(no_cameras)s Cameras"
-msgstr ""
+msgstr "%(no_cameras)s Камер"
 
-#: ../raphodo/devices.py:963
+#: ../raphodo/devices.py:970
 #, python-format
 msgid "%(no_devices)s Devices"
-msgstr ""
+msgstr "%(no_devices)s Устройств"
 
 #. Translators: two folder names, separated by a plus sign
-#: ../raphodo/devices.py:1258
+#: ../raphodo/devices.py:1265
 #, python-format
 msgid "%s + %s"
-msgstr ""
+msgstr "%s + %s"
 
-#: ../raphodo/didyouknow.py:44
+#: ../raphodo/didyouknow.py:45
 msgid "Click on a file's checkbox to mark or unmark it for download."
 msgstr ""
+"Кликните по флажку файла чтобы отметить его для загрузки или снять отметку"
 
-#: ../raphodo/didyouknow.py:50
+#: ../raphodo/didyouknow.py:51
 msgid ""
 "Files that have already been downloaded are remembered. You can still mark "
 "previously downloaded files to download again, but they are unchecked by "
 "default, and their thumbnails are dimmed so you can differentiate them from "
 "files that are yet to be downloaded."
 msgstr ""
+"Файлы, которые уже были загружены запоминаются. Вы по-прежнему можете снова "
+"отметить уже загруженные файлы для загрузки, но по умолчанию отметки с них "
+"сняты, и их миниатюры слегка затуманены чтобы вы могли их отличить от "
+"файлов, которые еще будт загружаться."
 
-#: ../raphodo/didyouknow.py:59
+#: ../raphodo/didyouknow.py:60
 msgid ""
 "If more than one file is selected, they'll all take the mark of the file "
 "whose checkbox was clicked, regardless of whether they previously had a "
 "checkmark or not."
 msgstr ""
+"Если выбрано более одного файла, независимо от того были они отмечены или "
+"нет они все примут отметку файла, по флажку которого вы кликните."
 
-#: ../raphodo/didyouknow.py:67
+#: ../raphodo/didyouknow.py:68
 msgid ""
 "Click on a device's checkbox to quickly mark or unmark all its files for "
 "downloading."
 msgstr ""
+"Кликните по флажку устройства, чтобы быстро отметить все его файлы для "
+"загрузки или снять с них отметку."
+
+#: ../raphodo/didyouknow.py:75
+msgid ""
+"After a download finishes, an icon replaces the thumbnail's checkbox. The "
+"icon's color indicates whether the download was successful (green), had file "
+"renaming problems (yellow/orange), or failed (red)."
+msgstr ""
+"После завершения загрузки флажок будет заменен значком. Цвет значка "
+"показывает была ли загрузка успешной (зеленый), были ли проблемы с "
+"переименованием (желтый) или загрузка не удалась (красный)."
+
+#: ../raphodo/didyouknow.py:83
+msgid ""
+"\n"
+"            In case of any problems, a red icon will appear at the bottom of "
+"the window\n"
+"            indicating how many error reports there are. Clicking on it "
+"opens the Error Report \n"
+"            window.\n"
+"            "
+msgstr ""
+"\n"
+"            При наличии каких-либо проблем в нижней части окна появится "
+"красный значок,\n"
+"            отображающий количество возникших ошибок. Нажатие на него "
+"откроет окно \n"
+"            Отчета об ошибках.\n"
+"            "
+
+#: ../raphodo/didyouknow.py:91
+msgid ""
+"\n"
+"            The Error Report window lists any problems encountered before, "
+"during or after the \n"
+"            download. An orange triangle represents a warning, a red circle "
+"indicates a failure, \n"
+"            and a black circle indicates more serious failures. You can "
+"click on the hyperlinks to \n"
+"            open its file or device in a file manager. You can also search "
+"the reports using the \n"
+"            search box in the lower left of the Error Report window.\n"
+"            "
+msgstr ""
+"\n"
+"            Окно Отчета об ошибках отображает список ошибок, возникших до, "
+"во время ил после \n"
+"            загрузки. Оранжевые треугольники отмечают предупреждения, "
+"красные кружки - сбои, \n"
+"            а черные кружки - более серьезные сбои. Вы можете нажать на "
+"ссылку, чтобы открыть \n"
+"            ее файл или устройство в файл менеджере. Вы также можете "
+"выполнять поиск в отчете, \n"
+"            используя поле поиска в нижней левой части окна Отчета об "
+"ошибках.\n"
+"            "
 
-#: ../raphodo/didyouknow.py:74
+#: ../raphodo/didyouknow.py:103
 msgid ""
 "You can simultaneously download from multiple cameras, smartphones, memory "
 "cards, and hard drives&mdash;as many devices as your computer can handle at "
 "one time."
 msgstr ""
+"Вы можете одновременно выполнять загрузку с нескольких камер, смартфонов, "
+"карт памяти и жестких дисков&mdash;с любого количества устройств, которое "
+"ваша система сможет обслуживать одновременно."
 
-#: ../raphodo/didyouknow.py:81
+#: ../raphodo/didyouknow.py:110
 msgid ""
 "The <b>Timeline</b> groups photos and videos based on how much time elapsed "
 "between consecutive shots. Use it to identify photos and videos taken at "
 "different periods in a single day or over consecutive days."
 msgstr ""
+"<b>Шкала времени</b> группирует фото и видео на основании того, сколько "
+"времени прошло между снимками. Вы можете использовать ее для определения "
+"фото и видео, снятых в разные периоды одного дня или за несколько дней "
+"подряд."
 
-#: ../raphodo/didyouknow.py:88
+#: ../raphodo/didyouknow.py:117
 msgid ""
 "\n"
 "<p>In the illustration above, the first row of the Timeline is black because "
@@ -311,29 +805,44 @@ msgid ""
 "the Timeline:</p>\n"
 "            "
 msgstr ""
+"\n"
+"<p>На иллюстрации выше первая строка шкалы времени окрашена черным, потому \n"
+"что все файлы за эту дату уже были загружены.</p>\n"
+"<p>Ползунок Шкалы времени определяет прошедшее между снимками \n"
+"время, которое используется для построения Шкалы времени:</p>\n"
+"            "
 
-#: ../raphodo/didyouknow.py:99
+#: ../raphodo/didyouknow.py:128
 msgid ""
 "To view photos and videos for a particular time range, use the mouse "
 "(optionally in combination with the <tt>Shift</tt> or <tt>Ctrl</tt> keys) to "
 "select time periods. When a time range is selected, the Timeline button on "
 "the left side of the main window will be highlighted."
 msgstr ""
+"Для просмотра фото и видео за определенный период времени используйте мышь "
+"(при необходимости в сочетании с клавишами <tt>Shift</tt> и <tt>Ctrl</tt>) "
+"для выбора временных интервалов. Когда период времени выбран, кнопка Шкалы "
+"времени с левой стороны главного окна будет подсвечена."
 
-#: ../raphodo/didyouknow.py:106
+#: ../raphodo/didyouknow.py:135
 msgid ""
 "A download always includes all files that are checked for download, "
 "including those that are not currently displayed because the Timeline is "
 "being used."
 msgstr ""
+"В загрузку всегда включаются все файлы, отмеченные для загрузки, включая и "
+"те, которые в данный момент не отображаются по причине использования Шкалы "
+"времени."
 
-#: ../raphodo/didyouknow.py:113
+#: ../raphodo/didyouknow.py:142
 msgid ""
 "You can hide or display the download sources by clicking on the name of the "
 "device you're downloading from at the top left of the program window."
 msgstr ""
+"Вы можете скрывать или отображать источники загрузки кликая по имени "
+"устройства с которого вы загружаете в окне программы вверху слева."
 
-#: ../raphodo/didyouknow.py:120
+#: ../raphodo/didyouknow.py:149
 msgid ""
 "\n"
 "          Thumbnails can be sorted using a variety of criteria:\n"
@@ -351,34 +860,53 @@ msgid ""
 "downloaded from.</li>\n"
 "</ol> "
 msgstr ""
+"\n"
+"          Миниатюры могут быть отсортированы с использованием:\n"
+"<ol>\n"
+"<li><b>Времени изменения:</b> когда файл был изменен последний раз, согласно "
+"его метаданным (где возможно) или согласно данным файловой системы.</li>\n"
+"<li><b>Состояния отметки:</b> отмечен ли файл для загрузки.</li>\n"
+"<li><b>Имени файла:</b> полное имя файла, включая расширение.</li>\n"
+"<li><b>Расширения:</b> расширение файла. Вы можете использовать это для "
+"группировки jpeg и raw файлов, например.</li>\n"
+"<li><b>Типа файла:</b> фото или видео.</li>\n"
+"<li><b>Устройства:</b> имя устройства, с которого будут загружаться фото и "
+"видео.</li>\n"
+"</ol> "
 
-#: ../raphodo/didyouknow.py:137
+#: ../raphodo/didyouknow.py:166
 msgid ""
 "One of Rapid Photo Downloader's most useful features is its ability to "
 "automatically generate download subfolders and rename files as it downloads, "
 "using a scheme of your choosing."
 msgstr ""
+"Одна из наиболее полезных возможностей Rapid Photo Downloader - это "
+"способность автоматически генерировать подпапки и переименовывать файлы во "
+"время загрузки, используя схему по вашему выбору."
 
-#: ../raphodo/didyouknow.py:143
+#: ../raphodo/didyouknow.py:172
 msgid ""
 "To specify where you want your files downloaded and how you want them named, "
 "open the appropriate panel on the right-side of the application window: "
 "<b>Destination</b>, <b>Rename</b>, or <b>Job Code</b>."
 msgstr ""
+"Чтобы указать, куда вы хотите загружать файлы и как вы хотите, чтобы они "
+"назывались, откройте соответствующую панель с правой стороны окна "
+"приложения: <b>Место хранения</b>, <b>Переименование</b>, или <b>Метка</b>."
 
-#: ../raphodo/didyouknow.py:150
+#: ../raphodo/didyouknow.py:179
 msgid ""
 "\n"
 "When thinking about your download directory structure, keep in mind two "
 "different types\n"
 "of directory:\n"
 "<ol>\n"
-"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, &quot;"
-"Photos&quot;, or\n"
+"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, "
+"&quot;Photos&quot;, or\n"
 "&quot;Videos&quot;. This directory should already exist on your computer. In "
 "the illustration \n"
-"below, the destination folders are &quot;Pictures&quot; and &quot;"
-"Videos&quot;. The\n"
+"below, the destination folders are &quot;Pictures&quot; and "
+"&quot;Videos&quot;. The\n"
 "name of the destination folder is displayed in the grey bar directly above "
 "the folder tree, \n"
 "with a folder icon to its left and a gear icon to its far right.</li>\n"
@@ -390,8 +918,28 @@ msgid ""
 "</ol>\n"
 "            "
 msgstr ""
+"\n"
+"Когда вы думаете о структуре папок загрузки, примите во внимание два разных "
+"\n"
+"типа папок:\n"
+"<ol>\n"
+"<li>The <b>место хранения</b>, т.е. &quot;Изображения&quot;, "
+"&quot;Фото&quot;, или\n"
+"&quot;Видео&quot;. Эта папка уже должна существовать в вашем компьютере. На "
+"иллюстрации \n"
+"ниже, места хранения &quot;Pictures&quot; и &quot;Videos&quot;. Имя\n"
+"места хранения отображается на серой панели над деревом папок, \n"
+"со значком папки слева от него и значком шестеренки с правого края.</li>\n"
+"<li>The <b>подпапки загрузки</b>, которые являются папками, автоматически "
+"созданными \n"
+"Rapid Photo Downloader. Они не должны обязательно уже существовать на вашем "
+"компьютере, но \n"
+"если они уже есть, то в этом нет ничего страшного. Они будут созданы внутри "
+"места хранения.</li>\n"
+"</ol>\n"
+"            "
 
-#: ../raphodo/didyouknow.py:167
+#: ../raphodo/didyouknow.py:196
 msgid ""
 "\n"
 "You can download photos and videos to the same destination folder, or "
@@ -403,15 +951,26 @@ msgid ""
 "type.            \n"
 "            "
 msgstr ""
+"\n"
+"Вы можете загружать фото и видео в одно место хранения, или указать разные \n"
+"места хранения. То же самое касается и подпапок для загрузки фото и "
+"видео&mdash;\n"
+"загружать фото и видео в одни и те же подпапки, или же использовать разные "
+"схемы \n"
+"для каждого типа.            \n"
+"            "
 
-#: ../raphodo/didyouknow.py:177
+#: ../raphodo/didyouknow.py:206
 msgid ""
 "Automatically generated download subfolders can contain further "
 "automatically generated subfolders if need be. A common scheme is to create "
 "a year subfolder and then a series of year-month-day subfolders within it."
 msgstr ""
+"Автоматически созданные подпапки загрузки могут содержать вложенные "
+"автоматически созданные подпапки, если необходимо. Обычная схема - создание "
+"папки года и внутри нее серии подпапок год-месяц-день."
 
-#: ../raphodo/didyouknow.py:186
+#: ../raphodo/didyouknow.py:215
 msgid ""
 "\n"
 "Whenever possible, the program previews the download subfolders of photos "
@@ -428,8 +987,22 @@ msgid ""
 "</ol>\n"
 "            "
 msgstr ""
+"\n"
+"Где возможно, программа отображает подпапки загрузки для загружаемых фото и "
+"видео:\n"
+"<ol>\n"
+"<li>Дерево папок места хранения отображает уже существующие на вашем "
+"компьютере подпапки  \n"
+"    (имена обычным шрифтом, не курсивом), и подпапки, которые будут созданы "
+"при загрузке \n"
+"    (имена курсивом).</li>\n"
+"<li>Дерево папок также показывает, в какую подпапку будут загружены файлы "
+"(окрашены \n"
+"    в черный цвет).</li>\n"
+"</ol>\n"
+"            "
 
-#: ../raphodo/didyouknow.py:201
+#: ../raphodo/didyouknow.py:230
 msgid ""
 "\n"
 "Download subfolder names are typically generated using some or all of the "
@@ -452,8 +1025,27 @@ msgid ""
 "option:\n"
 "            "
 msgstr ""
+"\n"
+"Имена подпапок загрузки обычно создаются с использованием следующих "
+"элементов:\n"
+"<ol>\n"
+"<li><b>Метаданных файла</b>, очень часто содержат дату создания фото или "
+"видео, но могут \n"
+"также \n"
+"содержать название камеры, ее серийный номер, или расширение файла т.е. JPG "
+"или CR2.</li>\n"
+"<li>A <b>Метки</b>, любого текста, который вы задаете во время загрузки, "
+"такого как\n"
+"название события или места.</li>\n"
+"<li><b>Текста</b> который вы хотите, чтобы появлялся всегда, как тире или "
+"пробел.</li>\n"
+"</ol>\n"
+"Создание имен подпапок из года, следующего за ним месяца, и, напоследок, дня "
+"в цифровом виде \n"
+"упрощает их сортировку в файл менеджере, и поэтому выбрано по умолчанию:\n"
+"            "
 
-#: ../raphodo/didyouknow.py:219
+#: ../raphodo/didyouknow.py:248
 msgid ""
 "\n"
 "To automatically create download subfolders as you download, \n"
@@ -462,8 +1054,14 @@ msgid ""
 "the gear icon to bring up a drop-down menu:            \n"
 "            "
 msgstr ""
+"\n"
+"Для автоматического создания подпапок при загрузке, вы можете использовать \n"
+"одну из встроенных предустановок Rapid Photo Downloader, или создать свою. "
+"Кликните по \n"
+"значку с шестеренкой для открытия выпадающего меню:            \n"
+"            "
 
-#: ../raphodo/didyouknow.py:227
+#: ../raphodo/didyouknow.py:256
 msgid ""
 "\n"
 "Using the drop-down menu, select a built-in preset or click on <b>Custom</b> "
@@ -472,21 +1070,32 @@ msgid ""
 "Generation Editor:             \n"
 "            "
 msgstr ""
+"\n"
+"Используя выпадающее меню, выберите встроенную предустановку или кликните на "
+"<b>Своя</b> для задания \n"
+"своей схемы. Вы создадите свою схему, используя Редактор создания подпапок "
+"для фото и видео:             \n"
+"            "
 
-#: ../raphodo/didyouknow.py:237
+#: ../raphodo/didyouknow.py:266
 msgid ""
 "It's easy to download raw images into one folder, and jpeg images into "
 "another. Simply use the <b>Filename Extension</b> as part of your download "
 "subfolder generation scheme:"
 msgstr ""
+"Очень легко загружать raw файлы в одну папку, а jpeg файлы - в другую. "
+"Просто используйте <b>Расширение файла</b> как часть схемы создания подпапок "
+"загрузки:"
 
-#: ../raphodo/didyouknow.py:242
+#: ../raphodo/didyouknow.py:271
 msgid ""
 "This illustration shows a saved custom preset named &quot;My custom "
 "preset&quot;."
 msgstr ""
+"На этой иллюстрации показана сохраненная предустановка с именем &quot;My "
+"custom preset&quot;."
 
-#: ../raphodo/didyouknow.py:246
+#: ../raphodo/didyouknow.py:275
 msgid ""
 "\n"
 "You do not have to create nested download subfolders. This illustration "
@@ -496,8 +1105,14 @@ msgid ""
 "Job Code:\n"
 "            "
 msgstr ""
+"\n"
+"Вы не обязаны создавать вложенные подпапки загрузки. Эта иллюстрация \n"
+"показывает создание подпапок загрузки, содержащих только дату, когда сделан "
+"снимок \n"
+"и метку:\n"
+"            "
 
-#: ../raphodo/didyouknow.py:256
+#: ../raphodo/didyouknow.py:285
 msgid ""
 "\n"
 "Although there are many built-in date/time naming options, you may find that "
@@ -510,8 +1125,18 @@ msgid ""
 "circle around the hyphen):\n"
 "            "
 msgstr ""
+"\n"
+"Несмотря на то, что есть много встроеных схем переименования с "
+"использованием даты/времени, вы можете решить, что \n"
+"вам надо что-то другое. Вы можете без проблем создать свою схему. Вы можете "
+"комбинировать варианты даты/времени, \n"
+"чтобы создать новые комбинации. Предположим вам нужен формат даты, "
+"содержащий год (ГГГГ), дефис и месяц (ММ) для \n"
+"получения ГГГГ-ММ. Вы можете создать его как показано здесь (обратите "
+"внимание на красный кружок вокруг дефиса:\n"
+"            "
 
-#: ../raphodo/didyouknow.py:265
+#: ../raphodo/didyouknow.py:294
 msgid ""
 "\n"
 "Read more about all the ways you can generate download subfolder names and "
@@ -520,8 +1145,15 @@ msgid ""
 "documentation</a>.\n"
 "            "
 msgstr ""
+"\n"
+"Прочесть больше о всех способах создания имен файлов и подпапок загрузки вы "
+"можете в \n"
+"<a "
+"href=\"http://damonlynch.net/rapid/documentation/#renamedateandtime\">докумен"
+"тации в сети</a>.\n"
+"            "
 
-#: ../raphodo/didyouknow.py:273
+#: ../raphodo/didyouknow.py:302
 msgid ""
 "\n"
 "<b>Job Codes</b> let you easily enter text that describes sets of photos and "
@@ -532,8 +1164,16 @@ msgid ""
 "the Job Code \n"
 "&quot;Green Bazaar&quot;: \n"
 msgstr ""
+"\n"
+"<b>Метки</b> позволяют вам легко задать текст, описывающий набор фото и "
+"видео. Вы \n"
+"можете использовать их в именах файлов и подпапок. На этой иллюстрации к "
+"некоторым \n"
+"файлам применена метка &quot;Street&quot;, а выбранные файлы должны получить "
+"метку  \n"
+"&quot;Green Bazaar&quot;: \n"
 
-#: ../raphodo/didyouknow.py:282
+#: ../raphodo/didyouknow.py:311
 msgid ""
 "\n"
 "You can apply new or existing Job Codes before you start a download. If "
@@ -543,37 +1183,53 @@ msgid ""
 "a Job Code for them before the download begins.\n"
 "            "
 msgstr ""
+"\n"
+"Вы можете применять новые или существующие Метки перед началом загрузки. "
+"Если среди \n"
+"загружаемых файлов есть такие, к которым еще не была применена Метка, вам "
+"будет предложено \n"
+"задать Метку для этих файлов перед тем как начнется загрузка.\n"
+"            "
 
-#: ../raphodo/didyouknow.py:291
+#: ../raphodo/didyouknow.py:320
 msgid "Look for hints to guide you when working with Job Codes:"
-msgstr ""
+msgstr "Ищите подсказки, которые направят вас при работе с Метками:"
 
-#: ../raphodo/didyouknow.py:295
+#: ../raphodo/didyouknow.py:324
 msgid ""
 "Hints will vary depending on the context, such as when the mouse is hovering "
 "over a button."
 msgstr ""
+"Подсказки будут зависеть от контекста, например когда наводите мышь на "
+"кнопку."
 
-#: ../raphodo/didyouknow.py:301
+#: ../raphodo/didyouknow.py:330
 msgid ""
 "\n"
 "When you give your photos and videos unique filenames, you'll never be "
 "confused as to \n"
 "which file is which. Using <b>sequence numbers</b> to make filenames unique "
 "is highly \n"
-"recommended!.\n"
+"recommended!\n"
 "            "
 msgstr ""
+"\n"
+"Если вы дадите вашим файлам фото и видео уникальные имена, вы никогда не "
+"будете в них \n"
+"путиться. Настоятельно рекомендуется для задания уникальных имен файлов "
+"использовать \n"
+"<b>Нумерацию</b>!\n"
+"            "
 
-#: ../raphodo/didyouknow.py:309
+#: ../raphodo/didyouknow.py:338
 msgid ""
 "\n"
 "<p>Four types of sequence values are available to help you assign unique "
 "names to your photos and \n"
 "videos:\n"
 "<ol>\n"
-"<li><b>Downloads today</b>: tracks downloads completed during that day.</"
-"li>\n"
+"<li><b>Downloads today</b>: tracks downloads completed during that "
+"day.</li>\n"
 "<li><b>Stored number</b>: similar to Downloads today, but it is remembered "
 "from the last time the  \n"
 "program was run.</li>\n"
@@ -586,8 +1242,29 @@ msgid ""
 "documentation</a>.</p>\n"
 "            "
 msgstr ""
+"\n"
+"<p>Для того, чтобы помочь вам в назначении уникальных имен вашим фото и "
+"видео есть \n"
+"четыре вида нумерации:\n"
+"<ol>\n"
+"<li><b>Загружено сегодня</b>: подсчитывает завершенные загрузки в течение "
+"дня.</li>\n"
+"<li><b>Сквозная нумерация</b>: похожа на Загружено сегодня, но ее значение "
+"сохраняется \n"
+"с прошлого запуска программы.</li>\n"
+"<li><b>Сеансовая нумерация</b>: сбрасывается при каждом запуске "
+"программы.</li>\n"
+"<li><b>Символьная нумерация</b>: как сеансовая нумерация, но использует "
+"буквы.</li>\n"
+"</ol></p>\n"
+"<p>\n"
+"Прочесть больше о нумерации вы можете в \n"
+"<a "
+"href=\"http://damonlynch.net/rapid/documentation/#sequencenumbers\">документа"
+"ции в сети</a>.</p>\n"
+"            "
 
-#: ../raphodo/didyouknow.py:327
+#: ../raphodo/didyouknow.py:356
 msgid ""
 "\n"
 "The <b>Rename</b> panel allows you to configure file renaming. To rename "
@@ -595,8 +1272,14 @@ msgid ""
 "from among existing renaming presets or define your own.              \n"
 "            "
 msgstr ""
+"\n"
+"Панель <b>Переименование</b> позволяет настроить переименование файлов. Для "
+"переименования файлов вы\n"
+"можете выбрать одну из существующих предустановок переименования или задать "
+"свои правила.              \n"
+"            "
 
-#: ../raphodo/didyouknow.py:334
+#: ../raphodo/didyouknow.py:363
 msgid ""
 "\n"
 "<p>The <b>Synchronize RAW + JPEG</b> option is useful if you use the RAW + "
@@ -614,8 +1297,23 @@ msgid ""
 "documentation</a>.</p>\n"
 "            "
 msgstr ""
+"\n"
+"<p>Параметр <b>Синхронизировать RAW + JPEG</b> если вы используете функцию "
+"RAW + JPEG \n"
+"в вашей камере и вы используете нумерацию при переименовании ваших фото. "
+"Включение этого \n"
+"параметра приводит к тому, что программа определяет пары RAW и JPEG файлов, "
+"и, после их \n"
+"определния, к их именам применяется одинаковая нумерация. Более того, "
+"нумерация \n"
+"изменяется, как если бы фото было одно.</p>\n"
+"<p>\n"
+"Прочесть больше о переименовании файлов вы можете в  \n"
+"<a href=\"http://damonlynch.net/rapid/documentation/#rename\">документации в "
+"сети</a>.</p>\n"
+"            "
 
-#: ../raphodo/didyouknow.py:348
+#: ../raphodo/didyouknow.py:377
 msgid ""
 "\n"
 "You can have your photos and videos backed up to multiple locations as they "
@@ -625,14 +1323,25 @@ msgid ""
 "backup locations specified.\n"
 "            "
 msgstr ""
+"\n"
+"Во время загрузки вы можете создавать резервные копии ваших фото и видео в "
+"нескольких местах, таких \n"
+"как внешние жесткие диски или сетевые хранилища. Устройства для хранения "
+"резервных копий могут \n"
+"быть определены автоматически или вы можете точно задать место хранения "
+"резервных копий.\n"
+"            "
 
-#: ../raphodo/didyouknow.py:356
+#: ../raphodo/didyouknow.py:385
 msgid ""
 "In this example, the drive <b>photobackup</b> does not contain a folder "
 "named <tt>Videos</tt>, so videos will not be backed up to it."
 msgstr ""
+"В этом примере накопитель <b>photobackup</b> не содержит папки с именем "
+"<tt>Videos</tt>, поэтому резервное копирование видео на него выполнено не "
+"будет."
 
-#: ../raphodo/didyouknow.py:362
+#: ../raphodo/didyouknow.py:391
 msgid ""
 "\n"
 "Several of the program's preferences can be set from the command line, "
@@ -642,8 +1351,19 @@ msgid ""
 "default state, and caches and remembered files cleared.            \n"
 "            "
 msgstr ""
+"\n"
+"Некоторые параметры программы могут быть заданы из командной строки, включая "
+"источники загрузки, места хранения и места хранения резервных копий. "
+"Дополнительно, настройки могут быть сброшены на значения по умолчанию, и "
+"может быть очищен кэш и запомненные файлы.            \n"
+"            "
+
+#: ../raphodo/didyouknow.py:396
+msgid "You can also import program preferences from the older 0.4 version."
+msgstr ""
+"Также вы можете импортировать настройки из старой 0.4 версии программы."
 
-#: ../raphodo/didyouknow.py:372
+#: ../raphodo/didyouknow.py:401
 msgid ""
 "\n"
 "Rapid Photo Downloader deals with three types of cache:\n"
@@ -653,8 +1373,8 @@ msgid ""
 "memory cards, and other devices.</li>\n"
 "<li>A <b>temporary cache</b> of files downloaded from a camera, one for "
 "photos and another for \n"
-"videos. They are located in temporary subfolders in the download destination."
-"</li>\n"
+"videos. They are located in temporary subfolders in the download "
+"destination.</li>\n"
 "<li>The <b>desktop's thumbnail cache</b>, in which Rapid Photo Downloader "
 "stores thumbnails of \n"
 "RAW and TIFF photos once they have been downloaded. File browsers like Gnome "
@@ -668,217 +1388,247 @@ msgid ""
 "documentation</a>.\n"
 "            "
 msgstr ""
+"\n"
+"Rapid Photo Downloader работает с тремя видами кэша:\n"
+"<ol>\n"
+"<li>A <b>кэшем миниатюр</b>, назначение которого - хранить миниатюры файлов "
+"с фаших камер, \n"
+"карт памяти и других устройств.</li>\n"
+"<li>A <b>временным кэшем</b> файлов, загруженных с камеры, одним для фото и "
+"другим для видео. \n"
+"Они находятся во временных подпапках в месте хранения.</li>\n"
+"<li><b>кэшем миниатюр рабочего стола</b>, в который Rapid Photo Downloader "
+"сохраняет миниатюры \n"
+"загруженных RAW и TIFF файлов. Файл менеджеры используют этот кэш, что "
+"значит, что они будут \n"
+"отображать миниатюры для этих файлов. \n"
+"</li>\n"
+"</ol>\n"
+"Прочесть больше о видах кэша и их влиянии на скорость загрузки вы можете в \n"
+"<a href=\"http://damonlynch.net/rapid/documentation/#caches\">документации в "
+"сети</a>.\n"
+"            "
 
-#: ../raphodo/didyouknow.py:431
+#: ../raphodo/didyouknow.py:460
 msgid "Tip of the Day"
-msgstr ""
+msgstr "Совет дня"
 
-#: ../raphodo/didyouknow.py:439
+#: ../raphodo/didyouknow.py:468
 msgid "Did you know...?"
-msgstr ""
+msgstr "Знаете ли вы...?"
 
-#: ../raphodo/didyouknow.py:466
+#: ../raphodo/didyouknow.py:495
 msgid "Show tips on startup"
-msgstr ""
+msgstr "Показывать советы при запуске"
 
-#: ../raphodo/didyouknow.py:470
+#: ../raphodo/didyouknow.py:499
 msgid "&Next"
-msgstr ""
+msgstr "Далее"
 
-#: ../raphodo/didyouknow.py:471
+#: ../raphodo/didyouknow.py:500
 msgid "&Previous"
-msgstr ""
+msgstr "Назад"
 
 #: ../raphodo/downloadtracker.py:402
 msgid "MB/sec"
-msgstr ""
+msgstr "МБ/с"
 
 #. Be friendly in the last few seconds
 #: ../raphodo/downloadtracker.py:532
 msgid "A few seconds"
-msgstr ""
+msgstr "Несколько секунд"
 
 #: ../raphodo/downloadtracker.py:588
 msgid "1 second"
-msgstr ""
+msgstr "1 секунда"
 
 #: ../raphodo/downloadtracker.py:590
 #, python-format
 msgid "%d seconds"
-msgstr ""
+msgstr "%d секунд"
 
 #: ../raphodo/downloadtracker.py:595
 msgid "1 minute"
-msgstr ""
+msgstr "1 минута"
 
 #: ../raphodo/downloadtracker.py:597
 #, python-format
 msgid "%d minutes"
-msgstr ""
+msgstr "%d минут(ы)"
 
 #: ../raphodo/downloadtracker.py:602 ../raphodo/downloadtracker.py:784
 msgid "1 hour"
-msgstr ""
+msgstr "1 час"
 
 #: ../raphodo/downloadtracker.py:604
 #, python-format
 msgid "%d hours"
-msgstr ""
+msgstr "%d часа(ов)"
 
 #: ../raphodo/downloadtracker.py:609 ../raphodo/downloadtracker.py:813
 #: ../raphodo/downloadtracker.py:821
 msgid "1 day"
-msgstr ""
+msgstr "1 день"
 
 #: ../raphodo/downloadtracker.py:611
 #, python-format
 msgid "%d days"
-msgstr ""
+msgstr "%d дня(ей)"
 
 #: ../raphodo/downloadtracker.py:790
 msgid "1 minute, 1 second"
-msgstr ""
+msgstr "1 минута, 1 секунда"
 
 #: ../raphodo/downloadtracker.py:792
 #, python-format
 msgid "1 minute, %d seconds"
-msgstr ""
+msgstr "1 минута, %d секунд(а)"
 
 #: ../raphodo/downloadtracker.py:795
 #, python-format
 msgid "%d minutes, 1 second"
-msgstr ""
+msgstr "%d минут(ы), 1 секунда"
 
 #: ../raphodo/downloadtracker.py:797
 #, python-format
 msgid "%(minutes)d minutes, %(seconds)d seconds"
-msgstr ""
+msgstr "%(minutes)d минут(а), %(seconds)d секунд(а)"
 
 #: ../raphodo/downloadtracker.py:828
 msgid "1 hour, 1 minute"
-msgstr ""
+msgstr "1 час, 1 минута"
 
 #: ../raphodo/downloadtracker.py:830
 #, python-format
 msgid "1 hour, %d minutes"
-msgstr ""
+msgstr "1 час, %d минут(а)"
 
 #: ../raphodo/downloadtracker.py:833
 #, python-format
 msgid "%d hours, 1 minute"
-msgstr ""
+msgstr "%d час(а/ов), 1 минута"
 
 #: ../raphodo/downloadtracker.py:835
 #, python-format
 msgid "%(hours)d hours, %(minutes)d minutes"
-msgstr ""
+msgstr "%(hours)d час(а/ов), %(minutes)d минут(а)"
 
 #: ../raphodo/downloadtracker.py:861
 msgid "1 day, 1 hour"
-msgstr ""
+msgstr "1 день, 1 час"
 
 #: ../raphodo/downloadtracker.py:863
 #, python-format
 msgid "1 day, %d hours"
-msgstr ""
+msgstr "1 день, %d час(а/ов)"
 
 #: ../raphodo/downloadtracker.py:866
 #, python-format
 msgid "%d days, 1 hour"
-msgstr ""
+msgstr "%d дней, 1 час"
 
 #: ../raphodo/downloadtracker.py:868
 #, python-format
 msgid "%(days)d days, %(hours)d hours"
-msgstr ""
+msgstr "%(days)d дней, %(hours)d час(а/ов)"
 
-#: ../raphodo/errorlog.py:65
+#: ../raphodo/errorlog.py:66
 msgid "Find"
-msgstr ""
+msgstr "Поиск"
 
-#: ../raphodo/errorlog.py:135
+#: ../raphodo/errorlog.py:136
 msgid "Error Reports - Rapid Photo Downloader"
-msgstr ""
+msgstr "Отчет об ошибках - Rapid Photo Downloader"
 
-#: ../raphodo/errorlog.py:170
+#: ../raphodo/errorlog.py:171
 msgid "Find in reports"
-msgstr ""
+msgstr "Найти в отчетах"
 
-#: ../raphodo/errorlog.py:187
+#: ../raphodo/errorlog.py:188
 msgid "Find the previous occurrence of the phrase"
-msgstr ""
+msgstr "Найти предыдущее совпадение с фразой"
 
-#: ../raphodo/errorlog.py:192
+#: ../raphodo/errorlog.py:193
 msgid "Find the next occurrence of the phrase"
-msgstr ""
+msgstr "Найти следующее совпадение с фразой"
 
-#: ../raphodo/errorlog.py:194
+#: ../raphodo/errorlog.py:195
 msgid "&Highlight All"
-msgstr ""
+msgstr "Подсветить все совпадения"
 
-#: ../raphodo/errorlog.py:195
+#: ../raphodo/errorlog.py:196
 msgid "Highlight all occurrences of the phrase"
-msgstr ""
+msgstr "Подсветить все совпадения с фразой"
 
-#: ../raphodo/errorlog.py:196
+#: ../raphodo/errorlog.py:197
 msgid "&Match Case"
-msgstr ""
+msgstr "Учитывать регистр"
 
-#: ../raphodo/errorlog.py:197
+#: ../raphodo/errorlog.py:198
 msgid "Search with case sensitivity"
-msgstr ""
+msgstr "Искать с учетом регистра"
 
-#: ../raphodo/errorlog.py:198
+#: ../raphodo/errorlog.py:199
 msgid "&Whole Words"
-msgstr ""
+msgstr "Слова целиком"
 
-#: ../raphodo/errorlog.py:199
+#: ../raphodo/errorlog.py:200
 msgid "Search whole words only"
-msgstr ""
+msgstr "Искать только целые слова"
 
-#: ../raphodo/errorlog.py:209 ../raphodo/errorlog.py:341
+#: ../raphodo/errorlog.py:210 ../raphodo/errorlog.py:345
 #, python-format
 msgid "%s of %s matches"
-msgstr ""
+msgstr "Совпало %s из %s"
 
-#: ../raphodo/errorlog.py:228
+#: ../raphodo/errorlog.py:232
 msgid "Clear"
-msgstr ""
+msgstr "Очистить"
 
-#: ../raphodo/errorlog.py:328
+#: ../raphodo/errorlog.py:332
 msgid "Phrase not found"
-msgstr ""
+msgstr "Фраза не найдена"
 
-#: ../raphodo/errorlog.py:487
+#: ../raphodo/errorlog.py:491
 msgid "Search pending..."
-msgstr ""
+msgstr "Ожидание поиска..."
 
-#: ../raphodo/errorlog.py:535
+#: ../raphodo/errorlog.py:539
 msgid ""
 "The number of new entries added to the Error Report since it was last open. "
 "Click to open the Error Report."
 msgstr ""
+"После последнего открытия в Отчет об ошибках добавлены записи. Кликните для "
+"открытия Отчета об ошибках."
 
 #: ../raphodo/excepthook.py:77
 msgid "Problem in Rapid Photo Downloader"
-msgstr ""
+msgstr "Проблема в Rapid Photo Downloader"
 
 #: ../raphodo/excepthook.py:81
 #, python-brace-format
 msgid ""
 "<b>A problem occurred in Rapid Photo Downloader</b><br><br>\n"
-"    Please report the problem at <a href=\"{website}\">{website}</a>."
-"<br><br>\n"
+"    Please report the problem at <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
 "    Attach the log file <i>{log_file}</i> to your bug report (click\n"
 "    <a href=\"{log_path}\">here</a> to open the log directory).<br><br>If "
 "the same problem occurs\n"
 "    again before the program exits, this is the only notification about it.\n"
 "    "
 msgstr ""
+"<b>В Rapid Photo Downloader возникла проблема</b><br><br>\n"
+"    Пожалуйста, сообщите об этой проблеме на <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
+"    Приложите к отчету лог файл <i>{log_file}</i> (нажмите\n"
+"    <a href=\"{log_path}\">здесь</a> для открытия папки с "
+"логом).<br><br>Если эта проблема возникнет\n"
+"    снова до завершения программы, сообщений о ней больше не будет.\n"
+"    "
 
 #: ../raphodo/excepthook.py:98
 msgid "A problem occurred in Rapid Photo Downloader\n"
-msgstr ""
+msgstr "В Rapid Photo Downloader возникла проблема\n"
 
 #: ../raphodo/excepthook.py:99
 #, python-brace-format
@@ -888,678 +1638,691 @@ msgid ""
 "    Attach the log file to your bug report, found at {log_path}\n"
 "\n"
 msgstr ""
+"Пожалуйста сообщите о проблеме на {website}\n"
+"\n"
+"    Приложить лог файл, найденный в {log_path} к вашему отчету об ошибках\n"
+"\n"
 
-#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1601
+#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1643
 msgid "Open in File Browser..."
-msgstr ""
+msgstr "Открыть в файл менеджере..."
 
 #: ../raphodo/foldercombo.py:120
 msgid "File System"
-msgstr ""
+msgstr "Файловая система"
 
 #: ../raphodo/foldercombo.py:157
 msgid "Other..."
-msgstr ""
+msgstr "Обзор..."
 
 #. Translators: indicate in combobox that a path does not exist
 #: ../raphodo/foldercombo.py:235
 #, python-format
 msgid "%s (location does not exist)"
-msgstr ""
+msgstr "%s (хранилище не существует)"
 
-#: ../raphodo/generatenameconfig.py:186
+#: ../raphodo/generatenameconfig.py:190
 msgid "Date time"
 msgstr "Дата и время"
 
-#: ../raphodo/generatenameconfig.py:187
+#: ../raphodo/generatenameconfig.py:191
 msgid "Text"
 msgstr "Текст"
 
-#: ../raphodo/generatenameconfig.py:188 ../raphodo/rapid.py:2053
+#: ../raphodo/generatenameconfig.py:192 ../raphodo/rapid.py:2125
 msgid "Filename"
 msgstr "Имя файла"
 
-#: ../raphodo/generatenameconfig.py:189 ../raphodo/preferencedialog.py:488
+#: ../raphodo/generatenameconfig.py:193 ../raphodo/preferencedialog.py:724
 msgid "Metadata"
 msgstr "Метаданные"
 
-#: ../raphodo/generatenameconfig.py:190
+#: ../raphodo/generatenameconfig.py:194
 msgid "Sequences"
-msgstr "Последовательности"
+msgstr "Нумерация"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: ../raphodo/generatenameconfig.py:193
+#: ../raphodo/generatenameconfig.py:197
 msgid "Job code"
 msgstr "Метка"
 
-#: ../raphodo/generatenameconfig.py:194
+#: ../raphodo/generatenameconfig.py:198
 msgid "Image date"
-msgstr "Дата фотографии"
+msgstr "Дата снимка"
 
-#: ../raphodo/generatenameconfig.py:195
+#: ../raphodo/generatenameconfig.py:199
 msgid "Video date"
 msgstr "Дата видео"
 
-#: ../raphodo/generatenameconfig.py:196
+#: ../raphodo/generatenameconfig.py:200
 msgid "Today"
 msgstr "Сегодня"
 
-#: ../raphodo/generatenameconfig.py:197
+#: ../raphodo/generatenameconfig.py:201
 msgid "Yesterday"
 msgstr "Вчера"
 
 #. Translators: Download time is the time and date that the download started (when the
 #. user clicked the Download button)
-#: ../raphodo/generatenameconfig.py:200
+#: ../raphodo/generatenameconfig.py:204
 msgid "Download time"
-msgstr "Время начала загрузки"
+msgstr "Время загрузки"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:203
+#: ../raphodo/generatenameconfig.py:207
 msgid "Name"
 msgstr "Имя"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:206 ../raphodo/rapid.py:2054
+#: ../raphodo/generatenameconfig.py:210 ../raphodo/rapid.py:2126
 msgid "Extension"
 msgstr "Расширение"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:209
+#: ../raphodo/generatenameconfig.py:213
 msgid "Image number"
-msgstr "Номер фотографии"
+msgstr "Номер снимка"
 
-#: ../raphodo/generatenameconfig.py:210
+#: ../raphodo/generatenameconfig.py:214
 msgid "Video number"
 msgstr "Номер видео"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:213
+#: ../raphodo/generatenameconfig.py:217
 msgid "Aperture"
 msgstr "Диафрагма"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:216
+#: ../raphodo/generatenameconfig.py:220
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:219
+#: ../raphodo/generatenameconfig.py:223
 msgid "Exposure time"
 msgstr "Выдержка"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:222
+#: ../raphodo/generatenameconfig.py:226
 msgid "Focal length"
 msgstr "Фокусное расстояние"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:225
+#: ../raphodo/generatenameconfig.py:229
 msgid "Camera make"
 msgstr "Производитель камеры"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:228
+#: ../raphodo/generatenameconfig.py:232
 msgid "Camera model"
 msgstr "Модель камеры"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:231
+#: ../raphodo/generatenameconfig.py:235
 msgid "Short camera model"
 msgstr "Сокращённое название камеры"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:234
+#: ../raphodo/generatenameconfig.py:238
 msgid "Hyphenated short camera model"
-msgstr "Дополнительное сокращенное название камеры"
+msgstr "Сокращенное название камеры с дефисами"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:237
+#: ../raphodo/generatenameconfig.py:241
 msgid "Serial number"
 msgstr "Серийный номер"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:240
+#: ../raphodo/generatenameconfig.py:244
 msgid "Shutter count"
 msgstr "Счётчик кадров"
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: ../raphodo/generatenameconfig.py:242
+#: ../raphodo/generatenameconfig.py:246
 msgid "File number"
 msgstr "Номер файла"
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:244
+#: ../raphodo/generatenameconfig.py:248
 msgid "Folder only"
-msgstr "Только каталог"
+msgstr "Только папка"
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:246
+#: ../raphodo/generatenameconfig.py:250
 msgid "Folder and file"
-msgstr "Каталог и файл"
+msgstr "Папка и файл"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:249
+#: ../raphodo/generatenameconfig.py:253
 msgid "Owner name"
 msgstr "Имя владельца"
 
-#: ../raphodo/generatenameconfig.py:250
+#: ../raphodo/generatenameconfig.py:254
 msgid "Codec"
 msgstr "Кодек"
 
-#: ../raphodo/generatenameconfig.py:251
+#: ../raphodo/generatenameconfig.py:255
 msgid "Width"
 msgstr "Ширина"
 
-#: ../raphodo/generatenameconfig.py:252
+#: ../raphodo/generatenameconfig.py:256
 msgid "Height"
 msgstr "Высота"
 
-#: ../raphodo/generatenameconfig.py:253
+#: ../raphodo/generatenameconfig.py:257
 msgid "Length"
 msgstr "Длительность"
 
-#: ../raphodo/generatenameconfig.py:254
+#: ../raphodo/generatenameconfig.py:258
 msgid "Frames Per Second"
 msgstr "Кадров в секунду"
 
-#: ../raphodo/generatenameconfig.py:255
+#: ../raphodo/generatenameconfig.py:259
 msgid "Artist"
 msgstr "Автор"
 
-#: ../raphodo/generatenameconfig.py:256
+#: ../raphodo/generatenameconfig.py:260
 msgid "Copyright"
 msgstr "Авторские права"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:259
+#: ../raphodo/generatenameconfig.py:263
 msgid "Downloads today"
-msgstr "Загрузок за текущий день"
+msgstr "Загружено сегодня"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:262
+#: ../raphodo/generatenameconfig.py:266
 msgid "Session number"
-msgstr "Номер в текущей сессии"
+msgstr "Сессионная нумерация"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:265
+#: ../raphodo/generatenameconfig.py:269
 msgid "Subfolder number"
-msgstr "Номер подкаталога"
+msgstr "Номер подпапки"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:268
+#: ../raphodo/generatenameconfig.py:272
 msgid "Stored number"
 msgstr "Сквозная нумерация"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: ../raphodo/generatenameconfig.py:271
+#: ../raphodo/generatenameconfig.py:275
 msgid "Sequence letter"
-msgstr "Последовательность символов"
+msgstr "Символьная нумерация"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:274
+#: ../raphodo/generatenameconfig.py:278
 msgid "All digits"
 msgstr "Все цифры"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:277
+#: ../raphodo/generatenameconfig.py:281
 msgid "Last digit"
 msgstr "Последняя цифра"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:280
+#: ../raphodo/generatenameconfig.py:284
 msgid "Last 2 digits"
 msgstr "Последние 2 цифры"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:283
+#: ../raphodo/generatenameconfig.py:287
 msgid "Last 3 digits"
 msgstr "Последние 3 цифры"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:286
+#: ../raphodo/generatenameconfig.py:290
 msgid "Last 4 digits"
 msgstr "Последние 4 цифры"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:289
+#: ../raphodo/generatenameconfig.py:293
 msgid "Original Case"
 msgstr "Исходный Регистр"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:292
+#: ../raphodo/generatenameconfig.py:296
 msgid "UPPERCASE"
-msgstr "ВЕРХНИЙ РЕГИСТР"
+msgstr "ЗАГЛАВНЫЕ БУКВЫ"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:295
+#: ../raphodo/generatenameconfig.py:299
 msgid "lowercase"
-msgstr "нижний регистр"
+msgstr "прописные буквы"
 
-#: ../raphodo/generatenameconfig.py:296
+#: ../raphodo/generatenameconfig.py:300
 msgid "One digit"
 msgstr "Одна цифра"
 
-#: ../raphodo/generatenameconfig.py:297
+#: ../raphodo/generatenameconfig.py:301
 msgid "Two digits"
 msgstr "Две цифры"
 
-#: ../raphodo/generatenameconfig.py:298
+#: ../raphodo/generatenameconfig.py:302
 msgid "Three digits"
 msgstr "Три цифры"
 
-#: ../raphodo/generatenameconfig.py:299
+#: ../raphodo/generatenameconfig.py:303
 msgid "Four digits"
 msgstr "Четыре цифры"
 
-#: ../raphodo/generatenameconfig.py:300
+#: ../raphodo/generatenameconfig.py:304
 msgid "Five digits"
 msgstr "Пять цифр"
 
-#: ../raphodo/generatenameconfig.py:301
+#: ../raphodo/generatenameconfig.py:305
 msgid "Six digits"
 msgstr "Шесть цифр"
 
-#: ../raphodo/generatenameconfig.py:302
+#: ../raphodo/generatenameconfig.py:306
 msgid "Seven digits"
 msgstr "семь цифр"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:305
+#: ../raphodo/generatenameconfig.py:309
 msgid "Subseconds"
 msgstr "Доли секунды"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:308 ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:312 ../raphodo/generatenameconfig.py:393
 msgid "YYYYMMDD"
 msgstr "ГГГГММДД"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:311 ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:315 ../raphodo/generatenameconfig.py:394
 msgid "YYYY-MM-DD"
 msgstr "ГГГГ-ММ-ДД"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:314 ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:318 ../raphodo/generatenameconfig.py:395
 msgid "YYYY_MM_DD"
-msgstr ""
+msgstr "ГГГГ_ММ_ДД"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:317
+#: ../raphodo/generatenameconfig.py:321
 msgid "YYMMDD"
 msgstr "ГГММДД"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:320
+#: ../raphodo/generatenameconfig.py:324
 msgid "YY-MM-DD"
 msgstr "ГГ-ММ-ДД"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:323
+#: ../raphodo/generatenameconfig.py:327
 msgid "YY_MM_DD"
-msgstr ""
+msgstr "ГГ_ММ_ДД"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:326
+#: ../raphodo/generatenameconfig.py:330
 msgid "MMDDYYYY"
 msgstr "ММДДГГГГ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:329
+#: ../raphodo/generatenameconfig.py:333
 msgid "MMDDYY"
 msgstr "ММДДГГ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:332
+#: ../raphodo/generatenameconfig.py:336
 msgid "MMDD"
 msgstr "ММДД"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:335
+#: ../raphodo/generatenameconfig.py:339
 msgid "DDMMYYYY"
 msgstr "ДДММГГГГ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:338
+#: ../raphodo/generatenameconfig.py:342
 msgid "DDMMYY"
 msgstr "ДДММГГ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:341 ../raphodo/generatenameconfig.py:389
-#: ../raphodo/generatenameconfig.py:390 ../raphodo/generatenameconfig.py:391
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:345 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:394 ../raphodo/generatenameconfig.py:395
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:397
 msgid "YYYY"
 msgstr "ГГГГ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:344
+#: ../raphodo/generatenameconfig.py:348
 msgid "YY"
 msgstr "ГГ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:347
+#: ../raphodo/generatenameconfig.py:351
 msgid "MM"
 msgstr "ММ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:350
+#: ../raphodo/generatenameconfig.py:354
 msgid "DD"
 msgstr "ДД"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:353
+#: ../raphodo/generatenameconfig.py:357
 msgid "Month (full)"
 msgstr "Месяц (полностью)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:356
+#: ../raphodo/generatenameconfig.py:360
 msgid "Month (abbreviated)"
 msgstr "Месяц (кратко)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:359
+#: ../raphodo/generatenameconfig.py:363
 msgid "HHMMSS"
 msgstr "ЧЧММСС"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:362
+#: ../raphodo/generatenameconfig.py:366
 msgid "HHMM"
 msgstr "ЧЧММ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:365
+#: ../raphodo/generatenameconfig.py:369
 msgid "HH-MM-SS"
 msgstr "ЧЧ-ММ-СС"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:368
+#: ../raphodo/generatenameconfig.py:372
 msgid "HH-MM"
 msgstr "ЧЧ-ММ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:371
+#: ../raphodo/generatenameconfig.py:375
 msgid "HH"
 msgstr "ЧЧ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:374
+#: ../raphodo/generatenameconfig.py:378
 msgid "MM (minutes)"
 msgstr "ММ (мин.)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:377
+#: ../raphodo/generatenameconfig.py:381
 msgid "SS"
 msgstr "СС"
 
-#: ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:393
 msgid "Date"
-msgstr ""
+msgstr "Дата"
 
-#: ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:394
 msgid "Date (hyphens)"
-msgstr ""
+msgstr "Дата (с дефисами)"
 
-#: ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:395
 msgid "Date (underscores)"
-msgstr ""
+msgstr "Дата (с подчерками)"
 
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:438
-#: ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:442
+#: ../raphodo/generatenameconfig.py:537
 msgid "Date and Job Code"
-msgstr ""
+msgstr "Дата и Метка"
 
-#: ../raphodo/generatenameconfig.py:392
+#: ../raphodo/generatenameconfig.py:396
 msgid "YYYYMM_Job Code"
-msgstr ""
+msgstr "ГГГГММ_Метка"
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "Date and Job Code Subfolder"
-msgstr ""
+msgstr "Дата и подпапка Метки"
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "YYYYMM"
-msgstr ""
+msgstr "ГГГГММ"
 
-#: ../raphodo/generatenameconfig.py:393 ../raphodo/jobcodepanel.py:198
-#: ../raphodo/nameeditor.py:827 ../raphodo/rapid.py:1809
+#: ../raphodo/generatenameconfig.py:397 ../raphodo/jobcodepanel.py:199
+#: ../raphodo/nameeditor.py:833 ../raphodo/rapid.py:1852
 #: ../raphodo/renamepanel.py:83 ../raphodo/renamepanel.py:241
 msgid "Job Code"
 msgstr "Метка"
 
-#: ../raphodo/generatenameconfig.py:433 ../raphodo/generatenameconfig.py:512
+#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:532
 msgid "Original Filename"
-msgstr ""
+msgstr "Исходное имя файла"
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "Date-Time and Downloads today"
-msgstr ""
+msgstr "Дата-Время и Загружено сегодня"
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "YYYYMMDD-HHMM-1"
-msgstr ""
+msgstr "ГГГГММДД-ЧЧММСС-1"
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "Date and Downloads today"
-msgstr ""
+msgstr "Дата и Загружено сегодня"
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "YYYYMMDD-1"
-msgstr ""
+msgstr "ГГГГММДД-1"
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "Date-Time and Image number"
-msgstr ""
+msgstr "Дата-Время и Номер снимка"
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "YYYYMMDD-1234"
-msgstr ""
+msgstr "ГГГГММДД-1234"
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "Date-Time and Job Code"
-msgstr ""
+msgstr "Дата-Время и Метка"
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "YYYYMMDD-HHMM-Job Code-1"
-msgstr ""
+msgstr "ГГГГММДД-ЧЧММ-Метка-1"
 
-#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:442 ../raphodo/generatenameconfig.py:537
 msgid "YYYYMMDD-Job Code-1"
-msgstr ""
+msgstr "ГГГГММДД-Метка-1"
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "Date-Time and Video number"
-msgstr ""
+msgstr "Дата-Время и Номер видео"
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "YYYYMMDD_1234"
-msgstr ""
+msgstr "ГГГГММДД_1234"
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "Resolution"
-msgstr ""
+msgstr "Разрешение"
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "YYYYMMDD-HHMM-1-1920x1080"
-msgstr ""
+msgstr "ГГГГММДД-ЧЧММ-1-1920x1080"
 
 #: ../raphodo/jobcodepanel.py:64
 msgid "Enter a new Job Code, or select a previous one"
-msgstr "Введите новую метку или выберите одну из существующих"
+msgstr "Задайте новую Метку или выберите из существующих"
 
 #. Translators: the value substituted will be something like '1 photo'.
 #: ../raphodo/jobcodepanel.py:70
 #, python-format
 msgid "The Job Code will be applied to %s that does not yet have a Job Code."
-msgstr ""
+msgstr "Метка будет применена к %s, еще не имеющему Метки"
 
 #. Translators: the value substituted will be something like '85 photos and 5
 #. videos'.
 #: ../raphodo/jobcodepanel.py:75
 #, python-format
 msgid "The Job Code will be applied to %s that do not yet have a Job Code."
-msgstr ""
+msgstr "Метка будет применена к %s, еще не имеющим Метки"
 
 #: ../raphodo/jobcodepanel.py:78
 msgid "Apply Job Code to Download"
-msgstr ""
+msgstr "Применить Метку к Загрузке"
 
 #: ../raphodo/jobcodepanel.py:80
 msgid "Enter a new Job Code"
-msgstr "Введите новую метку"
+msgstr "Задайте новую Метку"
 
 #: ../raphodo/jobcodepanel.py:86
 msgid "The new Job Code will not be applied to any photos or videos."
-msgstr ""
+msgstr "Новая Метка не будет применена к фото и видео."
 
 #. Translators: the value substituted will be something like '100 photos and 5
 #. videos'.
 #: ../raphodo/jobcodepanel.py:92
 #, python-format
 msgid "The new Job Code will <b>not</b> be applied to %s."
-msgstr ""
+msgstr "Новая Метка <b>не</b> будет применена к  %s."
 
 #. Translators: the value substituted will be something like '100 photos and 5
 #. videos'.
 #: ../raphodo/jobcodepanel.py:97
 #, python-format
 msgid "The new Job Code will be applied to %s."
-msgstr ""
+msgstr "Новая Метка будет применена к %s."
 
 #: ../raphodo/jobcodepanel.py:99
 msgid "New Job Code"
-msgstr ""
+msgstr "Новая Метка"
 
 #: ../raphodo/jobcodepanel.py:134
 msgid "&Job Code:"
-msgstr ""
+msgstr "Метка"
 
 #: ../raphodo/jobcodepanel.py:136 ../raphodo/rememberthisdialog.py:68
 msgid "&Remember this choice"
-msgstr ""
+msgstr "Запомнить этот выбор"
 
-#: ../raphodo/jobcodepanel.py:185
+#: ../raphodo/jobcodepanel.py:186
 msgid ""
 "Select photos and videos to be able to apply a new or existing Job Code to "
 "them."
 msgstr ""
-
-#: ../raphodo/jobcodepanel.py:186
-msgid "The new Job Code will be applied to all selected photos and/or videos."
-msgstr ""
+"Выберите фото и видео, к которым можно применить новую или существующую "
+"Метку."
 
 #: ../raphodo/jobcodepanel.py:187
 msgid ""
+"The new Job Code will be applied to all selected photos and/or videos."
+msgstr "Новая Метка будет применена ко всем выбранным фото и/или видео."
+
+#: ../raphodo/jobcodepanel.py:188
+msgid ""
 "Click the Apply button to apply the current Job Code to all selected photos "
 "and/or videos. You can also simply double click the Job Code."
 msgstr ""
+"Нажмите кнопку Применить, чтобы применить текущую Метку ко всем выбранным "
+"фото и/или видео. Также вы можете просто дважды кликнуть по Метке."
 
-#: ../raphodo/jobcodepanel.py:189
+#: ../raphodo/jobcodepanel.py:190
 msgid ""
 "Removing a Job Code removes it only from the list of saved Job Codes, not "
 "from any photos or videos that it may have been applied to."
 msgstr ""
+"Удаление Метки удалит ее только из списка сохраненных Меток, но не из фото "
+"или видео, к которым она могла быть применена."
 
-#: ../raphodo/jobcodepanel.py:191
+#: ../raphodo/jobcodepanel.py:192
 msgid ""
 "If you want to use Job Codes, configure file renaming or destination "
 "subfolder names to use them."
 msgstr ""
+"Если вы хотите использовать Метки, настройте переименование файлов или "
+"создание имен подпапок с их использованием."
 
-#: ../raphodo/jobcodepanel.py:197
+#: ../raphodo/jobcodepanel.py:198
 msgid "Last Used"
-msgstr ""
+msgstr "Последние"
 
-#: ../raphodo/jobcodepanel.py:202
+#: ../raphodo/jobcodepanel.py:203
 msgid "Job Code Sort:"
-msgstr ""
+msgstr "Сортировка Меток:"
 
-#: ../raphodo/jobcodepanel.py:205 ../raphodo/rapid.py:2061
+#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2133
 msgid "Ascending"
-msgstr ""
+msgstr "По возрастанию"
 
-#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2062
+#: ../raphodo/jobcodepanel.py:207 ../raphodo/rapid.py:2134
 msgid "Descending"
-msgstr ""
+msgstr "По убыванию"
 
-#: ../raphodo/jobcodepanel.py:216
+#: ../raphodo/jobcodepanel.py:217
 msgid "&New..."
-msgstr ""
+msgstr "Новая..."
 
-#: ../raphodo/jobcodepanel.py:220
+#: ../raphodo/jobcodepanel.py:221
 msgid "&Apply"
-msgstr ""
+msgstr "Применить"
 
-#: ../raphodo/jobcodepanel.py:224
+#: ../raphodo/jobcodepanel.py:225
 msgid "&Remove"
-msgstr ""
+msgstr "Удалить"
 
-#: ../raphodo/jobcodepanel.py:228 ../raphodo/preferencedialog.py:125
-#: ../raphodo/preferencedialog.py:154 ../raphodo/preferencedialog.py:433
+#: ../raphodo/jobcodepanel.py:229 ../raphodo/preferencedialog.py:200
+#: ../raphodo/preferencedialog.py:229 ../raphodo/preferencedialog.py:531
 msgid "Remove All"
-msgstr ""
+msgstr "Удалить все"
 
-#: ../raphodo/jobcodepanel.py:427
+#: ../raphodo/jobcodepanel.py:428
 msgid "Do you really want to remove all the Job Codes?"
-msgstr ""
+msgstr "Вы действительно хотите удалить все Метки?"
 
-#: ../raphodo/jobcodepanel.py:429
+#: ../raphodo/jobcodepanel.py:430
 msgid "Remove all Job Codes"
-msgstr ""
+msgstr "Удалить все Метки"
 
-#: ../raphodo/jobcodepanel.py:492
+#: ../raphodo/jobcodepanel.py:493
 msgid "Job Codes"
 msgstr "Метки"
 
@@ -1568,558 +2331,833 @@ msgstr "Метки"
 #: ../raphodo/messagewidget.py:65
 #, python-format
 msgid "<i><b>Hint:</b> %(message)s"
-msgstr ""
+msgstr "<i><b>Подсказка:</b> %(message)s"
 
-#: ../raphodo/nameeditor.py:418 ../raphodo/nameeditor.py:432
+#: ../raphodo/nameeditor.py:423 ../raphodo/nameeditor.py:437
 #, python-format
 msgid "%(description)s - %(elements)s"
-msgstr ""
+msgstr "%(description)s - %(elements)s"
 
-#: ../raphodo/nameeditor.py:512
+#: ../raphodo/nameeditor.py:517
 msgid "Save New Custom Preset..."
-msgstr ""
+msgstr "Сохранить новую предустановку"
 
-#: ../raphodo/nameeditor.py:513
+#: ../raphodo/nameeditor.py:518
 msgid "Remove All Custom Presets..."
-msgstr ""
+msgstr "Удалить все предустановки"
 
-#: ../raphodo/nameeditor.py:559
+#: ../raphodo/nameeditor.py:564
 msgid "(New Custom Preset)"
-msgstr ""
+msgstr "(Новая предустановка)"
 
-#: ../raphodo/nameeditor.py:576
+#: ../raphodo/nameeditor.py:581
 #, python-format
 msgid "%s (edited)"
-msgstr ""
+msgstr "%s (изменена)"
 
-#: ../raphodo/nameeditor.py:579 ../raphodo/nameeditor.py:1370
+#: ../raphodo/nameeditor.py:584 ../raphodo/nameeditor.py:1379
 #, python-format
 msgid "Update Custom Preset \"%s\""
-msgstr ""
+msgstr "Обновить предустановку \"%s\""
 
-#: ../raphodo/nameeditor.py:667
+#: ../raphodo/nameeditor.py:672
 msgid "Save New Custom Preset - Rapid Photo Downloader"
-msgstr ""
+msgstr "Сохранить новую предустановку - Rapid Photo Downloader"
 
-#: ../raphodo/nameeditor.py:675
+#: ../raphodo/nameeditor.py:680
 msgid "Preset Name:"
-msgstr ""
+msgstr "Имя предустановки"
+
+#: ../raphodo/nameeditor.py:799
+msgid "Photo Subfolder Generation Editor"
+msgstr "Редактор создания подпапок фото"
+
+#: ../raphodo/nameeditor.py:805
+msgid "Video Subfolder Generation Editor"
+msgstr "Редактор создания подпапок видео"
 
-#: ../raphodo/nameeditor.py:836
+#: ../raphodo/nameeditor.py:811
+msgid "Photo Renaming Editor"
+msgstr "Редактор переименования фото"
+
+#: ../raphodo/nameeditor.py:817
+msgid "Video Renaming Editor"
+msgstr "Редактор переименования видео"
+
+#: ../raphodo/nameeditor.py:842
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>There is insufficient data to "
 "fully generate the name. Please use other renaming options.</i>"
 msgstr ""
+"<b><font color=\"red\">Внимание:</font></b> <i>Недостаточно данных для "
+"полного создания имени. Пожалуйста используйте другие настройки "
+"переименования.</i>"
 
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees.
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:846
+#: ../raphodo/nameeditor.py:853
 #, python-format
 msgid "The character</i> %(separator)s <i>creates a new subfolder level."
-msgstr ""
+msgstr "Символ</i> %(separator)s <i>создает новый уровень подпапок."
 
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:851
+#: ../raphodo/nameeditor.py:858
 #, python-format
 msgid ""
 "There is no need start or end with the folder separator </i> "
 "%(separator)s<i>, because it is added automatically."
 msgstr ""
+"Нет необходимости начинать с символа разделителя папок </i> %(separator)s<i> "
+"или заканчивать им, потому что он добавляется автомвтически."
 
-#: ../raphodo/nameeditor.py:859
+#: ../raphodo/nameeditor.py:866
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>Unique filenames may not be "
 "generated. Make filenames unique by using Sequence values.</i>"
 msgstr ""
+"<b><font color=\"red\">Внимание:</font></b> <i>Уникальные имена файлов не "
+"будут созданы. Сделайте имена файлов уникальными, используя Нумерацию.</i>"
 
-#: ../raphodo/nameeditor.py:882 ../raphodo/renamepanel.py:121
+#: ../raphodo/nameeditor.py:889 ../raphodo/renamepanel.py:121
 msgid "Preset:"
-msgstr ""
+msgstr "Предустановка:"
 
 #. Translators: appears in a combobox, e.g. Image Date (YYYY)
-#: ../raphodo/nameeditor.py:959 ../raphodo/nameeditor.py:980
+#: ../raphodo/nameeditor.py:966 ../raphodo/nameeditor.py:987
 #, python-brace-format
 msgid "{choice} ({variant})"
-msgstr ""
+msgstr "{choice} ({variant})"
 
-#: ../raphodo/nameeditor.py:1005 ../raphodo/preferencedialog.py:530
+#: ../raphodo/nameeditor.py:1012 ../raphodo/preferencedialog.py:783
 msgid "Get help online..."
-msgstr ""
+msgstr "Помощь онлайн..."
 
-#: ../raphodo/nameeditor.py:1025
+#: ../raphodo/nameeditor.py:1034
 msgid "Insert"
-msgstr ""
+msgstr "Вставить"
 
-#: ../raphodo/nameeditor.py:1351
+#: ../raphodo/nameeditor.py:1360
 msgid "Save Preset - Rapid Photo Downloader"
-msgstr ""
+msgstr "Сохранить предустановку - Rapid Photo Downloader"
 
-#: ../raphodo/nameeditor.py:1356
+#: ../raphodo/nameeditor.py:1365
 msgid ""
-"<b>Do you want to save the changes in a new custom preset?</"
-"b><br><br>Creating a custom preset is not required, but can help you keep "
-"organized.<br><br>The changes to the preferences will still be applied "
-"regardless of whether you create a new custom preset or not."
+"<b>Do you want to save the changes in a new custom "
+"preset?</b><br><br>Creating a custom preset is not required, but can help "
+"you keep organized.<br><br>The changes to the preferences will still be "
+"applied regardless of whether you create a new custom preset or not."
 msgstr ""
+"<b>Вы хотите сохранить изменения в новой предустановке?</b><br><br>Создание "
+"своих предустановок не является обязательным, но может помочь вам навести "
+"порядок.<br><br>Изменения в настройках все равно будут применены, независимо "
+"от того, создадите ли вы свою предустановку или нет."
 
-#: ../raphodo/nameeditor.py:1365
+#: ../raphodo/nameeditor.py:1374
 msgid ""
 "<b>Do you want to save the changes in a custom preset?</b><br><br>If you "
 "like, you can create a new custom preset or update the existing custom "
 "preset.<br><br>The changes to the preferences will still be applied "
 "regardless of whether you save a custom preset or not."
 msgstr ""
+"<b>Вы хотите сохранить изменения в предустановке?</b><br><br>Если хотите, вы "
+"можете создать новую предустановку или обновить "
+"существующую.<br><br>Изменения в настройках все равно будут применены, "
+"независимо от того, создадите ли вы свою предустановку или нет."
 
-#: ../raphodo/nameeditor.py:1372
+#: ../raphodo/nameeditor.py:1381
 msgid "Save New Custom Preset"
-msgstr ""
+msgstr "Сохранить новую предустановку"
 
-#: ../raphodo/newversion.py:306
+#: ../raphodo/newversion.py:312
 msgid "Checking for new version..."
-msgstr ""
+msgstr "Проверка наличие новой версии..."
 
-#: ../raphodo/newversion.py:307
+#: ../raphodo/newversion.py:313
 msgid "You are running the latest version."
-msgstr ""
+msgstr "Вы используете последнюю версию."
 
-#: ../raphodo/newversion.py:308
+#: ../raphodo/newversion.py:314
 msgid "Failed to contact the update server."
-msgstr ""
+msgstr "Ошибка соединения с сервером обновлений."
 
-#: ../raphodo/newversion.py:310
+#: ../raphodo/newversion.py:316
 #, python-format
 msgid "A new version of Rapid Photo Downloader (%s) is available."
-msgstr ""
+msgstr "Доступна новая версия Rapid Photo Downloader (%s)."
 
-#: ../raphodo/newversion.py:312
+#: ../raphodo/newversion.py:318
 msgid "Do you want to download the new version?"
-msgstr ""
+msgstr "Вы хотите загрузить новую версию?"
 
-#: ../raphodo/newversion.py:313
+#: ../raphodo/newversion.py:319
 #, python-format
 msgid "Changes in the new release can be viewed <a href=\"%s\">here</a>."
 msgstr ""
+"Изменения в новой версии вы можете посмотреть <a href=\"%s\">здесь</a>."
 
 #. Translators: this text appears in a button - the & sets the s key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:340 ../raphodo/newversion.py:353
+#: ../raphodo/newversion.py:348 ../raphodo/newversion.py:363
 msgid "&Skip this release"
-msgstr ""
+msgstr "Пропустить эту версию"
 
 #. Translators: this text appears in a button - the & sets the o key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:356
+#: ../raphodo/newversion.py:366
 msgid "&Open Download Page"
-msgstr ""
+msgstr "Открыть страницу загрузки"
 
-#: ../raphodo/newversion.py:376
+#: ../raphodo/newversion.py:386
 msgid "Rapid Photo Downloader updates"
-msgstr ""
+msgstr "Обновление Rapid Photo Downloader"
 
 #. Translators: shows how much of a file has been downloaded e.g  123 KB of 1.3 MB
-#: ../raphodo/newversion.py:478
+#: ../raphodo/newversion.py:488
 #, python-format
 msgid "%(downloaded)s of %(total)s"
-msgstr ""
+msgstr "%(downloaded)s из %(total)s"
 
-#: ../raphodo/newversion.py:495
+#: ../raphodo/newversion.py:507
 msgid "Downloading..."
-msgstr ""
+msgstr "Загрузка..."
 
-#: ../raphodo/preferencedialog.py:76
+#: ../raphodo/preferencedialog.py:86
 msgid "Preferences"
-msgstr ""
+msgstr "Настройки"
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Automation"
 msgstr "Автоматизация"
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Thumbnails"
 msgstr "Миниатюры"
 
-#: ../raphodo/preferencedialog.py:85 ../raphodo/preferencedialog.py:343
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/preferencedialog.py:428
 msgid "Error Handling"
 msgstr "Обработка ошибок"
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Warnings"
-msgstr ""
+msgstr "Предупреждения"
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:109
+msgid "Consolidation"
+msgstr "Объединение"
+
+#: ../raphodo/preferencedialog.py:109 ../raphodo/preferencedialog.py:119
 msgid "Miscellaneous"
-msgstr "Прочие"
+msgstr "Разное"
 
-#: ../raphodo/preferencedialog.py:94
+#: ../raphodo/preferencedialog.py:147
 msgid "Device Scanning"
-msgstr ""
+msgstr "Сканирование устройств"
 
-#: ../raphodo/preferencedialog.py:96
+#: ../raphodo/preferencedialog.py:148
 msgid "Scan only external devices"
-msgstr ""
+msgstr "Сканировать только внешние устройства"
 
-#: ../raphodo/preferencedialog.py:98
+#: ../raphodo/preferencedialog.py:150
 msgid ""
 "Scan for photos and videos only on devices that are external to the "
 "computer,\n"
 "including cameras, memory cards, external hard drives, and USB flash drives."
 msgstr ""
+"Сканировать фото и видео только на внешних устройствах по отношению к этому "
+"компьютеру.\n"
+"Включая камеры, карты памяти, внешние жесткие диски и USB флеш диски."
+
+#: ../raphodo/preferencedialog.py:153
+msgid "Scan only specific folders on devices"
+msgstr "Сканировать на усьройстве только определенные папки"
 
-#: ../raphodo/preferencedialog.py:102
-msgid "Scan non-camera devices lacking a DCIM folder"
+#: ../raphodo/preferencedialog.py:155
+msgid ""
+"Scan for photos and videos only in the folders specified below (except "
+"paths\n"
+"specified in Ignored Paths).\n"
+"\n"
+"Changing this setting causes all devices to be scanned again."
 msgstr ""
+"Сканировать на наличие фото и видео только папки, указанные ниже (за\n"
+"исключением папок заданных в Путях для исключения).\n"
+"\n"
+"Изменение этой настройки приведет к повторному сканированию всех устройств."
+
+#: ../raphodo/preferencedialog.py:161
+msgid "Folders to scan:"
+msgstr "Папки для сканирования:"
+
+#: ../raphodo/preferencedialog.py:164
+msgid ""
+"Folders at the base level of device file systems that will be scanned\n"
+"for photos and videos."
+msgstr ""
+"Папки в корне файловой системы устройства, которые будут\n"
+"просканированы на наличие фото и видео."
+
+#: ../raphodo/preferencedialog.py:167 ../raphodo/preferencedialog.py:219
+msgid "Add..."
+msgstr "Добавить…"
 
-#: ../raphodo/preferencedialog.py:104
+#: ../raphodo/preferencedialog.py:169
 msgid ""
-"Scan the entirety of a device for photos and videos, irrespective of whether "
-"it contains a DCIM folder,\n"
-"as opposed to only scanning within a DCIM folder.\n"
+"Add a folder to the list of folders to scan for photos and videos.\n"
 "\n"
-"Changing this setting causes all devices to be scanned again.\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+"Добавить папку в список папок для сканирования на наличие фото и видео.\n"
+"\n"
+"Изменение этой настройки приведет к повторному сканированию всех устройств."
+
+#: ../raphodo/preferencedialog.py:172 ../raphodo/preferencedialog.py:198
+#: ../raphodo/preferencedialog.py:224 ../raphodo/preferencedialog.py:529
+msgid "Remove"
+msgstr "Удалить"
+
+#: ../raphodo/preferencedialog.py:174
+msgid ""
+"Remove a folder from the list of folders to scan for photos and videos.\n"
 "\n"
-"Note: With cameras, only the DCIM folder is scanned."
+"Changing this setting causes all devices to be scanned again."
 msgstr ""
+"Удалить папку из списка папок для сканирования на наличие фото и видео.\n"
+"\n"
+"Изменение этой настройки приведет к повторному сканированию всех устройств."
 
-#: ../raphodo/preferencedialog.py:116
+#: ../raphodo/preferencedialog.py:191
 msgid "Devices that have been set to automatically ignore or download from."
 msgstr ""
+"Устройства могут быть настроены для автоматического их игнорирования или "
+"автоматической загрузки с них."
 
-#: ../raphodo/preferencedialog.py:117
+#: ../raphodo/preferencedialog.py:192
 msgid "Remembered Devices"
-msgstr ""
+msgstr "Сохраненные устройства"
 
-#: ../raphodo/preferencedialog.py:121
+#: ../raphodo/preferencedialog.py:196
 msgid ""
 "Remove a device from the list of devices to automatically ignore or download "
 "from."
 msgstr ""
+"Удалить устройство из списка устройств для автоматической загрузки или "
+"игнорирования."
 
-#: ../raphodo/preferencedialog.py:123 ../raphodo/preferencedialog.py:149
-#: ../raphodo/preferencedialog.py:431
-msgid "Remove"
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:127
+#: ../raphodo/preferencedialog.py:202
 msgid ""
 "Clear the list of devices from which to automatically ignore or download "
 "from.\n"
 "\n"
 "Note: Changes take effect when the computer is next scanned for devices."
 msgstr ""
+"Очистить список устройств для автоматической загрузки или игнорирования.\n"
+"\n"
+"Замечание: Изменения вступят в силу при следующем сканировании устройств."
 
-#: ../raphodo/preferencedialog.py:140
+#: ../raphodo/preferencedialog.py:215
 msgid "Ignored Paths"
-msgstr "Пропускаемые расположения"
+msgstr "Игнорируемые пути"
 
-#: ../raphodo/preferencedialog.py:141
+#: ../raphodo/preferencedialog.py:216
 msgid ""
 "The end part of a path that should never be scanned for photos or videos."
 msgstr ""
+"Конечная часть путей, которые никогда не будут сканироваться на наличие фото "
+"или видео."
 
-#: ../raphodo/preferencedialog.py:144
-msgid "Add..."
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:146
+#: ../raphodo/preferencedialog.py:221
 msgid ""
 "Add a path to the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
+"Добавить путь в список путей для игнорирования.\n"
+"\n"
+"Изменение этого параметра приведет к повторному сканированию всех устройств."
 
-#: ../raphodo/preferencedialog.py:151
+#: ../raphodo/preferencedialog.py:226
 msgid ""
 "Remove a path from the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
+"Удалить путь из списка путей для игнорирования.\n"
+"\n"
+"Изменение этого параметра приведет к повторному сканированию всех устройств."
 
-#: ../raphodo/preferencedialog.py:156
+#: ../raphodo/preferencedialog.py:231
 msgid ""
 "Clear the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
+"Очистить список путей для игнорирования.\n"
+"\n"
+"Изменение этого параметра приведет к повторному сканированию всех устройств."
 
-#: ../raphodo/preferencedialog.py:164
+#: ../raphodo/preferencedialog.py:239
 msgid ""
-"Use python-style <a href=\"http://damonlynch.net/rapid/documentation/"
-"#regularexpressions\">regular expressions</a>"
+"Use python-style <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">regula"
+"r expressions</a>"
 msgstr ""
+"Использовать <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">регуля"
+"рные выражения</a> в стиле Python"
 
-#: ../raphodo/preferencedialog.py:168
+#: ../raphodo/preferencedialog.py:243
 msgid ""
 "Use regular expressions in the list of ignored paths.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
+"Использовать регулярные выражения в списке игнорируемых путей.\n"
+"\n"
+"Изменение этого параметра приведет к повторному сканированию всех устройств."
 
-#: ../raphodo/preferencedialog.py:208
+#: ../raphodo/preferencedialog.py:283
 msgid "Program Automation"
-msgstr ""
+msgstr "Автоматизация программы"
 
-#: ../raphodo/preferencedialog.py:209
+#: ../raphodo/preferencedialog.py:284
 msgid "Start downloading at program startup"
-msgstr ""
-"Начать загрузку фотографий и видеороликов сразу после запуска программы"
+msgstr "Начать загрузку при запуске программы"
 
-#: ../raphodo/preferencedialog.py:210
+#: ../raphodo/preferencedialog.py:285
 msgid "Start downloading upon device insertion"
 msgstr "Начать загрузку сразу после подключения носителя"
 
-#: ../raphodo/preferencedialog.py:211
+#: ../raphodo/preferencedialog.py:286
 msgid "Unmount (eject) device upon download completion"
-msgstr ""
+msgstr "Отмонтировать (извлечь) устройство по окончании загрузки"
 
-#: ../raphodo/preferencedialog.py:212
+#: ../raphodo/preferencedialog.py:287
 msgid "Exit program when download completes"
 msgstr "Завершить программу после загрузки"
 
-#: ../raphodo/preferencedialog.py:213
+#: ../raphodo/preferencedialog.py:288
 msgid "Exit program even if download had warnings or errors"
 msgstr "Завершить программу даже при ошибках загрузки"
 
-#: ../raphodo/preferencedialog.py:240
+#: ../raphodo/preferencedialog.py:315
 msgid "Thumbnail Generation"
-msgstr ""
+msgstr "Создание миниатюр"
 
-#: ../raphodo/preferencedialog.py:241
+#: ../raphodo/preferencedialog.py:316
 msgid "Generate thumbnails"
-msgstr ""
+msgstr "Создать миниатюры"
 
-#: ../raphodo/preferencedialog.py:242
+#: ../raphodo/preferencedialog.py:318
 msgid "Generate thumbnails to show in the main program window"
-msgstr ""
+msgstr "Создать миниатюры для отображения в главном окне программы"
 
-#: ../raphodo/preferencedialog.py:244
+#: ../raphodo/preferencedialog.py:320
 msgid "Cache thumbnails"
-msgstr ""
+msgstr "Кэшировать миниатюры"
 
-#: ../raphodo/preferencedialog.py:245
+#: ../raphodo/preferencedialog.py:323
 msgid ""
 "Save thumbnails shown in the main program window in a thumbnail cache unique "
 "to Rapid Photo Downloader"
 msgstr ""
+"Сохранять отображаемые в главном окне программы миниатюры в персональном "
+"кеше миниатюр Rapid Photo Downloader"
 
-#: ../raphodo/preferencedialog.py:247
+#: ../raphodo/preferencedialog.py:327
 msgid "Generate system thumbnails"
-msgstr ""
+msgstr "Создать миниатюры в системе"
 
-#: ../raphodo/preferencedialog.py:248
+#: ../raphodo/preferencedialog.py:330
 msgid ""
 "While downloading, save thumbnails that can be used by desktop file managers "
 "and other programs"
 msgstr ""
+"Во время загрузки сохранять миниатюры, которые могут быть использованы файл "
+"менеджерами и другими программами"
 
-#: ../raphodo/preferencedialog.py:255
+#: ../raphodo/preferencedialog.py:339
 msgid "Number of CPU cores used to generate thumbnails."
-msgstr ""
+msgstr "Количество ядер процессора для использования при создании миниатюр."
 
-#: ../raphodo/preferencedialog.py:256
+#: ../raphodo/preferencedialog.py:340
 msgid "CPU cores:"
-msgstr ""
+msgstr "Ядра процессора:"
 
 #. Translators: the * acts as an asterisk to denote a reference to an annotation
 #. such as '* Takes effect upon program restart'
-#: ../raphodo/preferencedialog.py:271 ../raphodo/preferencedialog.py:317
+#: ../raphodo/preferencedialog.py:355 ../raphodo/preferencedialog.py:401
 msgid "*"
-msgstr ""
+msgstr "*"
 
-#: ../raphodo/preferencedialog.py:294
+#: ../raphodo/preferencedialog.py:378
 msgid "Thumbnail Cache"
-msgstr ""
+msgstr "Кэш миниатюр"
 
-#: ../raphodo/preferencedialog.py:296
+#: ../raphodo/preferencedialog.py:380
 msgid "Calculating..."
-msgstr ""
+msgstr "Вычисление…"
 
-#: ../raphodo/preferencedialog.py:302
+#: ../raphodo/preferencedialog.py:386
 msgid "days"
-msgstr ""
+msgstr "день(дня,дней)"
 
-#: ../raphodo/preferencedialog.py:303
+#: ../raphodo/preferencedialog.py:387
 msgid "forever"
-msgstr ""
+msgstr "всегда"
 
-#: ../raphodo/preferencedialog.py:308
+#: ../raphodo/preferencedialog.py:392
 msgid "Cache size:"
-msgstr ""
+msgstr "Размер кэша:"
 
-#: ../raphodo/preferencedialog.py:310
+#: ../raphodo/preferencedialog.py:394
 msgid "Number of thumbnails:"
-msgstr ""
+msgstr "Количество миниатюр:"
 
-#: ../raphodo/preferencedialog.py:312
+#: ../raphodo/preferencedialog.py:396
 msgid "Database size:"
-msgstr ""
+msgstr "Размер базы данных:"
 
-#: ../raphodo/preferencedialog.py:314
+#: ../raphodo/preferencedialog.py:398
 msgid "Cache unaccessed thumbnails for:"
-msgstr ""
+msgstr "В кэше недоступны миниатюры для:"
 
-#: ../raphodo/preferencedialog.py:322
+#: ../raphodo/preferencedialog.py:406
 msgid "Purge Cache..."
-msgstr ""
+msgstr "Очистка кэша..."
 
-#: ../raphodo/preferencedialog.py:323
+#: ../raphodo/preferencedialog.py:408
 msgid "Optimize Cache..."
-msgstr ""
+msgstr "Оптимизация кэша..."
 
-#: ../raphodo/preferencedialog.py:336
+#: ../raphodo/preferencedialog.py:421
 msgid "* Takes effect upon program restart"
-msgstr ""
+msgstr "* Вступит в силу после перезапуска программы"
 
-#: ../raphodo/preferencedialog.py:346
+#: ../raphodo/preferencedialog.py:431
 msgid "Skip download"
 msgstr "Пропустить загрузку"
 
-#: ../raphodo/preferencedialog.py:347
+#: ../raphodo/preferencedialog.py:432
 msgid "Don't download the file, and issue an error message"
-msgstr ""
+msgstr "Не загружать файл, и выдать сообщение об ошибке"
 
-#: ../raphodo/preferencedialog.py:348
+#: ../raphodo/preferencedialog.py:433
 msgid "Add unique identifier"
 msgstr "Добавить уникальную метку"
 
-#: ../raphodo/preferencedialog.py:349
+#: ../raphodo/preferencedialog.py:436
 msgid ""
 "Add an identifier like _1 or _2 to the end of the filename, immediately "
 "before the file's extension"
 msgstr ""
+"Добавить метку вида  _1 или _2 в конец имени файла, непосредственно перед "
+"расширением"
 
-#: ../raphodo/preferencedialog.py:355
+#: ../raphodo/preferencedialog.py:444
 msgid "Overwrite"
 msgstr "Перезаписать"
 
-#: ../raphodo/preferencedialog.py:356
+#: ../raphodo/preferencedialog.py:445
 msgid "Overwrite the previously backed up file"
-msgstr ""
+msgstr "Перезаписать предыдущую резервную копию файла"
 
-#: ../raphodo/preferencedialog.py:357
+#: ../raphodo/preferencedialog.py:446
 msgid "Skip"
 msgstr "Пропустить"
 
-#: ../raphodo/preferencedialog.py:358
+#: ../raphodo/preferencedialog.py:448
 msgid "Don't overwrite the backup file, and issue an error message"
-msgstr ""
+msgstr "Не перезаписывать резервную копию, выдать сообщение об ошибке"
 
-#: ../raphodo/preferencedialog.py:364
+#: ../raphodo/preferencedialog.py:455
 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 identifier:"
 msgstr ""
+"Если фото или видео с таким именем уже было загружено, выберите, пропустить "
+"ли загрузку файла или добавить уникальную метку:"
 
-#: ../raphodo/preferencedialog.py:378
+#: ../raphodo/preferencedialog.py:464
+msgid ""
+"Using sequence numbers to automatically generate unique filenames is "
+"strongly recommended. Configure file renaming in the Rename panel in the "
+"main window."
+msgstr ""
+"Для автоматического создания уникальных имен файлов настоятельно "
+"рекомендуется использовать нумерацию. Настройте переименование файлов на "
+"панели Переименование в главном окне."
+
+#: ../raphodo/preferencedialog.py:473
 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 ""
+"При создании резервной копии, выберите, перезаписывать ли файл с таким "
+"именем на устройстве для резервного копирования или пропустить создание "
+"резервной копии:"
 
-#: ../raphodo/preferencedialog.py:398
+#: ../raphodo/preferencedialog.py:494
 msgid "Program Warnings"
-msgstr ""
+msgstr "Предупреждения программы"
 
-#: ../raphodo/preferencedialog.py:399
+#: ../raphodo/preferencedialog.py:495
 msgid "Show a warning when:"
-msgstr ""
+msgstr "Показывать предупреждение когда:"
 
-#: ../raphodo/preferencedialog.py:402
+#: ../raphodo/preferencedialog.py:498
 msgid "Downloading files currently not displayed"
-msgstr ""
+msgstr "Загружаемые файлы сейчас не отображаются"
 
-#: ../raphodo/preferencedialog.py:403
+#: ../raphodo/preferencedialog.py:499
 msgid ""
 "Warn when about to download files that are not displayed in the main window."
 msgstr ""
+"Предупреждать о загрузке файлов, которые не отображаются в главном окне."
 
-#: ../raphodo/preferencedialog.py:405
+#: ../raphodo/preferencedialog.py:501
 msgid "Backup destinations are missing"
-msgstr ""
+msgstr "Места хранения резервных копий отсутствуют"
 
-#: ../raphodo/preferencedialog.py:406
-msgid "Warn before starting a download if it is not possible to back up files."
+#: ../raphodo/preferencedialog.py:502
+msgid ""
+"Warn before starting a download if it is not possible to back up files."
 msgstr ""
+"Предупреждать перед началом загрузки, если создание резервных копий "
+"невозможно."
 
-#: ../raphodo/preferencedialog.py:408
+#: ../raphodo/preferencedialog.py:504
 msgid "Program libraries are missing or broken"
-msgstr ""
+msgstr "Библиотеки программы отсутствуют или повреждены"
 
-#: ../raphodo/preferencedialog.py:409
+#: ../raphodo/preferencedialog.py:505
 msgid ""
 "Warn if a software library used by Rapid Photo Downloader is missing or not "
 "functioning."
 msgstr ""
+"Предупреждать, если библиотеки, используемые Rapid Photo Downloader "
+"отсутствуют или не работают."
 
-#: ../raphodo/preferencedialog.py:412
+#: ../raphodo/preferencedialog.py:508
 msgid "Filesystem metadata cannot be set"
-msgstr ""
+msgstr "Метаданные файловой системы не могут быть установлены"
 
-#: ../raphodo/preferencedialog.py:413
+#: ../raphodo/preferencedialog.py:509
 msgid ""
 "Warn if there is an error setting a file's filesystem metadata, such as its "
 "modification time."
 msgstr ""
+"Предупреждать об ошибке установки метаданных файловой системы, таких как "
+"время изменения."
 
-#: ../raphodo/preferencedialog.py:416
+#: ../raphodo/preferencedialog.py:512
 msgid "Encountering unhandled files"
-msgstr ""
+msgstr "Найдены необслуживаемые файлы"
 
-#: ../raphodo/preferencedialog.py:417
+#: ../raphodo/preferencedialog.py:513
 msgid ""
 "Warn after scanning a device or this computer if there are unrecognized "
 "files that will not be included in the download."
 msgstr ""
+"Предупреждать после сканирования устройств или этого компьютера, если есть "
+"неопознанные файлы, которые не будет включены в загрузку."
 
-#: ../raphodo/preferencedialog.py:420
+#: ../raphodo/preferencedialog.py:517
 msgid "Do not warn about unhandled files with extensions:"
-msgstr ""
+msgstr "Не сообщать о необслуживаемых файлах с расширениями:"
 
-#: ../raphodo/preferencedialog.py:424
+#: ../raphodo/preferencedialog.py:522
 msgid ""
 "File extensions are case insensitive and do not need to include the leading "
 "dot."
 msgstr ""
+"Расширения файлов не чувствительны к регистру и не обязаны содержать "
+"предшествующую точку."
 
-#: ../raphodo/preferencedialog.py:427
+#: ../raphodo/preferencedialog.py:525
 msgid "Add"
-msgstr ""
+msgstr "Добавить"
 
-#: ../raphodo/preferencedialog.py:428
+#: ../raphodo/preferencedialog.py:526
 msgid ""
 "Add a file extension to the list of unhandled file types to not warn about."
 msgstr ""
+"Добавить расширение файла в список необслуживаемых типов файлов, сообщать о "
+"которых не нужно."
 
-#: ../raphodo/preferencedialog.py:430
+#: ../raphodo/preferencedialog.py:528
 msgid ""
 "Remove a file extension from the list of unhandled file types to not warn "
 "about."
 msgstr ""
+"Удалить расширение файла из списка необслуживаемых типов файлов, сообщать о "
+"которых не нужно."
 
-#: ../raphodo/preferencedialog.py:434
+#: ../raphodo/preferencedialog.py:532
 msgid ""
 "Clear the list of file extensions of unhandled file types to not warn about."
 msgstr ""
+"Очистить список необслуживаемых типов файлов, сообщать о которых не нужно."
 
-#: ../raphodo/preferencedialog.py:469
-msgid "Version Check"
+#: ../raphodo/preferencedialog.py:568
+msgid "Photo and Video Consolidation"
+msgstr "Объединение фото и видео"
+
+#: ../raphodo/preferencedialog.py:571
+msgid "Consolidate files across devices and downloads"
+msgstr "Объединять файлы между устройствами и загрузками"
+
+#: ../raphodo/preferencedialog.py:574
+msgid ""
+"Analyze the results of device scans looking for duplicate files and matching "
+"RAW and JPEG pairs,\n"
+"comparing them across multiple devices and download sessions."
 msgstr ""
+"Анализировать результаты сканирования устройств в поисках дубликатов и пар "
+"RAW и JPEG,\n"
+"сравнивая их между различными устройствами и сеансами загрузки."
 
-#: ../raphodo/preferencedialog.py:470
-msgid "Check for new version at startup"
+#: ../raphodo/preferencedialog.py:580
+msgid "Treat matching RAW and JPEG files as:"
+msgstr "Рассматривать соответствующие RAW и JPEG файлы как:"
+
+#: ../raphodo/preferencedialog.py:581
+msgid "One photo"
+msgstr "Одно фото"
+
+#: ../raphodo/preferencedialog.py:582
+msgid "Two photos"
+msgstr "Два фото"
+
+#: ../raphodo/preferencedialog.py:584
+msgid ""
+"Display matching pairs of RAW and JPEG photos as one photo, and if marked, "
+"download both."
 msgstr ""
+"Отображать пары RAW и JPEG как одно фото, и, если отмечены для загрузки, "
+"загружать оба файла."
 
-#: ../raphodo/preferencedialog.py:471
-msgid "Check for a new version of the program each time the program starts."
+#: ../raphodo/preferencedialog.py:589
+msgid ""
+"Display matching pairs of RAW and JPEG photos as two different photos. You "
+"can still synchronize their sequence numbers."
 msgstr ""
+"Отображать пары RAW и JPEG как два разных фото. Вы по-прежнему можете "
+"синхронизировать их нумерацию."
 
-#: ../raphodo/preferencedialog.py:473
-msgid "Include development releases"
+#: ../raphodo/preferencedialog.py:598
+msgid "With matching RAW and JPEG photos:"
+msgstr "С парами RAW и JPEG фото:"
+
+#: ../raphodo/preferencedialog.py:600
+msgid "Do not mark JPEG for download"
+msgstr "Не отмечать JPEG для загрузки"
+
+#: ../raphodo/preferencedialog.py:601
+msgid "Do not mark RAW for download"
+msgstr "Не отмечать RAW для загрузки"
+
+#: ../raphodo/preferencedialog.py:602
+msgid "Mark both for download"
+msgstr "Отмечать для загрузки оба"
+
+#: ../raphodo/preferencedialog.py:609
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"JPEG for\n"
+"download. You can still mark it for download yourself."
 msgstr ""
+"При обнаружении пар RAW и JPEG фото, не отмечать автоматически JPEG файлы\n"
+"для загрузки. Вы по-прежнему можете отметить их для загрузки сами."
 
-#: ../raphodo/preferencedialog.py:474
+#: ../raphodo/preferencedialog.py:614
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"RAW for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+"При обнаружении пар RAW и JPEG фото, не отмечать автоматически RAW файлы\n"
+"для загрузки. Вы по-прежнему можете отметить их для загрузки сами."
+
+#: ../raphodo/preferencedialog.py:619
+msgid ""
+"When matching RAW and JPEG photos are found, automatically mark both for "
+"download."
+msgstr ""
+"При обнаружении пар RAW и JPEG фото, автоматически отмечать для загрузки оба "
+"файла."
+
+#: ../raphodo/preferencedialog.py:625
+msgid ""
+"If you disable file consolidation, choose what to do when a download device "
+"is inserted while completed downloads are displayed:"
+msgstr ""
+"Если вы отключили объединение файлов, выберите, что делать если подключено "
+"устройство для загрузки в то время как отображаются завершенные загрузки:"
+
+#: ../raphodo/preferencedialog.py:631
+msgid ""
+"When a download device is inserted while completed downloads are displayed:"
+msgstr ""
+"Если устройство для загрузки подключено в то время как отображаются "
+"завершенные загрузки:"
+
+#: ../raphodo/preferencedialog.py:642
+msgid "Clear completed downloads"
+msgstr "Очистить завершенные загрузки"
+
+#: ../raphodo/preferencedialog.py:643
+msgid "Keep displaying completed downloads"
+msgstr "Продолжить отображение завершенных загрузок"
+
+#: ../raphodo/preferencedialog.py:644
+msgid "Prompt for what to do"
+msgstr "Спросить что делать"
+
+#: ../raphodo/preferencedialog.py:649
+msgid ""
+"Automatically clear the display of completed downloads whenever a new "
+"download device is inserted."
+msgstr ""
+"Автоматически очищать отображаемые завершенные загрузки каждый раз, когда "
+"подключается новое устройство для загрузки."
+
+#: ../raphodo/preferencedialog.py:654
+msgid ""
+"Keep displaying completed downloads whenever a new download device is "
+"inserted."
+msgstr ""
+"Продолжать отображать завершенные загрузки каждый раз, когда подключается "
+"новое устройство для загрузки."
+
+#: ../raphodo/preferencedialog.py:658
+msgid ""
+"Prompt whether to keep displaying completed downloads or clear them whenever "
+"a new download device is inserted."
+msgstr ""
+"Спросить, очищать отображаемые завершенные загрузки или продолжать их "
+"отображение каждый раз, когда подключается новое устройство для загрузки."
+
+#: ../raphodo/preferencedialog.py:702
+msgid "Version Check"
+msgstr "Проверка версии"
+
+#: ../raphodo/preferencedialog.py:703
+msgid "Check for new version at startup"
+msgstr "Проверять наличие новых версий при запуске"
+
+#: ../raphodo/preferencedialog.py:705
+msgid "Check for a new version of the program each time the program starts."
+msgstr "Проверять наличие новых версий программы при каждом ее запуске."
+
+#: ../raphodo/preferencedialog.py:707
+msgid "Include development releases"
+msgstr "Включая выпуски в разработке"
+
+#: ../raphodo/preferencedialog.py:709
 msgid ""
 "Include alpha, beta and other development releases when checking for a new "
 "version of the program.\n"
@@ -2127,12 +3165,17 @@ msgid ""
 "If you are currently running a development version, the check will always "
 "occur."
 msgstr ""
+"Включить альфа, бета и прочие выпуски в разработке для проверки на наличие "
+"новых версий программы.\n"
+"\n"
+"Если вы используете версию в разработке, проверка будет осуществляться "
+"всегда."
 
-#: ../raphodo/preferencedialog.py:489
+#: ../raphodo/preferencedialog.py:725
 msgid "Ignore DNG date/time metadata on MTP devices"
-msgstr ""
+msgstr "Игнорировать метаданные даты/времени DNG файлов на устройствах MTP"
 
-#: ../raphodo/preferencedialog.py:490
+#: ../raphodo/preferencedialog.py:727
 msgid ""
 "Ignore date/time metadata in DNG files located on MTP devices, and use the "
 "file's modification time instead.\n"
@@ -2140,73 +3183,99 @@ msgid ""
 "Useful for devices like some phones and tablets that create incorrect DNG "
 "metadata."
 msgstr ""
+"Игнорировать метаданные даты/времени DNG файлов, расположенных наустройствах "
+"MTP, и использовать вместо них время изменения.\n"
+"\n"
+"Полезно для таких устройств, как некоторые телефоны и планшеты, которые "
+"создают некорректные метаданные DNG."
+
+#: ../raphodo/preferencedialog.py:741
+msgid "Completed Downloads"
+msgstr "Завершенные загрузки"
 
 #. Translators: substituted value is a description for the set of preferences
 #. shown in the preference dialog window, e.g. Devices, Automation, etc.
 #. This string is shown in a tooltip for the "Restore Defaults" button
-#: ../raphodo/preferencedialog.py:710
+#: ../raphodo/preferencedialog.py:1067
 #, python-format
 msgid "Restores default %s preference values"
-msgstr ""
+msgstr "Сбросить настройки %s на значения по умолчанию"
 
-#: ../raphodo/preferencedialog.py:832
+#: ../raphodo/preferencedialog.py:1208
 msgid ""
 "Do you want to purge the thumbnail cache? The cache will be purged when the "
 "program is next started."
 msgstr ""
+"Вы хотите очистить кэш миниатюр? Кэш будет очищен при следующем запуске "
+"программы."
 
-#: ../raphodo/preferencedialog.py:835
+#: ../raphodo/preferencedialog.py:1212
 msgid "Purge Thumbnail Cache"
-msgstr ""
+msgstr "Очистить кэш миниатюр"
 
-#: ../raphodo/preferencedialog.py:847
+#: ../raphodo/preferencedialog.py:1225
 msgid ""
 "Do you want to optimize the thumbnail cache? The cache will be optimized "
 "when the program is next started."
 msgstr ""
+"Вы хотите оптимизировать кэш миниатюр? Кэш будет соптимизирован при "
+"следующем запуске программы."
 
-#: ../raphodo/preferencedialog.py:850
+#: ../raphodo/preferencedialog.py:1229
 msgid "Optimize Thumbnail Cache"
-msgstr ""
+msgstr "Оптимизировать кэш миниатюр"
+
+#: ../raphodo/preferencedialog.py:1481
+msgid "Enter a Folder to Scan"
+msgstr "Укажите папку для сканирования"
+
+#: ../raphodo/preferencedialog.py:1482
+msgid "Specify a folder that will be scanned for photos and videos"
+msgstr "Укажите папку для сканирования на наличие фото и видео."
 
-#: ../raphodo/preferencedialog.py:1045
+#: ../raphodo/preferencedialog.py:1483
+msgid "Folder:"
+msgstr "Папка:"
+
+#: ../raphodo/preferencedialog.py:1497
 msgid "Enter a Path to Ignore"
-msgstr "Введите расположение, которое хотите пропустить"
+msgstr "Введите путь, который хотите игнорировать"
 
-#: ../raphodo/preferencedialog.py:1046
+#: ../raphodo/preferencedialog.py:1498
 msgid "Specify a path that will never be scanned for photos or videos"
 msgstr ""
-"Укажите расположение, которое не будет сканироваться на наличие фотографий "
-"или видеофрагментов"
+"Задайте путь, который никогда не будет проверяться на наличие фото и видео"
 
-#: ../raphodo/preferencedialog.py:1047
+#: ../raphodo/preferencedialog.py:1499
 msgid "Path:"
-msgstr "Расположение:"
+msgstr "Путь:"
 
-#: ../raphodo/preferencedialog.py:1061
+#: ../raphodo/preferencedialog.py:1513
 msgid "Enter a File Extension"
-msgstr ""
+msgstr "Введите расширение файла"
 
-#: ../raphodo/preferencedialog.py:1062
+#: ../raphodo/preferencedialog.py:1514
 msgid "Specify a file extension (without the leading dot)"
-msgstr ""
+msgstr "Задайте расширение файла (без предшествующей точки)"
 
-#: ../raphodo/preferencedialog.py:1063 ../raphodo/renamepanel.py:122
+#: ../raphodo/preferencedialog.py:1515 ../raphodo/renamepanel.py:122
 msgid "Extension:"
-msgstr ""
+msgstr "Расширение:"
 
-#: ../raphodo/preferencedialog.py:1078
+#: ../raphodo/preferencedialog.py:1530
 msgid "Invalid File Extension"
-msgstr ""
+msgstr "Неверное расширение файла"
 
-#: ../raphodo/preferencedialog.py:1079
+#: ../raphodo/preferencedialog.py:1531
 #, python-format
 msgid ""
 "The file extension <b>%s</b> is recognized by Rapid Photo Downloader, so it "
 "makes no sense to warn about its presence."
 msgstr ""
+"Расширение файлов <b>%s</b> известно Rapid Photo Downloader, поэтому нет "
+"необходимости предупреждать об их наличии."
 
-#: ../raphodo/preferencedialog.py:1081
+#: ../raphodo/preferencedialog.py:1533
 #, python-format
 msgid ""
 "Recognized file types:\n"
@@ -2223,405 +3292,457 @@ msgid ""
 "Other:\n"
 "%(other)s"
 msgstr ""
+"Известные типы файлов:\n"
+"\n"
+"Фото:\n"
+"%(photos)s\n"
+"\n"
+"Видео:\n"
+"%(videos)s\n"
+"\n"
+"Аудио:\n"
+"%(audio)s\n"
+"\n"
+"Другие:\n"
+"%(other)s"
 
 #: ../raphodo/preferences.py:286
 msgid "Wedding"
-msgstr ""
+msgstr "Свадьба"
 
 #: ../raphodo/preferences.py:286
 msgid "Birthday"
-msgstr ""
+msgstr "День рождения"
 
-#: ../raphodo/preferences.py:614
+#: ../raphodo/preferences.py:624
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Имя каталога не должно начинаться с %s"
 
-#: ../raphodo/preferences.py:617
+#: ../raphodo/preferences.py:627
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Имя каталога не должно закачинаться на %s"
 
-#: ../raphodo/preferences.py:622
+#: ../raphodo/preferences.py:632
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr "Имя каталога не может содержать две %s, одну за другой"
 
-#. self.setFlat(True)
 #: ../raphodo/primarybutton.py:72
 msgid "Download 8 Photos and 10 Videos"
-msgstr ""
+msgstr "Загрузка 8фото и 10 видео"
 
-#: ../raphodo/problemnotification.py:86 ../raphodo/problemnotification.py:208
+#: ../raphodo/problemnotification.py:87 ../raphodo/problemnotification.py:209
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
-msgstr ""
+msgstr "Ошибка: %(errno)s %(strerror)s"
 
-#: ../raphodo/problemnotification.py:89
+#: ../raphodo/problemnotification.py:90
 #, python-format
 msgid "Error: %s"
-msgstr ""
+msgstr "Ошибка: %s"
 
-#: ../raphodo/problemnotification.py:116
+#: ../raphodo/problemnotification.py:117
 #, python-format
 msgid "GPhoto2 Error: %s"
-msgstr ""
+msgstr "Ошибка GPhoto2: %s"
 
-#: ../raphodo/problemnotification.py:124
+#: ../raphodo/problemnotification.py:125
 msgid ""
 "Unable to initialize the camera, probably because another program is using "
 "it. No files were copied from it."
 msgstr ""
+"Невозможно инициализировать камеру, возможно из-за ее использования другой "
+"программой. Файлы с нее скопированы не будут."
 
-#: ../raphodo/problemnotification.py:134
+#: ../raphodo/problemnotification.py:135
 #, python-format
 msgid "Unable to read directory %s"
-msgstr ""
+msgstr "Невозможно прочесть каталог %s"
 
-#: ../raphodo/problemnotification.py:140
+#: ../raphodo/problemnotification.py:141
 #, python-format
 msgid "Unable to access modification time or size from %s"
-msgstr ""
+msgstr "Невозможно получить доступ к времени изменения или размеру для %s"
 
-#: ../raphodo/problemnotification.py:146
+#: ../raphodo/problemnotification.py:147
 #, python-format
 msgid "Unable to read file %s"
-msgstr ""
+msgstr "Невозможно прочесть файл %s"
 
-#: ../raphodo/problemnotification.py:152
+#: ../raphodo/problemnotification.py:153
 #, python-format
 msgid "Unable to write file %s"
-msgstr ""
+msgstr "Невозможно записать файл %s"
 
-#: ../raphodo/problemnotification.py:158
+#: ../raphodo/problemnotification.py:159
 #, python-format
 msgid "Unable to move file %s"
-msgstr ""
+msgstr "Невозможно переместить файл %s"
 
-#: ../raphodo/problemnotification.py:164
+#: ../raphodo/problemnotification.py:165
 #, python-format
 msgid "Unable to remove file %s"
-msgstr ""
+msgstr "Невозможно удалить файл %s"
 
-#: ../raphodo/problemnotification.py:170
+#: ../raphodo/problemnotification.py:171
 #, python-format
 msgid "Unable to copy file %s"
-msgstr ""
+msgstr "Невозможно скопировать файл %s"
 
-#: ../raphodo/problemnotification.py:176
+#: ../raphodo/problemnotification.py:177
 #, python-format
 msgid "Zero length file %s will not be downloaded"
-msgstr ""
+msgstr "Файл %s с нулевой длиной не будет загружен"
 
-#: ../raphodo/problemnotification.py:182
+#: ../raphodo/problemnotification.py:183
 #, python-format
 msgid "Could not determine filesystem modification time for %s"
-msgstr ""
+msgstr "Нельзя определить время изменения из файловой системы для %s"
 
-#: ../raphodo/problemnotification.py:188
+#: ../raphodo/problemnotification.py:189
 #, python-format
 msgid "Unable to load metadata from %s"
-msgstr ""
+msgstr "Невозможно прочесть метаданные из %s"
 
-#: ../raphodo/problemnotification.py:194
+#: ../raphodo/problemnotification.py:195
 #, python-format
 msgid ""
 "Unable to load metadata from %(name)s. The %(filetype)s was not downloaded."
 msgstr ""
+"Невозможно загрузить метаданные из %(name)s. Файл %(filetype)s не был "
+"загружен."
 
-#: ../raphodo/problemnotification.py:202
+#: ../raphodo/problemnotification.py:203
 #, python-format
 msgid ""
 "An error occurred setting a file's filesystem metadata on the filesystem %s. "
 "If this error occurs again on the same filesystem, it will not be reported "
 "again."
 msgstr ""
+"Ошибка установки метаданных файла на файловой системе %s. Если эта ошибка "
+"повторится на той же файловой системе, повторного отчета не будет."
 
-#: ../raphodo/problemnotification.py:216
+#: ../raphodo/problemnotification.py:217
 #, python-format
 msgid "Encountered unhandled file %s. It will not be downloaded."
-msgstr ""
+msgstr "Обнаружен необслуживаемый файл %s. Он не будет загружен."
 
-#: ../raphodo/problemnotification.py:223
+#: ../raphodo/problemnotification.py:224
 #, python-format
 msgid "%(filetype)s %(destination)s already exists."
-msgstr ""
+msgstr "%(filetype)s %(destination)s уже существует."
 
-#: ../raphodo/problemnotification.py:234 ../raphodo/problemnotification.py:262
+#: ../raphodo/problemnotification.py:235 ../raphodo/problemnotification.py:263
 #, python-format
 msgid ""
 "The existing %(filetype)s %(destination)s was last modified on %(date)s at "
 "%(time)s."
 msgstr ""
+"Последнее изменение существующего %(filetype)s %(destination)s было %(date)s "
+"в %(time)s."
 
-#: ../raphodo/problemnotification.py:245
+#: ../raphodo/problemnotification.py:246
 #, python-format
 msgid "The %(filetype)s %(source)s was not downloaded from %(device)s."
 msgstr ""
+"Файл %(filetype)s %(source)s не был загружен с устройства %(device)s."
 
-#: ../raphodo/problemnotification.py:273
+#: ../raphodo/problemnotification.py:274
 #, python-format
 msgid "The %(filetype)s %(source)s was downloaded from %(device)s."
-msgstr ""
+msgstr "Файл %(filetype)s %(source)s был загружен с устройства %(device)s."
 
-#: ../raphodo/problemnotification.py:282
+#: ../raphodo/problemnotification.py:283
 #, python-format
 msgid "The unique identifier '%s' was added to the filename."
-msgstr ""
+msgstr "К имени файла была добавлена уникальная метка '%s'."
 
-#: ../raphodo/problemnotification.py:298
+#: ../raphodo/problemnotification.py:299
 #, python-format
 msgid ""
 "The existing backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
+"Последнее изменение существующей резервной копии %(filetype)s "
+"%(destination)s было %(date)s в %(time)s."
 
-#: ../raphodo/problemnotification.py:309
+#: ../raphodo/problemnotification.py:310
 #, python-format
 msgid "The %(filetype)s %(source)s was not backed up from %(device)s."
 msgstr ""
+"Для файла %(filetype)s %(source)s с устройства %(device)s не была создана "
+"резервная копия."
 
-#: ../raphodo/problemnotification.py:326
+#: ../raphodo/problemnotification.py:327
 #, python-format
 msgid ""
 "The previous backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
+"Последнее изменение предыдущей резервной копии %(filetype)s %(destination)s "
+"было %(date)s в %(time)s."
 
-#: ../raphodo/problemnotification.py:337
+#: ../raphodo/problemnotification.py:338
 #, python-format
 msgid ""
 "The %(filetype)s %(source)s from %(device)s was backed up, overwriting the "
 "previous backup %(filetype)s."
 msgstr ""
+"Для  файла %(filetype)s %(source)s с устройства %(device)s была создана "
+"резервная копия, перезаписавшая предыдущую резервную копию файла "
+"%(filetype)s."
 
-#: ../raphodo/problemnotification.py:356
+#: ../raphodo/problemnotification.py:357
 #, python-format
 msgid ""
 "When synchronizing RAW + JPEG sequence values, a duplicate %(filetype)s "
 "%(file)s was encountered, and was not downloaded."
 msgstr ""
+"При синхронизации нумерации RAW + JPEG обнаружен дубликат %(filetype)s "
+"%(file)s, который не был загружен."
 
-#: ../raphodo/problemnotification.py:366
+#: ../raphodo/problemnotification.py:367
 msgid ""
 "When synchronizing RAW + JPEG sequence values, photos were detected with the "
 "same filenames, but taken at different times:"
 msgstr ""
+"При синхронизации нумерации RAW + JPEG обнаружены фото с теми же именами, но "
+"снятые в другое время:"
 
-#: ../raphodo/problemnotification.py:373
+#: ../raphodo/problemnotification.py:374
 #, python-format
 msgid ""
 "%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
 "on %(image2_date)s at %(image2_time)s."
 msgstr ""
-"%(image1)s было создано %(image1_date)s в %(image1_time)s и %(image2)s "
-"создано %(image2_date)s в %(image2_time)s."
+"%(image1)s было снято %(image1_date)s в %(image1_time)s, и %(image2)s - "
+"%(image2_date)s в %(image2_time)s."
 
-#: ../raphodo/problemnotification.py:389
+#: ../raphodo/problemnotification.py:390
 #, python-format
 msgid "Unable to finalize the filename for %s"
-msgstr ""
+msgstr "Невозможно завершить имя файла для  %s"
 
-#: ../raphodo/problemnotification.py:424
+#: ../raphodo/problemnotification.py:425
 #, python-format
 msgid ""
 "The filename %(destination)s was not fully generated for %(filetype)s "
 "%(source)s."
 msgstr ""
+"Имя файла %(destination)s не было полностью создано для %(filetype)s "
+"%(source)s."
 
-#: ../raphodo/problemnotification.py:433
+#: ../raphodo/problemnotification.py:434
 #, python-format
 msgid "The %(type)s metadata is missing."
-msgstr "В метаданных пропущен %(type)s"
+msgstr "Отсутствуют метаданные %(type)s."
 
-#: ../raphodo/problemnotification.py:439
+#: ../raphodo/problemnotification.py:440
 #, python-format
 msgid "The following metadata is missing: %s."
-msgstr ""
+msgstr "Отсутствуют следующие метаданные: %s."
 
-#: ../raphodo/problemnotification.py:445
+#: ../raphodo/problemnotification.py:446
 #, python-format
 msgid "Date/time conversion failed: %s."
-msgstr ""
+msgstr "Ошибка преобразования даты/времени: %s."
 
-#: ../raphodo/problemnotification.py:451
+#: ../raphodo/problemnotification.py:452
 msgid ""
 "Could not extract valid date/time metadata or determine the file "
 "modification time."
 msgstr ""
+"Нельзя извлечь корректные метаданные даты/времени или определить время "
+"изменения файла."
 
-#: ../raphodo/problemnotification.py:457
+#: ../raphodo/problemnotification.py:458
 msgid "Filename does not have an extension."
-msgstr "Название файла не содержит расширения."
+msgstr "Имя файла не содержит расширения."
 
-#: ../raphodo/problemnotification.py:460
+#: ../raphodo/problemnotification.py:461
 msgid "Filename does not have a number component."
 msgstr "В имени файла нет порядкового номера"
 
-#: ../raphodo/problemnotification.py:464
+#: ../raphodo/problemnotification.py:465
 #, python-format
 msgid "Error generating component %(component)s. Error: %(error)s"
-msgstr ""
+msgstr "Ошибка создания компонента %(component)s. Ошибка: %(error)s"
 
-#: ../raphodo/problemnotification.py:477
+#: ../raphodo/problemnotification.py:478
 #, python-format
 msgid ""
 "The download subfolders %(folder)s were only partially generated for "
 "%(filetype)s %(source)s."
 msgstr ""
+"Подпапки загрузки %(folder)s для %(filetype)s %(source)s были созданы только "
+"частично."
 
-#: ../raphodo/problemnotification.py:486
+#: ../raphodo/problemnotification.py:487
 #, python-format
 msgid ""
 "There is no data with which to generate the %(subfolder_file)s for "
 "%(filename)s. The %(filetype)s was not downloaded."
 msgstr ""
+"Нет данных для создания %(subfolder_file)s для %(filename)s. Файл "
+"%(filetype)s не загружен."
 
-#: ../raphodo/problemnotification.py:499
+#: ../raphodo/problemnotification.py:500
 #, python-format
 msgid ""
 "Unable to create the %(filetype)s %(destination)s in %(folder)s. The "
 "download file was %(source)s in %(device)s. It was not downloaded."
 msgstr ""
+"Невозможно создать %(filetype)s %(destination)s в %(folder)s. Загружаемый "
+"файл был %(source)s в %(device)s. Он не загружен."
 
-#: ../raphodo/problemnotification.py:514
+#: ../raphodo/problemnotification.py:515
 #, python-format
 msgid "Unable to create the download subfolder %s."
-msgstr ""
+msgstr "Невозможно создать подпапки загрузки %s."
 
-#: ../raphodo/problemnotification.py:526
+#: ../raphodo/problemnotification.py:527
 #, python-format
 msgid "Unable to create the backup subfolder %s."
-msgstr ""
+msgstr "Невозможно создать подпапки для резервных копий %s."
 
-#: ../raphodo/problemnotification.py:577
+#: ../raphodo/problemnotification.py:578
 #, python-format
 msgid "Problems scanning %s"
-msgstr ""
+msgstr "Проблема сканирования %s."
 
-#: ../raphodo/problemnotification.py:584
+#: ../raphodo/problemnotification.py:585
 #, python-format
 msgid "Problems copying from %s"
-msgstr ""
+msgstr "Проблема копирования из %s."
 
-#: ../raphodo/problemnotification.py:591
+#: ../raphodo/problemnotification.py:592
 msgid "Problems while finalizing filenames and generating subfolders"
-msgstr ""
+msgstr "Проблемы с завершением имен файлов и созданием подпапок"
 
-#: ../raphodo/problemnotification.py:598
+#: ../raphodo/problemnotification.py:599
 #, python-format
 msgid "Problems backing up to %s"
-msgstr ""
+msgstr "Проблемы создания резервных копий в %s."
+
+#. Translators: for example Nov 3 2015, 11:25 AM
+#. Translators: for example, Nov 3, 12:15 PM
+#: ../raphodo/proximity.py:188 ../raphodo/proximity.py:213
+#: ../raphodo/proximity.py:236 ../raphodo/proximity.py:239
+#, python-format
+msgid "%(date)s, %(time)s"
+msgstr "%(date)s, %(time)s"
+
+#: ../raphodo/proximity.py:204
+#, python-format
+msgid "%(starttime)s - %(endtime)s"
+msgstr "%(starttime)s - %(endtime)s"
 
-#. Translators: for example Nov 3 or Dec 31
 #. The start and end dates are on a different day
 #. Translators: for example Nov 3 or Dec 31
-#: ../raphodo/proximity.py:105 ../raphodo/proximity.py:221
-#: ../raphodo/proximity.py:224 ../raphodo/proximity.py:828
+#: ../raphodo/proximity.py:221 ../raphodo/proximity.py:225
+#: ../raphodo/proximity.py:980 ../raphodo/timeutils.py:105
 #, python-format
 msgid "%(month)s %(numeric_day)s"
-msgstr ""
+msgstr "%(month)s %(numeric_day)s"
 
-#. Translators: for example Nov 15 2015
 #. Translators: for example Nov 3 2015
-#: ../raphodo/proximity.py:109 ../raphodo/proximity.py:230
-#: ../raphodo/proximity.py:231 ../raphodo/proximity.py:831
+#. Translators: for example Nov 2 2015
+#. Translators: for example Nov 15 2015
+#: ../raphodo/proximity.py:232 ../raphodo/proximity.py:233
+#: ../raphodo/proximity.py:985 ../raphodo/timeutils.py:110
 #, python-format
 msgid "%(date)s %(year)s"
-msgstr ""
-
-#. Translators: for example Nov 3 2015, 11:25 AM
-#. Translators: for example, Nov 3, 12:15 PM
-#: ../raphodo/proximity.py:197 ../raphodo/proximity.py:215
-#: ../raphodo/proximity.py:234 ../raphodo/proximity.py:236
-#, python-format
-msgid "%(date)s, %(time)s"
-msgstr ""
-
-#: ../raphodo/proximity.py:209
-#, python-format
-msgid "%(starttime)s - %(endtime)s"
-msgstr ""
+msgstr "%(date)s %(year)s"
 
 #. Translators: for example, Nov 3, 12:15 PM - Nov 4, 1:00 AM
-#: ../raphodo/proximity.py:241
+#: ../raphodo/proximity.py:245
 #, python-format
 msgid "%(earlier_time)s - %(later_time)s"
-msgstr ""
+msgstr "%(earlier_time)s - %(later_time)s"
 
 #. Translators, for example:
 #. Nov 3 2012, 12:15 PM -
 #. Nov 4 2012, 1:00 AM
 #. (please keep the line break signified by \n)
-#: ../raphodo/proximity.py:248
+#: ../raphodo/proximity.py:253
 #, python-format
 msgid ""
 "%(earlier_time)s -\n"
 "%(later_time)s"
 msgstr ""
+"%(earlier_time)s -\n"
+"%(later_time)s"
 
-#: ../raphodo/proximity.py:359
+#: ../raphodo/proximity.py:382
 #, python-format
 msgid "%(month)s  %(year)s"
-msgstr ""
+msgstr "%(month)s  %(year)s"
 
 #. Translators: for example Nov 2015
-#: ../raphodo/proximity.py:833
+#: ../raphodo/proximity.py:987
 #, python-format
 msgid "%(month)s %(year)s"
-msgstr ""
+msgstr "%(month)s %(year)s"
 
-#: ../raphodo/proximity.py:1344
+#: ../raphodo/proximity.py:1595
 msgid ""
 "The time elapsed between consecutive photos and videos that is used to build "
 "the Timeline"
 msgstr ""
+"Прошедшее между фото и видео время, используемое для построения Шкалы времени"
 
 #. Translators: e.g. "45m", which is short for 45 minutes.
 #. Replace the very last character (after the d) with the correct
 #. localized value, keeping everything else. In other words, change
 #. only the m character.
-#: ../raphodo/proximity.py:1406
+#: ../raphodo/proximity.py:1652
 #, python-format
 msgid "%(minutes)dm"
-msgstr ""
+msgstr "%(minutes)d мин"
 
 #. Translators: i.e. "1.5h", which is short for 1.5 hours.
 #. Replace the entire string with the correct localized value
-#: ../raphodo/proximity.py:1410
+#: ../raphodo/proximity.py:1656
 msgid "1.5h"
-msgstr ""
+msgstr "1.5 ч"
 
 #. Translators: e.g. "5h", which is short for 5 hours.
 #. Replace the very last character (after the d) with the correct localized value,
 #. keeping everything else. In other words, change only the h character.
-#: ../raphodo/proximity.py:1415
+#: ../raphodo/proximity.py:1661
 #, python-format
 msgid "%(hours)dh"
-msgstr ""
+msgstr "%(hours)d ч"
 
-#: ../raphodo/proximity.py:1461
+#: ../raphodo/proximity.py:1710
 msgid ""
 "The Timeline groups photos and videos based on how much time elapsed between "
 "consecutive shots. Use it to identify photos and videos taken at different "
 "periods in a single day or over consecutive days."
 msgstr ""
+"Шкала времени группирует фото и видео на основании времени, прошедшего между "
+"снимками. Используйте ее для определения фото и видео, снятых в разные "
+"периоды одного дня, или за несколько дней."
 
-#: ../raphodo/proximity.py:1464
+#: ../raphodo/proximity.py:1715
 msgid ""
 "Use the slider (below) to adjust the time elapsed between consecutive shots "
 "that is used to build the Timeline."
 msgstr ""
+"Используйте ползунок (ниже) для регулировки времени между снимками, которое "
+"используется для построения Шкалы времени."
 
-#: ../raphodo/proximity.py:1466
+#: ../raphodo/proximity.py:1718
 msgid "Timeline build pending..."
-msgstr ""
+msgstr "Ожидание построения Шкалы времени..."
 
-#: ../raphodo/proximity.py:1467
+#: ../raphodo/proximity.py:1719
 msgid "Timeline is building..."
-msgstr ""
+msgstr "Построение шкалы времени..."
 
-#: ../raphodo/proximity.py:1468
+#: ../raphodo/proximity.py:1721
 msgid ""
 "The Timeline needs to be rebuilt because the file modification time does not "
 "match the time a shot was taken for one or more shots.<br><br>The Timeline "
@@ -2632,226 +3753,252 @@ msgid ""
 "The time a shot was taken is confirmed when generating thumbnails or "
 "downloading, which is when the metadata is read."
 msgstr ""
-
-#: ../raphodo/rapid.py:485 ../raphodo/rapid.py:2461 ../raphodo/rapid.py:3728
-#: ../raphodo/rapid.py:3846 ../raphodo/rapid.py:3850 ../raphodo/rapid.py:3870
-#: ../raphodo/rapid.py:3874 ../raphodo/rapid.py:3998 ../raphodo/rapid.py:4007
-#: ../raphodo/rapid.py:4495 ../raphodo/rapid.py:4888 ../raphodo/rapid.py:5722
-#: ../raphodo/rememberthisdialog.py:97
+"Шкала времени должна быть перестроена, потому что время изменения файла не "
+"соответствует времени снимка для одного или более снимков.<br><br>Шкала "
+"времени показывает время, когда был сделан снимок. Это время содержится в "
+"метаданных фото и видео. Чтение метаданных отнимает много времени, поэтому "
+"Rapid Photo Downloader избегает чтения метаданных при сканировании файлов. "
+"Вместо этого используется время последнего изменения файла на замену времени "
+"снимка. Время снимка проверяется при построении миниатюр или загрузке, когда "
+"происходит чтение метаданных."
+
+#: ../raphodo/rapid.py:493 ../raphodo/rapid.py:2555 ../raphodo/rapid.py:3934
+#: ../raphodo/rapid.py:4065 ../raphodo/rapid.py:4069 ../raphodo/rapid.py:4092
+#: ../raphodo/rapid.py:4096 ../raphodo/rapid.py:4226 ../raphodo/rapid.py:4237
+#: ../raphodo/rapid.py:4743 ../raphodo/rapid.py:5195 ../raphodo/rapid.py:5997
+#: ../raphodo/rememberthisdialog.py:99
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:3
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: ../raphodo/rapid.py:1100
+#: ../raphodo/rapid.py:1131
 msgid ""
 "<b>ExifTool has a problem</b><br><br> Rapid Photo Downloader uses ExifTool "
 "to get metadata from videos and photos. The program will run without it, but "
 "installing it is <b>highly</b> recommended."
 msgstr ""
+"<b>Проблемы с ExifTool</b><br><br> Rapid Photo Downloader использует "
+"ExifTool для получения метаданных из фото и видео. Программа будет работать "
+"без него, но его установка <b>настоятельно</b> рекомендуется."
 
-#: ../raphodo/rapid.py:1110 ../raphodo/rapid.py:1130
+#: ../raphodo/rapid.py:1141 ../raphodo/rapid.py:1161
 msgid "Problem with libmediainfo"
-msgstr ""
+msgstr "Проблема с libmediainfo"
 
-#: ../raphodo/rapid.py:1119
+#: ../raphodo/rapid.py:1150
 msgid ""
 "<b>The library libmediainfo appears to be missing</b><br><br> Rapid Photo "
 "Downloader uses libmediainfo to get the date and time a video was shot. The "
 "program will run  without it, but installing it is recommended."
 msgstr ""
+"<b>Библиотека libmediainfo отсутствует</b><br><br> Rapid Photo Downloader "
+"использует libmediainfo для получения времени и даты, когда было снято "
+"видео. Программа будет работать без нее, но ее установка рекомендуется."
 
-#: ../raphodo/rapid.py:1417
+#: ../raphodo/rapid.py:1448
 msgid "Download failed"
-msgstr ""
+msgstr "Загрузка не удалась"
 
-#: ../raphodo/rapid.py:1419
+#: ../raphodo/rapid.py:1450
 msgid ""
 "Sorry, the download of the new version of Rapid Photo Downloader failed."
 msgstr ""
+"Очень жаль, но загрузка новой версии Rapid Photo Downloader не удалась."
 
-#: ../raphodo/rapid.py:1425
+#: ../raphodo/rapid.py:1457
 msgid ""
 "The new version was successfully downloaded. Do you want to close Rapid "
 "Photo Downloader and install it now?"
 msgstr ""
+"Новая версия была успешно загружена. Хотите закрыть Rapid Photo Downloader и "
+"установить ее сейчас?"
 
-#: ../raphodo/rapid.py:1428
+#: ../raphodo/rapid.py:1461
 msgid "Update Rapid Photo Downloader"
-msgstr ""
+msgstr "Обновить Rapid Photo Downloader"
 
-#: ../raphodo/rapid.py:1432
+#: ../raphodo/rapid.py:1465
 msgid "Install"
-msgstr ""
+msgstr "Установить"
 
-#: ../raphodo/rapid.py:1450
+#: ../raphodo/rapid.py:1483
 msgid "New version saved"
-msgstr ""
+msgstr "Новая версия сохранена"
 
-#: ../raphodo/rapid.py:1451
+#: ../raphodo/rapid.py:1485
 #, python-format
 msgid ""
 "The tar file and installer script are saved at:\n"
 "\n"
 " %s"
 msgstr ""
+"Файл tar и скрипт установки сохранены в :\n"
+"\n"
+" %s"
 
-#: ../raphodo/rapid.py:1468
+#: ../raphodo/rapid.py:1502
 msgid "Upgrade failed"
-msgstr ""
+msgstr "Обновление не удалось"
 
-#: ../raphodo/rapid.py:1469
+#: ../raphodo/rapid.py:1505
 msgid ""
 "Sorry, upgrading Rapid Photo Downloader failed because there was an error "
 "opening the installer."
 msgstr ""
+"Очень жаль, но обновление Rapid Photo Downloader не удалось из-за ошибки "
+"открытия установщика."
 
-#: ../raphodo/rapid.py:1667 ../raphodo/rapid.py:2331
+#: ../raphodo/rapid.py:1709 ../raphodo/rapid.py:2425
 msgid "Download"
 msgstr "Загрузка"
 
-#: ../raphodo/rapid.py:1671
+#: ../raphodo/rapid.py:1713
 msgid "&Refresh..."
-msgstr ""
+msgstr "Обновить"
 
-#: ../raphodo/rapid.py:1675
+#: ../raphodo/rapid.py:1717
 msgid "&Preferences"
-msgstr ""
+msgstr "Настройки"
 
-#: ../raphodo/rapid.py:1679
+#: ../raphodo/rapid.py:1721
 msgid "&Quit"
-msgstr ""
+msgstr "Выход"
 
-#: ../raphodo/rapid.py:1683
+#: ../raphodo/rapid.py:1725
 msgid "Error &Reports"
-msgstr ""
+msgstr "Отчет об ошибках"
 
-#: ../raphodo/rapid.py:1687
+#: ../raphodo/rapid.py:1729
 msgid "Clear Completed Downloads"
-msgstr ""
+msgstr "Очистить завершенные загрузки"
 
-#: ../raphodo/rapid.py:1691
+#: ../raphodo/rapid.py:1733
 msgid "Get Help Online..."
-msgstr ""
+msgstr "Справка в Сети..."
 
-#: ../raphodo/rapid.py:1695
+#: ../raphodo/rapid.py:1737
 msgid "&Tip of the Day..."
-msgstr ""
+msgstr "Совет дня..."
 
-#: ../raphodo/rapid.py:1699
+#: ../raphodo/rapid.py:1741
 msgid "Report a Problem..."
-msgstr ""
+msgstr "Сообщить о проблеме…"
 
-#: ../raphodo/rapid.py:1703
+#: ../raphodo/rapid.py:1745
 msgid "Make a Donation..."
-msgstr ""
+msgstr "Сделать взнос..."
 
-#: ../raphodo/rapid.py:1707
+#: ../raphodo/rapid.py:1749
 msgid "Translate this Application..."
-msgstr ""
+msgstr "Перевести это приложение..."
 
-#: ../raphodo/rapid.py:1711
+#: ../raphodo/rapid.py:1753
 msgid "&About..."
-msgstr ""
+msgstr "О программе..."
 
-#: ../raphodo/rapid.py:1715
+#: ../raphodo/rapid.py:1757
 msgid "Check for Updates..."
-msgstr ""
+msgstr "Проверить обновления..."
 
-#: ../raphodo/rapid.py:1797
+#: ../raphodo/rapid.py:1840
 msgid "Timeline"
-msgstr ""
+msgstr "Шкала Времени"
 
-#: ../raphodo/rapid.py:1807
+#: ../raphodo/rapid.py:1850
 msgid "Destination"
-msgstr ""
+msgstr "Место хранения"
 
-#: ../raphodo/rapid.py:1808
+#: ../raphodo/rapid.py:1851
 msgid "Rename"
-msgstr ""
+msgstr "Переименование"
 
-#: ../raphodo/rapid.py:1810
+#: ../raphodo/rapid.py:1853
 msgid "Back Up"
-msgstr ""
+msgstr "Резервное копирование"
 
 #. Devices Header and View
-#: ../raphodo/rapid.py:1926
+#: ../raphodo/rapid.py:1977
 msgid ""
 "Turn on or off the use of devices attached to this computer as download "
 "sources"
 msgstr ""
+"Включить или отключить использование подключенных к этому компьютеру "
+"устройств в качестве источников для загрузки"
 
 #. This Computer Header and View
-#: ../raphodo/rapid.py:1940
+#: ../raphodo/rapid.py:1994
 msgid ""
 "Turn on or off the use of a folder on this computer as a download source"
 msgstr ""
+"Включить или отключить использование папок этого компьютера в качестве "
+"источников для загрузки"
 
-#: ../raphodo/rapid.py:1941
+#: ../raphodo/rapid.py:1996
 msgid "This Computer"
-msgstr ""
+msgstr "Этот компьютер"
 
-#: ../raphodo/rapid.py:1952
+#: ../raphodo/rapid.py:2009
 msgid "Select a source folder"
-msgstr ""
+msgstr "Выбор источника"
 
-#: ../raphodo/rapid.py:1975
+#: ../raphodo/rapid.py:2038
 msgid "Projected Storage Use"
-msgstr ""
+msgstr "Использование хранилища"
 
-#: ../raphodo/rapid.py:1989 ../raphodo/rapid.py:1997
+#: ../raphodo/rapid.py:2056 ../raphodo/rapid.py:2068
 msgid "Select a destination folder"
-msgstr ""
+msgstr "Выбор места хранения"
 
-#: ../raphodo/rapid.py:2045
+#: ../raphodo/rapid.py:2117
 msgid "All"
-msgstr ""
+msgstr "Все"
 
-#: ../raphodo/rapid.py:2046
+#: ../raphodo/rapid.py:2118
 msgid "New"
-msgstr ""
+msgstr "Новые"
 
-#: ../raphodo/rapid.py:2048
+#: ../raphodo/rapid.py:2120
 msgid "Show:"
-msgstr ""
+msgstr "Показать:"
 
-#: ../raphodo/rapid.py:2051
+#: ../raphodo/rapid.py:2123
 msgid "Modification Time"
-msgstr ""
+msgstr "Время изменения"
 
-#: ../raphodo/rapid.py:2052
+#: ../raphodo/rapid.py:2124
 msgid "Checked State"
-msgstr ""
+msgstr "Состоянию отметки"
 
-#: ../raphodo/rapid.py:2055
+#: ../raphodo/rapid.py:2127
 msgid "File Type"
-msgstr ""
+msgstr "Типу файла"
 
-#: ../raphodo/rapid.py:2056
+#: ../raphodo/rapid.py:2128
 msgid "Device"
-msgstr "Носитель"
+msgstr "Устройству"
 
-#: ../raphodo/rapid.py:2058
+#: ../raphodo/rapid.py:2130
 msgid "Sort:"
-msgstr ""
+msgstr "Сортировать по:"
 
-#: ../raphodo/rapid.py:2069
+#: ../raphodo/rapid.py:2141
 msgid "Select All:"
-msgstr ""
+msgstr "Выбрать все:"
 
-#: ../raphodo/rapid.py:2311
+#: ../raphodo/rapid.py:2405
 #, python-format
 msgid "Download %(files)s"
-msgstr ""
+msgstr "Загрузка %(files)s"
 
-#: ../raphodo/rapid.py:2327
+#: ../raphodo/rapid.py:2421
 msgid "Resume Download"
-msgstr ""
+msgstr "Продолжить загрузку"
 
-#: ../raphodo/rapid.py:2329
+#: ../raphodo/rapid.py:2423
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../raphodo/rapid.py:2417
+#: ../raphodo/rapid.py:2511
 #, python-brace-format
 msgid ""
 "Please report the problem at <a href=\"{website}\">{website}</a>.<br><br>\n"
@@ -2859,12 +4006,17 @@ msgid ""
 "            <a href=\"{log_path}\">here</a> to open the log directory).\n"
 "            "
 msgstr ""
+"Пожалуйста сообщите о проблеме на <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
+"            Приложите к вашему отчету лог файл <i>{log_file}</i> (нажмите\n"
+"            <a href=\"{log_path}\">здесь</a> для открытия папки лога).\n"
+"            "
 
-#: ../raphodo/rapid.py:2431
+#: ../raphodo/rapid.py:2525
 msgid "Thank you for reporting a problem in Rapid Photo Downloader"
-msgstr ""
+msgstr "Благодарим вас за отче о проблеме в Rapid Photo Downloader"
 
-#: ../raphodo/rapid.py:2529
+#: ../raphodo/rapid.py:2624
 #, python-format
 msgid ""
 "<b>Changing This Computer source path</b><br><br>Do you really want to "
@@ -2872,31 +4024,44 @@ msgid ""
 "from %(source_path)s.<br><br>If you do change the path, the current download "
 "from This Computer will be cancelled."
 msgstr ""
+"<b>Изменение пути источника Этого компьютера</b><br><br>Вы действительно "
+"хотите изменить путь к источнику на %(new_path)s?<br><br>Вы сейчас загружате "
+"из %(source_path)s.<br><br>Если вы измените путь, текущая загрузка с Этого "
+"компьютера будет отменена."
 
-#: ../raphodo/rapid.py:2595
+#: ../raphodo/rapid.py:2694
 msgid "You cannot change the download destination while downloading."
-msgstr ""
+msgstr "Вы не можете изменить место хранения во время загрузки."
 
-#: ../raphodo/rapid.py:2604
+#: ../raphodo/rapid.py:2704
 #, python-format
 msgid ""
 "<b>Confirm Download Destination</b><br><br>Are you sure you want to set the "
 "%(file_type)s download destination to %(path)s?"
 msgstr ""
+"<b>Подтвердите Место загрузки</b><br><br>Вы уверены, что хотите установить "
+"место хранения %(file_type)s в %(path)s?"
 
-#: ../raphodo/rapid.py:2682
+#: ../raphodo/rapid.py:2785
 msgid ""
+"\n"
 "<b>Downloading all files</b><br><br>\n"
-"                    A download always includes all files that are checked "
-"for download,\n"
-"                    including those that are not currently displayed because "
-"the Timeline\n"
-"                    is being used or because only new files are being shown."
-"<br><br>\n"
-"                    Do you want to proceed with the download?"
+"A download always includes all files that are checked for download,\n"
+"including those that are not currently displayed because the Timeline\n"
+"is being used or because only new files are being shown.<br><br>\n"
+"Do you want to proceed with the download?\n"
+"                        "
 msgstr ""
+"\n"
+"<b>Загрузка всех файлов</b><br><br>\n"
+"В загрузку всегда включаются все файлы, отмеченные для загрузки, включая "
+"те,\n"
+"которые не отображаются в данный момент времени по причине использования\n"
+"Шкалы времени или потому, что отображаются только новые файлы.<br><br>\n"
+"Вы хотите продолжить загрузку?\n"
+"                        "
 
-#: ../raphodo/rapid.py:2820
+#: ../raphodo/rapid.py:2937
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -2907,208 +4072,224 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: ../raphodo/rapid.py:2824
+#: ../raphodo/rapid.py:2940
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
 "%s"
 msgstr ""
-"Неправильно указанная папка загрузки:\n"
+"Неправильно указана папка загрузки:\n"
 "%s"
 
-#: ../raphodo/rapid.py:2827
+#: ../raphodo/rapid.py:2943
 msgid "Download Failure"
-msgstr ""
+msgstr "Сбой загрузки"
 
-#: ../raphodo/rapid.py:2828
+#: ../raphodo/rapid.py:2944
 msgid "The download cannot proceed."
-msgstr ""
+msgstr "Загрузка не может быть продолжена"
 
-#: ../raphodo/rapid.py:2842
+#: ../raphodo/rapid.py:2962
 msgid ""
 "Photos and videos will not be backed up because there is nowhere to back "
 "them up. Do you still want to start the download?"
 msgstr ""
+"Резервные копии фото и видео не будут созданы, потому что их негде создать. "
+"Вы хотите начать загрузку?"
 
-#. Translators: filetype will be replaced with 'photos' or 'videos'
-#: ../raphodo/rapid.py:2847 ../raphodo/rapid.py:2854
+#: ../raphodo/rapid.py:2969 ../raphodo/rapid.py:2979
 #, python-format
 msgid ""
 "No backup device exists for backing up %(filetype)s. Do you still want to "
 "start the download?"
 msgstr ""
+"Нет устройства для резервного копирования файлов %(filetype)s. Вы хотите "
+"начать загрузку?"
 
-#: ../raphodo/rapid.py:2848 ../raphodo/rpdfile.py:228
+#: ../raphodo/rapid.py:2971 ../raphodo/rpdfile.py:228
 msgid "photos"
 msgstr "фото"
 
-#: ../raphodo/rapid.py:2855 ../raphodo/rpdfile.py:223
+#: ../raphodo/rapid.py:2981 ../raphodo/rpdfile.py:223
 msgid "videos"
 msgstr "видео"
 
-#: ../raphodo/rapid.py:2861
+#: ../raphodo/rapid.py:2989
 msgid ""
 "<b>The photo and video backup destinations do not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
+"<b>Место хранения резервных копий фото и видео не существует или в него "
+"невозможна запись.</b><br><br>Вы хотите начать загрузку?"
 
-#: ../raphodo/rapid.py:2869 ../raphodo/rapid.py:2876
+#: ../raphodo/rapid.py:2999 ../raphodo/rapid.py:3008
 #, python-format
 msgid ""
 "<b>The %(filetype)s backup destination does not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
+"<b>Место хранения резервных копий файлов %(filetype)s не существует или в "
+"него невозможна запись.</b><br><br>Вы хотите начать загрузку?"
 
-#: ../raphodo/rapid.py:2871 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:818
+#: ../raphodo/rapid.py:3001 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:843
 msgid "photo"
 msgstr "фото"
 
-#: ../raphodo/rapid.py:2878 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:858
+#: ../raphodo/rapid.py:3010 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:883
 msgid "video"
 msgstr "видео"
 
-#: ../raphodo/rapid.py:2886
+#: ../raphodo/rapid.py:3018
 msgid "Backup problem"
-msgstr ""
+msgstr "Проблема резервного копирования"
 
-#. Translators - in the middle is a unicode em dash - please retain it
-#. This string is displayed in the status bar when the download is running
-#: ../raphodo/rapid.py:3571
+#: ../raphodo/rapid.py:3756
 #, python-format
 msgid "%(downloading_from)s — %(time_left)s left (%(speed)s)"
-msgstr ""
+msgstr "%(downloading_from)s — %(time_left)s осталось (%(speed)s)"
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3640
+#: ../raphodo/rapid.py:3828
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
-msgstr "%(noFiles)s %(filetypes)s загружено"
+msgstr "%(noFiles)s %(filetypes)s файлов загружено"
 
-#. Translators: e.g. 2 videos failed to download
-#: ../raphodo/rapid.py:3645
+#: ../raphodo/rapid.py:3836
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
-msgstr "%(noFiles)s %(filetypes)s не удалось загрузить"
+msgstr "%(noFiles)s %(filetypes)s файлов загрузить не удалось"
 
-#: ../raphodo/rapid.py:3650 ../raphodo/rapid.py:3723
+#: ../raphodo/rapid.py:3842 ../raphodo/rapid.py:3927
 msgid "warnings"
 msgstr "предупреждения"
 
-#: ../raphodo/rapid.py:3679
+#: ../raphodo/rapid.py:3873
 msgid "All downloads complete"
 msgstr "Все загрузки завершены"
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3686 ../raphodo/rapid.py:3695 ../raphodo/rapid.py:3704
-#: ../raphodo/rapid.py:3713 ../raphodo/rapid.py:3721
+#: ../raphodo/rapid.py:3881 ../raphodo/rapid.py:3892 ../raphodo/rapid.py:3903
+#: ../raphodo/rapid.py:3914 ../raphodo/rapid.py:3924
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: ../raphodo/rapid.py:3688 ../raphodo/rapid.py:3706
+#: ../raphodo/rapid.py:3884 ../raphodo/rapid.py:3906
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s загружено"
 
-#: ../raphodo/rapid.py:3697 ../raphodo/rapid.py:3715
+#: ../raphodo/rapid.py:3895 ../raphodo/rapid.py:3917
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "%(filetype)s не удалось загрузить"
 
-#: ../raphodo/rapid.py:3742
+#: ../raphodo/rapid.py:3950
 msgid "1 failure"
-msgstr ""
+msgstr "1 сбой"
 
-#: ../raphodo/rapid.py:3744
+#: ../raphodo/rapid.py:3952
 #, python-format
 msgid "%d failures"
-msgstr ""
+msgstr "%d сбо(я/ев)"
 
-#: ../raphodo/rapid.py:3749
+#: ../raphodo/rapid.py:3957
 msgid "1 warning"
-msgstr ""
+msgstr "1 предупреждение"
 
-#: ../raphodo/rapid.py:3751
+#: ../raphodo/rapid.py:3959
 #, python-format
 msgid "%d warnings"
-msgstr ""
+msgstr "%d Предупреждени(я/й)"
 
-#: ../raphodo/rapid.py:3771
+#: ../raphodo/rapid.py:3981
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s"
-msgstr ""
+msgstr "Загружено %(no_files_and_types)s из %(devices)s"
 
-#: ../raphodo/rapid.py:3774
+#: ../raphodo/rapid.py:3985
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s — %(failures)s"
-msgstr ""
+msgstr "Загружено %(no_files_and_types)s из %(devices)s — %(failures)s"
 
-#: ../raphodo/rapid.py:3779
+#: ../raphodo/rapid.py:3989
 #, python-format
 msgid "No files downloaded — %(failures)s"
-msgstr ""
+msgstr "Файлы не загружены — %(failures)s"
 
-#: ../raphodo/rapid.py:3781
+#: ../raphodo/rapid.py:3991
 msgid "No files downloaded"
-msgstr ""
+msgstr "Файлы не загружены"
 
-#: ../raphodo/rapid.py:3805
+#: ../raphodo/rapid.py:4021
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s"
 msgstr ""
+"Подпапки Места хранения и Шкала времени будут перестроены, после окончания "
+"создания миниатюр для %(camera)s"
 
-#: ../raphodo/rapid.py:3809
+#: ../raphodo/rapid.py:4026
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for this computer"
 msgstr ""
+"Подпапки Места хранения и Шкала времени будут перестроены, после окончания "
+"создания миниатюр для этого компьютера"
 
-#: ../raphodo/rapid.py:3812
+#: ../raphodo/rapid.py:4031
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s"
 msgstr ""
+"Подпапки Места хранения и Шкала времени будут перестроены, после окончания "
+"создания миниатюр для %(device)s"
 
-#: ../raphodo/rapid.py:3820
+#: ../raphodo/rapid.py:4039
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices and this computer"
 msgstr ""
+"Подпапки Места хранения и Шкала времени будут перестроены, после окончания "
+"создания миниатюр для %(number_devices)s устройств и этого компьютера"
 
-#: ../raphodo/rapid.py:3833
+#: ../raphodo/rapid.py:4052
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s and this computer"
 msgstr ""
+"Подпапки Места хранения и Шкала времени будут перестроены, после окончания "
+"создания миниатюр для %(camera)s и этого компьютера"
 
-#: ../raphodo/rapid.py:3837
+#: ../raphodo/rapid.py:4056
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s and this computer"
 msgstr ""
+"Подпапки Места хранения и Шкала времени будут перестроены, после окончания "
+"создания миниатюр для %(device)s и этого компьютера"
 
-#: ../raphodo/rapid.py:3841
+#: ../raphodo/rapid.py:4060
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices"
 msgstr ""
+"Подпапки Места хранения и Шкала времени будут перестроены, после окончания "
+"создания миниатюр для %(number_devices)s устройств"
 
-#: ../raphodo/rapid.py:3867
+#: ../raphodo/rapid.py:4087
 msgid "The Destination subfolders and Timeline have been rebuilt"
-msgstr ""
+msgstr "Подпапки Места хранения и Шкала времени будут перестроены"
 
-#: ../raphodo/rapid.py:3922
+#: ../raphodo/rapid.py:4144
 msgid "Program preferences are invalid"
 msgstr "Настройки программы не корректны"
 
-#: ../raphodo/rapid.py:3999
+#: ../raphodo/rapid.py:4228
 #, python-format
 msgid ""
 "<b>All files on the %(camera)s are inaccessible</b>.<br><br>It may be locked "
@@ -3117,351 +4298,456 @@ msgid ""
 "charging</i> to <i>USB for file transfers</i>.<br><br>Alternatively, you can "
 "ignore this device."
 msgstr ""
+"<b>Все файлы в %(camera)s недоступны</b>.<br><br>Она может быть "
+"заблокирована или не настроена на передачу данных через MTP. Вы можете "
+"разблокировать ее и попробовать снова.<br><br>На некоторых моделях вам также "
+"необходимо изменить параметр <i>USB для зарядки</i> на <i>USB для "
+"передачи</i>.<br><br>Кроме того, вы можете игнорировать это устройство."
 
-#: ../raphodo/rapid.py:4008
+#: ../raphodo/rapid.py:4239
 #, python-format
 msgid ""
-"<b>The %(camera)s appears to be in use by another application.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again.<br><br>Alternatively, you can ignore this "
-"device."
+"<b>The %(camera)s appears to be in use by another "
+"application.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again.<br><br>Alternatively, you "
+"can ignore this device."
 msgstr ""
+"<b>%(camera)s используется другим приложением.</b><br><br>Вы можете закрыть "
+"все приложения (такие как файл менеджер), использующие ее и попробовать "
+"снова. Если это не помогает, отключите %(camera)s от компьютера и подключите "
+"снова.<br><br>Кроме того, вы можете игнорировать это устройство."
 
-#: ../raphodo/rapid.py:4019
+#: ../raphodo/rapid.py:4250
 msgid "&Try Again"
-msgstr ""
+msgstr "Попробовать еще"
 
-#: ../raphodo/rapid.py:4020
+#: ../raphodo/rapid.py:4251
 msgid "&Ignore This Device"
-msgstr ""
+msgstr "Игнорировать это устройство"
 
-#: ../raphodo/rapid.py:4086
+#: ../raphodo/rapid.py:4323
 #, python-format
 msgid "Sorry, an unexpected problem occurred while scanning %s."
-msgstr ""
+msgstr "Очень жаль,но при сканировании %s возникла непредвиденная проблема."
 
-#: ../raphodo/rapid.py:4087
+#: ../raphodo/rapid.py:4324
 msgid "Unfortunately you cannot download from this device."
-msgstr ""
+msgstr "К сожалению вы не можете загружать с этого устройства."
 
-#: ../raphodo/rapid.py:4091
+#: ../raphodo/rapid.py:4328
 msgid ""
 "A possible workaround for the problem might be downloading from the camera's "
 "memory card using a card reader."
 msgstr ""
+"Возможным решением проблемы может быть загрузка с карты памяти камеры через "
+"кард-ридер."
 
-#: ../raphodo/rapid.py:4096
+#: ../raphodo/rapid.py:4333
 msgid "Device scan failed"
-msgstr ""
+msgstr "Сканирование устройств не удалось"
 
-#: ../raphodo/rapid.py:4472
+#: ../raphodo/rapid.py:4720
 #, python-format
 msgid ""
-"<b>The %(camera)s cannot be scanned because it cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again."
+"<b>The %(camera)s cannot be scanned because it cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again."
 msgstr ""
+"<b>%(camera)s не может быть просканирована из-за того, что она не может быть "
+"отмонтирована.</b><br><br>Вы можете закрыть все приложения (такие как файл "
+"менеджер), использующие ее и попробовать снова. Если это не помогает, "
+"отключите %(camera)s от компьютера и подключите снова."
 
-#: ../raphodo/rapid.py:4496
+#: ../raphodo/rapid.py:4745
 #, python-format
 msgid ""
-"<b>The download cannot start because the %(camera)s cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again, and choose which files you want to "
-"download from it."
+"<b>The download cannot start because the %(camera)s cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again, and choose which files "
+"you want to download from it."
 msgstr ""
+"<b>Загрузка не может начаться из-за того, что %(camera)s не может быть "
+"отмонтирована.</b><br><br>Вы можете закрыть все приложения (такие как файл "
+"менеджер), использующие ее и попробовать снова. Если это не помогает, "
+"отключите %(camera)s от компьютера и подключите снова, и выберите файлы, "
+"которые вы хотите с нее загрузить."
+
+#: ../raphodo/rapid.py:4842
+msgid "Completed Downloads Present"
+msgstr "Есть завершенные загрузки"
 
-#: ../raphodo/rapid.py:4635
+#: ../raphodo/rapid.py:4844
+#, python-format
+msgid "%s whose download have completed are displayed."
+msgstr "%s, чья загрузка завершена, отображаются."
+
+#: ../raphodo/rapid.py:4846
+msgid "Do you want to clear the completed downloads?"
+msgstr "Вы хотите очистить завершенные загрузки?"
+
+#: ../raphodo/rapid.py:4848
+msgid "Completed Download Present"
+msgstr "Есть завершенная загрузка"
+
+#: ../raphodo/rapid.py:4850
+#, python-format
+msgid "%s whose download has completed is displayed."
+msgstr "%s, чья загрузка завершена, отображается."
+
+#: ../raphodo/rapid.py:4852
+msgid "Do you want to clear the completed download?"
+msgstr "Вы хотите очистить завершенную загрузку?"
+
+#: ../raphodo/rapid.py:4933
 #, python-format
 msgid ""
 "Do you want to download photos and videos from the device <i>%(device)s</i>?"
-msgstr ""
+msgstr "Вы хотите загрузить фото и видео с устройства <i>%(device)s</i>?"
 
-#: ../raphodo/rapid.py:4877
+#: ../raphodo/rapid.py:5183
 #, python-format
 msgid "<b>Do you want to ignore the %s whenever this program is run?</b>"
-msgstr ""
+msgstr "<b>Вы хотите игнорировать %s при каждом запуске программы?</b>"
 
-#: ../raphodo/rapid.py:4879
+#: ../raphodo/rapid.py:5186
 msgid ""
 "All cameras, phones and tablets with the same model name will be ignored."
 msgstr ""
+"Все камеры, телефоны и планшеты с таким названием модели будут "
+"игнорироваться."
 
-#: ../raphodo/rapid.py:4883
+#: ../raphodo/rapid.py:5190
 #, python-format
 msgid ""
 "<b>Do you want to ignore the device %s whenever this program is run?</b>"
 msgstr ""
+"<b>Вы хотите игнорировать устройство %s при каждом запуске программы?</b>"
 
-#: ../raphodo/rapid.py:4885
+#: ../raphodo/rapid.py:5192
 msgid "Any device with the same name will be ignored."
-msgstr ""
+msgstr "Все устройства с таким именем будут игнорироваться."
 
-#: ../raphodo/rapid.py:5178
+#: ../raphodo/rapid.py:5492
 #, python-format
 msgid "Downloading from %(location)s on This Computer."
-msgstr ""
+msgstr "Загрузка из %(location)s на Этом компьютере."
 
-#: ../raphodo/rapid.py:5180
+#: ../raphodo/rapid.py:5496
 msgid ""
 "Do you really want to download from here?<br><br>On some systems, scanning "
 "this location can take a very long time."
 msgstr ""
+"Вы действительно хотите загружать отсюда?<br><br>На некоторых системах "
+"сканирование этого расположения может длиться очень долго."
 
-#: ../raphodo/rapid.py:5224
+#: ../raphodo/rapid.py:5537
 #, python-format
 msgid "Generating thumbnails for %s"
-msgstr ""
+msgstr "Создание миниатр для %s"
 
-#: ../raphodo/rapid.py:5227
+#: ../raphodo/rapid.py:5540
 #, python-format
 msgid "Scanning %s"
-msgstr ""
+msgstr "Просканировано %s"
 
-#: ../raphodo/rapid.py:5237
+#: ../raphodo/rapid.py:5551
 #, python-format
 msgid ""
 "%(number)s of %(available files)s checked for download (%(hidden)s hidden)"
 msgstr ""
+"%(number)s из %(available files)s отмечено для загрузки (%(hidden)s скрыто)"
 
-#: ../raphodo/rapid.py:5243
+#: ../raphodo/rapid.py:5559
 #, python-format
 msgid "%(number)s of %(available files)s checked for download"
-msgstr ""
+msgstr "%(number)s из %(available files)s отмечено для загрузки"
 
-#: ../raphodo/rapid.py:5494
+#: ../raphodo/rapid.py:5764
 msgid "Display program information when run from the command line."
-msgstr ""
+msgstr "Показывать информацию программы при запуске из командной строки."
 
-#: ../raphodo/rapid.py:5496
+#: ../raphodo/rapid.py:5766
 msgid "Display debugging information when run from the command line."
-msgstr ""
+msgstr "Показывать отладочную информацию при запуске из командной строки."
 
-#: ../raphodo/rapid.py:5499
+#: ../raphodo/rapid.py:5769
 msgid "List photo and video file extensions the program recognizes and exit."
-msgstr ""
+msgstr "Показать расширения фото и видео, известные программе и завершить."
 
-#: ../raphodo/rapid.py:5502
+#: ../raphodo/rapid.py:5772
 msgid "Turn on or off the the renaming of photos."
-msgstr ""
+msgstr "Включить или выключить переименование фото."
 
-#: ../raphodo/rapid.py:5504
+#: ../raphodo/rapid.py:5774
 msgid "turn on or off the the renaming of videos."
-msgstr ""
+msgstr "Включить или выключить переименование видео."
 
-#: ../raphodo/rapid.py:5506
+#: ../raphodo/rapid.py:5776
 msgid ""
 "Turn on or off the automatic detection of devices from which to download."
 msgstr ""
+"Включить или выключить автоматическое определение устройств, с которых "
+"осуществлять загрузку."
 
-#: ../raphodo/rapid.py:5510
+#: ../raphodo/rapid.py:5780
 msgid "Turn on or off downloading from this computer."
-msgstr ""
+msgstr "Включить или выключить загрузку с этого компьютера."
 
-#: ../raphodo/rapid.py:5512 ../raphodo/rapid.py:5515 ../raphodo/rapid.py:5518
-#: ../raphodo/rapid.py:5539 ../raphodo/rapid.py:5543
+#: ../raphodo/rapid.py:5782 ../raphodo/rapid.py:5785 ../raphodo/rapid.py:5788
+#: ../raphodo/rapid.py:5809 ../raphodo/rapid.py:5813
 msgid "PATH"
-msgstr ""
+msgstr "ПУТЬ"
 
-#: ../raphodo/rapid.py:5513
+#: ../raphodo/rapid.py:5783
 msgid "The PATH on this computer from which to download."
 msgstr ""
+"ПУТЬ на этом компьютере из компьютере, из которого осуществлять загрузку."
 
-#: ../raphodo/rapid.py:5516
+#: ../raphodo/rapid.py:5786
 msgid "The PATH where photos will be downloaded to."
-msgstr ""
+msgstr "ПУТЬ куда будут загружаться фото."
 
-#: ../raphodo/rapid.py:5519
+#: ../raphodo/rapid.py:5789
 msgid "The PATH where videos will be downloaded to."
-msgstr ""
+msgstr "ПУТЬ куда будут загружаться видео."
 
-#: ../raphodo/rapid.py:5521
+#: ../raphodo/rapid.py:5791
 msgid "Turn on or off the backing up of photos and videos while downloading."
 msgstr ""
+"Включение или выключение создания резервных копий фото и видео во время "
+"загрузки."
 
-#: ../raphodo/rapid.py:5525
+#: ../raphodo/rapid.py:5795
 msgid "Turn on or off the automatic detection of backup devices."
 msgstr ""
+"Включение или выключение автоматического определения устройств для хранения "
+"резервных копий."
 
-#: ../raphodo/rapid.py:5527 ../raphodo/rapid.py:5533
+#: ../raphodo/rapid.py:5797 ../raphodo/rapid.py:5803
 msgid "FOLDER"
-msgstr ""
+msgstr "ПАПКА"
 
-#: ../raphodo/rapid.py:5528
+#: ../raphodo/rapid.py:5798
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected photo "
 "backup device, with the folder's name being used to identify whether or not "
 "the device is used for backups. For each device you wish to use for backing "
 "photos up to, create a folder on it with this name."
 msgstr ""
+"ПАПКА в которой хранятся резервные копии на автоматически определяемом "
+"устройстве для хранения резервных копий фото, имя этой папки используется "
+"для определения, используется ли это устройство для хранения резервных "
+"копий. Создайте папку с таким именем на каждом устройстве, которое вы хотите "
+"использовать для хранения резервных копий фото."
 
-#: ../raphodo/rapid.py:5534
+#: ../raphodo/rapid.py:5804
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected video "
 "backup device, with the folder's name being used to identify whether or not "
 "the device is used for backups. For each device you wish to use for backing "
 "up videos to, create a folder on it with this name."
 msgstr ""
+"ПАПКА в которой хранятся резервные копии на автоматически определяемом "
+"устройстве для хранения резервных копий видео, имя этой папки используется "
+"для определения, используется ли это устройство для хранения резервных "
+"копий. Создайте папку с таким именем на каждом устройстве, которое вы хотите "
+"использовать для хранения резервных копий видео."
 
-#: ../raphodo/rapid.py:5540
+#: ../raphodo/rapid.py:5810
 msgid ""
 "The PATH where photos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
+"ПУТЬ, где будут храниться резервные копии фото в случае, когда "
+"автоматическое определение устройств для хранения резервных копий отключено."
 
-#: ../raphodo/rapid.py:5544
+#: ../raphodo/rapid.py:5814
 msgid ""
 "The PATH where videos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
+"ПУТЬ, где будут храниться резервные копии видео в случае, когда "
+"автоматическое определение устройств для хранения резервных копий отключено."
 
-#: ../raphodo/rapid.py:5547
+#: ../raphodo/rapid.py:5817
 #, python-format
 msgid "Ignore photos with the following extensions: %s"
-msgstr ""
+msgstr "Игнорировать фото со следующими расширениями: %s"
 
-#: ../raphodo/rapid.py:5551
-msgid "Turn on or off starting downloads as soon as the program itself starts."
+#: ../raphodo/rapid.py:5821
+msgid ""
+"Turn on or off starting downloads as soon as the program itself starts."
 msgstr ""
+"Включение или выключение запуска загрузки сразу после старта программы."
 
-#: ../raphodo/rapid.py:5554
+#: ../raphodo/rapid.py:5824
 msgid "Turn on or off starting downloads as soon as a device is inserted."
 msgstr ""
+"Включение или выключение запуска загрузки сразу после подключения устройства."
 
-#: ../raphodo/rapid.py:5557
+#: ../raphodo/rapid.py:5827
 msgid ""
 "Turn on or off use of the Rapid Photo Downloader Thumbnail Cache. Turning it "
 "off does not delete existing cache contents."
 msgstr ""
+"Включение или выключение использования кэша миниатюр Rapid Photo Downloader. "
+"Выключение не приводит к удалению существующего содержимого кэша."
 
-#: ../raphodo/rapid.py:5561
+#: ../raphodo/rapid.py:5831
 msgid ""
 "Delete all thumbnails in the Rapid Photo Downloader Thumbnail Cache, and "
 "exit."
 msgstr ""
+"Удалить все миниатюры в кэше миниатюр Rapid Photo Downloader и выйти."
 
-#: ../raphodo/rapid.py:5565
+#: ../raphodo/rapid.py:5835
 msgid "Forget which files have been previously downloaded, and exit."
-msgstr ""
+msgstr "Забыть файлы, которые уже были загружены и выйти."
 
-#: ../raphodo/rapid.py:5568
+#: ../raphodo/rapid.py:5838
 msgid ""
 "Import preferences from an old program version and exit. Requires the "
 "command line program gconftool-2."
 msgstr ""
+"Импортировать настройки из старой версии программы и выйти. Требуется "
+"программа командной строки gconftool-2."
 
-#: ../raphodo/rapid.py:5571
+#: ../raphodo/rapid.py:5841
 msgid ""
 "Reset all program settings to their default values, delete all thumbnails in "
 "the Thumbnail cache, forget which files have been previously downloaded, and "
 "exit."
 msgstr ""
+"Сбросить все настройки программы на значения по умолчанию, удалить все "
+"миниатюры в кэше миниатюр, забыть, какие файлы уже были загружены и выйти."
 
-#: ../raphodo/rapid.py:5575
+#: ../raphodo/rapid.py:5845
 msgid "Include gphoto2 debugging information in log files."
-msgstr ""
+msgstr "Включать отладочную информацию gphoto2 в лог файлы."
 
-#: ../raphodo/rapid.py:5579
+#: ../raphodo/rapid.py:5849
 msgid "Print information to the terminal about attached cameras and exit."
-msgstr ""
+msgstr "Вывести в терминал информацию о подключенных камерах и выйти."
 
-#: ../raphodo/rapid.py:5640
+#: ../raphodo/rapid.py:5911
 msgid ""
 "To import preferences from the old version of Rapid Photo Downloader, you "
 "must install the program gconftool-2."
 msgstr ""
+"Для импорта настроек из старой версии Rapid Photo Downloader, вы должны "
+"установить программу gconftool-2."
 
-#: ../raphodo/rapid.py:5649
+#: ../raphodo/rapid.py:5920
 msgid "No prior program preferences detected: exiting"
-msgstr ""
+msgstr "Настройки от предыдущей программы не найдены: завершение"
 
-#: ../raphodo/rapid.py:5652
+#: ../raphodo/rapid.py:5923
 #, python-format
 msgid "Importing preferences from Rapid Photo Downloader %(version)s"
-msgstr ""
+msgstr "Импорт настроек от Rapid Photo Downloader %(version)s"
 
-#: ../raphodo/rapid.py:5714
+#: ../raphodo/rapid.py:5989
 #, python-format
-msgid "Do you want to copy the stored sequence number, which has the value %d?"
+msgid ""
+"Do you want to copy the stored sequence number, which has the value %d?"
 msgstr ""
+"Вы хотите скопировать значение сквозной нумерации, которое содержит значение "
+"%d?"
 
-#: ../raphodo/rapid.py:5726
+#: ../raphodo/rapid.py:6000
 msgid "Program aborting."
-msgstr ""
+msgstr "Работы программы прервана."
 
-#: ../raphodo/rapid.py:5736
+#: ../raphodo/rapid.py:6010
 msgid "Never run this program as the sudo / root user."
 msgstr ""
+"Никогда не запускайте эту программу от имени администратора (sudo / root)."
 
-#: ../raphodo/rapid.py:5740
+#: ../raphodo/rapid.py:6014
 msgid "You must install ExifTool to run Rapid Photo Downloader."
+msgstr "Для запуска Rapid Photo Downloader вы должны установить ExifTool."
+
+#: ../raphodo/rapid.py:6026
+msgid ""
+"Rapid Photo Downloader is installed in multiple locations.\n"
+"\n"
+"Uninstall all copies except the version you want to run."
 msgstr ""
+"Rapid Photo Downloader установлен в несколько мест.\n"
+"\n"
+"Удалите все копии, кроме версии, которую вы хотите использовать."
 
-#: ../raphodo/rapid.py:5794
+#: ../raphodo/rapid.py:6083
 msgid ""
 "When specifying a path on the command line, do not also specify an\n"
 "option for device auto detection or a path on \"This Computer\"."
 msgstr ""
+"Задавая путь в командной строке, не задавайте параметр для автоматического \n"
+"определения устройств или путь \"Этот компьютер\"."
 
-#: ../raphodo/rapid.py:5950
+#: ../raphodo/rapid.py:6243
 msgid "All settings and caches have been reset"
-msgstr ""
+msgstr "Все настройки и кэш сброшены"
 
-#: ../raphodo/rapid.py:5958
+#: ../raphodo/rapid.py:6251
 msgid "Thumbnail Cache has been reset"
-msgstr ""
+msgstr "Кэш миниатюр сброшен"
 
-#: ../raphodo/rapid.py:5964
+#: ../raphodo/rapid.py:6257
 msgid "Remembered files have been forgotten"
-msgstr ""
+msgstr "Файлы, которые уже были загружены, забыты"
 
 #: ../raphodo/rememberthisdialog.py:70
 msgid "&Don't ask me about this again"
-msgstr ""
+msgstr "Не спрашивать меня об этом снова"
 
 #: ../raphodo/rememberthisdialog.py:72
 msgid "&Don't warn me about this again"
-msgstr ""
+msgstr "Не предупреждать меня об этом снова"
 
 #: ../raphodo/rememberthisdialog.py:75
 msgid "&Don't warn me again about missing or broken program libraries"
 msgstr ""
+"Не предупреждать меня снова об отсутствующих или нерабочих библиотеках "
+"программы"
 
-#: ../raphodo/renameandmovefile.py:546
+#: ../raphodo/renameandmovefile.py:554
 msgid "subfolder and filename"
-msgstr "подкаталог и название файла"
+msgstr "подпапка и имя файла"
 
-#: ../raphodo/renameandmovefile.py:548
+#: ../raphodo/renameandmovefile.py:556
 msgid "filename"
 msgstr "имя файла"
 
-#: ../raphodo/renameandmovefile.py:550
+#: ../raphodo/renameandmovefile.py:558
 msgid "subfolder"
-msgstr "подкаталог"
+msgstr "подпапка"
 
 #: ../raphodo/renamepanel.py:290
 msgid "A counter for how many downloads occur on each day"
-msgstr ""
+msgstr "Счетчик количества загрузок за каждый день"
 
 #: ../raphodo/renamepanel.py:291
 msgid "Downloads today:"
-msgstr "Загрузок сегодня:"
+msgstr "Загружено сегодня:"
 
 #: ../raphodo/renamepanel.py:313
 msgid "A counter that is remembered each time the program is run "
-msgstr ""
+msgstr "Счетчик, который запоминается при каждом запуске программы "
 
 #: ../raphodo/renamepanel.py:314
 msgid "Stored number:"
-msgstr "Сквозная нумерация:"
+msgstr "Сквознаянумерация:"
 
 #: ../raphodo/renamepanel.py:331
 msgid ""
 "The time at which the <i>Downloads today</i> sequence number should be reset"
 msgstr ""
+"Время, в которое должно быть сброшено значение нумерации <i>Загружено "
+"сегодня</i>"
 
 #: ../raphodo/renamepanel.py:332
 msgid "Day start:"
@@ -3471,7 +4757,7 @@ msgstr "Начало дня:"
 #. self.dayStart.setDisplayFormat('HH:mm:ss')
 #: ../raphodo/renamepanel.py:342
 msgid "Synchronize RAW + JPEG"
-msgstr ""
+msgstr "Синхронизировать RAW + JPEG"
 
 #: ../raphodo/renamepanel.py:345
 msgid ""
@@ -3479,10 +4765,13 @@ msgid ""
 "\n"
 "See the online documentation for more details."
 msgstr ""
+"Синхронизировать нумерацию для пар RAW и JPEG.\n"
+"\n"
+"Для дополнительной информации смотрите документацию в сети."
 
 #: ../raphodo/renamepanel.py:349
 msgid "Sequence Numbers"
-msgstr ""
+msgstr "Нумерация"
 
 #: ../raphodo/renamepanel.py:360
 msgid "Strip incompatible characters"
@@ -3493,22 +4782,24 @@ msgid ""
 "Whether photo, video and folder names should have any characters removed "
 "that are not allowed by other operating systems"
 msgstr ""
+"Могут ли имена фото, видео и папок содержать символы, удаляемые как "
+"недопустимые другими операционными системами"
 
 #: ../raphodo/renamepanel.py:365
 msgid "Compatibility"
-msgstr ""
+msgstr "Совместимость"
 
 #: ../raphodo/renamepanel.py:433
 msgid "Photo Renaming"
-msgstr ""
+msgstr "Переименование фото"
 
 #: ../raphodo/renamepanel.py:436
 msgid "Video Renaming"
-msgstr ""
+msgstr "Переименование видео"
 
 #: ../raphodo/renamepanel.py:439
 msgid "Renaming Options"
-msgstr ""
+msgstr "Параметры переименования"
 
 #: ../raphodo/rpdfile.py:218
 msgid "photos and videos"
@@ -3518,159 +4809,236 @@ msgstr "фото и видео"
 msgid "photos or videos"
 msgstr "фото или видео"
 
-#: ../raphodo/rpdfile.py:306
+#: ../raphodo/rpdfile.py:315
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: ../raphodo/rpdfile.py:318
+#. translators: natural language expression signifying a single video
+#: ../raphodo/rpdfile.py:337
+msgid "a video"
+msgstr "видео"
+
+#: ../raphodo/rpdfile.py:339
 msgid "1 Video"
-msgstr ""
+msgstr "1 видео"
+
+#. translators: natural language expression signifying a single photo
+#: ../raphodo/rpdfile.py:346
+msgid "a photo"
+msgstr "фото"
 
-#: ../raphodo/rpdfile.py:323
+#: ../raphodo/rpdfile.py:348
 msgid "1 Photo"
-msgstr ""
+msgstr "1 фото"
 
-#: ../raphodo/rpdfile.py:803
+#: ../raphodo/rpdfile.py:828
 #, python-format
 msgid "%(path)s on %(camera)s"
-msgstr ""
+msgstr "%(path)s в %(camera)s"
 
-#: ../raphodo/rpdfile.py:819
+#: ../raphodo/rpdfile.py:844
 msgid "Photo"
 msgstr "Фото"
 
-#: ../raphodo/rpdfile.py:859
+#: ../raphodo/rpdfile.py:884
 msgid "Video"
 msgstr "Видео"
 
-#: ../raphodo/storage.py:138
+#: ../raphodo/storage.py:141
 msgid "File system root"
-msgstr ""
+msgstr "Корень файловой системы"
 
 #. translators: the name of the Pictures folder
-#: ../raphodo/storage.py:433
+#: ../raphodo/storage.py:437
 msgid "Pictures"
-msgstr ""
+msgstr "Изображения"
 
-#: ../raphodo/thumbnaildisplay.py:426
+#: ../raphodo/thumbnaildisplay.py:432
 #, python-format
 msgid "Taken on %(date_time)s (%(human_readable)s)"
-msgstr ""
+msgstr "Снято %(date_time)s (%(human_readable)s)"
 
-#: ../raphodo/thumbnaildisplay.py:431
+#: ../raphodo/thumbnaildisplay.py:439
 #, python-format
 msgid "Modified on %(date_time)s (%(human_readable)s)"
-msgstr ""
+msgstr "Изменено %(date_time)s (%(human_readable)s)"
 
-#: ../raphodo/thumbnaildisplay.py:437 ../raphodo/thumbnaildisplay.py:466
+#: ../raphodo/thumbnaildisplay.py:447 ../raphodo/thumbnaildisplay.py:481
 #, python-format
 msgid "%(date_time)s (%(human_readable)s)"
-msgstr ""
+msgstr "%(date_time)s (%(human_readable)s)"
 
-#: ../raphodo/thumbnaildisplay.py:451
+#: ../raphodo/thumbnaildisplay.py:464
 #, python-format
 msgid "Memory cards: %s"
-msgstr ""
+msgstr "Карты памяти: %s"
+
+#: ../raphodo/thumbnaildisplay.py:468
+#, python-format
+msgid "Memory card: %s"
+msgstr "Карта памяти: %s"
 
-#: ../raphodo/thumbnaildisplay.py:457
+#: ../raphodo/thumbnaildisplay.py:473
 msgid "Downloaded as:"
-msgstr ""
+msgstr "Загружено как:"
 
-#: ../raphodo/thumbnaildisplay.py:472
+#: ../raphodo/thumbnaildisplay.py:489
 #, python-format
 msgid "<br><br>Previous download:<br>%(filename)s<br>%(path)s<br>%(date)s"
-msgstr ""
+msgstr "<br><br>Предыдущая загрузка:<br>%(filename)s<br>%(path)s<br>%(date)s"
 
-#: ../raphodo/thumbnaildisplay.py:1603
+#: ../raphodo/thumbnaildisplay.py:1645
 msgid "Copy Path"
-msgstr ""
+msgstr "Копировать путь"
+
+#. Translators: these values are file size suffixes like B representing bytes, KB representing
+#. kilobytes, etc.
+#: ../raphodo/utilities.py:170
+msgid "B"
+msgstr "Б"
+
+#: ../raphodo/utilities.py:170
+msgid "KB"
+msgstr "кБ"
+
+#: ../raphodo/utilities.py:170
+msgid "MB"
+msgstr "МБ"
+
+#: ../raphodo/utilities.py:170
+msgid "GB"
+msgstr "ГБ"
+
+#: ../raphodo/utilities.py:170
+msgid "TB"
+msgstr "ТБ"
+
+#: ../raphodo/utilities.py:170
+msgid "PB"
+msgstr "ПБ"
+
+#: ../raphodo/utilities.py:170
+msgid "EB"
+msgstr "ЭБ"
+
+#: ../raphodo/utilities.py:170
+msgid "ZB"
+msgstr "ЗБ"
+
+#: ../raphodo/utilities.py:170
+msgid "YB"
+msgstr "ЙБ"
 
 #. two things in a list e.g. "device1 and device2"
-#: ../raphodo/utilities.py:391
+#: ../raphodo/utilities.py:394
 #, python-format
 msgid "%(first_item)s and %(last_item)s"
-msgstr ""
+msgstr "%(first_item)s и %(last_item)s"
 
-#: ../raphodo/utilities.py:464
+#: ../raphodo/utilities.py:468
 msgid "one"
-msgstr ""
+msgstr "1"
 
-#: ../raphodo/utilities.py:465
+#: ../raphodo/utilities.py:469
 msgid "two"
-msgstr ""
+msgstr "2"
 
-#: ../raphodo/utilities.py:466
+#: ../raphodo/utilities.py:470
 msgid "three"
-msgstr ""
+msgstr "3"
 
-#: ../raphodo/utilities.py:467
+#: ../raphodo/utilities.py:471
 msgid "four"
-msgstr ""
+msgstr "4"
 
-#: ../raphodo/utilities.py:468
+#: ../raphodo/utilities.py:472
 msgid "five"
-msgstr ""
+msgstr "5"
 
-#: ../raphodo/utilities.py:469
+#: ../raphodo/utilities.py:473
 msgid "six"
-msgstr ""
+msgstr "6"
 
-#: ../raphodo/utilities.py:470
+#: ../raphodo/utilities.py:474
 msgid "seven"
-msgstr ""
+msgstr "7"
 
-#: ../raphodo/utilities.py:471
+#: ../raphodo/utilities.py:475
 msgid "eight"
-msgstr ""
+msgstr "8"
 
-#: ../raphodo/utilities.py:472
+#: ../raphodo/utilities.py:476
 msgid "nine"
-msgstr ""
+msgstr "9"
 
-#: ../raphodo/utilities.py:473
+#: ../raphodo/utilities.py:477
 msgid "ten"
-msgstr ""
+msgstr "10"
 
-#: ../raphodo/utilities.py:474
+#: ../raphodo/utilities.py:478
 msgid "eleven"
-msgstr ""
+msgstr "11"
 
-#: ../raphodo/utilities.py:475
+#: ../raphodo/utilities.py:479
 msgid "twelve"
-msgstr ""
+msgstr "12"
 
-#: ../raphodo/utilities.py:476
+#: ../raphodo/utilities.py:480
 msgid "thirteen"
-msgstr ""
+msgstr "13"
 
-#: ../raphodo/utilities.py:477
+#: ../raphodo/utilities.py:481
 msgid "fourteen"
-msgstr ""
+msgstr "14"
 
-#: ../raphodo/utilities.py:478
+#: ../raphodo/utilities.py:482
 msgid "fifteen"
-msgstr ""
+msgstr "15"
 
-#: ../raphodo/utilities.py:479
+#: ../raphodo/utilities.py:483
 msgid "sixteen"
-msgstr ""
+msgstr "16"
 
-#: ../raphodo/utilities.py:480
+#: ../raphodo/utilities.py:484
 msgid "seventeen"
-msgstr ""
+msgstr "17"
 
-#: ../raphodo/utilities.py:481
+#: ../raphodo/utilities.py:485
 msgid "eighteen"
-msgstr ""
+msgstr "18"
 
-#: ../raphodo/utilities.py:482
+#: ../raphodo/utilities.py:486
 msgid "ninenteen"
-msgstr ""
+msgstr "19"
 
-#: ../raphodo/utilities.py:483
+#: ../raphodo/utilities.py:487
 msgid "twenty"
-msgstr ""
+msgstr "20"
+
+#: ../raphodo/viewutils.py:240
+msgid "&OK"
+msgstr "Да"
+
+#: ../raphodo/viewutils.py:243
+msgid "&Save"
+msgstr "Сохранить"
+
+#: ../raphodo/viewutils.py:244
+msgid "&Help"
+msgstr "Помощь"
+
+#: ../raphodo/viewutils.py:245
+msgid "Restore Defaults"
+msgstr "Восстановить значения по умолчанию"
+
+#: ../raphodo/viewutils.py:246
+msgid "&Yes"
+msgstr "Да"
+
+#: ../raphodo/viewutils.py:247
+msgid "&No"
+msgstr "Нет"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:1
 msgid ""
@@ -3680,6 +5048,11 @@ msgid ""
 "photos and videos as they are downloaded. It downloads from and backs up to "
 "multiple devices simultaneously."
 msgstr ""
+"Rapid Photo Downloader импортирует фото и видео с камер, телефонов, карт "
+"памяти и других устройств на высокой скорости. Он может быть настроен для "
+"переименования фото и видео осмысленными именами, заданными вами. Он также "
+"может создавать во время загрузки резервные копии фото и видео. Он загружает "
+"с и создает резервные копии на нескольких устройствах одновременно."
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:2
 msgid ""
@@ -3688,6 +5061,10 @@ msgid ""
 "identify photos and videos taken at different periods in a single day or "
 "over consecutive days."
 msgstr ""
+"Особенность Rapid Photo Downloader - его Шкала времени, на которой фото и "
+"видео группируются на основании времени, прошедшего между снимками. "
+"Используйте это для определения фото и видео, снятых в разное время одного "
+"дня, или за несколько дней."
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:3
 msgid ""
@@ -3696,43 +5073,53 @@ msgid ""
 "configured without the need for complicated codes. Common tasks can be "
 "automated, such as unmounting a memory card when the download is complete."
 msgstr ""
+"Написанный фотографом для профессионалов и любителей фотографии, Rapid Photo "
+"Downloader легко настроить и использовать. Настройки программы изменяются "
+"без необходимости в сложном кодировании. Общие задачи, такие как "
+"отмонтирование карты памяти по окончании загрузки, могут быть "
+"автоматизированы."
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:4
 msgid "The main window"
-msgstr ""
+msgstr "Главное окно"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:5
 msgid "Downloading"
-msgstr ""
+msgstr "Загрузка"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:6
 msgid "The Timeline"
-msgstr ""
+msgstr "Шкала времени"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:7
 msgid "Right-clicking on a device"
-msgstr ""
+msgstr "Нажатие ПКМ на устройстве"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:1
 msgid ""
 "Download, rename and back up photos and videos from cameras and other devices"
 msgstr ""
+"Загружайте, переименовывайте и создавайте резервные копии фото и видео с "
+"камер и других устройств"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:2
 msgid "Photo Downloader"
-msgstr ""
+msgstr "Загрузчик фото"
 
 #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:5
 msgid ""
-"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;"
-"memory;card;"
+"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;memory"
+";card;"
 msgstr ""
+"фото;загрузка;фотография;импорт;видео;RAW;камера;телефон;ingest;резрвные "
+"копии;память;карта;"
 
 #: ../data/kde/net.damonlynch.rapid-photo-downloader.desktop.in.h:1
 msgid "Download Photos and Videos with Rapid Photo Downloader"
-msgstr ""
+msgstr "Загружайте фото и видео с Rapid Photo Downloader"
 
+#, python-format
 #~ msgid "<i>Example: %s</i>"
 #~ msgstr "<i>Пример: %s</i>"
 
@@ -3745,6 +5132,7 @@ msgstr ""
 #~ msgid "and"
 #~ msgstr "и"
 
+#, python-format
 #~ msgid "About %i seconds remaining"
 #~ msgstr "Осталось %i  секунд"
 
@@ -3775,9 +5163,11 @@ msgstr ""
 #~ msgid "_Make a Donation..."
 #~ msgstr "_Сделать пожервование"
 
+#, python-format
 #~ msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 #~ msgstr "Осталось примерно %(minutes)i:%(seconds)02i"
 
+#, python-format
 #~ msgid "and %s"
 #~ msgstr "и %s"
 
@@ -3927,6 +5317,7 @@ msgstr ""
 #~ msgid "MB/s"
 #~ msgstr "МБ/с"
 
+#, python-format
 #~ msgid "Source: %(source)s"
 #~ msgstr "Источник: %(source)s"
 
@@ -3939,9 +5330,11 @@ msgstr ""
 #~ msgid "Should all Job Codes be removed?"
 #~ msgstr "Вы действительно хотите удалить все метки?"
 
+#, python-format
 #~ msgid "Select a folder containing %(file_types)s"
 #~ msgstr "Выберите каталог, содержащий %(file_types)s"
 
+#, python-format
 #~ msgid "Backing up to %(path)s"
 #~ msgstr "Резервное копирование в  %(path)s"
 
@@ -3960,6 +5353,7 @@ msgstr ""
 #~ msgid "Download cannot proceed"
 #~ msgstr "Невозможно загрузить"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s"
 #~ msgstr "%(number)s из %(total)s %(filetypes)s"
 
@@ -3996,6 +5390,7 @@ msgstr ""
 #~ "подкаталогов. Пожалуйста, используйте другие варианты именования "
 #~ "подкаталогов.</i>"
 
+#, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
 #~ "Destination: %(destination)s"
@@ -4003,6 +5398,7 @@ msgstr ""
 #~ "Источник: %(source)s\n"
 #~ "Назначение: %(destination)s"
 
+#, python-format
 #~ msgid "Destination directory could not be created: %(directory)s\n"
 #~ msgstr "Каталог назначения не может быть создан: %(directory)s\n"
 
@@ -4011,8 +5407,7 @@ msgstr ""
 
 #~ msgid "list photo and video file extensions the program recognizes and exit"
 #~ msgstr ""
-#~ "вывести расширения фото- и видеофайлов, которые распознает программа, и "
-#~ "выйти"
+#~ "вывести расширения фото- и видеофайлов, которые распознает программа, и выйти"
 
 #~ msgid "All settings and preferences have been reset"
 #~ msgstr "Все установки и настройки были сброшены"
@@ -4039,6 +5434,7 @@ msgstr ""
 #~ "Во время резервного копирования следует перезаписать файл, имеющий тоже "
 #~ "самое название, или пропустить его?"
 
+#, python-format
 #~ msgid "Error: %(inst)s"
 #~ msgstr "Ошибка: %(inst)s"
 
@@ -4048,15 +5444,19 @@ msgstr ""
 #~ msgid "_Select"
 #~ msgstr "_Выделить"
 
+#, python-format
 #~ msgid "%(date)s %(time)s"
 #~ msgstr "%(date)s %(time)s"
 
+#, python-format
 #~ msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
+#, python-format
 #~ msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
+#, python-format
 #~ msgid ""
 #~ "%(date)s\n"
 #~ "%(time)s"
@@ -4064,15 +5464,14 @@ msgstr ""
 #~ "%(date)s\n"
 #~ "%(time)s"
 
-#~ msgid ""
-#~ "Photos detected with the same filenames, but taken at different times"
+#~ msgid "Photos detected with the same filenames, but taken at different times"
 #~ msgstr ""
-#~ "Обнаружены фотографии с одинаковыми названиями, но сделанные в разное "
-#~ "время"
+#~ "Обнаружены фотографии с одинаковыми названиями, но сделанные в разное время"
 
 #~ msgid "Videos:"
 #~ msgstr "Видео:"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 #~ msgstr "%(number)s из %(total)s %(filetypes)s (%(remaining)s осталось)"
 
@@ -4141,8 +5540,7 @@ msgstr ""
 #~ "<span weight=\"bold\" size=\"x-large\">Каталоги для загрузки видео</span>"
 
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Переименование видео</span>\t"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Переименование видео</span>\t"
 
 #~ msgid "Video backup folder name:"
 #~ msgstr "Название каталога резервного копирования видео"
@@ -4153,6 +5551,7 @@ msgstr ""
 #~ msgid "Video Folders"
 #~ msgstr "Каталоги видео"
 
+#, python-format
 #~ msgid ""
 #~ "The %(filetype)s subfolder preferences entered are invalid and cannot be "
 #~ "used.\n"
@@ -4185,9 +5584,8 @@ msgstr ""
 #~ msgstr "Выбрать всё с _метками"
 
 #~ 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."
+#~ "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 ""
 #~ "Если фотография или видеоролик с таким названием уже загружен, выберите, "
 #~ "пропустить загрузку или добавить уникальный идентификатор."
@@ -4196,15 +5594,14 @@ msgstr ""
 #~ "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>"
+#~ "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 ""
 #~ "Укажите каталог для размещения резервных копий на носителе.  \n"
 #~ "\n"
-#~ "<i>Примечение: эта настройка также определяет, используется ли носитель "
-#~ "для резервного копирования. На каждом носителе, который вы хотите "
-#~ "использовать для резервного копирования, создайте каталог с одним из этих "
-#~ "имен.</i>"
+#~ "<i>Примечение: эта настройка также определяет, используется ли носитель для "
+#~ "резервного копирования. На каждом носителе, который вы хотите использовать "
+#~ "для резервного копирования, создайте каталог с одним из этих имен.</i>"
 
 #~ msgid ""
 #~ "Specify the time in 24 hour format at which the <i>Downloads today</i> "
@@ -4213,6 +5610,7 @@ msgstr ""
 #~ "Укажите время в 24-часовом формате, когда следует обнулять параметр "
 #~ "<i>Загрузок сегодня</i>."
 
+#, python-format
 #~ msgid "%(freespace)s. %(backuppaths)s."
 #~ msgstr "%(freespace)s. %(backuppaths)s."
 
@@ -4222,18 +5620,23 @@ msgstr ""
 #~ msgid "Free space:"
 #~ msgstr "Свободное место:"
 
+#, python-format
 #~ msgid "Folder: %s"
 #~ msgstr "Каталог: %s"
 
+#, python-format
 #~ msgid "%(filetype)s already exists"
 #~ msgstr "%(filetype)s уже существует"
 
+#, python-format
 #~ msgid "%(filetype)s was already downloaded"
 #~ msgstr "%(filetype)s уже был загружен"
 
+#, python-format
 #~ msgid "An error occurred when copying the %(filetype)s"
 #~ msgstr "Произошла ошибка при копировании %(filetype)s"
 
+#, python-format
 #~ msgid "An error occurred when backing up on %(volume)s."
 #~ msgstr "Произошла ошибка при создании резервной копии на %(volume)s."
 
@@ -4241,6 +5644,7 @@ msgstr ""
 #~ msgstr ""
 #~ "Произошли ошибки при создании резервной копии на следующих носителях: "
 
+#, python-format
 #~ msgid "An error occurred when backing up on %(volume)s: %(inst)s."
 #~ msgstr ""
 #~ "Произошла ошибка при создании резервной копии на %(volume)s: %(inst)s."
@@ -4257,12 +5661,15 @@ msgstr ""
 #~ msgid "_Download"
 #~ msgstr "_Загрузить"
 
+#, python-format
 #~ msgid "Error generating component %s."
 #~ msgstr "Ошибка создания компонента %s."
 
+#, python-format
 #~ msgid "%(filetype)s %(area)s could not be generated"
 #~ msgstr "%(filetype)s %(area)s не удалось создать"
 
+#, python-format
 #~ msgid ""
 #~ "%(problem)s\n"
 #~ "File: %(file)s"
@@ -4270,43 +5677,50 @@ msgstr ""
 #~ "%(problem)s\n"
 #~ "Файл: %(file)s"
 
+#, python-format
 #~ msgid "%(volume)s (%(inst)s), "
 #~ msgstr "%(volume)s (%(inst)s), "
 
+#, python-format
 #~ msgid ""
 #~ "Photos detected with the same filenames, but taken at different times: "
 #~ "%(details)s"
 #~ msgstr ""
-#~ "Обнаружены фотографии с одинаковыми названиями, но сделанные в разное "
-#~ "время: %(details)s"
+#~ "Обнаружены фотографии с одинаковыми названиями, но сделанные в разное время: "
+#~ "%(details)s"
 
+#, python-format
 #~ msgid " It was backed up to %(volume)s"
 #~ msgstr " Сделана резервная копия на %(volume)s"
 
 #~ msgid " It was backed up to these devices: "
 #~ msgstr " Сделана резервная копия на: "
 
+#, python-format
 #~ msgid "%s, "
 #~ msgstr "%s, "
 
+#, python-format
 #~ msgid "%(volumes)s and %(final_volume)s."
 #~ msgstr "%(volumes)s и %(final_volume)s."
 
 #~ msgid "Backups already exist in these locations: "
 #~ msgstr "Уже существует резервная копия на: "
 
+#, python-format
 #~ msgid "Backup already exists on %(volume)s."
 #~ msgstr "Уже существует резервная копия на %(volume)s."
 
+#, python-format
 #~ msgid "%(volumes)s and %(volume)s."
 #~ msgstr "%(volumes)s и %(volume)s."
 
+#, python-format
 #~ msgid "An error occurred when creating directories on %(volume)s: %(inst)s."
 #~ msgstr "Произошла ошибка при создании каталогов на %(volume)s: %(inst)s."
 
 #~ msgid ""
-#~ "Errors occurred when creating directories on the following backup "
-#~ "devices: "
+#~ "Errors occurred when creating directories on the following backup devices: "
 #~ msgstr "Произошла ошибка при создании каталогов на следующих устройствах: "
 
 #~ msgid "The following metadata is missing: "
@@ -4315,6 +5729,7 @@ msgstr ""
 #~ msgid "Multiple problems were encountered"
 #~ msgstr "Обнаружены многочисленные проблемы"
 
+#, python-format
 #~ msgid "Path: %s"
 #~ msgstr "Путь: %s"
 
@@ -4324,9 +5739,11 @@ msgstr ""
 #~ msgid "Previous File"
 #~ msgstr "Предыдущий файл"
 
+#, python-format
 #~ msgid "%(device)s did not unmount"
 #~ msgstr "%(device)s не отсоединён"
 
+#, python-format
 #~ msgid "%(free)s free"
 #~ msgstr "%(free)s свободно"
 
@@ -4342,21 +5759,26 @@ msgstr ""
 #~ msgid "Failed to create download subfolder"
 #~ msgstr "Не удалось создать каталог для загрузки"
 
+#, python-format
 #~ msgid "Error: %(errorno)s %(strerror)s"
 #~ msgstr "Ошибка: %(errorno)s %(strerror)s"
 
 #~ msgid "Performance"
 #~ msgstr "Быстродействие"
 
+#, python-format
 #~ msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
 #~ msgstr "Файл %(filetype)s был изменен %(date)s в %(time)s"
 
+#, python-format
 #~ msgid "Backup overwritten on %(volume)s."
 #~ msgstr "Резервная копия на %(volume)s перезаписана."
 
+#, python-format
 #~ msgid "%(free)s %(file_type)s"
 #~ msgstr "Доступно %(free)s для %(file_type)s"
 
+#, python-format
 #~ msgid "Date time value %s appears invalid."
 #~ msgstr "Значение даты и времени %s установлено неверно."
 
@@ -4366,18 +5788,21 @@ msgstr ""
 #~ msgid "Backups overwritten on these devices: "
 #~ msgstr "Перезаписана резерная копия на носителе: "
 
+#, python-format
 #~ msgid " Furthermore, there was a %(problem)s."
 #~ msgstr " К тому же была %(problem)s."
 
+#, python-format
 #~ msgid " Furthermore, there were %(problems)s."
 #~ msgstr " К тому же есть %(problems)s."
 
+#, python-format
 #~ msgid "Problems in %s generation"
 #~ msgstr "Возникли ошибки при создании %s"
 
+#, python-format
 #~ msgid "%(filetype)s already exists, but it was backed up"
-#~ msgstr ""
-#~ "Хотя %(filetype)s уже существует, резервная копия все равно создана."
+#~ msgstr "Хотя %(filetype)s уже существует, резервная копия все равно создана."
 
 #~ msgid "there were errors backing up"
 #~ msgstr "ошибки при создании резервной копии"
@@ -4391,6 +5816,7 @@ msgstr ""
 #~ msgid "Problem in subfolder and filename generation"
 #~ msgstr "Ошибка при задании имени каталога и файла."
 
+#, python-format
 #~ msgid "Problem in %s generation"
 #~ msgstr "Ошибка при создании %s"
 
@@ -4400,12 +5826,15 @@ msgstr ""
 #~ msgid "There was an error backing up"
 #~ msgstr "Была ошибка при резевном копировании"
 
+#, python-format
 #~ msgid "%(file_type)s download folder is invalid"
 #~ msgstr "для %(file_type)s папка загрузки указана неверно."
 
+#, python-format
 #~ msgid "%(file_type)s download folder is not writable"
 #~ msgstr "каталог для %(file_type)s доступен только для чтения"
 
+#, python-format
 #~ msgid ""
 #~ "%(filetype)s could not be backed up because no suitable backup locations "
 #~ "were found."
@@ -4418,13 +5847,15 @@ msgstr ""
 #~ "downloaded."
 #~ msgstr "Файл с таким именем, расширением и метаданными уже есть."
 
+#, python-format
 #~ msgid "%(volume)s, "
 #~ msgstr "%(volume)s, "
 
-#~ msgid ""
-#~ "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
+#, python-format
+#~ msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
 #~ msgstr "%(missing_metadata_elements)s, %(final_missing_metadata_element)s."
 
+#, python-format
 #~ msgid "%(previousproblem)s, and %(backinguperror)s"
 #~ msgstr "%(previousproblem)s, еще %(backinguperror)s"
 
@@ -4434,45 +5865,48 @@ msgstr ""
 #~ msgid "Generate thumbnails (slower)"
 #~ msgstr "Создавать миниатюры (дольше копируется)"
 
+#, python-format
 #~ msgid ""
-#~ "The existing %(filetype)s was last modified on %(date)s at %(time)s. "
-#~ "Unique identifier '%(identifier)s' added."
+#~ "The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
+#~ "identifier '%(identifier)s' added."
 #~ msgstr ""
 #~ "Файл %(filetype)s изменен %(date)s в %(time)s. Добавлен уникальный код "
 #~ "'%(identifier)s'."
 
+#, python-format
 #~ msgid "%(volumes)s and %(volume)s (%(inst)s)."
 #~ msgstr "%(volumes)s и %(volume)s (%(inst)s)."
 
+#, python-format
 #~ msgid "There is no data with which to name the %(filetype)s."
 #~ msgstr "Недостаточно данных для переименования файла %(filetype)s."
 
+#, python-format
 #~ msgid "%(previousproblem)s Additionally, %(newproblem)s"
 #~ msgstr "В дополнение к %(previousproblem)s: %(newproblem)s"
 
 #~ msgid ""
-#~ "If you disable automatic detection, choose the exact location of the "
-#~ "photos and videos."
+#~ "If you disable automatic detection, choose the exact location of the photos "
+#~ "and videos."
 #~ msgstr ""
 #~ "Если вы отключаете автоопределение, выберите место для резервного "
 #~ "копирования фото и видео."
 
-#~ msgid ""
-#~ "An error occurred when copying the %(filetype)s, but it was backed up"
+#, python-format
+#~ msgid "An error occurred when copying the %(filetype)s, but it was backed up"
 #~ msgstr ""
-#~ "При копировании %(filetype)s возникла ошибка, но резервная копия все "
-#~ "равно создана."
+#~ "При копировании %(filetype)s возникла ошибка, но резервная копия все равно "
+#~ "создана."
 
 #~ 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."
+#~ "When this option is enabled, and a potential device is detected, you will be "
+#~ "prompted to determine if it should be scanned or not."
 #~ msgstr ""
-#~ "Если вы включили автоопределение переносного накопителя, будет "
-#~ "просканирован весь накопитель. На устройствах большой емкости это может "
-#~ "занять время\n"
+#~ "Если вы включили автоопределение переносного накопителя, будет просканирован "
+#~ "весь накопитель. На устройствах большой емкости это может занять время\n"
 #~ "\n"
 #~ "Когда эта опция включена, и подходящее устройство обнаружено, программа "
 #~ "спросит вас, нужно ли его сканировать."
@@ -4487,24 +5921,24 @@ msgstr ""
 #~ "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"
+#~ "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>"
+#~ "<i>Downloading directly from cameras is currently an experimental feature. "
+#~ "If downloading directly from your camera works poorly or not at all, try "
+#~ "setting it to PTP mode. If that is not possible, a card reader must be "
+#~ "used.</i>"
 #~ msgstr ""
-#~ "Устройства -  с них загружается фото и видео, например, камера, карта "
-#~ "памяти или переносной накопитель.\n"
+#~ "Устройства -  с них загружается фото и видео, например, камера, карта памяти "
+#~ "или переносной накопитель.\n"
 #~ "\n"
-#~ "Вы можете настроить загрузку с нескольких устройств одновременно или "
-#~ "указать место для загрузки на жестком диске\n"
+#~ "Вы можете настроить загрузку с нескольких устройств одновременно или указать "
+#~ "место для загрузки на жестком диске\n"
 #~ "\n"
-#~ "<i>Загрузки напрямую с камеры пока что являются пробной возможностью. "
-#~ "Если загрузка напрямую с камеры работает плохо или не работает вообще, "
-#~ "переключите ее в режим PTP. Если это невозможно, используйте устройство "
-#~ "для чтения карт памяти.</i>"
+#~ "<i>Загрузки напрямую с камеры пока что являются пробной возможностью. Если "
+#~ "загрузка напрямую с камеры работает плохо или не работает вообще, "
+#~ "переключите ее в режим PTP. Если это невозможно, используйте устройство для "
+#~ "чтения карт памяти.</i>"
 
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Device Options</span>"
 #~ msgstr "<span weight=\"bold\" size=\"x-large\">Настройки устройств</span>"
@@ -4512,12 +5946,15 @@ msgstr ""
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Devices</span>"
 #~ msgstr "Устройства"
 
+#, python-format
 #~ msgid "%(filetype)s metadata cannot be read"
 #~ msgstr "для %(filetype)s не удается прочитать метаданные"
 
+#, python-format
 #~ msgid "%(file_type)s download folder does not exist"
 #~ msgstr "Указанный для загрузки каталог %(file_type)s не существует"
 
+#, python-format
 #~ msgid ""
 #~ "display program information on the command line as the program runs "
 #~ "(default: %default)"
@@ -4553,6 +5990,7 @@ msgstr ""
 #~ msgid "Use _python-style regular expressions"
 #~ msgstr "Использовать регулярные выражения стиля _python"
 
+#, python-format
 #~ msgid ""
 #~ "The following regular expressions are invalid, and will be removed unless "
 #~ "you correct them:\n"
@@ -4562,39 +6000,42 @@ msgstr ""
 #~ "исправите их:\n"
 #~ " %s"
 
+#, python-format
 #~ msgid ""
-#~ "This regular expression is invalid, and will be removed unless you "
-#~ "correct it:\n"
+#~ "This regular expression is invalid, and will be removed unless you correct "
+#~ "it:\n"
 #~ " %s"
 #~ msgstr ""
-#~ "Регулярное выражение недопустимо и будет удалено, если вы не исправите "
-#~ "его:\n"
+#~ "Регулярное выражение недопустимо и будет удалено, если вы не исправите его:\n"
 #~ " %s"
 
+#, python-format
 #~ msgid "(%(file_type)s)"
 #~ msgstr "(%(file_type)s)"
 
 #~ 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."
+#~ "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 ""
 #~ "Запоминаемыми адресами являются те, которые ассоциируются с устройствами "
 #~ "выбранными вами для выполнения их постоянного сканирования или "
-#~ "игнорирования, при задействованной возможности автоматического "
-#~ "определения Портативного устройства хранения."
+#~ "игнорирования, при задействованной возможности автоматического определения "
+#~ "Портативного устройства хранения."
 
+#, python-format
 #~ msgid "Backing up photos to %(path)s and videos to %(path2)s"
 #~ msgstr ""
 #~ "Резервное копирование фотографий в %(path)s и видеозаписей в %(path2)s"
 
+#, python-format
 #~ msgid "Backing up photos and videos to %(path)s"
 #~ msgstr "Резервное копирование фотографий и видеозаписей в %(path)s"
 
 #~ 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."
+#~ "devices for photos or videos. Any path ending with the values below will not "
+#~ "be scanned."
 #~ msgstr ""
 #~ "Укажите окончание любого адреса, которое вы хотите игнорировать при "
 #~ "сканировании устройств, на наличие фотографий и видеозаписей. Все адреса "
@@ -4607,9 +6048,10 @@ msgstr ""
 #~ "Do you really want to download from here? On some systems, scanning this "
 #~ "location can take a very long time."
 #~ msgstr ""
-#~ "Вы точно хотите загрузить отсюда? На некоторых системах сканирование "
-#~ "этого местоположения может занять много времени."
+#~ "Вы точно хотите загрузить отсюда? На некоторых системах сканирование этого "
+#~ "местоположения может занять много времени."
 
+#, python-format
 #~ msgid "Downloading from %(location)s."
 #~ msgstr "Загрузка из %(location)s."
 
@@ -4626,9 +6068,9 @@ msgstr ""
 #~ msgstr "Автоопределение"
 
 #~ 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>."
+#~ "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 ""
 #~ "Извините, но закачка видео отключена. Для того чтобы иметь возможность "
 #~ "загружать видео, пожалуйста, установите пакеты <i>hachoir metadata</i> и "
@@ -4641,8 +6083,8 @@ msgstr ""
 #~ msgstr "Автоматически поворачивать изображения JPEG"
 
 #~ msgid ""
-#~ "manually specify the PATH of the device from which to download, "
-#~ "overwriting existing program preferences"
+#~ "manually specify the PATH of the device from which to download, overwriting "
+#~ "existing program preferences"
 #~ msgstr ""
 #~ "самостоятельно укажите расположение (PATH) устройства, с которого будет "
 #~ "производиться загрузка, заменяя существующие настройки программы"
@@ -4654,6 +6096,7 @@ msgstr ""
 #~ "автоматически определять устройство,  с которого будет производиться "
 #~ "загрузка, заменяя существующие настройки программы"
 
+#, python-format
 #~ msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
 #~ msgstr ""
 #~ "проверка (найдено %(photos)s фотографий и %(videos)s видеозаписей)..."
@@ -4663,5 +6106,67 @@ msgstr ""
 #~ "from which to download, but do not do both."
 #~ msgstr ""
 #~ "Ошибка: укажите автоматическое определение устройства или самостоятельно "
-#~ "укажите расположение устройства, с которого будет производиться загрузка, "
-#~ "но не используйте сразу оба варианта."
+#~ "укажите расположение устройства, с которого будет производиться загрузка, но "
+#~ "не используйте сразу оба варианта."
+
+#, python-format
+#~ msgid "Backup %(file_type)s overwritten"
+#~ msgstr "Резервные копии %(file_type)s перезаписаны"
+
+#, python-format
+#~ msgid "Backup of %(file_type)s already exists"
+#~ msgstr "Резервные копии %(file_type)s уже существуют"
+
+#, python-format
+#~ msgid "No backup device contains a valid folder for backing up %(filetype)s"
+#~ msgstr ""
+#~ "Ни одно устройство для хранения резервных копий не содержит папок для "
+#~ "резервирования %(filetype)s"
+
+#, python-format
+#~ msgid "%(file_type)s not backed up"
+#~ msgstr "Резервные копии %(file_type)s не созданы"
+
+#~ msgid "Quit"
+#~ msgstr "Выход"
+
+#~ msgid "Refresh"
+#~ msgstr "Обновить"
+
+#~ msgid "Verify files as they are downloaded"
+#~ msgstr "Проверить файлы после загрузки"
+
+#~ msgid "Check All Videos"
+#~ msgstr "Проверить все видео"
+
+#~ msgid "Help"
+#~ msgstr "Помощь"
+
+#~ msgid "Check All Photos"
+#~ msgstr "Проверить все фото"
+
+#~ msgid "An unknown error occurred"
+#~ msgstr "Произошла неизвестная ошибка"
+
+#~ msgid "About..."
+#~ msgstr "О..."
+
+#, python-format
+#~ msgid "The %(filetype)s did not download correctly"
+#~ msgstr "Файлы %(filetype)s не были корректно загружены"
+
+#~ msgid "File verification failed on these devices: "
+#~ msgstr "Ошибка проверки файлов на следующих устройствах: "
+
+#, python-format
+#~ msgid ""
+#~ "File verification failed on %(volume)s. The backed up version is different "
+#~ "from the downloaded version."
+#~ msgstr ""
+#~ "Ошибка проверки файла на  %(volume)s. Резервная копия отличается от "
+#~ "загруженной версии."
+
+#~ msgid ""
+#~ "File verification failed. The downloaded version is different from the "
+#~ "original."
+#~ msgstr "Ошибка проверки файла. Загруженная версия отличается от оригинала."
diff --git a/po/sk.po b/po/sk.po
index 0ec2008..417d74a 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,35 +7,386 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: damonlynch@gmail.com\n"
-"POT-Creation-Date: 2017-07-08 19:16-0500\n"
-"PO-Revision-Date: 2017-07-07 20:21+0000\n"
-"Last-Translator: Robert Valik <Unknown>\n"
+"POT-Creation-Date: 2017-09-12 17:01-0400\n"
+"PO-Revision-Date: 2017-09-13 18:31+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: Slovak <sk@li.org>\n"
-"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-07-09 00:08+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-09-26 22:04+0000\n"
+"X-Generator: Launchpad (build 18463)\n"
+"Language: sk\n"
+
+#: ../install.py:65
+msgid "Rapid Photo Downloader installer"
+msgstr ""
+
+#: ../install.py:66
+msgid "Download and install latest version of Rapid Photo Downloader."
+msgstr ""
+
+#: ../install.py:236 ../install.py:1732
+msgid "Installer not found:"
+msgstr ""
+
+#. Translators: do not translate the term tar.gz
+#: ../install.py:240 ../install.py:1736
+msgid "Installer not in tar.gz format:"
+msgstr ""
+
+#: ../install.py:465
+msgid ""
+"Incorrect folder ownership detected. Changing ownership of and resetting "
+"permissions for"
+msgstr ""
+
+#: ../install.py:540
+msgid "The following command will be run:"
+msgstr ""
+
+#: ../install.py:543 ../install.py:1479 ../install.py:1484
+msgid "sudo may prompt you for the sudo password."
+msgstr ""
+
+#: ../install.py:547
+msgid "Would you like to run the command now?"
+msgstr ""
+
+#: ../install.py:549
+msgid "Answer is not yes, exiting."
+msgstr ""
+
+#: ../install.py:559 ../install.py:751 ../install.py:966
+msgid "Command failed"
+msgstr ""
+
+#: ../install.py:561 ../install.py:752 ../install.py:967
+msgid "Exiting"
+msgstr ""
+
+#: ../install.py:582
+msgid "The Universe repository must be enabled."
+msgstr ""
+
+#: ../install.py:606
+msgid ""
+"Do you want to to uninstall the previous version of Rapid Photo Downloader:"
+msgstr ""
+
+#: ../install.py:715 ../install.py:740
+msgid ""
+"Querying package system to see if an older version of Rapid Photo Downloader "
+"is installed (this may take a while)..."
+msgstr ""
+
+#: ../install.py:726
+msgid ""
+"Unable to query package system. Please check your Internet connection and "
+"try again"
+msgstr ""
+
+#: ../install.py:756
+msgid "Checking if previous version installed with pip..."
+msgstr ""
+
+#: ../install.py:850
+msgid "The following package is unknown on your system: {}\n"
+msgstr ""
+
+#: ../install.py:857 ../install.py:929 ../install.py:974
+msgid ""
+"To continue, some packages required to run the application will be installed."
+msgstr ""
+
+#: ../install.py:886
+msgid "Querying installed and available packages (this may take a while)"
+msgstr ""
+
+#: ../install.py:958
+msgid ""
+"Querying zypper to see if any required packages are already installed (this "
+"may take a while)... "
+msgstr ""
+
+#: ../install.py:1004
+msgid "Query to confirm action at each step."
+msgstr ""
+
+#: ../install.py:1011
+msgid ""
+"When downloading the latest version, install the development version if it "
+"is newer than the stable version."
+msgstr ""
+
+#: ../install.py:1020
+msgid ""
+"Optional tar.gz Rapid Photo Downloader installer archive. If not specified, "
+"the latest version is downloaded from the Internet."
+msgstr ""
+
+#: ../install.py:1043
+msgid ""
+"Do not run the installer in the tar.gz Rapid Photo Downloader installer "
+"archive if it is newer than this version ({}). The default is to run "
+"whichever installer is newer."
+msgstr ""
+
+#: ../install.py:1050
+msgid ""
+"Uninstall Rapid Photo Downloader that was installed with pip, keeping its "
+"dependencies."
+msgstr ""
+
+#: ../install.py:1054
+msgid ""
+"Uninstall the dependencies installed by pip during Rapid Photo Downloader's "
+"installation, and Rapid Photo Downloader itself, then exit."
+msgstr ""
+
+#: ../install.py:1059
+msgid ""
+"Note: this will not uninstall any version of Rapid Photo Downloader "
+"installed by your Linux distribution's package manager."
+msgstr ""
+
+#: ../install.py:1066
+msgid ""
+"Dependencies will only be removed if they are not required by other programs."
+msgstr ""
+
+#: ../install.py:1072
+msgid ""
+"Note: this option will remove the dependencies regardless of whether they "
+"are required by another program pip has installed. Upgrade to pip 9.0 or "
+"above if you want to avoid this behavior. You can do so using the command "
+"'python3 -m pip install pip -U --user'. Also note that any version of Rapid "
+"Photo Downloader installed by your Linux distribution's package manager will "
+"not be uninstalled."
+msgstr ""
+
+#: ../install.py:1122
+msgid "Failed to download versions file"
+msgstr ""
+
+#: ../install.py:1126
+msgid "Got error code {} while accessing versions file"
+msgstr ""
+
+#: ../install.py:1234
+msgid ""
+"Sorry, could not locate installer. Please check your Internet connection and "
+"verify if you can reach https://www.damonlynch.net\n"
+"\n"
+"Exiting.\n"
+msgstr ""
+
+#: ../install.py:1408
+msgid "Installing application requirements..."
+msgstr ""
+
+#: ../install.py:1424
+msgid "Received error code"
+msgstr ""
+
+#: ../install.py:1425
+msgid "Failed to install application requirements: exiting"
+msgstr ""
+
+#: ../install.py:1428
+msgid "Installing application..."
+msgstr ""
+
+#: ../install.py:1441
+msgid "Failed to install application: exiting..."
+msgstr ""
+
+#: ../install.py:1465
+msgid ""
+"You may have to restart the computer to be able to run the program from the "
+"commmand line or application launcher."
+msgstr ""
+
+#: ../install.py:1476
+msgid "Do you want to install the application's man pages?"
+msgstr ""
+
+#: ../install.py:1477
+msgid "They will be installed into {}"
+msgstr ""
+
+#: ../install.py:1478 ../install.py:1483
+msgid "If you uninstall the application, remove these manpages yourself."
+msgstr ""
+
+#: ../install.py:1480
+msgid "Do want to install the man pages?"
+msgstr ""
+
+#: ../install.py:1482
+msgid "Installing man pages into {}"
+msgstr ""
+
+#: ../install.py:1499
+msgid "Failed to create man page directory: exiting"
+msgstr ""
+
+#: ../install.py:1511
+msgid "Failed to copy man page."
+msgstr ""
+
+#: ../install.py:1521
+msgid "(If a segmentation fault occurs at exit, you can ignore it...)"
+msgstr ""
+
+#: ../install.py:1534
+msgid ""
+"The python3 tool pip is required to uninstall a version of Rapid Photo "
+"Downloader that was installed with pip.\n"
+"Cannot continue. Exiting."
+msgstr ""
+
+#: ../install.py:1575
+msgid ""
+"Do not run this installer script as sudo / root user.\n"
+"Run it using the user who will run the program.\n"
+msgstr ""
+
+#: ../install.py:1585 ../install.py:1599
+msgid "Do not include any other command line arguments when specifying"
+msgstr ""
+
+#: ../install.py:1614
+msgid ""
+"Sorry, this installer does not support a custom python installation.\n"
+"Exiting..."
+msgstr ""
+
+#: ../install.py:1620
+msgid "Restarting script using system python..."
+msgstr ""
+
+#: ../install.py:1651
+msgid "Exiting..."
+msgstr ""
+
+#. Translators: do not translate the term python3-apt
+#: ../install.py:1670
+msgid "To continue, the package python3-apt must be installed."
+msgstr ""
+
+#: ../install.py:1689
+msgid ""
+"Install the following packages using your Linux distribution's standard "
+"package manager, and then rerun this installer"
+msgstr ""
+
+#: ../install.py:1698
+msgid ""
+"To run this program, programs to assist Python 3 and its package management "
+"must be installed."
+msgstr ""
+
+#. Translators: do not translate the terms Python 3, pip and setuptools
+#: ../install.py:1713
+msgid "Python 3's pip and setuptools must be upgraded for your user."
+msgstr ""
 
-#. type: QPushButton
-#: ../raphodo/aboutdialog.py:217
+#. Translators: do not translate the term python or requests
+#: ../install.py:1726
+msgid "Installing python requests"
+msgstr ""
+
+#: ../upgrade.py:79
+msgid "Upgrade Rapid Photo Downloader"
+msgstr ""
+
+#: ../upgrade.py:401 ../raphodo/viewutils.py:242
+msgid "&Cancel"
+msgstr ""
+
+#: ../upgrade.py:405
+msgid "&Upgrade"
+msgstr ""
+
+#: ../upgrade.py:410
+#, python-format
+msgid "Click the Upgrade button to upgrade to version %s."
+msgstr ""
+
+#: ../upgrade.py:413
+msgid "Click the Upgrade button to start the upgrade."
+msgstr ""
+
+#: ../upgrade.py:416 ../upgrade.py:422 ../raphodo/viewutils.py:241
+msgid "&Close"
+msgstr ""
+
+#: ../upgrade.py:417
+msgid "&Run"
+msgstr ""
+
+#: ../upgrade.py:447
+msgid "Close Rapid Photo Downloader before running this upgrade"
+msgstr ""
+
+#: ../upgrade.py:450
+msgid "Upgrade running..."
+msgstr ""
+
+#: ../upgrade.py:486
+#, python-format
+msgid ""
+"Successfully upgraded to %s. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:491
+msgid ""
+"Upgrade finished successfully. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:495
+msgid "Upgrade failed. Click Close to exit."
+msgstr ""
+
+#: ../upgrade.py:6967
+#, python-format
+msgid "Upgrading %s..."
+msgstr ""
+
+#: ../upgrade.py:6969
+msgid "Press any key to continue..."
+msgstr ""
+
+#: ../upgrade.py:6982
+msgid "Rapid Photo Downloader upgrade failed"
+msgstr ""
+
+#: ../upgrade.py:6984
+#, python-format
+msgid ""
+"The python package %s could not be updated. The upgrade cannot continue."
+msgstr ""
+
+#: ../raphodo/aboutdialog.py:225
 msgid "Credits"
 msgstr "Poďakovanie"
 
-#: ../raphodo/backuppanel.py:239
+#: ../raphodo/backuppanel.py:240
 msgid "Backups are not configured"
 msgstr "Zálohy nie sú nakonfigurované"
 
-#: ../raphodo/backuppanel.py:241
+#: ../raphodo/backuppanel.py:242
 msgid "No backup devices detected"
 msgstr "Neboli nájdené žiadne zariadenia pre zálohu"
 
-#: ../raphodo/backuppanel.py:243
+#: ../raphodo/backuppanel.py:244
 msgid "Valid backup locations not yet specified"
 msgstr "Ešte nie sú zvolené miesta pre zálohy"
 
-#: ../raphodo/backuppanel.py:401
+#: ../raphodo/backuppanel.py:404
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
@@ -43,101 +394,110 @@ msgstr ""
 "Svoje fotografie a videá môžete popri sťahovaní zálohovať na rôzne "
 "zariadenia, napr. externé disky"
 
-#: ../raphodo/backuppanel.py:407
+#: ../raphodo/backuppanel.py:412
 msgid "Back up photos and videos when downloading"
 msgstr "Zálohovať fotky a videá popri sťahovaní"
 
-#: ../raphodo/backuppanel.py:413
+#: ../raphodo/backuppanel.py:418
 msgid "Automatically detect backup devices"
 msgstr "Automatická detekcia zálohovacích zariadení"
 
-#: ../raphodo/backuppanel.py:417
+#: ../raphodo/backuppanel.py:424
 msgid ""
-"Specify the folder in which backups are stored on the device."
-"<br><br><i>Note: the presence of a folder with this name is used to "
+"Specify the folder in which backups are stored on the "
+"device.<br><br><i>Note: the presence of a folder with this name is used to "
 "determine if 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 folder names. By "
 "adding both folders, the same device can be used to back up both photos and "
 "videos.</i>"
 msgstr ""
-"Zvoľte názov adresára, v ktorom budú na zariadeniach uložené zálohy."
-"<br><br><i>Poznámka: Existencia tohoto adresára je predpokladom pre "
+"Zvoľte názov adresára, v ktorom budú na zariadeniach uložené "
+"zálohy.<br><br><i>Poznámka: Existencia tohoto adresára je predpokladom pre "
 "identifikovanie zariadenia ako úložiska záloh. Na každom zariadení, ktoré "
 "chcete používať pre uloženie záloh, vytvorte adresár s jedným z týchto "
 "názvov. Ak vytvoríte oba adresáre, budú na zariadenie zálohované fotky aj "
 "videá."
 
-#: ../raphodo/backuppanel.py:428
+#: ../raphodo/backuppanel.py:439
 msgid "Photo folder name:"
 msgstr "Názov adresára pre fotky:"
 
-#: ../raphodo/backuppanel.py:433
+#: ../raphodo/backuppanel.py:444
 msgid "Video folder name:"
 msgstr "Názov adresára pre videá:"
 
-#: ../raphodo/backuppanel.py:438 ../raphodo/nameeditor.py:883
+#: ../raphodo/backuppanel.py:449 ../raphodo/nameeditor.py:890
 #: ../raphodo/renamepanel.py:123
 msgid "Example:"
 msgstr "Príklad:"
 
-#: ../raphodo/backuppanel.py:448
-msgid "If you disable automatic detection, choose the exact backup locations."
+#: ../raphodo/backuppanel.py:460
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr "Ak vypnete automatickú detekciu, vyberte presné umiestnenie záloh."
 
-#: ../raphodo/backuppanel.py:452
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:468
 msgid "Photo backup location:"
 msgstr "Umiestnenie zálohy fotiek:"
 
-#: ../raphodo/backuppanel.py:454
+#: ../raphodo/backuppanel.py:474
 msgid "Select Photo Backup Location"
 msgstr "Vyberte umiestnenie pre zálohu fotiek:"
 
-#: ../raphodo/backuppanel.py:460
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:485
 msgid "Video backup location:"
 msgstr "Umiestnenie zálohy videa:"
 
-#: ../raphodo/backuppanel.py:462
+#: ../raphodo/backuppanel.py:491
 msgid "Select Video Backup Location"
 msgstr "Vyberte umiestnenie pre zálohu videa:"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:564
+#: ../raphodo/backuppanel.py:595
 msgid "drive1"
 msgstr "disk1"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:567
+#: ../raphodo/backuppanel.py:598
 msgid "drive2"
 msgstr "disk2"
 
-#: ../raphodo/backuppanel.py:628
+#: ../raphodo/backuppanel.py:663
 msgid "Projected Backup Storage Use"
 msgstr "Predpokladaná veľkosť zálohy"
 
-#: ../raphodo/backuppanel.py:632
+#: ../raphodo/backuppanel.py:669
 msgid "Backup Options"
 msgstr "Nastavenia zálohy"
 
 #. translators: refers to the video thumbnail file that some
 #. cameras generate -- it has a .THM file extension
-#: ../raphodo/copyfiles.py:476
+#: ../raphodo/copyfiles.py:491
 msgid "video THM"
 msgstr "video THM"
 
-#: ../raphodo/copyfiles.py:482
+#: ../raphodo/copyfiles.py:497
 msgid "audio"
 msgstr "zvuk"
 
 #: ../raphodo/destinationdisplay.py:78 ../raphodo/devicedisplay.py:1079
-#: ../raphodo/rpdfile.py:321
+#: ../raphodo/rpdfile.py:342
 #, python-format
 msgid "%(no_photos)s Photos"
 msgstr "Počet fotiek: %(no_photos)s"
 
 #: ../raphodo/destinationdisplay.py:82 ../raphodo/devicedisplay.py:1081
-#: ../raphodo/rpdfile.py:316
+#: ../raphodo/rpdfile.py:333
 #, python-format
 msgid "%(no_videos)s Videos"
 msgstr "Počet videí: %(no_videos)s"
@@ -165,15 +525,15 @@ msgid "%(size_free)s free of %(size_total)s"
 msgstr "%(size_free)s voľných z %(size_total)s"
 
 #: ../raphodo/destinationdisplay.py:190 ../raphodo/devicedisplay.py:993
-#: ../raphodo/rapid.py:1964 ../raphodo/rapid.py:2079 ../raphodo/rapid.py:5753
-#: ../raphodo/rpdfile.py:905
+#: ../raphodo/rapid.py:2023 ../raphodo/rapid.py:2151 ../raphodo/rapid.py:6043
+#: ../raphodo/rpdfile.py:930
 msgid "Photos"
 msgstr "Fotky"
 
 #. translators: the name of the Videos folder
 #: ../raphodo/destinationdisplay.py:191 ../raphodo/devicedisplay.py:994
-#: ../raphodo/rapid.py:1967 ../raphodo/rapid.py:2080 ../raphodo/rapid.py:5754
-#: ../raphodo/rpdfile.py:933 ../raphodo/storage.py:445
+#: ../raphodo/rapid.py:2028 ../raphodo/rapid.py:2152 ../raphodo/rapid.py:6044
+#: ../raphodo/rpdfile.py:958 ../raphodo/storage.py:449
 msgid "Videos"
 msgstr "Videá"
 
@@ -181,7 +541,7 @@ msgstr "Videá"
 msgid "Projected storage use after download"
 msgstr "Predpokladané miesto pre stiahnutie"
 
-#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:516
+#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:521
 msgid "Custom..."
 msgstr "Vlastné..."
 
@@ -219,57 +579,58 @@ msgstr "Prehľadať znovu"
 msgid "%s full"
 msgstr "Plné na %s"
 
-#: ../raphodo/devices.py:459
+#: ../raphodo/devices.py:463
 msgid "Cameras"
 msgstr "Fotoaparáty"
 
-#: ../raphodo/devices.py:460 ../raphodo/devices.py:920
-#: ../raphodo/preferencedialog.py:85 ../raphodo/rapid.py:1927
+#: ../raphodo/devices.py:464 ../raphodo/devices.py:927
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/rapid.py:1979
 msgid "Devices"
 msgstr "Zariadenia"
 
-#: ../raphodo/devices.py:720
+#: ../raphodo/devices.py:724
 #, python-format
 msgid "Downloading from %(device_names)s"
 msgstr "Sťahuje sa z %(device_names)s"
 
 #. Translators: e.g. Three Devices
-#: ../raphodo/devices.py:780
+#: ../raphodo/devices.py:784
 #, python-format
 msgid "%(no_devices)s %(device_type)s"
 msgstr ""
 
-#: ../raphodo/devices.py:905 ../raphodo/rapid.py:1764
+#: ../raphodo/devices.py:912 ../raphodo/rapid.py:1807
 msgid "Select Source"
 msgstr "Vybrať zdroj"
 
-#: ../raphodo/devices.py:936 ../raphodo/devices.py:947
+#: ../raphodo/devices.py:943 ../raphodo/devices.py:954
 #, python-format
 msgid "%(device1)s + %(device2)s"
 msgstr ""
 
 #. Number of cameras e.g. 3 Cameras
-#: ../raphodo/devices.py:958
+#: ../raphodo/devices.py:965
 #, python-format
 msgid "%(no_cameras)s Cameras"
 msgstr "Fotoaparátov: %(no_cameras)s"
 
-#: ../raphodo/devices.py:963
+#: ../raphodo/devices.py:970
 #, python-format
 msgid "%(no_devices)s Devices"
 msgstr "Zariadení: %(no_devices)s"
 
 #. Translators: two folder names, separated by a plus sign
-#: ../raphodo/devices.py:1258
+#: ../raphodo/devices.py:1265
 #, python-format
 msgid "%s + %s"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:44
+#: ../raphodo/didyouknow.py:45
 msgid "Click on a file's checkbox to mark or unmark it for download."
 msgstr "Označte súbory, ktoré majú byť stiahnuté."
 
-#: ../raphodo/didyouknow.py:50
+#: ../raphodo/didyouknow.py:51
 msgid ""
 "Files that have already been downloaded are remembered. You can still mark "
 "previously downloaded files to download again, but they are unchecked by "
@@ -279,7 +640,7 @@ msgstr ""
 "Súbory, ktoré už boli v minulosti stiahnuté, nie sú označené pre stiahnutie "
 "a ich náhľad je mierne stlmený. Môžete ich vybrať a budú stiahnuté znovu."
 
-#: ../raphodo/didyouknow.py:59
+#: ../raphodo/didyouknow.py:60
 msgid ""
 "If more than one file is selected, they'll all take the mark of the file "
 "whose checkbox was clicked, regardless of whether they previously had a "
@@ -288,14 +649,47 @@ msgstr ""
 "Ak je vybratých viac súborov, prenesie sa označenie aj na ne, nezáleží, či "
 "už predtým boli označené."
 
-#: ../raphodo/didyouknow.py:67
+#: ../raphodo/didyouknow.py:68
 msgid ""
 "Click on a device's checkbox to quickly mark or unmark all its files for "
 "downloading."
 msgstr ""
 "Kliknutím na označovacie políčko zariadenia označíte všetky súbory na ňom."
 
-#: ../raphodo/didyouknow.py:74
+#: ../raphodo/didyouknow.py:75
+msgid ""
+"After a download finishes, an icon replaces the thumbnail's checkbox. The "
+"icon's color indicates whether the download was successful (green), had file "
+"renaming problems (yellow/orange), or failed (red)."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:83
+msgid ""
+"\n"
+"            In case of any problems, a red icon will appear at the bottom of "
+"the window\n"
+"            indicating how many error reports there are. Clicking on it "
+"opens the Error Report \n"
+"            window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:91
+msgid ""
+"\n"
+"            The Error Report window lists any problems encountered before, "
+"during or after the \n"
+"            download. An orange triangle represents a warning, a red circle "
+"indicates a failure, \n"
+"            and a black circle indicates more serious failures. You can "
+"click on the hyperlinks to \n"
+"            open its file or device in a file manager. You can also search "
+"the reports using the \n"
+"            search box in the lower left of the Error Report window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:103
 msgid ""
 "You can simultaneously download from multiple cameras, smartphones, memory "
 "cards, and hard drives&mdash;as many devices as your computer can handle at "
@@ -304,7 +698,7 @@ msgstr ""
 "Sťahovať môžete aj z viacerých fotoaparátov, telefónov, pamäťových kariet a "
 "diskov&mdash;záleží, koľko zvládne váš počítač."
 
-#: ../raphodo/didyouknow.py:81
+#: ../raphodo/didyouknow.py:110
 msgid ""
 "The <b>Timeline</b> groups photos and videos based on how much time elapsed "
 "between consecutive shots. Use it to identify photos and videos taken at "
@@ -314,7 +708,7 @@ msgstr ""
 "za sebou nasledujúcimi záznamami. To vám pomôže identifikovať, ktoré fotky a "
 "videá ste urobili krátko po sebe v rámci jedného, ale aj viacerých dní."
 
-#: ../raphodo/didyouknow.py:88
+#: ../raphodo/didyouknow.py:117
 msgid ""
 "\n"
 "<p>In the illustration above, the first row of the Timeline is black because "
@@ -334,7 +728,7 @@ msgstr ""
 "je následne tvorená Časová os.</p>\n"
 "            "
 
-#: ../raphodo/didyouknow.py:99
+#: ../raphodo/didyouknow.py:128
 msgid ""
 "To view photos and videos for a particular time range, use the mouse "
 "(optionally in combination with the <tt>Shift</tt> or <tt>Ctrl</tt> keys) to "
@@ -346,20 +740,20 @@ msgstr ""
 "<tt>Shift</tt> alebo <tt>Ctrl</tt>) Po výbere časového úseku bude tlačidlo "
 "Časová os v ľavej časti okna zvýraznené."
 
-#: ../raphodo/didyouknow.py:106
+#: ../raphodo/didyouknow.py:135
 msgid ""
 "A download always includes all files that are checked for download, "
 "including those that are not currently displayed because the Timeline is "
 "being used."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:113
+#: ../raphodo/didyouknow.py:142
 msgid ""
 "You can hide or display the download sources by clicking on the name of the "
 "device you're downloading from at the top left of the program window."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:120
+#: ../raphodo/didyouknow.py:149
 msgid ""
 "\n"
 "          Thumbnails can be sorted using a variety of criteria:\n"
@@ -378,33 +772,33 @@ msgid ""
 "</ol> "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:137
+#: ../raphodo/didyouknow.py:166
 msgid ""
 "One of Rapid Photo Downloader's most useful features is its ability to "
 "automatically generate download subfolders and rename files as it downloads, "
 "using a scheme of your choosing."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:143
+#: ../raphodo/didyouknow.py:172
 msgid ""
 "To specify where you want your files downloaded and how you want them named, "
 "open the appropriate panel on the right-side of the application window: "
 "<b>Destination</b>, <b>Rename</b>, or <b>Job Code</b>."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:150
+#: ../raphodo/didyouknow.py:179
 msgid ""
 "\n"
 "When thinking about your download directory structure, keep in mind two "
 "different types\n"
 "of directory:\n"
 "<ol>\n"
-"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, &quot;"
-"Photos&quot;, or\n"
+"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, "
+"&quot;Photos&quot;, or\n"
 "&quot;Videos&quot;. This directory should already exist on your computer. In "
 "the illustration \n"
-"below, the destination folders are &quot;Pictures&quot; and &quot;"
-"Videos&quot;. The\n"
+"below, the destination folders are &quot;Pictures&quot; and "
+"&quot;Videos&quot;. The\n"
 "name of the destination folder is displayed in the grey bar directly above "
 "the folder tree, \n"
 "with a folder icon to its left and a gear icon to its far right.</li>\n"
@@ -417,7 +811,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:167
+#: ../raphodo/didyouknow.py:196
 msgid ""
 "\n"
 "You can download photos and videos to the same destination folder, or "
@@ -430,14 +824,14 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:177
+#: ../raphodo/didyouknow.py:206
 msgid ""
 "Automatically generated download subfolders can contain further "
 "automatically generated subfolders if need be. A common scheme is to create "
 "a year subfolder and then a series of year-month-day subfolders within it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:186
+#: ../raphodo/didyouknow.py:215
 msgid ""
 "\n"
 "Whenever possible, the program previews the download subfolders of photos "
@@ -455,7 +849,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:201
+#: ../raphodo/didyouknow.py:230
 msgid ""
 "\n"
 "Download subfolder names are typically generated using some or all of the "
@@ -479,7 +873,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:219
+#: ../raphodo/didyouknow.py:248
 msgid ""
 "\n"
 "To automatically create download subfolders as you download, \n"
@@ -489,7 +883,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:227
+#: ../raphodo/didyouknow.py:256
 msgid ""
 "\n"
 "Using the drop-down menu, select a built-in preset or click on <b>Custom</b> "
@@ -499,20 +893,20 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:237
+#: ../raphodo/didyouknow.py:266
 msgid ""
 "It's easy to download raw images into one folder, and jpeg images into "
 "another. Simply use the <b>Filename Extension</b> as part of your download "
 "subfolder generation scheme:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:242
+#: ../raphodo/didyouknow.py:271
 msgid ""
 "This illustration shows a saved custom preset named &quot;My custom "
 "preset&quot;."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:246
+#: ../raphodo/didyouknow.py:275
 msgid ""
 "\n"
 "You do not have to create nested download subfolders. This illustration "
@@ -523,7 +917,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:256
+#: ../raphodo/didyouknow.py:285
 msgid ""
 "\n"
 "Although there are many built-in date/time naming options, you may find that "
@@ -537,7 +931,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:265
+#: ../raphodo/didyouknow.py:294
 msgid ""
 "\n"
 "Read more about all the ways you can generate download subfolder names and "
@@ -547,7 +941,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:273
+#: ../raphodo/didyouknow.py:302
 msgid ""
 "\n"
 "<b>Job Codes</b> let you easily enter text that describes sets of photos and "
@@ -559,7 +953,7 @@ msgid ""
 "&quot;Green Bazaar&quot;: \n"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:282
+#: ../raphodo/didyouknow.py:311
 msgid ""
 "\n"
 "You can apply new or existing Job Codes before you start a download. If "
@@ -570,36 +964,36 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:291
+#: ../raphodo/didyouknow.py:320
 msgid "Look for hints to guide you when working with Job Codes:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:295
+#: ../raphodo/didyouknow.py:324
 msgid ""
 "Hints will vary depending on the context, such as when the mouse is hovering "
 "over a button."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:301
+#: ../raphodo/didyouknow.py:330
 msgid ""
 "\n"
 "When you give your photos and videos unique filenames, you'll never be "
 "confused as to \n"
 "which file is which. Using <b>sequence numbers</b> to make filenames unique "
 "is highly \n"
-"recommended!.\n"
+"recommended!\n"
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:309
+#: ../raphodo/didyouknow.py:338
 msgid ""
 "\n"
 "<p>Four types of sequence values are available to help you assign unique "
 "names to your photos and \n"
 "videos:\n"
 "<ol>\n"
-"<li><b>Downloads today</b>: tracks downloads completed during that day.</"
-"li>\n"
+"<li><b>Downloads today</b>: tracks downloads completed during that "
+"day.</li>\n"
 "<li><b>Stored number</b>: similar to Downloads today, but it is remembered "
 "from the last time the  \n"
 "program was run.</li>\n"
@@ -613,7 +1007,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:327
+#: ../raphodo/didyouknow.py:356
 msgid ""
 "\n"
 "The <b>Rename</b> panel allows you to configure file renaming. To rename "
@@ -622,7 +1016,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:334
+#: ../raphodo/didyouknow.py:363
 msgid ""
 "\n"
 "<p>The <b>Synchronize RAW + JPEG</b> option is useful if you use the RAW + "
@@ -641,7 +1035,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:348
+#: ../raphodo/didyouknow.py:377
 msgid ""
 "\n"
 "You can have your photos and videos backed up to multiple locations as they "
@@ -652,13 +1046,13 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:356
+#: ../raphodo/didyouknow.py:385
 msgid ""
 "In this example, the drive <b>photobackup</b> does not contain a folder "
 "named <tt>Videos</tt>, so videos will not be backed up to it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:362
+#: ../raphodo/didyouknow.py:391
 msgid ""
 "\n"
 "Several of the program's preferences can be set from the command line, "
@@ -669,7 +1063,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:372
+#: ../raphodo/didyouknow.py:396
+msgid "You can also import program preferences from the older 0.4 version."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:401
 msgid ""
 "\n"
 "Rapid Photo Downloader deals with three types of cache:\n"
@@ -679,8 +1077,8 @@ msgid ""
 "memory cards, and other devices.</li>\n"
 "<li>A <b>temporary cache</b> of files downloaded from a camera, one for "
 "photos and another for \n"
-"videos. They are located in temporary subfolders in the download destination."
-"</li>\n"
+"videos. They are located in temporary subfolders in the download "
+"destination.</li>\n"
 "<li>The <b>desktop's thumbnail cache</b>, in which Rapid Photo Downloader "
 "stores thumbnails of \n"
 "RAW and TIFF photos once they have been downloaded. File browsers like Gnome "
@@ -695,23 +1093,23 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:431
+#: ../raphodo/didyouknow.py:460
 msgid "Tip of the Day"
 msgstr "Tip dňa"
 
-#: ../raphodo/didyouknow.py:439
+#: ../raphodo/didyouknow.py:468
 msgid "Did you know...?"
 msgstr "Vedeli ste...?"
 
-#: ../raphodo/didyouknow.py:466
+#: ../raphodo/didyouknow.py:495
 msgid "Show tips on startup"
 msgstr "Zobraziť tipy pri spustení"
 
-#: ../raphodo/didyouknow.py:470
+#: ../raphodo/didyouknow.py:499
 msgid "&Next"
 msgstr "Ď&alší"
 
-#: ../raphodo/didyouknow.py:471
+#: ../raphodo/didyouknow.py:500
 msgid "&Previous"
 msgstr "&Späť"
 
@@ -818,68 +1216,68 @@ msgstr "%d dní, 1 hodina"
 msgid "%(days)d days, %(hours)d hours"
 msgstr "%(days)d dní, %(hours)d hodín(y)"
 
-#: ../raphodo/errorlog.py:65
+#: ../raphodo/errorlog.py:66
 msgid "Find"
 msgstr "Nájsť"
 
-#: ../raphodo/errorlog.py:135
+#: ../raphodo/errorlog.py:136
 msgid "Error Reports - Rapid Photo Downloader"
 msgstr "Hlásenia o chybách - Rapid Photo Downloader"
 
-#: ../raphodo/errorlog.py:170
+#: ../raphodo/errorlog.py:171
 msgid "Find in reports"
 msgstr "Nájsť v hláseniach"
 
-#: ../raphodo/errorlog.py:187
+#: ../raphodo/errorlog.py:188
 msgid "Find the previous occurrence of the phrase"
 msgstr "Nájsť predošlý výskyt frázy"
 
-#: ../raphodo/errorlog.py:192
+#: ../raphodo/errorlog.py:193
 msgid "Find the next occurrence of the phrase"
 msgstr "Nájsť nasledujúci výskyt frázy"
 
-#: ../raphodo/errorlog.py:194
+#: ../raphodo/errorlog.py:195
 msgid "&Highlight All"
 msgstr "&Zvýrazniť všetko"
 
-#: ../raphodo/errorlog.py:195
+#: ../raphodo/errorlog.py:196
 msgid "Highlight all occurrences of the phrase"
 msgstr "Zvýrazniť všetky výskyty frázy"
 
-#: ../raphodo/errorlog.py:196
+#: ../raphodo/errorlog.py:197
 msgid "&Match Case"
 msgstr "&Dodržať veľkosť písmen"
 
-#: ../raphodo/errorlog.py:197
+#: ../raphodo/errorlog.py:198
 msgid "Search with case sensitivity"
 msgstr "Vyhľadávať brať ohľad na veľkosť písmen"
 
-#: ../raphodo/errorlog.py:198
+#: ../raphodo/errorlog.py:199
 msgid "&Whole Words"
 msgstr "&Celé slová"
 
-#: ../raphodo/errorlog.py:199
+#: ../raphodo/errorlog.py:200
 msgid "Search whole words only"
 msgstr "Hľadať len celé slová"
 
-#: ../raphodo/errorlog.py:209 ../raphodo/errorlog.py:341
+#: ../raphodo/errorlog.py:210 ../raphodo/errorlog.py:345
 #, python-format
 msgid "%s of %s matches"
 msgstr "%s z %s nájdených"
 
-#: ../raphodo/errorlog.py:228
+#: ../raphodo/errorlog.py:232
 msgid "Clear"
 msgstr "Zmazať"
 
-#: ../raphodo/errorlog.py:328
+#: ../raphodo/errorlog.py:332
 msgid "Phrase not found"
 msgstr "Fráza nenájdená"
 
-#: ../raphodo/errorlog.py:487
+#: ../raphodo/errorlog.py:491
 msgid "Search pending..."
 msgstr "Prehľadáva sa..."
 
-#: ../raphodo/errorlog.py:535
+#: ../raphodo/errorlog.py:539
 msgid ""
 "The number of new entries added to the Error Report since it was last open. "
 "Click to open the Error Report."
@@ -893,8 +1291,8 @@ msgstr "Chyba v Rapid Photo Downloader"
 #, python-brace-format
 msgid ""
 "<b>A problem occurred in Rapid Photo Downloader</b><br><br>\n"
-"    Please report the problem at <a href=\"{website}\">{website}</a>."
-"<br><br>\n"
+"    Please report the problem at <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
 "    Attach the log file <i>{log_file}</i> to your bug report (click\n"
 "    <a href=\"{log_path}\">here</a> to open the log directory).<br><br>If "
 "the same problem occurs\n"
@@ -928,7 +1326,7 @@ msgstr ""
 "    K hláseniu o chybe priložte log, ktorý nájdete v {log_path}\n"
 "\n"
 
-#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1601
+#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1643
 msgid "Open in File Browser..."
 msgstr "Otvoriť v správcovi súborov"
 
@@ -946,531 +1344,531 @@ msgstr "Iný..."
 msgid "%s (location does not exist)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:186
+#: ../raphodo/generatenameconfig.py:190
 msgid "Date time"
 msgstr "Dátum a čas"
 
-#: ../raphodo/generatenameconfig.py:187
+#: ../raphodo/generatenameconfig.py:191
 msgid "Text"
 msgstr "Text"
 
-#: ../raphodo/generatenameconfig.py:188 ../raphodo/rapid.py:2053
+#: ../raphodo/generatenameconfig.py:192 ../raphodo/rapid.py:2125
 msgid "Filename"
 msgstr "Názov súboru"
 
-#: ../raphodo/generatenameconfig.py:189 ../raphodo/preferencedialog.py:488
+#: ../raphodo/generatenameconfig.py:193 ../raphodo/preferencedialog.py:724
 msgid "Metadata"
 msgstr "Metadáta"
 
-#: ../raphodo/generatenameconfig.py:190
+#: ../raphodo/generatenameconfig.py:194
 msgid "Sequences"
 msgstr "Sekvencie"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: ../raphodo/generatenameconfig.py:193
+#: ../raphodo/generatenameconfig.py:197
 msgid "Job code"
 msgstr "Pracovný kód"
 
-#: ../raphodo/generatenameconfig.py:194
+#: ../raphodo/generatenameconfig.py:198
 msgid "Image date"
 msgstr "Dátum obrázku"
 
-#: ../raphodo/generatenameconfig.py:195
+#: ../raphodo/generatenameconfig.py:199
 msgid "Video date"
 msgstr "Dátum nahratia videa"
 
-#: ../raphodo/generatenameconfig.py:196
+#: ../raphodo/generatenameconfig.py:200
 msgid "Today"
 msgstr "Dnes"
 
-#: ../raphodo/generatenameconfig.py:197
+#: ../raphodo/generatenameconfig.py:201
 msgid "Yesterday"
 msgstr "Včera"
 
 #. Translators: Download time is the time and date that the download started (when the
 #. user clicked the Download button)
-#: ../raphodo/generatenameconfig.py:200
+#: ../raphodo/generatenameconfig.py:204
 msgid "Download time"
 msgstr "Čas stiahnutia"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:203
+#: ../raphodo/generatenameconfig.py:207
 msgid "Name"
 msgstr "Názov"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:206 ../raphodo/rapid.py:2054
+#: ../raphodo/generatenameconfig.py:210 ../raphodo/rapid.py:2126
 msgid "Extension"
 msgstr "Koncovka"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:209
+#: ../raphodo/generatenameconfig.py:213
 msgid "Image number"
 msgstr "Číslo obrázka"
 
-#: ../raphodo/generatenameconfig.py:210
+#: ../raphodo/generatenameconfig.py:214
 msgid "Video number"
 msgstr "Číslo videa"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:213
+#: ../raphodo/generatenameconfig.py:217
 msgid "Aperture"
 msgstr "Clona"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:216
+#: ../raphodo/generatenameconfig.py:220
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:219
+#: ../raphodo/generatenameconfig.py:223
 msgid "Exposure time"
 msgstr "Čas expozície"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:222
+#: ../raphodo/generatenameconfig.py:226
 msgid "Focal length"
 msgstr "Ohnisková vzdialenosť"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:225
+#: ../raphodo/generatenameconfig.py:229
 msgid "Camera make"
 msgstr "Výrobca fotoaparátu"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:228
+#: ../raphodo/generatenameconfig.py:232
 msgid "Camera model"
 msgstr "Model kamery"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:231
+#: ../raphodo/generatenameconfig.py:235
 msgid "Short camera model"
 msgstr "Skrátené označenie modelu fotoaparátu"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:234
+#: ../raphodo/generatenameconfig.py:238
 msgid "Hyphenated short camera model"
 msgstr "Označenie modelu fotoaparátu"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:237
+#: ../raphodo/generatenameconfig.py:241
 msgid "Serial number"
 msgstr "Sériové číslo"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:240
+#: ../raphodo/generatenameconfig.py:244
 msgid "Shutter count"
 msgstr "Počet cyklov uzávierky"
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: ../raphodo/generatenameconfig.py:242
+#: ../raphodo/generatenameconfig.py:246
 msgid "File number"
 msgstr "Poradové číslo súboru"
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:244
+#: ../raphodo/generatenameconfig.py:248
 msgid "Folder only"
 msgstr "Len adresár"
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:246
+#: ../raphodo/generatenameconfig.py:250
 msgid "Folder and file"
 msgstr "Adresár a súbor"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:249
+#: ../raphodo/generatenameconfig.py:253
 msgid "Owner name"
 msgstr "Meno vlastníka"
 
-#: ../raphodo/generatenameconfig.py:250
+#: ../raphodo/generatenameconfig.py:254
 msgid "Codec"
 msgstr "Kodek"
 
-#: ../raphodo/generatenameconfig.py:251
+#: ../raphodo/generatenameconfig.py:255
 msgid "Width"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:252
+#: ../raphodo/generatenameconfig.py:256
 msgid "Height"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:253
+#: ../raphodo/generatenameconfig.py:257
 msgid "Length"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:254
+#: ../raphodo/generatenameconfig.py:258
 msgid "Frames Per Second"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:255
+#: ../raphodo/generatenameconfig.py:259
 msgid "Artist"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:256
+#: ../raphodo/generatenameconfig.py:260
 msgid "Copyright"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:259
+#: ../raphodo/generatenameconfig.py:263
 msgid "Downloads today"
 msgstr "Dnešné stiahnutie"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:262
+#: ../raphodo/generatenameconfig.py:266
 msgid "Session number"
 msgstr "Číslo relácie"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:265
+#: ../raphodo/generatenameconfig.py:269
 msgid "Subfolder number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:268
+#: ../raphodo/generatenameconfig.py:272
 msgid "Stored number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: ../raphodo/generatenameconfig.py:271
+#: ../raphodo/generatenameconfig.py:275
 msgid "Sequence letter"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:274
+#: ../raphodo/generatenameconfig.py:278
 msgid "All digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:277
+#: ../raphodo/generatenameconfig.py:281
 msgid "Last digit"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:280
+#: ../raphodo/generatenameconfig.py:284
 msgid "Last 2 digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:283
+#: ../raphodo/generatenameconfig.py:287
 msgid "Last 3 digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:286
+#: ../raphodo/generatenameconfig.py:290
 msgid "Last 4 digits"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:289
+#: ../raphodo/generatenameconfig.py:293
 msgid "Original Case"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:292
+#: ../raphodo/generatenameconfig.py:296
 msgid "UPPERCASE"
 msgstr "VEĽKÉ PÍSMENÁ"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:295
+#: ../raphodo/generatenameconfig.py:299
 msgid "lowercase"
 msgstr "malé písmená"
 
-#: ../raphodo/generatenameconfig.py:296
+#: ../raphodo/generatenameconfig.py:300
 msgid "One digit"
 msgstr "Jedna číslica"
 
-#: ../raphodo/generatenameconfig.py:297
+#: ../raphodo/generatenameconfig.py:301
 msgid "Two digits"
 msgstr "Dve číslice"
 
-#: ../raphodo/generatenameconfig.py:298
+#: ../raphodo/generatenameconfig.py:302
 msgid "Three digits"
 msgstr "Tri číslice"
 
-#: ../raphodo/generatenameconfig.py:299
+#: ../raphodo/generatenameconfig.py:303
 msgid "Four digits"
 msgstr "Štyri číslice"
 
-#: ../raphodo/generatenameconfig.py:300
+#: ../raphodo/generatenameconfig.py:304
 msgid "Five digits"
 msgstr "Päť číslic"
 
-#: ../raphodo/generatenameconfig.py:301
+#: ../raphodo/generatenameconfig.py:305
 msgid "Six digits"
 msgstr "Šesť číslic"
 
-#: ../raphodo/generatenameconfig.py:302
+#: ../raphodo/generatenameconfig.py:306
 msgid "Seven digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:305
+#: ../raphodo/generatenameconfig.py:309
 msgid "Subseconds"
 msgstr "Subsekundy"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:308 ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:312 ../raphodo/generatenameconfig.py:393
 msgid "YYYYMMDD"
 msgstr "RRRRMMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:311 ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:315 ../raphodo/generatenameconfig.py:394
 msgid "YYYY-MM-DD"
 msgstr "RRRR-MM-DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:314 ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:318 ../raphodo/generatenameconfig.py:395
 msgid "YYYY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:317
+#: ../raphodo/generatenameconfig.py:321
 msgid "YYMMDD"
 msgstr "RRMMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:320
+#: ../raphodo/generatenameconfig.py:324
 msgid "YY-MM-DD"
 msgstr "RR-MM-DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:323
+#: ../raphodo/generatenameconfig.py:327
 msgid "YY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:326
+#: ../raphodo/generatenameconfig.py:330
 msgid "MMDDYYYY"
 msgstr "MMDDRRRR"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:329
+#: ../raphodo/generatenameconfig.py:333
 msgid "MMDDYY"
 msgstr "MMDDRR"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:332
+#: ../raphodo/generatenameconfig.py:336
 msgid "MMDD"
 msgstr "MMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:335
+#: ../raphodo/generatenameconfig.py:339
 msgid "DDMMYYYY"
 msgstr "DDMMRRRR"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:338
+#: ../raphodo/generatenameconfig.py:342
 msgid "DDMMYY"
 msgstr "DDMMRR"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:341 ../raphodo/generatenameconfig.py:389
-#: ../raphodo/generatenameconfig.py:390 ../raphodo/generatenameconfig.py:391
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:345 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:394 ../raphodo/generatenameconfig.py:395
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:397
 msgid "YYYY"
 msgstr "RRRR"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:344
+#: ../raphodo/generatenameconfig.py:348
 msgid "YY"
 msgstr "RR"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:347
+#: ../raphodo/generatenameconfig.py:351
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:350
+#: ../raphodo/generatenameconfig.py:354
 msgid "DD"
 msgstr "DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:353
+#: ../raphodo/generatenameconfig.py:357
 msgid "Month (full)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:356
+#: ../raphodo/generatenameconfig.py:360
 msgid "Month (abbreviated)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:359
+#: ../raphodo/generatenameconfig.py:363
 msgid "HHMMSS"
 msgstr "HHMMSS"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:362
+#: ../raphodo/generatenameconfig.py:366
 msgid "HHMM"
 msgstr "HHMM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:365
+#: ../raphodo/generatenameconfig.py:369
 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
-#: ../raphodo/generatenameconfig.py:368
+#: ../raphodo/generatenameconfig.py:372
 msgid "HH-MM"
 msgstr "HH-MM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:371
+#: ../raphodo/generatenameconfig.py:375
 msgid "HH"
 msgstr "HH"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:374
+#: ../raphodo/generatenameconfig.py:378
 msgid "MM (minutes)"
 msgstr "MM (minúty)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:377
+#: ../raphodo/generatenameconfig.py:381
 msgid "SS"
 msgstr "SS"
 
-#: ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:393
 msgid "Date"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:394
 msgid "Date (hyphens)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:395
 msgid "Date (underscores)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:438
-#: ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:442
+#: ../raphodo/generatenameconfig.py:537
 msgid "Date and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392
+#: ../raphodo/generatenameconfig.py:396
 msgid "YYYYMM_Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "Date and Job Code Subfolder"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "YYYYMM"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393 ../raphodo/jobcodepanel.py:198
-#: ../raphodo/nameeditor.py:827 ../raphodo/rapid.py:1809
+#: ../raphodo/generatenameconfig.py:397 ../raphodo/jobcodepanel.py:199
+#: ../raphodo/nameeditor.py:833 ../raphodo/rapid.py:1852
 #: ../raphodo/renamepanel.py:83 ../raphodo/renamepanel.py:241
 msgid "Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:433 ../raphodo/generatenameconfig.py:512
+#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:532
 msgid "Original Filename"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "Date-Time and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "YYYYMMDD-HHMM-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "Date and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "YYYYMMDD-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "Date-Time and Image number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "YYYYMMDD-1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "Date-Time and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "YYYYMMDD-HHMM-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:442 ../raphodo/generatenameconfig.py:537
 msgid "YYYYMMDD-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "Date-Time and Video number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "YYYYMMDD_1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "Resolution"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "YYYYMMDD-HHMM-1-1920x1080"
 msgstr ""
 
@@ -1529,76 +1927,77 @@ msgstr ""
 msgid "&Remember this choice"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:185
+#: ../raphodo/jobcodepanel.py:186
 msgid ""
 "Select photos and videos to be able to apply a new or existing Job Code to "
 "them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:186
-msgid "The new Job Code will be applied to all selected photos and/or videos."
+#: ../raphodo/jobcodepanel.py:187
+msgid ""
+"The new Job Code will be applied to all selected photos and/or videos."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:187
+#: ../raphodo/jobcodepanel.py:188
 msgid ""
 "Click the Apply button to apply the current Job Code to all selected photos "
 "and/or videos. You can also simply double click the Job Code."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:189
+#: ../raphodo/jobcodepanel.py:190
 msgid ""
 "Removing a Job Code removes it only from the list of saved Job Codes, not "
 "from any photos or videos that it may have been applied to."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:191
+#: ../raphodo/jobcodepanel.py:192
 msgid ""
 "If you want to use Job Codes, configure file renaming or destination "
 "subfolder names to use them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:197
+#: ../raphodo/jobcodepanel.py:198
 msgid "Last Used"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:202
+#: ../raphodo/jobcodepanel.py:203
 msgid "Job Code Sort:"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:205 ../raphodo/rapid.py:2061
+#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2133
 msgid "Ascending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2062
+#: ../raphodo/jobcodepanel.py:207 ../raphodo/rapid.py:2134
 msgid "Descending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:216
+#: ../raphodo/jobcodepanel.py:217
 msgid "&New..."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:220
+#: ../raphodo/jobcodepanel.py:221
 msgid "&Apply"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:224
+#: ../raphodo/jobcodepanel.py:225
 msgid "&Remove"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:228 ../raphodo/preferencedialog.py:125
-#: ../raphodo/preferencedialog.py:154 ../raphodo/preferencedialog.py:433
+#: ../raphodo/jobcodepanel.py:229 ../raphodo/preferencedialog.py:200
+#: ../raphodo/preferencedialog.py:229 ../raphodo/preferencedialog.py:531
 msgid "Remove All"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:427
+#: ../raphodo/jobcodepanel.py:428
 msgid "Do you really want to remove all the Job Codes?"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:429
+#: ../raphodo/jobcodepanel.py:430
 msgid "Remove all Job Codes"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:492
+#: ../raphodo/jobcodepanel.py:493
 msgid "Job Codes"
 msgstr "Pracovné kódy"
 
@@ -1609,42 +2008,58 @@ msgstr "Pracovné kódy"
 msgid "<i><b>Hint:</b> %(message)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:418 ../raphodo/nameeditor.py:432
+#: ../raphodo/nameeditor.py:423 ../raphodo/nameeditor.py:437
 #, python-format
 msgid "%(description)s - %(elements)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:512
+#: ../raphodo/nameeditor.py:517
 msgid "Save New Custom Preset..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:513
+#: ../raphodo/nameeditor.py:518
 msgid "Remove All Custom Presets..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:559
+#: ../raphodo/nameeditor.py:564
 msgid "(New Custom Preset)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:576
+#: ../raphodo/nameeditor.py:581
 #, python-format
 msgid "%s (edited)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:579 ../raphodo/nameeditor.py:1370
+#: ../raphodo/nameeditor.py:584 ../raphodo/nameeditor.py:1379
 #, python-format
 msgid "Update Custom Preset \"%s\""
 msgstr ""
 
-#: ../raphodo/nameeditor.py:667
+#: ../raphodo/nameeditor.py:672
 msgid "Save New Custom Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:675
+#: ../raphodo/nameeditor.py:680
 msgid "Preset Name:"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:836
+#: ../raphodo/nameeditor.py:799
+msgid "Photo Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:805
+msgid "Video Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:811
+msgid "Photo Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:817
+msgid "Video Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:842
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>There is insufficient data to "
 "fully generate the name. Please use other renaming options.</i>"
@@ -1653,7 +2068,7 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees.
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:846
+#: ../raphodo/nameeditor.py:853
 #, python-format
 msgid "The character</i> %(separator)s <i>creates a new subfolder level."
 msgstr ""
@@ -1661,50 +2076,50 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:851
+#: ../raphodo/nameeditor.py:858
 #, python-format
 msgid ""
 "There is no need start or end with the folder separator </i> "
 "%(separator)s<i>, because it is added automatically."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:859
+#: ../raphodo/nameeditor.py:866
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>Unique filenames may not be "
 "generated. Make filenames unique by using Sequence values.</i>"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:882 ../raphodo/renamepanel.py:121
+#: ../raphodo/nameeditor.py:889 ../raphodo/renamepanel.py:121
 msgid "Preset:"
 msgstr ""
 
 #. Translators: appears in a combobox, e.g. Image Date (YYYY)
-#: ../raphodo/nameeditor.py:959 ../raphodo/nameeditor.py:980
+#: ../raphodo/nameeditor.py:966 ../raphodo/nameeditor.py:987
 #, python-brace-format
 msgid "{choice} ({variant})"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1005 ../raphodo/preferencedialog.py:530
+#: ../raphodo/nameeditor.py:1012 ../raphodo/preferencedialog.py:783
 msgid "Get help online..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1025
+#: ../raphodo/nameeditor.py:1034
 msgid "Insert"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1351
+#: ../raphodo/nameeditor.py:1360
 msgid "Save Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1356
+#: ../raphodo/nameeditor.py:1365
 msgid ""
-"<b>Do you want to save the changes in a new custom preset?</"
-"b><br><br>Creating a custom preset is not required, but can help you keep "
-"organized.<br><br>The changes to the preferences will still be applied "
-"regardless of whether you create a new custom preset or not."
+"<b>Do you want to save the changes in a new custom "
+"preset?</b><br><br>Creating a custom preset is not required, but can help "
+"you keep organized.<br><br>The changes to the preferences will still be "
+"applied regardless of whether you create a new custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1365
+#: ../raphodo/nameeditor.py:1374
 msgid ""
 "<b>Do you want to save the changes in a custom preset?</b><br><br>If you "
 "like, you can create a new custom preset or update the existing custom "
@@ -1712,136 +2127,167 @@ msgid ""
 "regardless of whether you save a custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1372
+#: ../raphodo/nameeditor.py:1381
 msgid "Save New Custom Preset"
 msgstr ""
 
-#: ../raphodo/newversion.py:306
+#: ../raphodo/newversion.py:312
 msgid "Checking for new version..."
 msgstr ""
 
-#: ../raphodo/newversion.py:307
+#: ../raphodo/newversion.py:313
 msgid "You are running the latest version."
 msgstr ""
 
-#: ../raphodo/newversion.py:308
+#: ../raphodo/newversion.py:314
 msgid "Failed to contact the update server."
 msgstr ""
 
-#: ../raphodo/newversion.py:310
+#: ../raphodo/newversion.py:316
 #, python-format
 msgid "A new version of Rapid Photo Downloader (%s) is available."
 msgstr ""
 
-#: ../raphodo/newversion.py:312
+#: ../raphodo/newversion.py:318
 msgid "Do you want to download the new version?"
 msgstr ""
 
-#: ../raphodo/newversion.py:313
+#: ../raphodo/newversion.py:319
 #, python-format
 msgid "Changes in the new release can be viewed <a href=\"%s\">here</a>."
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the s key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:340 ../raphodo/newversion.py:353
+#: ../raphodo/newversion.py:348 ../raphodo/newversion.py:363
 msgid "&Skip this release"
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the o key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:356
+#: ../raphodo/newversion.py:366
 msgid "&Open Download Page"
 msgstr ""
 
-#: ../raphodo/newversion.py:376
+#: ../raphodo/newversion.py:386
 msgid "Rapid Photo Downloader updates"
 msgstr ""
 
 #. Translators: shows how much of a file has been downloaded e.g  123 KB of 1.3 MB
-#: ../raphodo/newversion.py:478
+#: ../raphodo/newversion.py:488
 #, python-format
 msgid "%(downloaded)s of %(total)s"
 msgstr ""
 
-#: ../raphodo/newversion.py:495
+#: ../raphodo/newversion.py:507
 msgid "Downloading..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:76
+#: ../raphodo/preferencedialog.py:86
 msgid "Preferences"
 msgstr "Nastavenia"
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Automation"
 msgstr "Automatizácia"
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Thumbnails"
 msgstr "Náhľad"
 
-#: ../raphodo/preferencedialog.py:85 ../raphodo/preferencedialog.py:343
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/preferencedialog.py:428
 msgid "Error Handling"
 msgstr "Obsluha chýb"
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:109
+msgid "Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:109 ../raphodo/preferencedialog.py:119
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:94
+#: ../raphodo/preferencedialog.py:147
 msgid "Device Scanning"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:96
+#: ../raphodo/preferencedialog.py:148
 msgid "Scan only external devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:98
+#: ../raphodo/preferencedialog.py:150
 msgid ""
 "Scan for photos and videos only on devices that are external to the "
 "computer,\n"
 "including cameras, memory cards, external hard drives, and USB flash drives."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:102
-msgid "Scan non-camera devices lacking a DCIM folder"
+#: ../raphodo/preferencedialog.py:153
+msgid "Scan only specific folders on devices"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:155
+msgid ""
+"Scan for photos and videos only in the folders specified below (except "
+"paths\n"
+"specified in Ignored Paths).\n"
+"\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:161
+msgid "Folders to scan:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:164
+msgid ""
+"Folders at the base level of device file systems that will be scanned\n"
+"for photos and videos."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:167 ../raphodo/preferencedialog.py:219
+msgid "Add..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:104
+#: ../raphodo/preferencedialog.py:169
 msgid ""
-"Scan the entirety of a device for photos and videos, irrespective of whether "
-"it contains a DCIM folder,\n"
-"as opposed to only scanning within a DCIM folder.\n"
+"Add a folder to the list of folders to scan for photos and videos.\n"
 "\n"
-"Changing this setting causes all devices to be scanned again.\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:172 ../raphodo/preferencedialog.py:198
+#: ../raphodo/preferencedialog.py:224 ../raphodo/preferencedialog.py:529
+msgid "Remove"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:174
+msgid ""
+"Remove a folder from the list of folders to scan for photos and videos.\n"
 "\n"
-"Note: With cameras, only the DCIM folder is scanned."
+"Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:116
+#: ../raphodo/preferencedialog.py:191
 msgid "Devices that have been set to automatically ignore or download from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:117
+#: ../raphodo/preferencedialog.py:192
 msgid "Remembered Devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:121
+#: ../raphodo/preferencedialog.py:196
 msgid ""
 "Remove a device from the list of devices to automatically ignore or download "
 "from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:123 ../raphodo/preferencedialog.py:149
-#: ../raphodo/preferencedialog.py:431
-msgid "Remove"
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:127
+#: ../raphodo/preferencedialog.py:202
 msgid ""
 "Clear the list of devices from which to automatically ignore or download "
 "from.\n"
@@ -1849,315 +2295,436 @@ msgid ""
 "Note: Changes take effect when the computer is next scanned for devices."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:140
+#: ../raphodo/preferencedialog.py:215
 msgid "Ignored Paths"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:141
+#: ../raphodo/preferencedialog.py:216
 msgid ""
 "The end part of a path that should never be scanned for photos or videos."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:144
-msgid "Add..."
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:146
+#: ../raphodo/preferencedialog.py:221
 msgid ""
 "Add a path to the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:151
+#: ../raphodo/preferencedialog.py:226
 msgid ""
 "Remove a path from the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:156
+#: ../raphodo/preferencedialog.py:231
 msgid ""
 "Clear the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:164
+#: ../raphodo/preferencedialog.py:239
 msgid ""
-"Use python-style <a href=\"http://damonlynch.net/rapid/documentation/"
-"#regularexpressions\">regular expressions</a>"
+"Use python-style <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">regula"
+"r expressions</a>"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:168
+#: ../raphodo/preferencedialog.py:243
 msgid ""
 "Use regular expressions in the list of ignored paths.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:208
+#: ../raphodo/preferencedialog.py:283
 msgid "Program Automation"
 msgstr "Automatizácia programu"
 
-#: ../raphodo/preferencedialog.py:209
+#: ../raphodo/preferencedialog.py:284
 msgid "Start downloading at program startup"
 msgstr "Spustiť sťahovanie pri štarte programu"
 
-#: ../raphodo/preferencedialog.py:210
+#: ../raphodo/preferencedialog.py:285
 msgid "Start downloading upon device insertion"
 msgstr "Spustiť sťahovanie po pripojení zariadenia"
 
-#: ../raphodo/preferencedialog.py:211
+#: ../raphodo/preferencedialog.py:286
 msgid "Unmount (eject) device upon download completion"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:212
+#: ../raphodo/preferencedialog.py:287
 msgid "Exit program when download completes"
 msgstr "Ukončiť program po skončení sťahovania"
 
-#: ../raphodo/preferencedialog.py:213
+#: ../raphodo/preferencedialog.py:288
 msgid "Exit program even if download had warnings or errors"
 msgstr "Ukončíť program aj ak pri sťahovaní došlo k chybám"
 
-#: ../raphodo/preferencedialog.py:240
+#: ../raphodo/preferencedialog.py:315
 msgid "Thumbnail Generation"
 msgstr "Generovanie náhľadov"
 
-#: ../raphodo/preferencedialog.py:241
+#: ../raphodo/preferencedialog.py:316
 msgid "Generate thumbnails"
 msgstr "Generovať náhľady"
 
-#: ../raphodo/preferencedialog.py:242
+#: ../raphodo/preferencedialog.py:318
 msgid "Generate thumbnails to show in the main program window"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:244
+#: ../raphodo/preferencedialog.py:320
 msgid "Cache thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:245
+#: ../raphodo/preferencedialog.py:323
 msgid ""
 "Save thumbnails shown in the main program window in a thumbnail cache unique "
 "to Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:247
+#: ../raphodo/preferencedialog.py:327
 msgid "Generate system thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:248
+#: ../raphodo/preferencedialog.py:330
 msgid ""
 "While downloading, save thumbnails that can be used by desktop file managers "
 "and other programs"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:255
+#: ../raphodo/preferencedialog.py:339
 msgid "Number of CPU cores used to generate thumbnails."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:256
+#: ../raphodo/preferencedialog.py:340
 msgid "CPU cores:"
 msgstr ""
 
 #. Translators: the * acts as an asterisk to denote a reference to an annotation
 #. such as '* Takes effect upon program restart'
-#: ../raphodo/preferencedialog.py:271 ../raphodo/preferencedialog.py:317
+#: ../raphodo/preferencedialog.py:355 ../raphodo/preferencedialog.py:401
 msgid "*"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:294
+#: ../raphodo/preferencedialog.py:378
 msgid "Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:296
+#: ../raphodo/preferencedialog.py:380
 msgid "Calculating..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:302
+#: ../raphodo/preferencedialog.py:386
 msgid "days"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:303
+#: ../raphodo/preferencedialog.py:387
 msgid "forever"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:308
+#: ../raphodo/preferencedialog.py:392
 msgid "Cache size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:310
+#: ../raphodo/preferencedialog.py:394
 msgid "Number of thumbnails:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:312
+#: ../raphodo/preferencedialog.py:396
 msgid "Database size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:314
+#: ../raphodo/preferencedialog.py:398
 msgid "Cache unaccessed thumbnails for:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:322
+#: ../raphodo/preferencedialog.py:406
 msgid "Purge Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:323
+#: ../raphodo/preferencedialog.py:408
 msgid "Optimize Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:336
+#: ../raphodo/preferencedialog.py:421
 msgid "* Takes effect upon program restart"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:346
+#: ../raphodo/preferencedialog.py:431
 msgid "Skip download"
 msgstr "Vynechať sťahovanie"
 
-#: ../raphodo/preferencedialog.py:347
+#: ../raphodo/preferencedialog.py:432
 msgid "Don't download the file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:348
+#: ../raphodo/preferencedialog.py:433
 msgid "Add unique identifier"
 msgstr "Pridať unikátny identifikátor"
 
-#: ../raphodo/preferencedialog.py:349
+#: ../raphodo/preferencedialog.py:436
 msgid ""
 "Add an identifier like _1 or _2 to the end of the filename, immediately "
 "before the file's extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:355
+#: ../raphodo/preferencedialog.py:444
 msgid "Overwrite"
 msgstr "Prapísať"
 
-#: ../raphodo/preferencedialog.py:356
+#: ../raphodo/preferencedialog.py:445
 msgid "Overwrite the previously backed up file"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:357
+#: ../raphodo/preferencedialog.py:446
 msgid "Skip"
 msgstr "Preskočiť"
 
-#: ../raphodo/preferencedialog.py:358
+#: ../raphodo/preferencedialog.py:448
 msgid "Don't overwrite the backup file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:364
+#: ../raphodo/preferencedialog.py:455
 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 identifier:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:378
+#: ../raphodo/preferencedialog.py:464
+msgid ""
+"Using sequence numbers to automatically generate unique filenames is "
+"strongly recommended. Configure file renaming in the Rename panel in the "
+"main window."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:473
 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 ""
 
-#: ../raphodo/preferencedialog.py:398
+#: ../raphodo/preferencedialog.py:494
 msgid "Program Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:399
+#: ../raphodo/preferencedialog.py:495
 msgid "Show a warning when:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:402
+#: ../raphodo/preferencedialog.py:498
 msgid "Downloading files currently not displayed"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:403
+#: ../raphodo/preferencedialog.py:499
 msgid ""
 "Warn when about to download files that are not displayed in the main window."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:405
+#: ../raphodo/preferencedialog.py:501
 msgid "Backup destinations are missing"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:406
-msgid "Warn before starting a download if it is not possible to back up files."
+#: ../raphodo/preferencedialog.py:502
+msgid ""
+"Warn before starting a download if it is not possible to back up files."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:408
+#: ../raphodo/preferencedialog.py:504
 msgid "Program libraries are missing or broken"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:409
+#: ../raphodo/preferencedialog.py:505
 msgid ""
 "Warn if a software library used by Rapid Photo Downloader is missing or not "
 "functioning."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:412
+#: ../raphodo/preferencedialog.py:508
 msgid "Filesystem metadata cannot be set"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:413
+#: ../raphodo/preferencedialog.py:509
 msgid ""
 "Warn if there is an error setting a file's filesystem metadata, such as its "
 "modification time."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:416
+#: ../raphodo/preferencedialog.py:512
 msgid "Encountering unhandled files"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:417
+#: ../raphodo/preferencedialog.py:513
 msgid ""
 "Warn after scanning a device or this computer if there are unrecognized "
 "files that will not be included in the download."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:420
+#: ../raphodo/preferencedialog.py:517
 msgid "Do not warn about unhandled files with extensions:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:424
+#: ../raphodo/preferencedialog.py:522
 msgid ""
 "File extensions are case insensitive and do not need to include the leading "
 "dot."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:427
+#: ../raphodo/preferencedialog.py:525
 msgid "Add"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:428
+#: ../raphodo/preferencedialog.py:526
 msgid ""
 "Add a file extension to the list of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:430
+#: ../raphodo/preferencedialog.py:528
 msgid ""
 "Remove a file extension from the list of unhandled file types to not warn "
 "about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:434
+#: ../raphodo/preferencedialog.py:532
 msgid ""
 "Clear the list of file extensions of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:469
+#: ../raphodo/preferencedialog.py:568
+msgid "Photo and Video Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:571
+msgid "Consolidate files across devices and downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:574
+msgid ""
+"Analyze the results of device scans looking for duplicate files and matching "
+"RAW and JPEG pairs,\n"
+"comparing them across multiple devices and download sessions."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:580
+msgid "Treat matching RAW and JPEG files as:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:581
+msgid "One photo"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:582
+msgid "Two photos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:584
+msgid ""
+"Display matching pairs of RAW and JPEG photos as one photo, and if marked, "
+"download both."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:589
+msgid ""
+"Display matching pairs of RAW and JPEG photos as two different photos. You "
+"can still synchronize their sequence numbers."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:598
+msgid "With matching RAW and JPEG photos:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:600
+msgid "Do not mark JPEG for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:601
+msgid "Do not mark RAW for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:602
+msgid "Mark both for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:609
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"JPEG for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:614
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"RAW for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:619
+msgid ""
+"When matching RAW and JPEG photos are found, automatically mark both for "
+"download."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:625
+msgid ""
+"If you disable file consolidation, choose what to do when a download device "
+"is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:631
+msgid ""
+"When a download device is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:642
+msgid "Clear completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:643
+msgid "Keep displaying completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:644
+msgid "Prompt for what to do"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:649
+msgid ""
+"Automatically clear the display of completed downloads whenever a new "
+"download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:654
+msgid ""
+"Keep displaying completed downloads whenever a new download device is "
+"inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:658
+msgid ""
+"Prompt whether to keep displaying completed downloads or clear them whenever "
+"a new download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:702
 msgid "Version Check"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:470
+#: ../raphodo/preferencedialog.py:703
 msgid "Check for new version at startup"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:471
+#: ../raphodo/preferencedialog.py:705
 msgid "Check for a new version of the program each time the program starts."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:473
+#: ../raphodo/preferencedialog.py:707
 msgid "Include development releases"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:474
+#: ../raphodo/preferencedialog.py:709
 msgid ""
 "Include alpha, beta and other development releases when checking for a new "
 "version of the program.\n"
@@ -2166,11 +2733,11 @@ msgid ""
 "occur."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:489
+#: ../raphodo/preferencedialog.py:725
 msgid "Ignore DNG date/time metadata on MTP devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:490
+#: ../raphodo/preferencedialog.py:727
 msgid ""
 "Ignore date/time metadata in DNG files located on MTP devices, and use the "
 "file's modification time instead.\n"
@@ -2179,70 +2746,86 @@ msgid ""
 "metadata."
 msgstr ""
 
+#: ../raphodo/preferencedialog.py:741
+msgid "Completed Downloads"
+msgstr ""
+
 #. Translators: substituted value is a description for the set of preferences
 #. shown in the preference dialog window, e.g. Devices, Automation, etc.
 #. This string is shown in a tooltip for the "Restore Defaults" button
-#: ../raphodo/preferencedialog.py:710
+#: ../raphodo/preferencedialog.py:1067
 #, python-format
 msgid "Restores default %s preference values"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:832
+#: ../raphodo/preferencedialog.py:1208
 msgid ""
 "Do you want to purge the thumbnail cache? The cache will be purged when the "
 "program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:835
+#: ../raphodo/preferencedialog.py:1212
 msgid "Purge Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:847
+#: ../raphodo/preferencedialog.py:1225
 msgid ""
 "Do you want to optimize the thumbnail cache? The cache will be optimized "
 "when the program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:850
+#: ../raphodo/preferencedialog.py:1229
 msgid "Optimize Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1045
+#: ../raphodo/preferencedialog.py:1481
+msgid "Enter a Folder to Scan"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1482
+msgid "Specify a folder that will be scanned for photos and videos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1483
+msgid "Folder:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1497
 msgid "Enter a Path to Ignore"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1046
+#: ../raphodo/preferencedialog.py:1498
 msgid "Specify a path that will never be scanned for photos or videos"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1047
+#: ../raphodo/preferencedialog.py:1499
 msgid "Path:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1061
+#: ../raphodo/preferencedialog.py:1513
 msgid "Enter a File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1062
+#: ../raphodo/preferencedialog.py:1514
 msgid "Specify a file extension (without the leading dot)"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1063 ../raphodo/renamepanel.py:122
+#: ../raphodo/preferencedialog.py:1515 ../raphodo/renamepanel.py:122
 msgid "Extension:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1078
+#: ../raphodo/preferencedialog.py:1530
 msgid "Invalid File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1079
+#: ../raphodo/preferencedialog.py:1531
 #, python-format
 msgid ""
 "The file extension <b>%s</b> is recognized by Rapid Photo Downloader, so it "
 "makes no sense to warn about its presence."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1081
+#: ../raphodo/preferencedialog.py:1533
 #, python-format
 msgid ""
 "Recognized file types:\n"
@@ -2268,104 +2851,103 @@ msgstr ""
 msgid "Birthday"
 msgstr ""
 
-#: ../raphodo/preferences.py:614
+#: ../raphodo/preferences.py:624
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr ""
 
-#: ../raphodo/preferences.py:617
+#: ../raphodo/preferences.py:627
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr ""
 
-#: ../raphodo/preferences.py:622
+#: ../raphodo/preferences.py:632
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
 
-#. self.setFlat(True)
 #: ../raphodo/primarybutton.py:72
 msgid "Download 8 Photos and 10 Videos"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:86 ../raphodo/problemnotification.py:208
+#: ../raphodo/problemnotification.py:87 ../raphodo/problemnotification.py:209
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:89
+#: ../raphodo/problemnotification.py:90
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:116
+#: ../raphodo/problemnotification.py:117
 #, python-format
 msgid "GPhoto2 Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:124
+#: ../raphodo/problemnotification.py:125
 msgid ""
 "Unable to initialize the camera, probably because another program is using "
 "it. No files were copied from it."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:134
+#: ../raphodo/problemnotification.py:135
 #, python-format
 msgid "Unable to read directory %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:140
+#: ../raphodo/problemnotification.py:141
 #, python-format
 msgid "Unable to access modification time or size from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:146
+#: ../raphodo/problemnotification.py:147
 #, python-format
 msgid "Unable to read file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:152
+#: ../raphodo/problemnotification.py:153
 #, python-format
 msgid "Unable to write file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:158
+#: ../raphodo/problemnotification.py:159
 #, python-format
 msgid "Unable to move file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:164
+#: ../raphodo/problemnotification.py:165
 #, python-format
 msgid "Unable to remove file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:170
+#: ../raphodo/problemnotification.py:171
 #, python-format
 msgid "Unable to copy file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:176
+#: ../raphodo/problemnotification.py:177
 #, python-format
 msgid "Zero length file %s will not be downloaded"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:182
+#: ../raphodo/problemnotification.py:183
 #, python-format
 msgid "Could not determine filesystem modification time for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:188
+#: ../raphodo/problemnotification.py:189
 #, python-format
 msgid "Unable to load metadata from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:194
+#: ../raphodo/problemnotification.py:195
 #, python-format
 msgid ""
 "Unable to load metadata from %(name)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:202
+#: ../raphodo/problemnotification.py:203
 #, python-format
 msgid ""
 "An error occurred setting a file's filesystem metadata on the filesystem %s. "
@@ -2373,212 +2955,212 @@ msgid ""
 "again."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:216
+#: ../raphodo/problemnotification.py:217
 #, python-format
 msgid "Encountered unhandled file %s. It will not be downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:223
+#: ../raphodo/problemnotification.py:224
 #, python-format
 msgid "%(filetype)s %(destination)s already exists."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:234 ../raphodo/problemnotification.py:262
+#: ../raphodo/problemnotification.py:235 ../raphodo/problemnotification.py:263
 #, python-format
 msgid ""
 "The existing %(filetype)s %(destination)s was last modified on %(date)s at "
 "%(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:245
+#: ../raphodo/problemnotification.py:246
 #, python-format
 msgid "The %(filetype)s %(source)s was not downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:273
+#: ../raphodo/problemnotification.py:274
 #, python-format
 msgid "The %(filetype)s %(source)s was downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:282
+#: ../raphodo/problemnotification.py:283
 #, python-format
 msgid "The unique identifier '%s' was added to the filename."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:298
+#: ../raphodo/problemnotification.py:299
 #, python-format
 msgid ""
 "The existing backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:309
+#: ../raphodo/problemnotification.py:310
 #, python-format
 msgid "The %(filetype)s %(source)s was not backed up from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:326
+#: ../raphodo/problemnotification.py:327
 #, python-format
 msgid ""
 "The previous backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:337
+#: ../raphodo/problemnotification.py:338
 #, python-format
 msgid ""
 "The %(filetype)s %(source)s from %(device)s was backed up, overwriting the "
 "previous backup %(filetype)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:356
+#: ../raphodo/problemnotification.py:357
 #, python-format
 msgid ""
 "When synchronizing RAW + JPEG sequence values, a duplicate %(filetype)s "
 "%(file)s was encountered, and was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:366
+#: ../raphodo/problemnotification.py:367
 msgid ""
 "When synchronizing RAW + JPEG sequence values, photos were detected with the "
 "same filenames, but taken at different times:"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:373
+#: ../raphodo/problemnotification.py:374
 #, 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 ""
 
-#: ../raphodo/problemnotification.py:389
+#: ../raphodo/problemnotification.py:390
 #, python-format
 msgid "Unable to finalize the filename for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:424
+#: ../raphodo/problemnotification.py:425
 #, python-format
 msgid ""
 "The filename %(destination)s was not fully generated for %(filetype)s "
 "%(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:433
+#: ../raphodo/problemnotification.py:434
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:439
+#: ../raphodo/problemnotification.py:440
 #, python-format
 msgid "The following metadata is missing: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:445
+#: ../raphodo/problemnotification.py:446
 #, python-format
 msgid "Date/time conversion failed: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:451
+#: ../raphodo/problemnotification.py:452
 msgid ""
 "Could not extract valid date/time metadata or determine the file "
 "modification time."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:457
+#: ../raphodo/problemnotification.py:458
 msgid "Filename does not have an extension."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:460
+#: ../raphodo/problemnotification.py:461
 msgid "Filename does not have a number component."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:464
+#: ../raphodo/problemnotification.py:465
 #, python-format
 msgid "Error generating component %(component)s. Error: %(error)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:477
+#: ../raphodo/problemnotification.py:478
 #, python-format
 msgid ""
 "The download subfolders %(folder)s were only partially generated for "
 "%(filetype)s %(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:486
+#: ../raphodo/problemnotification.py:487
 #, python-format
 msgid ""
 "There is no data with which to generate the %(subfolder_file)s for "
 "%(filename)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:499
+#: ../raphodo/problemnotification.py:500
 #, python-format
 msgid ""
 "Unable to create the %(filetype)s %(destination)s in %(folder)s. The "
 "download file was %(source)s in %(device)s. It was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:514
+#: ../raphodo/problemnotification.py:515
 #, python-format
 msgid "Unable to create the download subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:526
+#: ../raphodo/problemnotification.py:527
 #, python-format
 msgid "Unable to create the backup subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:577
+#: ../raphodo/problemnotification.py:578
 #, python-format
 msgid "Problems scanning %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:584
+#: ../raphodo/problemnotification.py:585
 #, python-format
 msgid "Problems copying from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:591
+#: ../raphodo/problemnotification.py:592
 msgid "Problems while finalizing filenames and generating subfolders"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:598
+#: ../raphodo/problemnotification.py:599
 #, python-format
 msgid "Problems backing up to %s"
 msgstr ""
 
-#. Translators: for example Nov 3 or Dec 31
-#. The start and end dates are on a different day
-#. Translators: for example Nov 3 or Dec 31
-#: ../raphodo/proximity.py:105 ../raphodo/proximity.py:221
-#: ../raphodo/proximity.py:224 ../raphodo/proximity.py:828
+#. Translators: for example Nov 3 2015, 11:25 AM
+#. Translators: for example, Nov 3, 12:15 PM
+#: ../raphodo/proximity.py:188 ../raphodo/proximity.py:213
+#: ../raphodo/proximity.py:236 ../raphodo/proximity.py:239
 #, python-format
-msgid "%(month)s %(numeric_day)s"
+msgid "%(date)s, %(time)s"
 msgstr ""
 
-#. Translators: for example Nov 15 2015
-#. Translators: for example Nov 3 2015
-#: ../raphodo/proximity.py:109 ../raphodo/proximity.py:230
-#: ../raphodo/proximity.py:231 ../raphodo/proximity.py:831
+#: ../raphodo/proximity.py:204
 #, python-format
-msgid "%(date)s %(year)s"
+msgid "%(starttime)s - %(endtime)s"
 msgstr ""
 
-#. Translators: for example Nov 3 2015, 11:25 AM
-#. Translators: for example, Nov 3, 12:15 PM
-#: ../raphodo/proximity.py:197 ../raphodo/proximity.py:215
-#: ../raphodo/proximity.py:234 ../raphodo/proximity.py:236
+#. The start and end dates are on a different day
+#. Translators: for example Nov 3 or Dec 31
+#: ../raphodo/proximity.py:221 ../raphodo/proximity.py:225
+#: ../raphodo/proximity.py:980 ../raphodo/timeutils.py:105
 #, python-format
-msgid "%(date)s, %(time)s"
+msgid "%(month)s %(numeric_day)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:209
+#. Translators: for example Nov 3 2015
+#. Translators: for example Nov 2 2015
+#. Translators: for example Nov 15 2015
+#: ../raphodo/proximity.py:232 ../raphodo/proximity.py:233
+#: ../raphodo/proximity.py:985 ../raphodo/timeutils.py:110
 #, python-format
-msgid "%(starttime)s - %(endtime)s"
+msgid "%(date)s %(year)s"
 msgstr ""
 
 #. Translators: for example, Nov 3, 12:15 PM - Nov 4, 1:00 AM
-#: ../raphodo/proximity.py:241
+#: ../raphodo/proximity.py:245
 #, python-format
 msgid "%(earlier_time)s - %(later_time)s"
 msgstr ""
@@ -2587,25 +3169,25 @@ msgstr ""
 #. Nov 3 2012, 12:15 PM -
 #. Nov 4 2012, 1:00 AM
 #. (please keep the line break signified by \n)
-#: ../raphodo/proximity.py:248
+#: ../raphodo/proximity.py:253
 #, python-format
 msgid ""
 "%(earlier_time)s -\n"
 "%(later_time)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:359
+#: ../raphodo/proximity.py:382
 #, python-format
 msgid "%(month)s  %(year)s"
 msgstr ""
 
 #. Translators: for example Nov 2015
-#: ../raphodo/proximity.py:833
+#: ../raphodo/proximity.py:987
 #, python-format
 msgid "%(month)s %(year)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:1344
+#: ../raphodo/proximity.py:1595
 msgid ""
 "The time elapsed between consecutive photos and videos that is used to build "
 "the Timeline"
@@ -2615,47 +3197,47 @@ msgstr ""
 #. Replace the very last character (after the d) with the correct
 #. localized value, keeping everything else. In other words, change
 #. only the m character.
-#: ../raphodo/proximity.py:1406
+#: ../raphodo/proximity.py:1652
 #, python-format
 msgid "%(minutes)dm"
 msgstr ""
 
 #. Translators: i.e. "1.5h", which is short for 1.5 hours.
 #. Replace the entire string with the correct localized value
-#: ../raphodo/proximity.py:1410
+#: ../raphodo/proximity.py:1656
 msgid "1.5h"
 msgstr ""
 
 #. Translators: e.g. "5h", which is short for 5 hours.
 #. Replace the very last character (after the d) with the correct localized value,
 #. keeping everything else. In other words, change only the h character.
-#: ../raphodo/proximity.py:1415
+#: ../raphodo/proximity.py:1661
 #, python-format
 msgid "%(hours)dh"
 msgstr ""
 
-#: ../raphodo/proximity.py:1461
+#: ../raphodo/proximity.py:1710
 msgid ""
 "The Timeline groups photos and videos based on how much time elapsed between "
 "consecutive shots. Use it to identify photos and videos taken at different "
 "periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/proximity.py:1464
+#: ../raphodo/proximity.py:1715
 msgid ""
 "Use the slider (below) to adjust the time elapsed between consecutive shots "
 "that is used to build the Timeline."
 msgstr ""
 
-#: ../raphodo/proximity.py:1466
+#: ../raphodo/proximity.py:1718
 msgid "Timeline build pending..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1467
+#: ../raphodo/proximity.py:1719
 msgid "Timeline is building..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1468
+#: ../raphodo/proximity.py:1721
 msgid ""
 "The Timeline needs to be rebuilt because the file modification time does not "
 "match the time a shot was taken for one or more shots.<br><br>The Timeline "
@@ -2667,61 +3249,61 @@ msgid ""
 "downloading, which is when the metadata is read."
 msgstr ""
 
-#: ../raphodo/rapid.py:485 ../raphodo/rapid.py:2461 ../raphodo/rapid.py:3728
-#: ../raphodo/rapid.py:3846 ../raphodo/rapid.py:3850 ../raphodo/rapid.py:3870
-#: ../raphodo/rapid.py:3874 ../raphodo/rapid.py:3998 ../raphodo/rapid.py:4007
-#: ../raphodo/rapid.py:4495 ../raphodo/rapid.py:4888 ../raphodo/rapid.py:5722
-#: ../raphodo/rememberthisdialog.py:97
+#: ../raphodo/rapid.py:493 ../raphodo/rapid.py:2555 ../raphodo/rapid.py:3934
+#: ../raphodo/rapid.py:4065 ../raphodo/rapid.py:4069 ../raphodo/rapid.py:4092
+#: ../raphodo/rapid.py:4096 ../raphodo/rapid.py:4226 ../raphodo/rapid.py:4237
+#: ../raphodo/rapid.py:4743 ../raphodo/rapid.py:5195 ../raphodo/rapid.py:5997
+#: ../raphodo/rememberthisdialog.py:99
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:3
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: ../raphodo/rapid.py:1100
+#: ../raphodo/rapid.py:1131
 msgid ""
 "<b>ExifTool has a problem</b><br><br> Rapid Photo Downloader uses ExifTool "
 "to get metadata from videos and photos. The program will run without it, but "
 "installing it is <b>highly</b> recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1110 ../raphodo/rapid.py:1130
+#: ../raphodo/rapid.py:1141 ../raphodo/rapid.py:1161
 msgid "Problem with libmediainfo"
 msgstr ""
 
-#: ../raphodo/rapid.py:1119
+#: ../raphodo/rapid.py:1150
 msgid ""
 "<b>The library libmediainfo appears to be missing</b><br><br> Rapid Photo "
 "Downloader uses libmediainfo to get the date and time a video was shot. The "
 "program will run  without it, but installing it is recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1417
+#: ../raphodo/rapid.py:1448
 msgid "Download failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1419
+#: ../raphodo/rapid.py:1450
 msgid ""
 "Sorry, the download of the new version of Rapid Photo Downloader failed."
 msgstr ""
 
-#: ../raphodo/rapid.py:1425
+#: ../raphodo/rapid.py:1457
 msgid ""
 "The new version was successfully downloaded. Do you want to close Rapid "
 "Photo Downloader and install it now?"
 msgstr ""
 
-#: ../raphodo/rapid.py:1428
+#: ../raphodo/rapid.py:1461
 msgid "Update Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:1432
+#: ../raphodo/rapid.py:1465
 msgid "Install"
 msgstr ""
 
-#: ../raphodo/rapid.py:1450
+#: ../raphodo/rapid.py:1483
 msgid "New version saved"
 msgstr ""
 
-#: ../raphodo/rapid.py:1451
+#: ../raphodo/rapid.py:1485
 #, python-format
 msgid ""
 "The tar file and installer script are saved at:\n"
@@ -2729,163 +3311,163 @@ msgid ""
 " %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:1468
+#: ../raphodo/rapid.py:1502
 msgid "Upgrade failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1469
+#: ../raphodo/rapid.py:1505
 msgid ""
 "Sorry, upgrading Rapid Photo Downloader failed because there was an error "
 "opening the installer."
 msgstr ""
 
-#: ../raphodo/rapid.py:1667 ../raphodo/rapid.py:2331
+#: ../raphodo/rapid.py:1709 ../raphodo/rapid.py:2425
 msgid "Download"
 msgstr "Stiahnuť"
 
-#: ../raphodo/rapid.py:1671
+#: ../raphodo/rapid.py:1713
 msgid "&Refresh..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1675
+#: ../raphodo/rapid.py:1717
 msgid "&Preferences"
 msgstr "&Nastavenia"
 
-#: ../raphodo/rapid.py:1679
+#: ../raphodo/rapid.py:1721
 msgid "&Quit"
 msgstr ""
 
-#: ../raphodo/rapid.py:1683
+#: ../raphodo/rapid.py:1725
 msgid "Error &Reports"
 msgstr ""
 
-#: ../raphodo/rapid.py:1687
+#: ../raphodo/rapid.py:1729
 msgid "Clear Completed Downloads"
 msgstr ""
 
-#: ../raphodo/rapid.py:1691
+#: ../raphodo/rapid.py:1733
 msgid "Get Help Online..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1695
+#: ../raphodo/rapid.py:1737
 msgid "&Tip of the Day..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1699
+#: ../raphodo/rapid.py:1741
 msgid "Report a Problem..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1703
+#: ../raphodo/rapid.py:1745
 msgid "Make a Donation..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1707
+#: ../raphodo/rapid.py:1749
 msgid "Translate this Application..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1711
+#: ../raphodo/rapid.py:1753
 msgid "&About..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1715
+#: ../raphodo/rapid.py:1757
 msgid "Check for Updates..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1797
+#: ../raphodo/rapid.py:1840
 msgid "Timeline"
 msgstr ""
 
-#: ../raphodo/rapid.py:1807
+#: ../raphodo/rapid.py:1850
 msgid "Destination"
 msgstr ""
 
-#: ../raphodo/rapid.py:1808
+#: ../raphodo/rapid.py:1851
 msgid "Rename"
 msgstr ""
 
-#: ../raphodo/rapid.py:1810
+#: ../raphodo/rapid.py:1853
 msgid "Back Up"
 msgstr ""
 
 #. Devices Header and View
-#: ../raphodo/rapid.py:1926
+#: ../raphodo/rapid.py:1977
 msgid ""
 "Turn on or off the use of devices attached to this computer as download "
 "sources"
 msgstr ""
 
 #. This Computer Header and View
-#: ../raphodo/rapid.py:1940
+#: ../raphodo/rapid.py:1994
 msgid ""
 "Turn on or off the use of a folder on this computer as a download source"
 msgstr ""
 
-#: ../raphodo/rapid.py:1941
+#: ../raphodo/rapid.py:1996
 msgid "This Computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:1952
+#: ../raphodo/rapid.py:2009
 msgid "Select a source folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:1975
+#: ../raphodo/rapid.py:2038
 msgid "Projected Storage Use"
 msgstr ""
 
-#: ../raphodo/rapid.py:1989 ../raphodo/rapid.py:1997
+#: ../raphodo/rapid.py:2056 ../raphodo/rapid.py:2068
 msgid "Select a destination folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:2045
+#: ../raphodo/rapid.py:2117
 msgid "All"
 msgstr ""
 
-#: ../raphodo/rapid.py:2046
+#: ../raphodo/rapid.py:2118
 msgid "New"
 msgstr ""
 
-#: ../raphodo/rapid.py:2048
+#: ../raphodo/rapid.py:2120
 msgid "Show:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2051
+#: ../raphodo/rapid.py:2123
 msgid "Modification Time"
 msgstr ""
 
-#: ../raphodo/rapid.py:2052
+#: ../raphodo/rapid.py:2124
 msgid "Checked State"
 msgstr ""
 
-#: ../raphodo/rapid.py:2055
+#: ../raphodo/rapid.py:2127
 msgid "File Type"
 msgstr ""
 
-#: ../raphodo/rapid.py:2056
+#: ../raphodo/rapid.py:2128
 msgid "Device"
 msgstr "Zariadenie"
 
-#: ../raphodo/rapid.py:2058
+#: ../raphodo/rapid.py:2130
 msgid "Sort:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2069
+#: ../raphodo/rapid.py:2141
 msgid "Select All:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2311
+#: ../raphodo/rapid.py:2405
 #, python-format
 msgid "Download %(files)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2327
+#: ../raphodo/rapid.py:2421
 msgid "Resume Download"
 msgstr ""
 
-#: ../raphodo/rapid.py:2329
+#: ../raphodo/rapid.py:2423
 msgid "Pause"
 msgstr "Pozastaviť"
 
-#: ../raphodo/rapid.py:2417
+#: ../raphodo/rapid.py:2511
 #, python-brace-format
 msgid ""
 "Please report the problem at <a href=\"{website}\">{website}</a>.<br><br>\n"
@@ -2894,11 +3476,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/rapid.py:2431
+#: ../raphodo/rapid.py:2525
 msgid "Thank you for reporting a problem in Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:2529
+#: ../raphodo/rapid.py:2624
 #, python-format
 msgid ""
 "<b>Changing This Computer source path</b><br><br>Do you really want to "
@@ -2907,30 +3489,29 @@ msgid ""
 "from This Computer will be cancelled."
 msgstr ""
 
-#: ../raphodo/rapid.py:2595
+#: ../raphodo/rapid.py:2694
 msgid "You cannot change the download destination while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:2604
+#: ../raphodo/rapid.py:2704
 #, python-format
 msgid ""
 "<b>Confirm Download Destination</b><br><br>Are you sure you want to set the "
 "%(file_type)s download destination to %(path)s?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2682
+#: ../raphodo/rapid.py:2785
 msgid ""
+"\n"
 "<b>Downloading all files</b><br><br>\n"
-"                    A download always includes all files that are checked "
-"for download,\n"
-"                    including those that are not currently displayed because "
-"the Timeline\n"
-"                    is being used or because only new files are being shown."
-"<br><br>\n"
-"                    Do you want to proceed with the download?"
+"A download always includes all files that are checked for download,\n"
+"including those that are not currently displayed because the Timeline\n"
+"is being used or because only new files are being shown.<br><br>\n"
+"Do you want to proceed with the download?\n"
+"                        "
 msgstr ""
 
-#: ../raphodo/rapid.py:2820
+#: ../raphodo/rapid.py:2937
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -2941,7 +3522,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: ../raphodo/rapid.py:2824
+#: ../raphodo/rapid.py:2940
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -2950,199 +3531,193 @@ msgstr ""
 "Tento adresár nie je použiteľný pre sťahovanie:\n"
 "%s"
 
-#: ../raphodo/rapid.py:2827
+#: ../raphodo/rapid.py:2943
 msgid "Download Failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:2828
+#: ../raphodo/rapid.py:2944
 msgid "The download cannot proceed."
 msgstr ""
 
-#: ../raphodo/rapid.py:2842
+#: ../raphodo/rapid.py:2962
 msgid ""
 "Photos and videos will not be backed up because there is nowhere to back "
 "them up. Do you still want to start the download?"
 msgstr ""
 
-#. Translators: filetype will be replaced with 'photos' or 'videos'
-#: ../raphodo/rapid.py:2847 ../raphodo/rapid.py:2854
+#: ../raphodo/rapid.py:2969 ../raphodo/rapid.py:2979
 #, python-format
 msgid ""
 "No backup device exists for backing up %(filetype)s. Do you still want to "
 "start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2848 ../raphodo/rpdfile.py:228
+#: ../raphodo/rapid.py:2971 ../raphodo/rpdfile.py:228
 msgid "photos"
 msgstr "fotografie"
 
-#: ../raphodo/rapid.py:2855 ../raphodo/rpdfile.py:223
+#: ../raphodo/rapid.py:2981 ../raphodo/rpdfile.py:223
 msgid "videos"
 msgstr "videá"
 
-#: ../raphodo/rapid.py:2861
+#: ../raphodo/rapid.py:2989
 msgid ""
 "<b>The photo and video backup destinations do not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2869 ../raphodo/rapid.py:2876
+#: ../raphodo/rapid.py:2999 ../raphodo/rapid.py:3008
 #, python-format
 msgid ""
 "<b>The %(filetype)s backup destination does not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2871 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:818
+#: ../raphodo/rapid.py:3001 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:843
 msgid "photo"
 msgstr "fotografia"
 
-#: ../raphodo/rapid.py:2878 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:858
+#: ../raphodo/rapid.py:3010 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:883
 msgid "video"
 msgstr "video"
 
-#: ../raphodo/rapid.py:2886
+#: ../raphodo/rapid.py:3018
 msgid "Backup problem"
 msgstr "Chyba zálohovania"
 
-#. Translators - in the middle is a unicode em dash - please retain it
-#. This string is displayed in the status bar when the download is running
-#: ../raphodo/rapid.py:3571
+#: ../raphodo/rapid.py:3756
 #, python-format
 msgid "%(downloading_from)s — %(time_left)s left (%(speed)s)"
 msgstr ""
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3640
+#: ../raphodo/rapid.py:3828
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s stiahnutých."
 
-#. Translators: e.g. 2 videos failed to download
-#: ../raphodo/rapid.py:3645
+#: ../raphodo/rapid.py:3836
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "%(noFiles)s %(filetypes)s sa nepodarilo stiahnuť."
 
-#: ../raphodo/rapid.py:3650 ../raphodo/rapid.py:3723
+#: ../raphodo/rapid.py:3842 ../raphodo/rapid.py:3927
 msgid "warnings"
 msgstr "varovania"
 
-#: ../raphodo/rapid.py:3679
+#: ../raphodo/rapid.py:3873
 msgid "All downloads complete"
 msgstr "Všetka sťahovania bola dokončená"
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3686 ../raphodo/rapid.py:3695 ../raphodo/rapid.py:3704
-#: ../raphodo/rapid.py:3713 ../raphodo/rapid.py:3721
+#: ../raphodo/rapid.py:3881 ../raphodo/rapid.py:3892 ../raphodo/rapid.py:3903
+#: ../raphodo/rapid.py:3914 ../raphodo/rapid.py:3924
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: ../raphodo/rapid.py:3688 ../raphodo/rapid.py:3706
+#: ../raphodo/rapid.py:3884 ../raphodo/rapid.py:3906
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s stiahnutých."
 
-#: ../raphodo/rapid.py:3697 ../raphodo/rapid.py:3715
+#: ../raphodo/rapid.py:3895 ../raphodo/rapid.py:3917
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "%(filetype)s failed to download"
 
-#: ../raphodo/rapid.py:3742
+#: ../raphodo/rapid.py:3950
 msgid "1 failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:3744
+#: ../raphodo/rapid.py:3952
 #, python-format
 msgid "%d failures"
 msgstr ""
 
-#: ../raphodo/rapid.py:3749
+#: ../raphodo/rapid.py:3957
 msgid "1 warning"
 msgstr ""
 
-#: ../raphodo/rapid.py:3751
+#: ../raphodo/rapid.py:3959
 #, python-format
 msgid "%d warnings"
 msgstr ""
 
-#: ../raphodo/rapid.py:3771
+#: ../raphodo/rapid.py:3981
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3774
+#: ../raphodo/rapid.py:3985
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3779
+#: ../raphodo/rapid.py:3989
 #, python-format
 msgid "No files downloaded — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3781
+#: ../raphodo/rapid.py:3991
 msgid "No files downloaded"
 msgstr ""
 
-#: ../raphodo/rapid.py:3805
+#: ../raphodo/rapid.py:4021
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3809
+#: ../raphodo/rapid.py:4026
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3812
+#: ../raphodo/rapid.py:4031
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3820
+#: ../raphodo/rapid.py:4039
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3833
+#: ../raphodo/rapid.py:4052
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3837
+#: ../raphodo/rapid.py:4056
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3841
+#: ../raphodo/rapid.py:4060
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices"
 msgstr ""
 
-#: ../raphodo/rapid.py:3867
+#: ../raphodo/rapid.py:4087
 msgid "The Destination subfolders and Timeline have been rebuilt"
 msgstr ""
 
-#: ../raphodo/rapid.py:3922
+#: ../raphodo/rapid.py:4144
 msgid "Program preferences are invalid"
 msgstr "Nastavenia aplikácie sú neplatné"
 
-#: ../raphodo/rapid.py:3999
+#: ../raphodo/rapid.py:4228
 #, python-format
 msgid ""
 "<b>All files on the %(camera)s are inaccessible</b>.<br><br>It may be locked "
@@ -3152,179 +3727,205 @@ msgid ""
 "ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4008
+#: ../raphodo/rapid.py:4239
 #, python-format
 msgid ""
-"<b>The %(camera)s appears to be in use by another application.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again.<br><br>Alternatively, you can ignore this "
-"device."
+"<b>The %(camera)s appears to be in use by another "
+"application.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again.<br><br>Alternatively, you "
+"can ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4019
+#: ../raphodo/rapid.py:4250
 msgid "&Try Again"
 msgstr ""
 
-#: ../raphodo/rapid.py:4020
+#: ../raphodo/rapid.py:4251
 msgid "&Ignore This Device"
 msgstr ""
 
-#: ../raphodo/rapid.py:4086
+#: ../raphodo/rapid.py:4323
 #, python-format
 msgid "Sorry, an unexpected problem occurred while scanning %s."
 msgstr ""
 
-#: ../raphodo/rapid.py:4087
+#: ../raphodo/rapid.py:4324
 msgid "Unfortunately you cannot download from this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4091
+#: ../raphodo/rapid.py:4328
 msgid ""
 "A possible workaround for the problem might be downloading from the camera's "
 "memory card using a card reader."
 msgstr ""
 
-#: ../raphodo/rapid.py:4096
+#: ../raphodo/rapid.py:4333
 msgid "Device scan failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:4472
+#: ../raphodo/rapid.py:4720
 #, python-format
 msgid ""
-"<b>The %(camera)s cannot be scanned because it cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again."
+"<b>The %(camera)s cannot be scanned because it cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again."
 msgstr ""
 
-#: ../raphodo/rapid.py:4496
+#: ../raphodo/rapid.py:4745
 #, python-format
 msgid ""
-"<b>The download cannot start because the %(camera)s cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again, and choose which files you want to "
-"download from it."
+"<b>The download cannot start because the %(camera)s cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again, and choose which files "
+"you want to download from it."
+msgstr ""
+
+#: ../raphodo/rapid.py:4842
+msgid "Completed Downloads Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4844
+#, python-format
+msgid "%s whose download have completed are displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4846
+msgid "Do you want to clear the completed downloads?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4848
+msgid "Completed Download Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4850
+#, python-format
+msgid "%s whose download has completed is displayed."
 msgstr ""
 
-#: ../raphodo/rapid.py:4635
+#: ../raphodo/rapid.py:4852
+msgid "Do you want to clear the completed download?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4933
 #, python-format
 msgid ""
 "Do you want to download photos and videos from the device <i>%(device)s</i>?"
 msgstr ""
 
-#: ../raphodo/rapid.py:4877
+#: ../raphodo/rapid.py:5183
 #, python-format
 msgid "<b>Do you want to ignore the %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4879
+#: ../raphodo/rapid.py:5186
 msgid ""
 "All cameras, phones and tablets with the same model name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:4883
+#: ../raphodo/rapid.py:5190
 #, python-format
 msgid ""
 "<b>Do you want to ignore the device %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4885
+#: ../raphodo/rapid.py:5192
 msgid "Any device with the same name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:5178
+#: ../raphodo/rapid.py:5492
 #, python-format
 msgid "Downloading from %(location)s on This Computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5180
+#: ../raphodo/rapid.py:5496
 msgid ""
 "Do you really want to download from here?<br><br>On some systems, scanning "
 "this location can take a very long time."
 msgstr ""
 
-#: ../raphodo/rapid.py:5224
+#: ../raphodo/rapid.py:5537
 #, python-format
 msgid "Generating thumbnails for %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5227
+#: ../raphodo/rapid.py:5540
 #, python-format
 msgid "Scanning %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5237
+#: ../raphodo/rapid.py:5551
 #, python-format
 msgid ""
 "%(number)s of %(available files)s checked for download (%(hidden)s hidden)"
 msgstr ""
 
-#: ../raphodo/rapid.py:5243
+#: ../raphodo/rapid.py:5559
 #, python-format
 msgid "%(number)s of %(available files)s checked for download"
 msgstr ""
 
-#: ../raphodo/rapid.py:5494
+#: ../raphodo/rapid.py:5764
 msgid "Display program information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5496
+#: ../raphodo/rapid.py:5766
 msgid "Display debugging information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5499
+#: ../raphodo/rapid.py:5769
 msgid "List photo and video file extensions the program recognizes and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5502
+#: ../raphodo/rapid.py:5772
 msgid "Turn on or off the the renaming of photos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5504
+#: ../raphodo/rapid.py:5774
 msgid "turn on or off the the renaming of videos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5506
+#: ../raphodo/rapid.py:5776
 msgid ""
 "Turn on or off the automatic detection of devices from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5510
+#: ../raphodo/rapid.py:5780
 msgid "Turn on or off downloading from this computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5512 ../raphodo/rapid.py:5515 ../raphodo/rapid.py:5518
-#: ../raphodo/rapid.py:5539 ../raphodo/rapid.py:5543
+#: ../raphodo/rapid.py:5782 ../raphodo/rapid.py:5785 ../raphodo/rapid.py:5788
+#: ../raphodo/rapid.py:5809 ../raphodo/rapid.py:5813
 msgid "PATH"
 msgstr ""
 
-#: ../raphodo/rapid.py:5513
+#: ../raphodo/rapid.py:5783
 msgid "The PATH on this computer from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5516
+#: ../raphodo/rapid.py:5786
 msgid "The PATH where photos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5519
+#: ../raphodo/rapid.py:5789
 msgid "The PATH where videos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5521
+#: ../raphodo/rapid.py:5791
 msgid "Turn on or off the backing up of photos and videos while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:5525
+#: ../raphodo/rapid.py:5795
 msgid "Turn on or off the automatic detection of backup devices."
 msgstr ""
 
-#: ../raphodo/rapid.py:5527 ../raphodo/rapid.py:5533
+#: ../raphodo/rapid.py:5797 ../raphodo/rapid.py:5803
 msgid "FOLDER"
 msgstr ""
 
-#: ../raphodo/rapid.py:5528
+#: ../raphodo/rapid.py:5798
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected photo "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3332,7 +3933,7 @@ msgid ""
 "photos up to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5534
+#: ../raphodo/rapid.py:5804
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected video "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3340,115 +3941,124 @@ msgid ""
 "up videos to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5540
+#: ../raphodo/rapid.py:5810
 msgid ""
 "The PATH where photos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5544
+#: ../raphodo/rapid.py:5814
 msgid ""
 "The PATH where videos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5547
+#: ../raphodo/rapid.py:5817
 #, python-format
 msgid "Ignore photos with the following extensions: %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5551
-msgid "Turn on or off starting downloads as soon as the program itself starts."
+#: ../raphodo/rapid.py:5821
+msgid ""
+"Turn on or off starting downloads as soon as the program itself starts."
 msgstr ""
 
-#: ../raphodo/rapid.py:5554
+#: ../raphodo/rapid.py:5824
 msgid "Turn on or off starting downloads as soon as a device is inserted."
 msgstr ""
 
-#: ../raphodo/rapid.py:5557
+#: ../raphodo/rapid.py:5827
 msgid ""
 "Turn on or off use of the Rapid Photo Downloader Thumbnail Cache. Turning it "
 "off does not delete existing cache contents."
 msgstr ""
 
-#: ../raphodo/rapid.py:5561
+#: ../raphodo/rapid.py:5831
 msgid ""
 "Delete all thumbnails in the Rapid Photo Downloader Thumbnail Cache, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5565
+#: ../raphodo/rapid.py:5835
 msgid "Forget which files have been previously downloaded, and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5568
+#: ../raphodo/rapid.py:5838
 msgid ""
 "Import preferences from an old program version and exit. Requires the "
 "command line program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5571
+#: ../raphodo/rapid.py:5841
 msgid ""
 "Reset all program settings to their default values, delete all thumbnails in "
 "the Thumbnail cache, forget which files have been previously downloaded, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5575
+#: ../raphodo/rapid.py:5845
 msgid "Include gphoto2 debugging information in log files."
 msgstr ""
 
-#: ../raphodo/rapid.py:5579
+#: ../raphodo/rapid.py:5849
 msgid "Print information to the terminal about attached cameras and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5640
+#: ../raphodo/rapid.py:5911
 msgid ""
 "To import preferences from the old version of Rapid Photo Downloader, you "
 "must install the program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5649
+#: ../raphodo/rapid.py:5920
 msgid "No prior program preferences detected: exiting"
 msgstr ""
 
-#: ../raphodo/rapid.py:5652
+#: ../raphodo/rapid.py:5923
 #, python-format
 msgid "Importing preferences from Rapid Photo Downloader %(version)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5714
+#: ../raphodo/rapid.py:5989
 #, python-format
-msgid "Do you want to copy the stored sequence number, which has the value %d?"
+msgid ""
+"Do you want to copy the stored sequence number, which has the value %d?"
 msgstr ""
 
-#: ../raphodo/rapid.py:5726
+#: ../raphodo/rapid.py:6000
 msgid "Program aborting."
 msgstr ""
 
-#: ../raphodo/rapid.py:5736
+#: ../raphodo/rapid.py:6010
 msgid "Never run this program as the sudo / root user."
 msgstr ""
 
-#: ../raphodo/rapid.py:5740
+#: ../raphodo/rapid.py:6014
 msgid "You must install ExifTool to run Rapid Photo Downloader."
 msgstr ""
 
-#: ../raphodo/rapid.py:5794
+#: ../raphodo/rapid.py:6026
+msgid ""
+"Rapid Photo Downloader is installed in multiple locations.\n"
+"\n"
+"Uninstall all copies except the version you want to run."
+msgstr ""
+
+#: ../raphodo/rapid.py:6083
 msgid ""
 "When specifying a path on the command line, do not also specify an\n"
 "option for device auto detection or a path on \"This Computer\"."
 msgstr ""
 
-#: ../raphodo/rapid.py:5950
+#: ../raphodo/rapid.py:6243
 msgid "All settings and caches have been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5958
+#: ../raphodo/rapid.py:6251
 msgid "Thumbnail Cache has been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5964
+#: ../raphodo/rapid.py:6257
 msgid "Remembered files have been forgotten"
 msgstr ""
 
@@ -3464,15 +4074,15 @@ msgstr ""
 msgid "&Don't warn me again about missing or broken program libraries"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:546
+#: ../raphodo/renameandmovefile.py:554
 msgid "subfolder and filename"
 msgstr "podpriečinok a meno súboru"
 
-#: ../raphodo/renameandmovefile.py:548
+#: ../raphodo/renameandmovefile.py:556
 msgid "filename"
 msgstr "názov súboru"
 
-#: ../raphodo/renameandmovefile.py:550
+#: ../raphodo/renameandmovefile.py:558
 msgid "subfolder"
 msgstr "podpriečinok"
 
@@ -3552,160 +4162,237 @@ msgstr "fotografie a videá"
 msgid "photos or videos"
 msgstr "fotografie a videá"
 
-#: ../raphodo/rpdfile.py:306
+#: ../raphodo/rpdfile.py:315
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:318
+#. translators: natural language expression signifying a single video
+#: ../raphodo/rpdfile.py:337
+msgid "a video"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:339
 msgid "1 Video"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:323
+#. translators: natural language expression signifying a single photo
+#: ../raphodo/rpdfile.py:346
+msgid "a photo"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:348
 msgid "1 Photo"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:803
+#: ../raphodo/rpdfile.py:828
 #, python-format
 msgid "%(path)s on %(camera)s"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:819
+#: ../raphodo/rpdfile.py:844
 msgid "Photo"
 msgstr "Fotografia"
 
-#: ../raphodo/rpdfile.py:859
+#: ../raphodo/rpdfile.py:884
 msgid "Video"
 msgstr "Video"
 
-#: ../raphodo/storage.py:138
+#: ../raphodo/storage.py:141
 msgid "File system root"
 msgstr ""
 
 #. translators: the name of the Pictures folder
-#: ../raphodo/storage.py:433
+#: ../raphodo/storage.py:437
 msgid "Pictures"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:426
+#: ../raphodo/thumbnaildisplay.py:432
 #, python-format
 msgid "Taken on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:431
+#: ../raphodo/thumbnaildisplay.py:439
 #, python-format
 msgid "Modified on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:437 ../raphodo/thumbnaildisplay.py:466
+#: ../raphodo/thumbnaildisplay.py:447 ../raphodo/thumbnaildisplay.py:481
 #, python-format
 msgid "%(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:451
+#: ../raphodo/thumbnaildisplay.py:464
 #, python-format
 msgid "Memory cards: %s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:457
+#: ../raphodo/thumbnaildisplay.py:468
+#, python-format
+msgid "Memory card: %s"
+msgstr ""
+
+#: ../raphodo/thumbnaildisplay.py:473
 msgid "Downloaded as:"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:472
+#: ../raphodo/thumbnaildisplay.py:489
 #, python-format
 msgid "<br><br>Previous download:<br>%(filename)s<br>%(path)s<br>%(date)s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:1603
+#: ../raphodo/thumbnaildisplay.py:1645
 msgid "Copy Path"
 msgstr ""
 
+#. Translators: these values are file size suffixes like B representing bytes, KB representing
+#. kilobytes, etc.
+#: ../raphodo/utilities.py:170
+msgid "B"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "KB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "MB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "GB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "TB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "PB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "EB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "ZB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "YB"
+msgstr ""
+
 #. two things in a list e.g. "device1 and device2"
-#: ../raphodo/utilities.py:391
+#: ../raphodo/utilities.py:394
 #, python-format
 msgid "%(first_item)s and %(last_item)s"
 msgstr ""
 
-#: ../raphodo/utilities.py:464
+#: ../raphodo/utilities.py:468
 msgid "one"
 msgstr ""
 
-#: ../raphodo/utilities.py:465
+#: ../raphodo/utilities.py:469
 msgid "two"
 msgstr ""
 
-#: ../raphodo/utilities.py:466
+#: ../raphodo/utilities.py:470
 msgid "three"
 msgstr ""
 
-#: ../raphodo/utilities.py:467
+#: ../raphodo/utilities.py:471
 msgid "four"
 msgstr ""
 
-#: ../raphodo/utilities.py:468
+#: ../raphodo/utilities.py:472
 msgid "five"
 msgstr ""
 
-#: ../raphodo/utilities.py:469
+#: ../raphodo/utilities.py:473
 msgid "six"
 msgstr ""
 
-#: ../raphodo/utilities.py:470
+#: ../raphodo/utilities.py:474
 msgid "seven"
 msgstr ""
 
-#: ../raphodo/utilities.py:471
+#: ../raphodo/utilities.py:475
 msgid "eight"
 msgstr ""
 
-#: ../raphodo/utilities.py:472
+#: ../raphodo/utilities.py:476
 msgid "nine"
 msgstr ""
 
-#: ../raphodo/utilities.py:473
+#: ../raphodo/utilities.py:477
 msgid "ten"
 msgstr ""
 
-#: ../raphodo/utilities.py:474
+#: ../raphodo/utilities.py:478
 msgid "eleven"
 msgstr ""
 
-#: ../raphodo/utilities.py:475
+#: ../raphodo/utilities.py:479
 msgid "twelve"
 msgstr ""
 
-#: ../raphodo/utilities.py:476
+#: ../raphodo/utilities.py:480
 msgid "thirteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:477
+#: ../raphodo/utilities.py:481
 msgid "fourteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:478
+#: ../raphodo/utilities.py:482
 msgid "fifteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:479
+#: ../raphodo/utilities.py:483
 msgid "sixteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:480
+#: ../raphodo/utilities.py:484
 msgid "seventeen"
 msgstr ""
 
-#: ../raphodo/utilities.py:481
+#: ../raphodo/utilities.py:485
 msgid "eighteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:482
+#: ../raphodo/utilities.py:486
 msgid "ninenteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:483
+#: ../raphodo/utilities.py:487
 msgid "twenty"
 msgstr ""
 
+#: ../raphodo/viewutils.py:240
+msgid "&OK"
+msgstr ""
+
+#: ../raphodo/viewutils.py:243
+msgid "&Save"
+msgstr ""
+
+#: ../raphodo/viewutils.py:244
+msgid "&Help"
+msgstr ""
+
+#: ../raphodo/viewutils.py:245
+msgid "Restore Defaults"
+msgstr ""
+
+#: ../raphodo/viewutils.py:246
+msgid "&Yes"
+msgstr ""
+
+#: ../raphodo/viewutils.py:247
+msgid "&No"
+msgstr ""
+
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:1
 msgid ""
 "Rapid Photo Downloader imports photos and videos from cameras, phones, "
@@ -3759,8 +4446,8 @@ msgstr ""
 #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:5
 msgid ""
-"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;"
-"memory;card;"
+"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;memory"
+";card;"
 msgstr ""
 
 #: ../data/kde/net.damonlynch.rapid-photo-downloader.desktop.in.h:1
@@ -3833,6 +4520,7 @@ msgstr ""
 #~ msgid "Tehran"
 #~ msgstr "Teherán"
 
+#, python-format
 #~ msgid "<i>Example: %s</i>"
 #~ msgstr "<i>Príklad: %s</i>"
 
@@ -3941,6 +4629,7 @@ msgstr ""
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
 #~ msgstr "<span weight=\"bold\" size=\"x-large\">Možnosti premenovanie</span>"
 
+#, python-format
 #~ msgid "and %s"
 #~ msgstr "a %s"
 
@@ -3971,6 +4660,7 @@ msgstr ""
 #~ msgid "Device Detected"
 #~ msgstr "Zariadenie detekované"
 
+#, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
 #~ "Destination: %(destination)s"
@@ -3981,6 +4671,7 @@ msgstr ""
 #~ msgid "_Remember this choice"
 #~ msgstr "_Zapamatovať si túto voľbu"
 
+#, python-format
 #~ msgid "Source: %(source)s"
 #~ msgstr "Zdroj: %(source)s"
 
@@ -3993,10 +4684,10 @@ msgstr ""
 #~ msgid "Photo has already been downloaded"
 #~ msgstr "Fotografie už boli stiahnuté"
 
-#~ msgid ""
-#~ "Photos detected with the same filenames, but taken at different times"
+#~ msgid "Photos detected with the same filenames, but taken at different times"
 #~ msgstr "Fotografie detekované s rovnakým názvom, ale urobené v rozličný čas"
 
+#, python-format
 #~ msgid "About %i seconds remaining"
 #~ msgstr "Zostáva približné %i sekúnd"
 
@@ -4006,6 +4697,7 @@ msgstr ""
 #~ msgid "About 1 minute remaining"
 #~ msgstr "Ostáva približne 1 minúta."
 
+#, python-format
 #~ msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 #~ msgstr "Ostáva približne %(minutes)i:%(seconds)02i minút."
 
@@ -4033,9 +4725,11 @@ msgstr ""
 #~ msgid "scanning..."
 #~ msgstr "prehľadávanie..."
 
+#, python-format
 #~ msgid "Downloading from %(location)s."
 #~ msgstr "Prebieha sťahovanie z %(location)s."
 
+#, python-format
 #~ msgid "%(device)s did not unmount"
 #~ msgstr "%(device)s nebolo možné odpojiť"
 
@@ -4043,20 +4737,24 @@ msgstr ""
 #~ "Do you really want to download from here? On some systems, scanning this "
 #~ "location can take a very long time."
 #~ msgstr ""
-#~ "Na niektorých systémoch môže prehľadávanie tejto lokality trvať veľmi "
-#~ "dlho. Skutočne z nej chcete sťahovať?"
+#~ "Na niektorých systémoch môže prehľadávanie tejto lokality trvať veľmi dlho. "
+#~ "Skutočne z nej chcete sťahovať?"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 #~ msgstr "%(number)s z %(total)s %(filetypes)s (%(remaining)s ostáva)"
 
+#, python-format
 #~ msgid "No backup device contains a valid folder for backing up %(filetype)s"
 #~ msgstr ""
 #~ "Žiadne zariadenie určené na zálohovanie neobsahuje platný adresár pre "
 #~ "zálohovanie súborov typu %(filetype)s"
 
+#, python-format
 #~ msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
+#, python-format
 #~ msgid ""
 #~ "%(date)s\n"
 #~ "%(time)s"
@@ -4064,6 +4762,7 @@ msgstr ""
 #~ "%(date)s\n"
 #~ "%(time)s"
 
+#, python-format
 #~ msgid "%(date)s %(time)s"
 #~ msgstr "%(date)s %(time)s"
 
@@ -4076,45 +4775,58 @@ msgstr ""
 #~ msgid "; "
 #~ msgstr "; "
 
+#, python-format
 #~ msgid "(%(file_type)s)"
 #~ msgstr "(%(file_type)s)"
 
+#, python-format
 #~ msgid "%(free)s %(file_type)s"
 #~ msgstr "%(free)s %(file_type)s"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s"
 #~ msgstr "%(number)s z %(total)s %(filetypes)s"
 
+#, python-format
 #~ msgid "Select a folder containing %(file_types)s"
 #~ msgstr "Vyberte zložku, ktorá obsahuje %(file_types)s"
 
+#, python-format
 #~ msgid "Folder: %s"
 #~ msgstr "Adresár: %s"
 
+#, python-format
 #~ msgid "%(file_type)s download folder is invalid"
 #~ msgstr "Adresár %(file_type)s je neplatný"
 
 #~ msgid "."
 #~ msgstr "."
 
+#, python-format
 #~ msgid "%(file_type)s download folder does not exist"
 #~ msgstr "Adresár %(file_type)s neexistuje"
 
+#, python-format
 #~ msgid "%(free)s free"
 #~ msgstr "%(free)s voľné"
 
+#, python-format
 #~ msgid "Backing up photos to %(path)s and videos to %(path2)s"
 #~ msgstr "Fokty sa zálohujú do %(path)s a videá do %(path2)s"
 
+#, python-format
 #~ msgid "Backing up photos and videos to %(path)s"
 #~ msgstr "Zálohovať fotky a videá do %(path)s"
 
+#, python-format
 #~ msgid "Backing up to %(path)s"
 #~ msgstr "Zálohuje sa do %(path)s"
 
+#, python-format
 #~ msgid "%(freespace)s. %(backuppaths)s."
 #~ msgstr "%(freespace)s. %(backuppaths)s."
 
+#, python-format
 #~ msgid "%(file_type)s download folder is not writable"
 #~ msgstr "Do adresára %(file_type)s nie je možný zápis"
 
@@ -4134,14 +4846,15 @@ msgstr ""
 #~ msgid "only output errors to the command line"
 #~ msgstr "len výstup do konzoly"
 
+#, python-format
 #~ msgid ""
 #~ "display program information on the command line as the program runs "
 #~ "(default: %default)"
 #~ msgstr "zobraziť informácie o behu programu v konzole (default: %default)"
 
 #~ msgid ""
-#~ "manually specify the PATH of the device from which to download, "
-#~ "overwriting existing program preferences"
+#~ "manually specify the PATH of the device from which to download, overwriting "
+#~ "existing program preferences"
 #~ msgstr ""
 #~ "ručne vybrať cestu k zariadeniu pre sťahovanie, prepíše existujúce "
 #~ "nastavenie programu"
@@ -4164,6 +4877,7 @@ msgstr ""
 #~ "Should this device or partition be used to download photos or videos from?"
 #~ msgstr "Majú byť z tohoto zariadenia stiahnuté fotografie alebo videá?"
 
+#, python-format
 #~ msgid ""
 #~ "%(problem)s\n"
 #~ "File: %(file)s"
@@ -4171,20 +4885,25 @@ msgstr ""
 #~ "%(problem)s\n"
 #~ "Súbor: %(file)s"
 
+#, python-format
 #~ msgid "Backup %(file_type)s overwritten"
 #~ msgstr "Záloha %(file_type)s prepísaná"
 
+#, python-format
 #~ msgid "%(file_type)s not backed up"
 #~ msgstr "Záloha %(file_type)s neprebehla"
 
+#, python-format
 #~ msgid "Backup of %(file_type)s already exists"
 #~ msgstr "Záloha %(file_type)s už existuje"
 
+#, python-format
 #~ msgid "Destination directory could not be created: %(directory)s\n"
 #~ msgstr "Cieľový adresár nebolo možné vytvoriť: %(directory)s\n"
 
 #~ msgid "An unknown error occurred"
 #~ msgstr "Nastala neznáma chyba"
 
+#, python-format
 #~ msgid "Error: %(inst)s"
 #~ msgstr "Chyba: %(inst)s"
diff --git a/po/sr.po b/po/sr.po
index ce72a65..e3d24d1 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,40 +1,391 @@
 # Serbian translation for rapid
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# Copyright © 2010 Rosetta Contributors and Canonical Ltd 2010
 # This file is distributed under the same license as the rapid package.
 # Мирослав Николић <miroslavnikolic@rocketmail.com>, 2012—2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: damonlynch@gmail.com\n"
-"POT-Creation-Date: 2017-07-08 19:16-0500\n"
-"PO-Revision-Date: 2017-07-04 11:06+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2017-09-12 17:01-0400\n"
+"PO-Revision-Date: 2017-09-13 18:37+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: српски <gnome-sr@googlegroups.org>\n"
-"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-07-05 23:04+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-09-26 22:04+0000\n"
+"X-Generator: Launchpad (build 18463)\n"
+"Language: sr\n"
+
+#: ../install.py:65
+msgid "Rapid Photo Downloader installer"
+msgstr ""
+
+#: ../install.py:66
+msgid "Download and install latest version of Rapid Photo Downloader."
+msgstr ""
+
+#: ../install.py:236 ../install.py:1732
+msgid "Installer not found:"
+msgstr ""
+
+#. Translators: do not translate the term tar.gz
+#: ../install.py:240 ../install.py:1736
+msgid "Installer not in tar.gz format:"
+msgstr ""
+
+#: ../install.py:465
+msgid ""
+"Incorrect folder ownership detected. Changing ownership of and resetting "
+"permissions for"
+msgstr ""
+
+#: ../install.py:540
+msgid "The following command will be run:"
+msgstr ""
+
+#: ../install.py:543 ../install.py:1479 ../install.py:1484
+msgid "sudo may prompt you for the sudo password."
+msgstr ""
+
+#: ../install.py:547
+msgid "Would you like to run the command now?"
+msgstr ""
+
+#: ../install.py:549
+msgid "Answer is not yes, exiting."
+msgstr ""
+
+#: ../install.py:559 ../install.py:751 ../install.py:966
+msgid "Command failed"
+msgstr ""
+
+#: ../install.py:561 ../install.py:752 ../install.py:967
+msgid "Exiting"
+msgstr ""
+
+#: ../install.py:582
+msgid "The Universe repository must be enabled."
+msgstr ""
+
+#: ../install.py:606
+msgid ""
+"Do you want to to uninstall the previous version of Rapid Photo Downloader:"
+msgstr ""
+
+#: ../install.py:715 ../install.py:740
+msgid ""
+"Querying package system to see if an older version of Rapid Photo Downloader "
+"is installed (this may take a while)..."
+msgstr ""
+
+#: ../install.py:726
+msgid ""
+"Unable to query package system. Please check your Internet connection and "
+"try again"
+msgstr ""
+
+#: ../install.py:756
+msgid "Checking if previous version installed with pip..."
+msgstr ""
+
+#: ../install.py:850
+msgid "The following package is unknown on your system: {}\n"
+msgstr ""
+
+#: ../install.py:857 ../install.py:929 ../install.py:974
+msgid ""
+"To continue, some packages required to run the application will be installed."
+msgstr ""
+
+#: ../install.py:886
+msgid "Querying installed and available packages (this may take a while)"
+msgstr ""
+
+#: ../install.py:958
+msgid ""
+"Querying zypper to see if any required packages are already installed (this "
+"may take a while)... "
+msgstr ""
+
+#: ../install.py:1004
+msgid "Query to confirm action at each step."
+msgstr ""
+
+#: ../install.py:1011
+msgid ""
+"When downloading the latest version, install the development version if it "
+"is newer than the stable version."
+msgstr ""
+
+#: ../install.py:1020
+msgid ""
+"Optional tar.gz Rapid Photo Downloader installer archive. If not specified, "
+"the latest version is downloaded from the Internet."
+msgstr ""
+
+#: ../install.py:1043
+msgid ""
+"Do not run the installer in the tar.gz Rapid Photo Downloader installer "
+"archive if it is newer than this version ({}). The default is to run "
+"whichever installer is newer."
+msgstr ""
+
+#: ../install.py:1050
+msgid ""
+"Uninstall Rapid Photo Downloader that was installed with pip, keeping its "
+"dependencies."
+msgstr ""
+
+#: ../install.py:1054
+msgid ""
+"Uninstall the dependencies installed by pip during Rapid Photo Downloader's "
+"installation, and Rapid Photo Downloader itself, then exit."
+msgstr ""
+
+#: ../install.py:1059
+msgid ""
+"Note: this will not uninstall any version of Rapid Photo Downloader "
+"installed by your Linux distribution's package manager."
+msgstr ""
+
+#: ../install.py:1066
+msgid ""
+"Dependencies will only be removed if they are not required by other programs."
+msgstr ""
+
+#: ../install.py:1072
+msgid ""
+"Note: this option will remove the dependencies regardless of whether they "
+"are required by another program pip has installed. Upgrade to pip 9.0 or "
+"above if you want to avoid this behavior. You can do so using the command "
+"'python3 -m pip install pip -U --user'. Also note that any version of Rapid "
+"Photo Downloader installed by your Linux distribution's package manager will "
+"not be uninstalled."
+msgstr ""
+
+#: ../install.py:1122
+msgid "Failed to download versions file"
+msgstr ""
+
+#: ../install.py:1126
+msgid "Got error code {} while accessing versions file"
+msgstr ""
+
+#: ../install.py:1234
+msgid ""
+"Sorry, could not locate installer. Please check your Internet connection and "
+"verify if you can reach https://www.damonlynch.net\n"
+"\n"
+"Exiting.\n"
+msgstr ""
+
+#: ../install.py:1408
+msgid "Installing application requirements..."
+msgstr ""
+
+#: ../install.py:1424
+msgid "Received error code"
+msgstr ""
+
+#: ../install.py:1425
+msgid "Failed to install application requirements: exiting"
+msgstr ""
+
+#: ../install.py:1428
+msgid "Installing application..."
+msgstr ""
+
+#: ../install.py:1441
+msgid "Failed to install application: exiting..."
+msgstr ""
+
+#: ../install.py:1465
+msgid ""
+"You may have to restart the computer to be able to run the program from the "
+"commmand line or application launcher."
+msgstr ""
+
+#: ../install.py:1476
+msgid "Do you want to install the application's man pages?"
+msgstr ""
+
+#: ../install.py:1477
+msgid "They will be installed into {}"
+msgstr ""
+
+#: ../install.py:1478 ../install.py:1483
+msgid "If you uninstall the application, remove these manpages yourself."
+msgstr ""
+
+#: ../install.py:1480
+msgid "Do want to install the man pages?"
+msgstr ""
+
+#: ../install.py:1482
+msgid "Installing man pages into {}"
+msgstr ""
+
+#: ../install.py:1499
+msgid "Failed to create man page directory: exiting"
+msgstr ""
+
+#: ../install.py:1511
+msgid "Failed to copy man page."
+msgstr ""
+
+#: ../install.py:1521
+msgid "(If a segmentation fault occurs at exit, you can ignore it...)"
+msgstr ""
+
+#: ../install.py:1534
+msgid ""
+"The python3 tool pip is required to uninstall a version of Rapid Photo "
+"Downloader that was installed with pip.\n"
+"Cannot continue. Exiting."
+msgstr ""
+
+#: ../install.py:1575
+msgid ""
+"Do not run this installer script as sudo / root user.\n"
+"Run it using the user who will run the program.\n"
+msgstr ""
+
+#: ../install.py:1585 ../install.py:1599
+msgid "Do not include any other command line arguments when specifying"
+msgstr ""
+
+#: ../install.py:1614
+msgid ""
+"Sorry, this installer does not support a custom python installation.\n"
+"Exiting..."
+msgstr ""
+
+#: ../install.py:1620
+msgid "Restarting script using system python..."
+msgstr ""
+
+#: ../install.py:1651
+msgid "Exiting..."
+msgstr ""
+
+#. Translators: do not translate the term python3-apt
+#: ../install.py:1670
+msgid "To continue, the package python3-apt must be installed."
+msgstr ""
+
+#: ../install.py:1689
+msgid ""
+"Install the following packages using your Linux distribution's standard "
+"package manager, and then rerun this installer"
+msgstr ""
+
+#: ../install.py:1698
+msgid ""
+"To run this program, programs to assist Python 3 and its package management "
+"must be installed."
+msgstr ""
+
+#. Translators: do not translate the terms Python 3, pip and setuptools
+#: ../install.py:1713
+msgid "Python 3's pip and setuptools must be upgraded for your user."
+msgstr ""
+
+#. Translators: do not translate the term python or requests
+#: ../install.py:1726
+msgid "Installing python requests"
+msgstr ""
+
+#: ../upgrade.py:79
+msgid "Upgrade Rapid Photo Downloader"
+msgstr ""
+
+#: ../upgrade.py:401 ../raphodo/viewutils.py:242
+msgid "&Cancel"
+msgstr ""
+
+#: ../upgrade.py:405
+msgid "&Upgrade"
+msgstr ""
+
+#: ../upgrade.py:410
+#, python-format
+msgid "Click the Upgrade button to upgrade to version %s."
+msgstr ""
+
+#: ../upgrade.py:413
+msgid "Click the Upgrade button to start the upgrade."
+msgstr ""
+
+#: ../upgrade.py:416 ../upgrade.py:422 ../raphodo/viewutils.py:241
+msgid "&Close"
+msgstr ""
 
-#. type: QPushButton
-#: ../raphodo/aboutdialog.py:217
+#: ../upgrade.py:417
+msgid "&Run"
+msgstr ""
+
+#: ../upgrade.py:447
+msgid "Close Rapid Photo Downloader before running this upgrade"
+msgstr ""
+
+#: ../upgrade.py:450
+msgid "Upgrade running..."
+msgstr ""
+
+#: ../upgrade.py:486
+#, python-format
+msgid ""
+"Successfully upgraded to %s. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:491
+msgid ""
+"Upgrade finished successfully. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:495
+msgid "Upgrade failed. Click Close to exit."
+msgstr ""
+
+#: ../upgrade.py:6967
+#, python-format
+msgid "Upgrading %s..."
+msgstr ""
+
+#: ../upgrade.py:6969
+msgid "Press any key to continue..."
+msgstr ""
+
+#: ../upgrade.py:6982
+msgid "Rapid Photo Downloader upgrade failed"
+msgstr ""
+
+#: ../upgrade.py:6984
+#, python-format
+msgid ""
+"The python package %s could not be updated. The upgrade cannot continue."
+msgstr ""
+
+#: ../raphodo/aboutdialog.py:225
 msgid "Credits"
 msgstr "Заслуге"
 
-#: ../raphodo/backuppanel.py:239
+#: ../raphodo/backuppanel.py:240
 msgid "Backups are not configured"
 msgstr "Резерве нису подешене"
 
-#: ../raphodo/backuppanel.py:241
+#: ../raphodo/backuppanel.py:242
 msgid "No backup devices detected"
 msgstr "Нисам открио уређаје резерве"
 
-#: ../raphodo/backuppanel.py:243
+#: ../raphodo/backuppanel.py:244
 msgid "Valid backup locations not yet specified"
 msgstr "Исправна месте за резерве још нису наведена"
 
-#: ../raphodo/backuppanel.py:401
+#: ../raphodo/backuppanel.py:404
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
@@ -42,18 +393,18 @@ msgstr ""
 "Можете направити резерве фотографија и снимака на више места у току "
 "преузимања, нпр. на спољним дисковима."
 
-#: ../raphodo/backuppanel.py:407
+#: ../raphodo/backuppanel.py:412
 msgid "Back up photos and videos when downloading"
 msgstr "Направи резерву фотографија и снимака за време преузимања"
 
-#: ../raphodo/backuppanel.py:413
+#: ../raphodo/backuppanel.py:418
 msgid "Automatically detect backup devices"
 msgstr "Сам пронађи уређаје за резерве"
 
-#: ../raphodo/backuppanel.py:417
+#: ../raphodo/backuppanel.py:424
 msgid ""
-"Specify the folder in which backups are stored on the device."
-"<br><br><i>Note: the presence of a folder with this name is used to "
+"Specify the folder in which backups are stored on the "
+"device.<br><br><i>Note: the presence of a folder with this name is used to "
 "determine if 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 folder names. By "
 "adding both folders, the same device can be used to back up both photos and "
@@ -63,81 +414,90 @@ msgstr ""
 "присуство фасцикле са овим називом се користи да одреди да ли се уређај "
 "користи за резерве. За сваки уређај који желите да користите за резерве, "
 "направите фасциклу на њему са једним од ових назива фасцикли. Додавањем обе "
-"фасцикле, исти уређај се може користити за резерве и фотографија и снимака.</"
-"i>"
+"фасцикле, исти уређај се може користити за резерве и фотографија и "
+"снимака.</i>"
 
-#: ../raphodo/backuppanel.py:428
+#: ../raphodo/backuppanel.py:439
 msgid "Photo folder name:"
 msgstr "Назив фасцикле за фотографије:"
 
-#: ../raphodo/backuppanel.py:433
+#: ../raphodo/backuppanel.py:444
 msgid "Video folder name:"
 msgstr "Назив фасцикле за снимке:"
 
-#: ../raphodo/backuppanel.py:438 ../raphodo/nameeditor.py:883
+#: ../raphodo/backuppanel.py:449 ../raphodo/nameeditor.py:890
 #: ../raphodo/renamepanel.py:123
 msgid "Example:"
 msgstr "Пример:"
 
-#: ../raphodo/backuppanel.py:448
-msgid "If you disable automatic detection, choose the exact backup locations."
+#: ../raphodo/backuppanel.py:460
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
 "Ако искључите аутоматско налажење уређаја, изаберите тачна места за резерве."
 
-#: ../raphodo/backuppanel.py:452
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:468
 msgid "Photo backup location:"
 msgstr "Путања до резерве фотографија:"
 
-#: ../raphodo/backuppanel.py:454
+#: ../raphodo/backuppanel.py:474
 msgid "Select Photo Backup Location"
 msgstr "Изаберите место за резерву фотографија"
 
-#: ../raphodo/backuppanel.py:460
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:485
 msgid "Video backup location:"
 msgstr "Путања до резерве снимака:"
 
-#: ../raphodo/backuppanel.py:462
+#: ../raphodo/backuppanel.py:491
 msgid "Select Video Backup Location"
 msgstr "Изаберите место за резерву снимака"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:564
+#: ../raphodo/backuppanel.py:595
 msgid "drive1"
 msgstr "1. уређај"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:567
+#: ../raphodo/backuppanel.py:598
 msgid "drive2"
 msgstr "2. уређај"
 
-#: ../raphodo/backuppanel.py:628
+#: ../raphodo/backuppanel.py:663
 msgid "Projected Backup Storage Use"
 msgstr "Пројектовано коришћење смештаја резерве"
 
-#: ../raphodo/backuppanel.py:632
+#: ../raphodo/backuppanel.py:669
 msgid "Backup Options"
 msgstr "Опције резерве"
 
 #. translators: refers to the video thumbnail file that some
 #. cameras generate -- it has a .THM file extension
-#: ../raphodo/copyfiles.py:476
+#: ../raphodo/copyfiles.py:491
 msgid "video THM"
 msgstr "THM снимак"
 
-#: ../raphodo/copyfiles.py:482
+#: ../raphodo/copyfiles.py:497
 msgid "audio"
 msgstr "звук"
 
 #: ../raphodo/destinationdisplay.py:78 ../raphodo/devicedisplay.py:1079
-#: ../raphodo/rpdfile.py:321
+#: ../raphodo/rpdfile.py:342
 #, python-format
 msgid "%(no_photos)s Photos"
 msgstr "%(no_photos)s фотографије"
 
 #: ../raphodo/destinationdisplay.py:82 ../raphodo/devicedisplay.py:1081
-#: ../raphodo/rpdfile.py:316
+#: ../raphodo/rpdfile.py:333
 #, python-format
 msgid "%(no_videos)s Videos"
 msgstr "%(no_videos)s снимка"
@@ -165,15 +525,15 @@ msgid "%(size_free)s free of %(size_total)s"
 msgstr "%(size_free)s је слободно од %(size_total)s"
 
 #: ../raphodo/destinationdisplay.py:190 ../raphodo/devicedisplay.py:993
-#: ../raphodo/rapid.py:1964 ../raphodo/rapid.py:2079 ../raphodo/rapid.py:5753
-#: ../raphodo/rpdfile.py:905
+#: ../raphodo/rapid.py:2023 ../raphodo/rapid.py:2151 ../raphodo/rapid.py:6043
+#: ../raphodo/rpdfile.py:930
 msgid "Photos"
 msgstr "Фотографије"
 
 #. translators: the name of the Videos folder
 #: ../raphodo/destinationdisplay.py:191 ../raphodo/devicedisplay.py:994
-#: ../raphodo/rapid.py:1967 ../raphodo/rapid.py:2080 ../raphodo/rapid.py:5754
-#: ../raphodo/rpdfile.py:933 ../raphodo/storage.py:445
+#: ../raphodo/rapid.py:2028 ../raphodo/rapid.py:2152 ../raphodo/rapid.py:6044
+#: ../raphodo/rpdfile.py:958 ../raphodo/storage.py:449
 msgid "Videos"
 msgstr "Снимци"
 
@@ -181,7 +541,7 @@ msgstr "Снимци"
 msgid "Projected storage use after download"
 msgstr "Пројектован смештај се користи након преузимања"
 
-#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:516
+#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:521
 msgid "Custom..."
 msgstr "Произвољно..."
 
@@ -219,58 +579,59 @@ msgstr "Поново прегледај"
 msgid "%s full"
 msgstr "%s је пун"
 
-#: ../raphodo/devices.py:459
+#: ../raphodo/devices.py:463
 msgid "Cameras"
 msgstr "Фото-апарати"
 
-#: ../raphodo/devices.py:460 ../raphodo/devices.py:920
-#: ../raphodo/preferencedialog.py:85 ../raphodo/rapid.py:1927
+#: ../raphodo/devices.py:464 ../raphodo/devices.py:927
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/rapid.py:1979
 msgid "Devices"
 msgstr "Уређаји"
 
-#: ../raphodo/devices.py:720
+#: ../raphodo/devices.py:724
 #, python-format
 msgid "Downloading from %(device_names)s"
 msgstr "Преузимам са „%(device_names)s“"
 
 #. Translators: e.g. Three Devices
-#: ../raphodo/devices.py:780
+#: ../raphodo/devices.py:784
 #, python-format
 msgid "%(no_devices)s %(device_type)s"
 msgstr "%(no_devices)s %(device_type)s"
 
-#: ../raphodo/devices.py:905 ../raphodo/rapid.py:1764
+#: ../raphodo/devices.py:912 ../raphodo/rapid.py:1807
 msgid "Select Source"
 msgstr "Изаберите извор"
 
-#: ../raphodo/devices.py:936 ../raphodo/devices.py:947
+#: ../raphodo/devices.py:943 ../raphodo/devices.py:954
 #, python-format
 msgid "%(device1)s + %(device2)s"
 msgstr "%(device1)s + %(device2)s"
 
 #. Number of cameras e.g. 3 Cameras
-#: ../raphodo/devices.py:958
+#: ../raphodo/devices.py:965
 #, python-format
 msgid "%(no_cameras)s Cameras"
 msgstr "%(no_cameras)s фото-апарати"
 
-#: ../raphodo/devices.py:963
+#: ../raphodo/devices.py:970
 #, python-format
 msgid "%(no_devices)s Devices"
 msgstr "%(no_devices)s уређаји"
 
 #. Translators: two folder names, separated by a plus sign
-#: ../raphodo/devices.py:1258
+#: ../raphodo/devices.py:1265
 #, python-format
 msgid "%s + %s"
 msgstr "„%s“ + „%s“"
 
-#: ../raphodo/didyouknow.py:44
+#: ../raphodo/didyouknow.py:45
 msgid "Click on a file's checkbox to mark or unmark it for download."
 msgstr ""
 "Кликните на кућицу датотеке да је означите или одзначите за преузимање."
 
-#: ../raphodo/didyouknow.py:50
+#: ../raphodo/didyouknow.py:51
 msgid ""
 "Files that have already been downloaded are remembered. You can still mark "
 "previously downloaded files to download again, but they are unchecked by "
@@ -282,7 +643,7 @@ msgstr ""
 "сличице су затамњене, тако да их можете разликовати од датотека које тек "
 "треба да се преузмете."
 
-#: ../raphodo/didyouknow.py:59
+#: ../raphodo/didyouknow.py:60
 msgid ""
 "If more than one file is selected, they'll all take the mark of the file "
 "whose checkbox was clicked, regardless of whether they previously had a "
@@ -292,7 +653,7 @@ msgstr ""
 "чије поље за потврду сте кликнули, без обзира на то да ли су пре тога биле "
 "означене или не."
 
-#: ../raphodo/didyouknow.py:67
+#: ../raphodo/didyouknow.py:68
 msgid ""
 "Click on a device's checkbox to quickly mark or unmark all its files for "
 "downloading."
@@ -300,7 +661,40 @@ msgstr ""
 "Кликните на поље за означавање уређаја да брзо означите или одзначите све "
 "његове датотеке за преузимање."
 
-#: ../raphodo/didyouknow.py:74
+#: ../raphodo/didyouknow.py:75
+msgid ""
+"After a download finishes, an icon replaces the thumbnail's checkbox. The "
+"icon's color indicates whether the download was successful (green), had file "
+"renaming problems (yellow/orange), or failed (red)."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:83
+msgid ""
+"\n"
+"            In case of any problems, a red icon will appear at the bottom of "
+"the window\n"
+"            indicating how many error reports there are. Clicking on it "
+"opens the Error Report \n"
+"            window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:91
+msgid ""
+"\n"
+"            The Error Report window lists any problems encountered before, "
+"during or after the \n"
+"            download. An orange triangle represents a warning, a red circle "
+"indicates a failure, \n"
+"            and a black circle indicates more serious failures. You can "
+"click on the hyperlinks to \n"
+"            open its file or device in a file manager. You can also search "
+"the reports using the \n"
+"            search box in the lower left of the Error Report window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:103
 msgid ""
 "You can simultaneously download from multiple cameras, smartphones, memory "
 "cards, and hard drives&mdash;as many devices as your computer can handle at "
@@ -310,7 +704,7 @@ msgstr ""
 "меморијских картица, и чврстих дискова&mdash;са онолико уређаја са колико "
 "ваш рачунар може истовремено да ради."
 
-#: ../raphodo/didyouknow.py:81
+#: ../raphodo/didyouknow.py:110
 msgid ""
 "The <b>Timeline</b> groups photos and videos based on how much time elapsed "
 "between consecutive shots. Use it to identify photos and videos taken at "
@@ -321,7 +715,7 @@ msgstr ""
 "фотографије и снимке снимљене у различитим периодима у једном дану или у "
 "току узастопних дана."
 
-#: ../raphodo/didyouknow.py:88
+#: ../raphodo/didyouknow.py:117
 msgid ""
 "\n"
 "<p>In the illustration above, the first row of the Timeline is black because "
@@ -341,7 +735,7 @@ msgstr ""
 "временске линије:</p>\n"
 "            "
 
-#: ../raphodo/didyouknow.py:99
+#: ../raphodo/didyouknow.py:128
 msgid ""
 "To view photos and videos for a particular time range, use the mouse "
 "(optionally in combination with the <tt>Shift</tt> or <tt>Ctrl</tt> keys) to "
@@ -353,7 +747,7 @@ msgstr ""
 "да изаберете периоде времена. Када се изабере опсег времена, дугме временске "
 "линије на левој страни главног прозора биће истакнуто."
 
-#: ../raphodo/didyouknow.py:106
+#: ../raphodo/didyouknow.py:135
 msgid ""
 "A download always includes all files that are checked for download, "
 "including those that are not currently displayed because the Timeline is "
@@ -363,7 +757,7 @@ msgstr ""
 "укључујући и оне које тренутно нису приказане јер се користи временска "
 "линија."
 
-#: ../raphodo/didyouknow.py:113
+#: ../raphodo/didyouknow.py:142
 msgid ""
 "You can hide or display the download sources by clicking on the name of the "
 "device you're downloading from at the top left of the program window."
@@ -371,7 +765,7 @@ msgstr ""
 "Можете сакрити или приказати изворе преузимања кликом на назив уређаја са "
 "кога преузимате у горњем левом углу прозора програма."
 
-#: ../raphodo/didyouknow.py:120
+#: ../raphodo/didyouknow.py:149
 msgid ""
 "\n"
 "          Thumbnails can be sorted using a variety of criteria:\n"
@@ -395,18 +789,18 @@ msgstr ""
 "<li><b>Време измене:</b> када је датотека последњи пут измењена, у складу са "
 "њеним мета подацима (када су \n"
 " доступни) или у складу са системом датотека (као резерва).</li>\n"
-"<li><b>Стање изабраности:</b> да ли је датотека означена за преузимање.</"
-"li>\n"
+"<li><b>Стање изабраности:</b> да ли је датотека означена за "
+"преузимање.</li>\n"
 "<li><b>Назив датотеке:</b> пун назив датотеке, укључујући наставак.</li>\n"
 "<li><b>Наставак:</b> наставак назива датотеке. Можете користити ово за "
 "груписање јпег и сирових слика, на \n"
 "пример.</li>\n"
 "<li><b>Врста датотеке:</b> фотографија или снимак.</li>\n"
-"<li><b>Уређај:</b> назив уређаја са кога су преузете фотографије и снимци.</"
-"li>\n"
+"<li><b>Уређај:</b> назив уређаја са кога су преузете фотографије и "
+"снимци.</li>\n"
 "</ol> "
 
-#: ../raphodo/didyouknow.py:137
+#: ../raphodo/didyouknow.py:166
 msgid ""
 "One of Rapid Photo Downloader's most useful features is its ability to "
 "automatically generate download subfolders and rename files as it downloads, "
@@ -416,7 +810,7 @@ msgstr ""
 "способност да аутоматски створи садржане фасцикле преузимања и да преименује "
 "датотеке како их преузима, користећи шему по вашем избору."
 
-#: ../raphodo/didyouknow.py:143
+#: ../raphodo/didyouknow.py:172
 msgid ""
 "To specify where you want your files downloaded and how you want them named, "
 "open the appropriate panel on the right-side of the application window: "
@@ -426,19 +820,19 @@ msgstr ""
 "именују, отворите одговарајући панел на десној страни прозора програма: "
 "<b>Одредиште</b>, <b>Преименуј</b>, или <b>Шифра посла</b>."
 
-#: ../raphodo/didyouknow.py:150
+#: ../raphodo/didyouknow.py:179
 msgid ""
 "\n"
 "When thinking about your download directory structure, keep in mind two "
 "different types\n"
 "of directory:\n"
 "<ol>\n"
-"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, &quot;"
-"Photos&quot;, or\n"
+"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, "
+"&quot;Photos&quot;, or\n"
 "&quot;Videos&quot;. This directory should already exist on your computer. In "
 "the illustration \n"
-"below, the destination folders are &quot;Pictures&quot; and &quot;"
-"Videos&quot;. The\n"
+"below, the destination folders are &quot;Pictures&quot; and "
+"&quot;Videos&quot;. The\n"
 "name of the destination folder is displayed in the grey bar directly above "
 "the folder tree, \n"
 "with a folder icon to its left and a gear icon to its far right.</li>\n"
@@ -471,7 +865,7 @@ msgstr ""
 "</ol>\n"
 "            "
 
-#: ../raphodo/didyouknow.py:167
+#: ../raphodo/didyouknow.py:196
 msgid ""
 "\n"
 "You can download photos and videos to the same destination folder, or "
@@ -493,7 +887,7 @@ msgstr ""
 "врсту.            \n"
 "            "
 
-#: ../raphodo/didyouknow.py:177
+#: ../raphodo/didyouknow.py:206
 msgid ""
 "Automatically generated download subfolders can contain further "
 "automatically generated subfolders if need be. A common scheme is to create "
@@ -503,7 +897,7 @@ msgstr ""
 "створене подфасцикле ако је потребно. Уобичајена шема је да се створи "
 "подфасцикла године, а затим низ подфасцикли година-месеци-дана унутар ње."
 
-#: ../raphodo/didyouknow.py:186
+#: ../raphodo/didyouknow.py:215
 msgid ""
 "\n"
 "Whenever possible, the program previews the download subfolders of photos "
@@ -535,7 +929,7 @@ msgstr ""
 "</ol>\n"
 "            "
 
-#: ../raphodo/didyouknow.py:201
+#: ../raphodo/didyouknow.py:230
 msgid ""
 "\n"
 "Download subfolder names are typically generated using some or all of the "
@@ -578,7 +972,7 @@ msgstr ""
 "опција:\n"
 "            "
 
-#: ../raphodo/didyouknow.py:219
+#: ../raphodo/didyouknow.py:248
 msgid ""
 "\n"
 "To automatically create download subfolders as you download, \n"
@@ -594,7 +988,7 @@ msgstr ""
 "иконицу зупчаника да прикажете падајући изборник:            \n"
 "            "
 
-#: ../raphodo/didyouknow.py:227
+#: ../raphodo/didyouknow.py:256
 msgid ""
 "\n"
 "Using the drop-down menu, select a built-in preset or click on <b>Custom</b> "
@@ -610,7 +1004,7 @@ msgstr ""
 "или снимка:             \n"
 "            "
 
-#: ../raphodo/didyouknow.py:237
+#: ../raphodo/didyouknow.py:266
 msgid ""
 "It's easy to download raw images into one folder, and jpeg images into "
 "another. Simply use the <b>Filename Extension</b> as part of your download "
@@ -620,7 +1014,7 @@ msgstr ""
 "Једноставно користите <b>Наставак назива датотеке</b> као део ваше шеме "
 "стварања подфасцикле преузимања:"
 
-#: ../raphodo/didyouknow.py:242
+#: ../raphodo/didyouknow.py:271
 msgid ""
 "This illustration shows a saved custom preset named &quot;My custom "
 "preset&quot;."
@@ -628,7 +1022,7 @@ msgstr ""
 "Ова илустрација показује сачувану произвољну подешеност под називом „Моја "
 "произвољна подешеност“."
 
-#: ../raphodo/didyouknow.py:246
+#: ../raphodo/didyouknow.py:275
 msgid ""
 "\n"
 "You do not have to create nested download subfolders. This illustration "
@@ -641,12 +1035,12 @@ msgstr ""
 "\n"
 "Не морате да направите угнеждене подфасцикле преузимања. Ова илустрација "
 "показује \n"
-"стварање подфасцикли преузимања које садрже само датум снимања фотографија "
-"и \n"
+"стварање подфасцикли преузимања које садрже само датум снимања фотографија и "
+"\n"
 "шифру посла:\n"
 "            "
 
-#: ../raphodo/didyouknow.py:256
+#: ../raphodo/didyouknow.py:285
 msgid ""
 "\n"
 "Although there are many built-in date/time naming options, you may find that "
@@ -670,7 +1064,7 @@ msgstr ""
 "црвени круг око цртице):\n"
 "            "
 
-#: ../raphodo/didyouknow.py:265
+#: ../raphodo/didyouknow.py:294
 msgid ""
 "\n"
 "Read more about all the ways you can generate download subfolder names and "
@@ -682,11 +1076,11 @@ msgstr ""
 "\n"
 "Прочитајте више о свим начинима на које можете створити назив подфасцикле "
 "преузимања и називе датотека у <a \n"
-"href=\"http://damonlynch.net/rapid/documentation/#renamedateandtime"
-"\">документацији на мрежи</a>.\n"
+"href=\"http://damonlynch.net/rapid/documentation/#renamedateandtime\">докумен"
+"тацији на мрежи</a>.\n"
 "            "
 
-#: ../raphodo/didyouknow.py:273
+#: ../raphodo/didyouknow.py:302
 msgid ""
 "\n"
 "<b>Job Codes</b> let you easily enter text that describes sets of photos and "
@@ -705,7 +1099,7 @@ msgstr ""
 "шифру посла „Улица“, а изабране датотеке ће добити шифру посла \n"
 "„Зелена пијаца“: \n"
 
-#: ../raphodo/didyouknow.py:282
+#: ../raphodo/didyouknow.py:311
 msgid ""
 "\n"
 "You can apply new or existing Job Codes before you start a download. If "
@@ -723,11 +1117,11 @@ msgstr ""
 "шифру посла пре него што преузимање почне.\n"
 "            "
 
-#: ../raphodo/didyouknow.py:291
+#: ../raphodo/didyouknow.py:320
 msgid "Look for hints to guide you when working with Job Codes:"
 msgstr "Потражите савете да вас воде у раду са шифрама послова:"
 
-#: ../raphodo/didyouknow.py:295
+#: ../raphodo/didyouknow.py:324
 msgid ""
 "Hints will vary depending on the context, such as when the mouse is hovering "
 "over a button."
@@ -735,33 +1129,26 @@ msgstr ""
 "Савети ће се разликовати у зависности од контекста, као када миш лебди изнад "
 "дугмета."
 
-#: ../raphodo/didyouknow.py:301
+#: ../raphodo/didyouknow.py:330
 msgid ""
 "\n"
 "When you give your photos and videos unique filenames, you'll never be "
 "confused as to \n"
 "which file is which. Using <b>sequence numbers</b> to make filenames unique "
 "is highly \n"
-"recommended!.\n"
+"recommended!\n"
 "            "
 msgstr ""
-"\n"
-"Када дајете својим фотографијама и снимцима јединствен назив, никада се "
-"нећете збунити о томе \n"
-"која датотека је која. Коришћење <b>бројева низа</b> да учините називе "
-"датотека јединственим се веома \n"
-"препоручује!.\n"
-"            "
 
-#: ../raphodo/didyouknow.py:309
+#: ../raphodo/didyouknow.py:338
 msgid ""
 "\n"
 "<p>Four types of sequence values are available to help you assign unique "
 "names to your photos and \n"
 "videos:\n"
 "<ol>\n"
-"<li><b>Downloads today</b>: tracks downloads completed during that day.</"
-"li>\n"
+"<li><b>Downloads today</b>: tracks downloads completed during that "
+"day.</li>\n"
 "<li><b>Stored number</b>: similar to Downloads today, but it is remembered "
 "from the last time the  \n"
 "program was run.</li>\n"
@@ -779,22 +1166,22 @@ msgstr ""
 "јединствене називе вашим фотографијама и \n"
 "снимцима:\n"
 "<ol>\n"
-"<li><b>Данашња преузимања</b>: прати преузимања обављена током тог дана.</"
-"li>\n"
+"<li><b>Данашња преузимања</b>: прати преузимања обављена током тог "
+"дана.</li>\n"
 "<li><b>Сачувани број</b>: слично као данашња преузимања, али се памти из "
 "последњег покретања \n"
 "програма.</li>\n"
-"<li><b>Број сесије</b>: поништава се приликом сваког покретања програма.</"
-"li>\n"
+"<li><b>Број сесије</b>: поништава се приликом сваког покретања "
+"програма.</li>\n"
 "<li><b>Слово низа</b>: као бројеви низа, али користи слова.</li>\n"
 "</ol></p>\n"
 "<p>\n"
 "Прочитајте више о бројевима низа у <a \n"
-"href=\"http://damonlynch.net/rapid/documentation/#sequencenumbers"
-"\">документацији на мрежи</a>.</p>\n"
+"href=\"http://damonlynch.net/rapid/documentation/#sequencenumbers\">документа"
+"цији на мрежи</a>.</p>\n"
 "            "
 
-#: ../raphodo/didyouknow.py:327
+#: ../raphodo/didyouknow.py:356
 msgid ""
 "\n"
 "The <b>Rename</b> panel allows you to configure file renaming. To rename "
@@ -805,11 +1192,11 @@ msgstr ""
 "\n"
 "Панел <b>Преименуј</b> вам омогућава да подесите преименовање датотека. Да "
 "преименујте ваше датотеке, можете изабрати\n"
-"из већ постојећих подешености преименовања или да одредите неку "
-"вашу.              \n"
+"из већ постојећих подешености преименовања или да одредите неку вашу.        "
+"      \n"
 "            "
 
-#: ../raphodo/didyouknow.py:334
+#: ../raphodo/didyouknow.py:363
 msgid ""
 "\n"
 "<p>The <b>Synchronize RAW + JPEG</b> option is useful if you use the RAW + "
@@ -843,7 +1230,7 @@ msgstr ""
 "мрежи</a>.</p>\n"
 "            "
 
-#: ../raphodo/didyouknow.py:348
+#: ../raphodo/didyouknow.py:377
 msgid ""
 "\n"
 "You can have your photos and videos backed up to multiple locations as they "
@@ -861,7 +1248,7 @@ msgstr ""
 "наведена места резерве.\n"
 "            "
 
-#: ../raphodo/didyouknow.py:356
+#: ../raphodo/didyouknow.py:385
 msgid ""
 "In this example, the drive <b>photobackup</b> does not contain a folder "
 "named <tt>Videos</tt>, so videos will not be backed up to it."
@@ -869,7 +1256,7 @@ msgstr ""
 "У овом примеру, уређај <b>резерва_фотографија</b> не садржи фасциклу "
 "<tt>Снимци</tt>, тако да на њему неће бити прављене резерве снимака."
 
-#: ../raphodo/didyouknow.py:362
+#: ../raphodo/didyouknow.py:391
 msgid ""
 "\n"
 "Several of the program's preferences can be set from the command line, "
@@ -880,14 +1267,18 @@ msgid ""
 "            "
 msgstr ""
 "\n"
-"Некe поставке програма се могу подесити са линије наредби, укључујући "
-"изворе \n"
+"Некe поставке програма се могу подесити са линије наредби, укључујући изворе "
+"\n"
 "преузимања, одредишта и резерве. Осим тога, подешавања се могу вратити на "
 "њихова \n"
 "подразумевана стања, а остава и запамћене датотеке очишћене.            \n"
 "            "
 
-#: ../raphodo/didyouknow.py:372
+#: ../raphodo/didyouknow.py:396
+msgid "You can also import program preferences from the older 0.4 version."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:401
 msgid ""
 "\n"
 "Rapid Photo Downloader deals with three types of cache:\n"
@@ -897,8 +1288,8 @@ msgid ""
 "memory cards, and other devices.</li>\n"
 "<li>A <b>temporary cache</b> of files downloaded from a camera, one for "
 "photos and another for \n"
-"videos. They are located in temporary subfolders in the download destination."
-"</li>\n"
+"videos. They are located in temporary subfolders in the download "
+"destination.</li>\n"
 "<li>The <b>desktop's thumbnail cache</b>, in which Rapid Photo Downloader "
 "stores thumbnails of \n"
 "RAW and TIFF photos once they have been downloaded. File browsers like Gnome "
@@ -935,23 +1326,23 @@ msgstr ""
 "мрежи</a>.\n"
 "            "
 
-#: ../raphodo/didyouknow.py:431
+#: ../raphodo/didyouknow.py:460
 msgid "Tip of the Day"
 msgstr "Савет дана"
 
-#: ../raphodo/didyouknow.py:439
+#: ../raphodo/didyouknow.py:468
 msgid "Did you know...?"
 msgstr "Да ли занте...?"
 
-#: ../raphodo/didyouknow.py:466
+#: ../raphodo/didyouknow.py:495
 msgid "Show tips on startup"
 msgstr "Прикажи савете при покретању"
 
-#: ../raphodo/didyouknow.py:470
+#: ../raphodo/didyouknow.py:499
 msgid "&Next"
 msgstr "&Следеће"
 
-#: ../raphodo/didyouknow.py:471
+#: ../raphodo/didyouknow.py:500
 msgid "&Previous"
 msgstr "&Претходно"
 
@@ -1058,68 +1449,68 @@ msgstr "%d дан, 1 сат"
 msgid "%(days)d days, %(hours)d hours"
 msgstr "%(days)d дана, %(hours)d сата"
 
-#: ../raphodo/errorlog.py:65
+#: ../raphodo/errorlog.py:66
 msgid "Find"
 msgstr "Нађи"
 
-#: ../raphodo/errorlog.py:135
+#: ../raphodo/errorlog.py:136
 msgid "Error Reports - Rapid Photo Downloader"
 msgstr "Извештаји о грешкама — Брзи преносилац фотографија"
 
-#: ../raphodo/errorlog.py:170
+#: ../raphodo/errorlog.py:171
 msgid "Find in reports"
 msgstr "Нађи у извештајима"
 
-#: ../raphodo/errorlog.py:187
+#: ../raphodo/errorlog.py:188
 msgid "Find the previous occurrence of the phrase"
 msgstr "Нађите претходну појаву израза"
 
-#: ../raphodo/errorlog.py:192
+#: ../raphodo/errorlog.py:193
 msgid "Find the next occurrence of the phrase"
 msgstr "Нађите следећу појаву израза"
 
-#: ../raphodo/errorlog.py:194
+#: ../raphodo/errorlog.py:195
 msgid "&Highlight All"
 msgstr "&Истакни све"
 
-#: ../raphodo/errorlog.py:195
+#: ../raphodo/errorlog.py:196
 msgid "Highlight all occurrences of the phrase"
 msgstr "Истакните све појаве израза"
 
-#: ../raphodo/errorlog.py:196
+#: ../raphodo/errorlog.py:197
 msgid "&Match Case"
 msgstr "&Упореди величину слова"
 
-#: ../raphodo/errorlog.py:197
+#: ../raphodo/errorlog.py:198
 msgid "Search with case sensitivity"
 msgstr "Тражите са разликовањем величине слова"
 
-#: ../raphodo/errorlog.py:198
+#: ../raphodo/errorlog.py:199
 msgid "&Whole Words"
 msgstr "&Целе речи"
 
-#: ../raphodo/errorlog.py:199
+#: ../raphodo/errorlog.py:200
 msgid "Search whole words only"
 msgstr "Тражите само целе речи"
 
-#: ../raphodo/errorlog.py:209 ../raphodo/errorlog.py:341
+#: ../raphodo/errorlog.py:210 ../raphodo/errorlog.py:345
 #, python-format
 msgid "%s of %s matches"
 msgstr "%s од %s поклапања"
 
-#: ../raphodo/errorlog.py:228
+#: ../raphodo/errorlog.py:232
 msgid "Clear"
 msgstr "Очисти"
 
-#: ../raphodo/errorlog.py:328
+#: ../raphodo/errorlog.py:332
 msgid "Phrase not found"
 msgstr "Нисам нашао израз"
 
-#: ../raphodo/errorlog.py:487
+#: ../raphodo/errorlog.py:491
 msgid "Search pending..."
 msgstr "Претрага је на чекању..."
 
-#: ../raphodo/errorlog.py:535
+#: ../raphodo/errorlog.py:539
 msgid ""
 "The number of new entries added to the Error Report since it was last open. "
 "Click to open the Error Report."
@@ -1135,8 +1526,8 @@ msgstr "Проблем у Брзом преносиоцу фотографија
 #, python-brace-format
 msgid ""
 "<b>A problem occurred in Rapid Photo Downloader</b><br><br>\n"
-"    Please report the problem at <a href=\"{website}\">{website}</a>."
-"<br><br>\n"
+"    Please report the problem at <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
 "    Attach the log file <i>{log_file}</i> to your bug report (click\n"
 "    <a href=\"{log_path}\">here</a> to open the log directory).<br><br>If "
 "the same problem occurs\n"
@@ -1147,8 +1538,8 @@ msgstr ""
 "    Известите о проблему на <a href=\"{website}\">{website}</a>.<br><br>\n"
 "    Приложите датотеку дневника <i>{log_file}</i> уз ваш извештај о грешци "
 "(кликните\n"
-"    <a href=\"{log_path}\">овде</a> да отворите директоријум дневника)."
-"<br><br>Ако се исти проблем деси\n"
+"    <a href=\"{log_path}\">овде</a> да отворите директоријум "
+"дневника).<br><br>Ако се исти проблем деси\n"
 "    опет пре изласка из програма, ово је једино обавештење о томе.\n"
 "    "
 
@@ -1169,7 +1560,7 @@ msgstr ""
 "    Приложите датотеку дневника уз извештај, који се налази на „{log_path}“\n"
 "\n"
 
-#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1601
+#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1643
 msgid "Open in File Browser..."
 msgstr "Отвори у прегледачу датотека..."
 
@@ -1187,531 +1578,531 @@ msgstr "Друго..."
 msgid "%s (location does not exist)"
 msgstr "„%s“ (место не постоји)"
 
-#: ../raphodo/generatenameconfig.py:186
+#: ../raphodo/generatenameconfig.py:190
 msgid "Date time"
 msgstr "Датум"
 
-#: ../raphodo/generatenameconfig.py:187
+#: ../raphodo/generatenameconfig.py:191
 msgid "Text"
 msgstr "Текст"
 
-#: ../raphodo/generatenameconfig.py:188 ../raphodo/rapid.py:2053
+#: ../raphodo/generatenameconfig.py:192 ../raphodo/rapid.py:2125
 msgid "Filename"
 msgstr "Назив датотеке"
 
-#: ../raphodo/generatenameconfig.py:189 ../raphodo/preferencedialog.py:488
+#: ../raphodo/generatenameconfig.py:193 ../raphodo/preferencedialog.py:724
 msgid "Metadata"
 msgstr "Метаподаци"
 
-#: ../raphodo/generatenameconfig.py:190
+#: ../raphodo/generatenameconfig.py:194
 msgid "Sequences"
 msgstr "Низови"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: ../raphodo/generatenameconfig.py:193
+#: ../raphodo/generatenameconfig.py:197
 msgid "Job code"
 msgstr "Шифра посла"
 
-#: ../raphodo/generatenameconfig.py:194
+#: ../raphodo/generatenameconfig.py:198
 msgid "Image date"
 msgstr "Датум слике"
 
-#: ../raphodo/generatenameconfig.py:195
+#: ../raphodo/generatenameconfig.py:199
 msgid "Video date"
 msgstr "Датум снимка"
 
-#: ../raphodo/generatenameconfig.py:196
+#: ../raphodo/generatenameconfig.py:200
 msgid "Today"
 msgstr "Данас"
 
-#: ../raphodo/generatenameconfig.py:197
+#: ../raphodo/generatenameconfig.py:201
 msgid "Yesterday"
 msgstr "Јуче"
 
 #. Translators: Download time is the time and date that the download started (when the
 #. user clicked the Download button)
-#: ../raphodo/generatenameconfig.py:200
+#: ../raphodo/generatenameconfig.py:204
 msgid "Download time"
 msgstr "Време преузимања"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:203
+#: ../raphodo/generatenameconfig.py:207
 msgid "Name"
 msgstr "Назив"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:206 ../raphodo/rapid.py:2054
+#: ../raphodo/generatenameconfig.py:210 ../raphodo/rapid.py:2126
 msgid "Extension"
 msgstr "Наставак"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:209
+#: ../raphodo/generatenameconfig.py:213
 msgid "Image number"
 msgstr "Број слике"
 
-#: ../raphodo/generatenameconfig.py:210
+#: ../raphodo/generatenameconfig.py:214
 msgid "Video number"
 msgstr "Број снимка"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:213
+#: ../raphodo/generatenameconfig.py:217
 msgid "Aperture"
 msgstr "Отвор бленде"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:216
+#: ../raphodo/generatenameconfig.py:220
 msgid "ISO"
 msgstr "ИСО"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:219
+#: ../raphodo/generatenameconfig.py:223
 msgid "Exposure time"
 msgstr "Време излагања"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:222
+#: ../raphodo/generatenameconfig.py:226
 msgid "Focal length"
 msgstr "Жижна даљина"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:225
+#: ../raphodo/generatenameconfig.py:229
 msgid "Camera make"
 msgstr "Произвођач фото-апарата"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:228
+#: ../raphodo/generatenameconfig.py:232
 msgid "Camera model"
 msgstr "Модел фото-апарата"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:231
+#: ../raphodo/generatenameconfig.py:235
 msgid "Short camera model"
 msgstr "Скраћени назив фото-апарата"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:234
+#: ../raphodo/generatenameconfig.py:238
 msgid "Hyphenated short camera model"
 msgstr "Дужи назив фото-апарата"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:237
+#: ../raphodo/generatenameconfig.py:241
 msgid "Serial number"
 msgstr "Серијски број"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:240
+#: ../raphodo/generatenameconfig.py:244
 msgid "Shutter count"
 msgstr "Број окидања"
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: ../raphodo/generatenameconfig.py:242
+#: ../raphodo/generatenameconfig.py:246
 msgid "File number"
 msgstr "Број датотеке"
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:244
+#: ../raphodo/generatenameconfig.py:248
 msgid "Folder only"
 msgstr "Само фасцикла"
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:246
+#: ../raphodo/generatenameconfig.py:250
 msgid "Folder and file"
 msgstr "Фасцикла и датотека"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:249
+#: ../raphodo/generatenameconfig.py:253
 msgid "Owner name"
 msgstr "Име власника"
 
-#: ../raphodo/generatenameconfig.py:250
+#: ../raphodo/generatenameconfig.py:254
 msgid "Codec"
 msgstr "Кодек"
 
-#: ../raphodo/generatenameconfig.py:251
+#: ../raphodo/generatenameconfig.py:255
 msgid "Width"
 msgstr "Ширина"
 
-#: ../raphodo/generatenameconfig.py:252
+#: ../raphodo/generatenameconfig.py:256
 msgid "Height"
 msgstr "Висина"
 
-#: ../raphodo/generatenameconfig.py:253
+#: ../raphodo/generatenameconfig.py:257
 msgid "Length"
 msgstr "Дужина"
 
-#: ../raphodo/generatenameconfig.py:254
+#: ../raphodo/generatenameconfig.py:258
 msgid "Frames Per Second"
 msgstr "Кадрова у секунди"
 
-#: ../raphodo/generatenameconfig.py:255
+#: ../raphodo/generatenameconfig.py:259
 msgid "Artist"
 msgstr "Аутор"
 
-#: ../raphodo/generatenameconfig.py:256
+#: ../raphodo/generatenameconfig.py:260
 msgid "Copyright"
 msgstr "Ауторска права"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:259
+#: ../raphodo/generatenameconfig.py:263
 msgid "Downloads today"
 msgstr "Данашња преузимања"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:262
+#: ../raphodo/generatenameconfig.py:266
 msgid "Session number"
 msgstr "Број сесије"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:265
+#: ../raphodo/generatenameconfig.py:269
 msgid "Subfolder number"
 msgstr "Број садржане фасцикле"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:268
+#: ../raphodo/generatenameconfig.py:272
 msgid "Stored number"
 msgstr "Сачувани број"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: ../raphodo/generatenameconfig.py:271
+#: ../raphodo/generatenameconfig.py:275
 msgid "Sequence letter"
 msgstr "Низ слова"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:274
+#: ../raphodo/generatenameconfig.py:278
 msgid "All digits"
 msgstr "Све цифре"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:277
+#: ../raphodo/generatenameconfig.py:281
 msgid "Last digit"
 msgstr "Последња цифра"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:280
+#: ../raphodo/generatenameconfig.py:284
 msgid "Last 2 digits"
 msgstr "Последње две цифре"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:283
+#: ../raphodo/generatenameconfig.py:287
 msgid "Last 3 digits"
 msgstr "Последње три цифре"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:286
+#: ../raphodo/generatenameconfig.py:290
 msgid "Last 4 digits"
 msgstr "Последње четири цифре"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:289
+#: ../raphodo/generatenameconfig.py:293
 msgid "Original Case"
 msgstr "Изворна величина слова"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:292
+#: ../raphodo/generatenameconfig.py:296
 msgid "UPPERCASE"
 msgstr "ВЕЛИКА СЛОВА"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:295
+#: ../raphodo/generatenameconfig.py:299
 msgid "lowercase"
 msgstr "мала слова"
 
-#: ../raphodo/generatenameconfig.py:296
+#: ../raphodo/generatenameconfig.py:300
 msgid "One digit"
 msgstr "Једна цифра"
 
-#: ../raphodo/generatenameconfig.py:297
+#: ../raphodo/generatenameconfig.py:301
 msgid "Two digits"
 msgstr "Две цифре"
 
-#: ../raphodo/generatenameconfig.py:298
+#: ../raphodo/generatenameconfig.py:302
 msgid "Three digits"
 msgstr "Три цифре"
 
-#: ../raphodo/generatenameconfig.py:299
+#: ../raphodo/generatenameconfig.py:303
 msgid "Four digits"
 msgstr "Четири цифре"
 
-#: ../raphodo/generatenameconfig.py:300
+#: ../raphodo/generatenameconfig.py:304
 msgid "Five digits"
 msgstr "Пет цифре"
 
-#: ../raphodo/generatenameconfig.py:301
+#: ../raphodo/generatenameconfig.py:305
 msgid "Six digits"
 msgstr "Шест цифре"
 
-#: ../raphodo/generatenameconfig.py:302
+#: ../raphodo/generatenameconfig.py:306
 msgid "Seven digits"
 msgstr "Седам цифара"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:305
+#: ../raphodo/generatenameconfig.py:309
 msgid "Subseconds"
 msgstr "Стотинке"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:308 ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:312 ../raphodo/generatenameconfig.py:393
 msgid "YYYYMMDD"
 msgstr "ГГГГММДД"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:311 ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:315 ../raphodo/generatenameconfig.py:394
 msgid "YYYY-MM-DD"
 msgstr "ГГГГ-ММ-ДД"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:314 ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:318 ../raphodo/generatenameconfig.py:395
 msgid "YYYY_MM_DD"
 msgstr "ГГГГ_ММ_ДД"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:317
+#: ../raphodo/generatenameconfig.py:321
 msgid "YYMMDD"
 msgstr "ГГММДД"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:320
+#: ../raphodo/generatenameconfig.py:324
 msgid "YY-MM-DD"
 msgstr "ГГ-ММ-ДД"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:323
+#: ../raphodo/generatenameconfig.py:327
 msgid "YY_MM_DD"
 msgstr "ГГ_ММ_ДД"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:326
+#: ../raphodo/generatenameconfig.py:330
 msgid "MMDDYYYY"
 msgstr "ММДДГГГГ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:329
+#: ../raphodo/generatenameconfig.py:333
 msgid "MMDDYY"
 msgstr "ММДДГГ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:332
+#: ../raphodo/generatenameconfig.py:336
 msgid "MMDD"
 msgstr "ММДД"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:335
+#: ../raphodo/generatenameconfig.py:339
 msgid "DDMMYYYY"
 msgstr "ДД.ММ.ГГГГ."
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:338
+#: ../raphodo/generatenameconfig.py:342
 msgid "DDMMYY"
 msgstr "ДД.ММ.ГГ."
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:341 ../raphodo/generatenameconfig.py:389
-#: ../raphodo/generatenameconfig.py:390 ../raphodo/generatenameconfig.py:391
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:345 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:394 ../raphodo/generatenameconfig.py:395
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:397
 msgid "YYYY"
 msgstr "ГГГГ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:344
+#: ../raphodo/generatenameconfig.py:348
 msgid "YY"
 msgstr "ГГ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:347
+#: ../raphodo/generatenameconfig.py:351
 msgid "MM"
 msgstr "ММ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:350
+#: ../raphodo/generatenameconfig.py:354
 msgid "DD"
 msgstr "ДД"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:353
+#: ../raphodo/generatenameconfig.py:357
 msgid "Month (full)"
 msgstr "Месец (пун)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:356
+#: ../raphodo/generatenameconfig.py:360
 msgid "Month (abbreviated)"
 msgstr "Месец (скраћено)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:359
+#: ../raphodo/generatenameconfig.py:363
 msgid "HHMMSS"
 msgstr "ЧЧММСС"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:362
+#: ../raphodo/generatenameconfig.py:366
 msgid "HHMM"
 msgstr "ЧЧММ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:365
+#: ../raphodo/generatenameconfig.py:369
 msgid "HH-MM-SS"
 msgstr "ЧЧ:ММ:СС"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:368
+#: ../raphodo/generatenameconfig.py:372
 msgid "HH-MM"
 msgstr "ЧЧ:ММ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:371
+#: ../raphodo/generatenameconfig.py:375
 msgid "HH"
 msgstr "ЧЧ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:374
+#: ../raphodo/generatenameconfig.py:378
 msgid "MM (minutes)"
 msgstr "ММ (минута)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:377
+#: ../raphodo/generatenameconfig.py:381
 msgid "SS"
 msgstr "СС"
 
-#: ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:393
 msgid "Date"
 msgstr "Датум"
 
-#: ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:394
 msgid "Date (hyphens)"
 msgstr "Датум (цртице)"
 
-#: ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:395
 msgid "Date (underscores)"
 msgstr "Датум (подвлаке)"
 
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:438
-#: ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:442
+#: ../raphodo/generatenameconfig.py:537
 msgid "Date and Job Code"
 msgstr "Датум и шифра посла"
 
-#: ../raphodo/generatenameconfig.py:392
+#: ../raphodo/generatenameconfig.py:396
 msgid "YYYYMM_Job Code"
 msgstr "ММГГГГ_Шифра посла"
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "Date and Job Code Subfolder"
 msgstr "Подфасцикла датума и шифре посла"
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "YYYYMM"
 msgstr "ММ.ГГГГ."
 
-#: ../raphodo/generatenameconfig.py:393 ../raphodo/jobcodepanel.py:198
-#: ../raphodo/nameeditor.py:827 ../raphodo/rapid.py:1809
+#: ../raphodo/generatenameconfig.py:397 ../raphodo/jobcodepanel.py:199
+#: ../raphodo/nameeditor.py:833 ../raphodo/rapid.py:1852
 #: ../raphodo/renamepanel.py:83 ../raphodo/renamepanel.py:241
 msgid "Job Code"
 msgstr "Шифра посла"
 
-#: ../raphodo/generatenameconfig.py:433 ../raphodo/generatenameconfig.py:512
+#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:532
 msgid "Original Filename"
 msgstr "Изворни назив датотеке"
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "Date-Time and Downloads today"
 msgstr "Датум-време и данашња преузимања"
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "YYYYMMDD-HHMM-1"
 msgstr "ДД.ММ.ГГГГ.—ЧЧ:ММ—1"
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "Date and Downloads today"
 msgstr "Датум и данашња преузимања"
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "YYYYMMDD-1"
 msgstr "ДД.ММ.ГГГГ.—1"
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "Date-Time and Image number"
 msgstr "Датум-време и број слике"
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "YYYYMMDD-1234"
 msgstr "ДД.ММ.ГГГГ.—1234"
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "Date-Time and Job Code"
 msgstr "Датум-време и шифра посла"
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "YYYYMMDD-HHMM-Job Code-1"
 msgstr "ДД.ММ.ГГГГ.—Шифра посла-1"
 
-#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:442 ../raphodo/generatenameconfig.py:537
 msgid "YYYYMMDD-Job Code-1"
 msgstr "ДД.ММ.ГГГГ.—Шифра посла-1"
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "Date-Time and Video number"
 msgstr "Датум-време и број снимка"
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "YYYYMMDD_1234"
 msgstr "ДД.ММ.ГГГГ._1234"
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "Resolution"
 msgstr "Резолуција"
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "YYYYMMDD-HHMM-1-1920x1080"
 msgstr "ДД.ММ.ГГГГ.—ЧЧ:ММ-1-1920x1080"
 
@@ -1771,7 +2162,7 @@ msgstr "&Шифра посла:"
 msgid "&Remember this choice"
 msgstr "&Запамти овај избор"
 
-#: ../raphodo/jobcodepanel.py:185
+#: ../raphodo/jobcodepanel.py:186
 msgid ""
 "Select photos and videos to be able to apply a new or existing Job Code to "
 "them."
@@ -1779,12 +2170,13 @@ msgstr ""
 "Изаберите фотографије и снимке да бисте били у могућности да примените нову "
 "или постојећу шифру посла на њих."
 
-#: ../raphodo/jobcodepanel.py:186
-msgid "The new Job Code will be applied to all selected photos and/or videos."
+#: ../raphodo/jobcodepanel.py:187
+msgid ""
+"The new Job Code will be applied to all selected photos and/or videos."
 msgstr ""
 "Нова шифра посла биће примењена на све изабране фотографије и/или снимке."
 
-#: ../raphodo/jobcodepanel.py:187
+#: ../raphodo/jobcodepanel.py:188
 msgid ""
 "Click the Apply button to apply the current Job Code to all selected photos "
 "and/or videos. You can also simply double click the Job Code."
@@ -1793,7 +2185,7 @@ msgstr ""
 "фотографије и/или снимке. Такође можете једноставно два пута да кликнете на "
 "шифру посла."
 
-#: ../raphodo/jobcodepanel.py:189
+#: ../raphodo/jobcodepanel.py:190
 msgid ""
 "Removing a Job Code removes it only from the list of saved Job Codes, not "
 "from any photos or videos that it may have been applied to."
@@ -1801,7 +2193,7 @@ msgstr ""
 "Уклањање шифре посла је уклања само са списка сачуваних шифри послова, а не "
 "са неких фотографија или снимака на којима је можда била примењена."
 
-#: ../raphodo/jobcodepanel.py:191
+#: ../raphodo/jobcodepanel.py:192
 msgid ""
 "If you want to use Job Codes, configure file renaming or destination "
 "subfolder names to use them."
@@ -1809,48 +2201,48 @@ msgstr ""
 "Ако желите да користите шифре послова, подесите датотеку преименовањем или "
 "називе одредишних подфасцикли да их користе."
 
-#: ../raphodo/jobcodepanel.py:197
+#: ../raphodo/jobcodepanel.py:198
 msgid "Last Used"
 msgstr "Последње коришћено"
 
-#: ../raphodo/jobcodepanel.py:202
+#: ../raphodo/jobcodepanel.py:203
 msgid "Job Code Sort:"
 msgstr "Ређање шифре посла:"
 
-#: ../raphodo/jobcodepanel.py:205 ../raphodo/rapid.py:2061
+#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2133
 msgid "Ascending"
 msgstr "Растуће"
 
-#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2062
+#: ../raphodo/jobcodepanel.py:207 ../raphodo/rapid.py:2134
 msgid "Descending"
 msgstr "Опадајуће"
 
-#: ../raphodo/jobcodepanel.py:216
+#: ../raphodo/jobcodepanel.py:217
 msgid "&New..."
 msgstr "&Ново..."
 
-#: ../raphodo/jobcodepanel.py:220
+#: ../raphodo/jobcodepanel.py:221
 msgid "&Apply"
 msgstr "&Примени"
 
-#: ../raphodo/jobcodepanel.py:224
+#: ../raphodo/jobcodepanel.py:225
 msgid "&Remove"
 msgstr "&Уклони"
 
-#: ../raphodo/jobcodepanel.py:228 ../raphodo/preferencedialog.py:125
-#: ../raphodo/preferencedialog.py:154 ../raphodo/preferencedialog.py:433
+#: ../raphodo/jobcodepanel.py:229 ../raphodo/preferencedialog.py:200
+#: ../raphodo/preferencedialog.py:229 ../raphodo/preferencedialog.py:531
 msgid "Remove All"
 msgstr "Уклони све"
 
-#: ../raphodo/jobcodepanel.py:427
+#: ../raphodo/jobcodepanel.py:428
 msgid "Do you really want to remove all the Job Codes?"
 msgstr "Да ли заиста желите да уклоните све шифре послова?"
 
-#: ../raphodo/jobcodepanel.py:429
+#: ../raphodo/jobcodepanel.py:430
 msgid "Remove all Job Codes"
 msgstr "Уклоните све шифре послова"
 
-#: ../raphodo/jobcodepanel.py:492
+#: ../raphodo/jobcodepanel.py:493
 msgid "Job Codes"
 msgstr "Шифре послова"
 
@@ -1861,42 +2253,58 @@ msgstr "Шифре послова"
 msgid "<i><b>Hint:</b> %(message)s"
 msgstr "<i><b>Савет:</b> %(message)s"
 
-#: ../raphodo/nameeditor.py:418 ../raphodo/nameeditor.py:432
+#: ../raphodo/nameeditor.py:423 ../raphodo/nameeditor.py:437
 #, python-format
 msgid "%(description)s - %(elements)s"
 msgstr "%(description)s — %(elements)s"
 
-#: ../raphodo/nameeditor.py:512
+#: ../raphodo/nameeditor.py:517
 msgid "Save New Custom Preset..."
 msgstr "Сачувај нову произвољну подешеност..."
 
-#: ../raphodo/nameeditor.py:513
+#: ../raphodo/nameeditor.py:518
 msgid "Remove All Custom Presets..."
 msgstr "Уклони све произвољне подешености..."
 
-#: ../raphodo/nameeditor.py:559
+#: ../raphodo/nameeditor.py:564
 msgid "(New Custom Preset)"
 msgstr "(Нова произвољна подешеност)"
 
-#: ../raphodo/nameeditor.py:576
+#: ../raphodo/nameeditor.py:581
 #, python-format
 msgid "%s (edited)"
 msgstr "%s (уређено)"
 
-#: ../raphodo/nameeditor.py:579 ../raphodo/nameeditor.py:1370
+#: ../raphodo/nameeditor.py:584 ../raphodo/nameeditor.py:1379
 #, python-format
 msgid "Update Custom Preset \"%s\""
 msgstr "Освежи произвољну подешеност „%s“"
 
-#: ../raphodo/nameeditor.py:667
+#: ../raphodo/nameeditor.py:672
 msgid "Save New Custom Preset - Rapid Photo Downloader"
 msgstr "Сачувајте нову произвољну подешеност — Брзи преносилац фотографија"
 
-#: ../raphodo/nameeditor.py:675
+#: ../raphodo/nameeditor.py:680
 msgid "Preset Name:"
 msgstr "Назив подешености:"
 
-#: ../raphodo/nameeditor.py:836
+#: ../raphodo/nameeditor.py:799
+msgid "Photo Subfolder Generation Editor"
+msgstr "Уређивач творца подфасцикле фотографија"
+
+#: ../raphodo/nameeditor.py:805
+msgid "Video Subfolder Generation Editor"
+msgstr "Уређивач творца подфасцикле снимака"
+
+#: ../raphodo/nameeditor.py:811
+msgid "Photo Renaming Editor"
+msgstr "Уређивач преименовања фотографија"
+
+#: ../raphodo/nameeditor.py:817
+msgid "Video Renaming Editor"
+msgstr "Уређивач преименовања снимака"
+
+#: ../raphodo/nameeditor.py:842
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>There is insufficient data to "
 "fully generate the name. Please use other renaming options.</i>"
@@ -1907,7 +2315,7 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees.
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:846
+#: ../raphodo/nameeditor.py:853
 #, python-format
 msgid "The character</i> %(separator)s <i>creates a new subfolder level."
 msgstr "Знак</i> %(separator)s <i>прави нови ниво подфасцикле."
@@ -1915,7 +2323,7 @@ msgstr "Знак</i> %(separator)s <i>прави нови ниво подфас�
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:851
+#: ../raphodo/nameeditor.py:858
 #, python-format
 msgid ""
 "There is no need start or end with the folder separator </i> "
@@ -1924,7 +2332,7 @@ msgstr ""
 "Нема потребе за почетком или завршавањем са раздвојником фасцикле </i> "
 "%(separator)s<i>, јер се додаје аутоматски."
 
-#: ../raphodo/nameeditor.py:859
+#: ../raphodo/nameeditor.py:866
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>Unique filenames may not be "
 "generated. Make filenames unique by using Sequence values.</i>"
@@ -1933,41 +2341,42 @@ msgstr ""
 "се не могу створити. Учините називе датотека јединственим користећи "
 "вредности низа.</i>"
 
-#: ../raphodo/nameeditor.py:882 ../raphodo/renamepanel.py:121
+#: ../raphodo/nameeditor.py:889 ../raphodo/renamepanel.py:121
 msgid "Preset:"
 msgstr "Подешеност:"
 
 #. Translators: appears in a combobox, e.g. Image Date (YYYY)
-#: ../raphodo/nameeditor.py:959 ../raphodo/nameeditor.py:980
+#: ../raphodo/nameeditor.py:966 ../raphodo/nameeditor.py:987
 #, python-brace-format
 msgid "{choice} ({variant})"
 msgstr "{choice} ({variant})"
 
-#: ../raphodo/nameeditor.py:1005 ../raphodo/preferencedialog.py:530
+#: ../raphodo/nameeditor.py:1012 ../raphodo/preferencedialog.py:783
 msgid "Get help online..."
 msgstr "Нађи помоћ на мрежи..."
 
-#: ../raphodo/nameeditor.py:1025
+#: ../raphodo/nameeditor.py:1034
 msgid "Insert"
 msgstr "Уметни"
 
-#: ../raphodo/nameeditor.py:1351
+#: ../raphodo/nameeditor.py:1360
 msgid "Save Preset - Rapid Photo Downloader"
 msgstr "Сачувајте подешеност — Брзи преносилац фотографија"
 
-#: ../raphodo/nameeditor.py:1356
+#: ../raphodo/nameeditor.py:1365
 msgid ""
-"<b>Do you want to save the changes in a new custom preset?</"
-"b><br><br>Creating a custom preset is not required, but can help you keep "
-"organized.<br><br>The changes to the preferences will still be applied "
-"regardless of whether you create a new custom preset or not."
+"<b>Do you want to save the changes in a new custom "
+"preset?</b><br><br>Creating a custom preset is not required, but can help "
+"you keep organized.<br><br>The changes to the preferences will still be "
+"applied regardless of whether you create a new custom preset or not."
 msgstr ""
-"<b>Да ли желите да сачувате измене у новој произвољној подешености?</"
-"b><br><br>Прављење произвољне подешености није потребно, али вам може помоћи "
-"да будете организовани.<br><br>Измене у поставкама ће и даље бити примењене "
-"без обзира на то да ли сте направили нову произвољну подешеност или не."
+"<b>Да ли желите да сачувате измене у новој произвољној "
+"подешености?</b><br><br>Прављење произвољне подешености није потребно, али "
+"вам може помоћи да будете организовани.<br><br>Измене у поставкама ће и даље "
+"бити примењене без обзира на то да ли сте направили нову произвољну "
+"подешеност или не."
 
-#: ../raphodo/nameeditor.py:1365
+#: ../raphodo/nameeditor.py:1374
 msgid ""
 "<b>Do you want to save the changes in a custom preset?</b><br><br>If you "
 "like, you can create a new custom preset or update the existing custom "
@@ -1980,95 +2389,100 @@ msgstr ""
 "примењене без обзира на то да ли сте сачували нову произвољну подешеност или "
 "не."
 
-#: ../raphodo/nameeditor.py:1372
+#: ../raphodo/nameeditor.py:1381
 msgid "Save New Custom Preset"
 msgstr "Сачувајте нову произвољну подешеност"
 
-#: ../raphodo/newversion.py:306
+#: ../raphodo/newversion.py:312
 msgid "Checking for new version..."
 msgstr "Тражим ново издање..."
 
-#: ../raphodo/newversion.py:307
+#: ../raphodo/newversion.py:313
 msgid "You are running the latest version."
 msgstr "Радите са најновијим издањем."
 
-#: ../raphodo/newversion.py:308
+#: ../raphodo/newversion.py:314
 msgid "Failed to contact the update server."
 msgstr "Нисам успео да ступим у везу са сервером за освежавања."
 
-#: ../raphodo/newversion.py:310
+#: ../raphodo/newversion.py:316
 #, python-format
 msgid "A new version of Rapid Photo Downloader (%s) is available."
 msgstr "Ново издање Брзог преносиоца фотографија (%s) је доступно."
 
-#: ../raphodo/newversion.py:312
+#: ../raphodo/newversion.py:318
 msgid "Do you want to download the new version?"
 msgstr "Да ли желите да преузмете ново издање?"
 
-#: ../raphodo/newversion.py:313
+#: ../raphodo/newversion.py:319
 #, python-format
 msgid "Changes in the new release can be viewed <a href=\"%s\">here</a>."
 msgstr "Измене у новом издању можете видети <a href=\"%s\">овде</a>."
 
 #. Translators: this text appears in a button - the & sets the s key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:340 ../raphodo/newversion.py:353
+#: ../raphodo/newversion.py:348 ../raphodo/newversion.py:363
 msgid "&Skip this release"
 msgstr "&Прескочи ово издање"
 
 #. Translators: this text appears in a button - the & sets the o key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:356
+#: ../raphodo/newversion.py:366
 msgid "&Open Download Page"
 msgstr "&Отвори страницу преузимања"
 
-#: ../raphodo/newversion.py:376
+#: ../raphodo/newversion.py:386
 msgid "Rapid Photo Downloader updates"
 msgstr "Освежења Брзог преносиоца фотографија"
 
 #. Translators: shows how much of a file has been downloaded e.g  123 KB of 1.3 MB
-#: ../raphodo/newversion.py:478
+#: ../raphodo/newversion.py:488
 #, python-format
 msgid "%(downloaded)s of %(total)s"
 msgstr "%(downloaded)s од %(total)s"
 
-#: ../raphodo/newversion.py:495
+#: ../raphodo/newversion.py:507
 msgid "Downloading..."
 msgstr "Преузимам..."
 
-#: ../raphodo/preferencedialog.py:76
+#: ../raphodo/preferencedialog.py:86
 msgid "Preferences"
 msgstr "Поставке"
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Automation"
 msgstr "Аутоматизација"
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Thumbnails"
 msgstr "Минијатуре"
 
-#: ../raphodo/preferencedialog.py:85 ../raphodo/preferencedialog.py:343
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/preferencedialog.py:428
 msgid "Error Handling"
 msgstr "Рад са грешкама"
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Warnings"
 msgstr "Упозорења"
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:109
+msgid "Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:109 ../raphodo/preferencedialog.py:119
 msgid "Miscellaneous"
 msgstr "Остало"
 
-#: ../raphodo/preferencedialog.py:94
+#: ../raphodo/preferencedialog.py:147
 msgid "Device Scanning"
 msgstr "Прегледање уређаја"
 
-#: ../raphodo/preferencedialog.py:96
+#: ../raphodo/preferencedialog.py:148
 msgid "Scan only external devices"
 msgstr "Прегледај само спољне уређаје"
 
-#: ../raphodo/preferencedialog.py:98
+#: ../raphodo/preferencedialog.py:150
 msgid ""
 "Scan for photos and videos only on devices that are external to the "
 "computer,\n"
@@ -2078,50 +2492,68 @@ msgstr ""
 "укључујући\n"
 "фото-апарате, меморијске картице, спољне чврсте дискове и УСБ флеш дискове."
 
-#: ../raphodo/preferencedialog.py:102
-msgid "Scan non-camera devices lacking a DCIM folder"
+#: ../raphodo/preferencedialog.py:153
+msgid "Scan only specific folders on devices"
 msgstr ""
-"Прегледај уређаје који нису фото-апарати којима недостаје ДЦИМ фасцикла"
 
-#: ../raphodo/preferencedialog.py:104
+#: ../raphodo/preferencedialog.py:155
 msgid ""
-"Scan the entirety of a device for photos and videos, irrespective of whether "
-"it contains a DCIM folder,\n"
-"as opposed to only scanning within a DCIM folder.\n"
-"\n"
-"Changing this setting causes all devices to be scanned again.\n"
+"Scan for photos and videos only in the folders specified below (except "
+"paths\n"
+"specified in Ignored Paths).\n"
 "\n"
-"Note: With cameras, only the DCIM folder is scanned."
+"Changing this setting causes all devices to be scanned again."
 msgstr ""
-"Прегледајте целину уређаја за фотографијама и снимцима, без обзира на то да "
-"ли садржи ДЦИМ фасциклу,\n"
-"за разлику од прегледања у оквиру ДЦИМ фасцикле.\n"
+
+#: ../raphodo/preferencedialog.py:161
+msgid "Folders to scan:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:164
+msgid ""
+"Folders at the base level of device file systems that will be scanned\n"
+"for photos and videos."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:167 ../raphodo/preferencedialog.py:219
+msgid "Add..."
+msgstr "Додај..."
+
+#: ../raphodo/preferencedialog.py:169
+msgid ""
+"Add a folder to the list of folders to scan for photos and videos.\n"
 "\n"
-"Измена овог подешавања доводи до поновног прегледања свих уређаја.\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:172 ../raphodo/preferencedialog.py:198
+#: ../raphodo/preferencedialog.py:224 ../raphodo/preferencedialog.py:529
+msgid "Remove"
+msgstr "Уклони"
+
+#: ../raphodo/preferencedialog.py:174
+msgid ""
+"Remove a folder from the list of folders to scan for photos and videos.\n"
 "\n"
-"Напомена: Са фото-апаратима, само ДЦИМ фасцикла се прегледа."
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
 
-#: ../raphodo/preferencedialog.py:116
+#: ../raphodo/preferencedialog.py:191
 msgid "Devices that have been set to automatically ignore or download from."
 msgstr "Уређаји који су подешени за аутоматско занемаривање или преузимање."
 
-#: ../raphodo/preferencedialog.py:117
+#: ../raphodo/preferencedialog.py:192
 msgid "Remembered Devices"
 msgstr "Запамћени уређаји"
 
-#: ../raphodo/preferencedialog.py:121
+#: ../raphodo/preferencedialog.py:196
 msgid ""
 "Remove a device from the list of devices to automatically ignore or download "
 "from."
 msgstr ""
 "Уклоните уређај са списка уређаја за аутоматско занемаривање или преузимање."
 
-#: ../raphodo/preferencedialog.py:123 ../raphodo/preferencedialog.py:149
-#: ../raphodo/preferencedialog.py:431
-msgid "Remove"
-msgstr "Уклони"
-
-#: ../raphodo/preferencedialog.py:127
+#: ../raphodo/preferencedialog.py:202
 msgid ""
 "Clear the list of devices from which to automatically ignore or download "
 "from.\n"
@@ -2133,22 +2565,18 @@ msgstr ""
 "Напомена: Измене ће ступити на снагу приликом следећег прегледања рачунара "
 "за уређајима."
 
-#: ../raphodo/preferencedialog.py:140
+#: ../raphodo/preferencedialog.py:215
 msgid "Ignored Paths"
 msgstr "Занемарене путање"
 
-#: ../raphodo/preferencedialog.py:141
+#: ../raphodo/preferencedialog.py:216
 msgid ""
 "The end part of a path that should never be scanned for photos or videos."
 msgstr ""
 "Крајњи део путање која никада неће бити прегледана за фотографијама или "
 "снимцима."
 
-#: ../raphodo/preferencedialog.py:144
-msgid "Add..."
-msgstr "Додај..."
-
-#: ../raphodo/preferencedialog.py:146
+#: ../raphodo/preferencedialog.py:221
 msgid ""
 "Add a path to the list of paths to ignore.\n"
 "\n"
@@ -2158,7 +2586,7 @@ msgstr ""
 "\n"
 "Измена овог подешавања доводи до поновног прегледања свих уређаја."
 
-#: ../raphodo/preferencedialog.py:151
+#: ../raphodo/preferencedialog.py:226
 msgid ""
 "Remove a path from the list of paths to ignore.\n"
 "\n"
@@ -2168,7 +2596,7 @@ msgstr ""
 "\n"
 "Измена овог подешавања доводи до поновног прегледања свих уређаја."
 
-#: ../raphodo/preferencedialog.py:156
+#: ../raphodo/preferencedialog.py:231
 msgid ""
 "Clear the list of paths to ignore.\n"
 "\n"
@@ -2178,15 +2606,17 @@ msgstr ""
 "\n"
 "Измена овог подешавања доводи до поновног прегледања свих уређаја."
 
-#: ../raphodo/preferencedialog.py:164
+#: ../raphodo/preferencedialog.py:239
 msgid ""
-"Use python-style <a href=\"http://damonlynch.net/rapid/documentation/"
-"#regularexpressions\">regular expressions</a>"
+"Use python-style <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">regula"
+"r expressions</a>"
 msgstr ""
-"Користите <a href=\"http://damonlynch.net/rapid/documentation/"
-"#regularexpressions\">регуларне изразе</a> у питон-стилу"
+"Користите <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">регула"
+"рне изразе</a> у питон-стилу"
 
-#: ../raphodo/preferencedialog.py:168
+#: ../raphodo/preferencedialog.py:243
 msgid ""
 "Use regular expressions in the list of ignored paths.\n"
 "\n"
@@ -2196,47 +2626,47 @@ msgstr ""
 "\n"
 "Измена овог подешавања доводи до поновног прегледања свих уређаја."
 
-#: ../raphodo/preferencedialog.py:208
+#: ../raphodo/preferencedialog.py:283
 msgid "Program Automation"
 msgstr "Аутоматизација програма"
 
-#: ../raphodo/preferencedialog.py:209
+#: ../raphodo/preferencedialog.py:284
 msgid "Start downloading at program startup"
 msgstr "Започни преузимање по покретању програма"
 
-#: ../raphodo/preferencedialog.py:210
+#: ../raphodo/preferencedialog.py:285
 msgid "Start downloading upon device insertion"
 msgstr "Започни преузимање по прикључивању уређаја"
 
-#: ../raphodo/preferencedialog.py:211
+#: ../raphodo/preferencedialog.py:286
 msgid "Unmount (eject) device upon download completion"
 msgstr "Откачи (избаци) уређај након обављеног преузимања"
 
-#: ../raphodo/preferencedialog.py:212
+#: ../raphodo/preferencedialog.py:287
 msgid "Exit program when download completes"
 msgstr "Изађи из програма након обављеног преузимања"
 
-#: ../raphodo/preferencedialog.py:213
+#: ../raphodo/preferencedialog.py:288
 msgid "Exit program even if download had warnings or errors"
 msgstr "Изађи из програма чак и када постоје грешке у преузимању"
 
-#: ../raphodo/preferencedialog.py:240
+#: ../raphodo/preferencedialog.py:315
 msgid "Thumbnail Generation"
 msgstr "Стварање сличица"
 
-#: ../raphodo/preferencedialog.py:241
+#: ../raphodo/preferencedialog.py:316
 msgid "Generate thumbnails"
 msgstr "Направи сличице"
 
-#: ../raphodo/preferencedialog.py:242
+#: ../raphodo/preferencedialog.py:318
 msgid "Generate thumbnails to show in the main program window"
 msgstr "Направи сличице за приказ у главном прозору програма"
 
-#: ../raphodo/preferencedialog.py:244
+#: ../raphodo/preferencedialog.py:320
 msgid "Cache thumbnails"
 msgstr "Смести сличице у оставу"
 
-#: ../raphodo/preferencedialog.py:245
+#: ../raphodo/preferencedialog.py:323
 msgid ""
 "Save thumbnails shown in the main program window in a thumbnail cache unique "
 "to Rapid Photo Downloader"
@@ -2244,11 +2674,11 @@ msgstr ""
 "Сачувајте сличице приказане у главном прозору програма у остави сличица "
 "јединственој за Брзог преносиоца фотографија"
 
-#: ../raphodo/preferencedialog.py:247
+#: ../raphodo/preferencedialog.py:327
 msgid "Generate system thumbnails"
 msgstr "Направи системске сличице"
 
-#: ../raphodo/preferencedialog.py:248
+#: ../raphodo/preferencedialog.py:330
 msgid ""
 "While downloading, save thumbnails that can be used by desktop file managers "
 "and other programs"
@@ -2256,77 +2686,77 @@ msgstr ""
 "Прилико преузимања, сачувајте сличице које могу користити управници датотека "
 "радне површи и други програми"
 
-#: ../raphodo/preferencedialog.py:255
+#: ../raphodo/preferencedialog.py:339
 msgid "Number of CPU cores used to generate thumbnails."
 msgstr "Број језгара процесора која ће се користити за стварање сличица."
 
-#: ../raphodo/preferencedialog.py:256
+#: ../raphodo/preferencedialog.py:340
 msgid "CPU cores:"
 msgstr "Језгра процесора:"
 
 #. Translators: the * acts as an asterisk to denote a reference to an annotation
 #. such as '* Takes effect upon program restart'
-#: ../raphodo/preferencedialog.py:271 ../raphodo/preferencedialog.py:317
+#: ../raphodo/preferencedialog.py:355 ../raphodo/preferencedialog.py:401
 msgid "*"
 msgstr "*"
 
-#: ../raphodo/preferencedialog.py:294
+#: ../raphodo/preferencedialog.py:378
 msgid "Thumbnail Cache"
 msgstr "Остава сличица"
 
-#: ../raphodo/preferencedialog.py:296
+#: ../raphodo/preferencedialog.py:380
 msgid "Calculating..."
 msgstr "Израчунавам..."
 
-#: ../raphodo/preferencedialog.py:302
+#: ../raphodo/preferencedialog.py:386
 msgid "days"
 msgstr "дана"
 
-#: ../raphodo/preferencedialog.py:303
+#: ../raphodo/preferencedialog.py:387
 msgid "forever"
 msgstr "заувек"
 
-#: ../raphodo/preferencedialog.py:308
+#: ../raphodo/preferencedialog.py:392
 msgid "Cache size:"
 msgstr "Величина оставе:"
 
-#: ../raphodo/preferencedialog.py:310
+#: ../raphodo/preferencedialog.py:394
 msgid "Number of thumbnails:"
 msgstr "Број сличица:"
 
-#: ../raphodo/preferencedialog.py:312
+#: ../raphodo/preferencedialog.py:396
 msgid "Database size:"
 msgstr "Величина базе података:"
 
-#: ../raphodo/preferencedialog.py:314
+#: ../raphodo/preferencedialog.py:398
 msgid "Cache unaccessed thumbnails for:"
 msgstr "Неприступљене сличице оставе за:"
 
-#: ../raphodo/preferencedialog.py:322
+#: ../raphodo/preferencedialog.py:406
 msgid "Purge Cache..."
 msgstr "Очисти оставу..."
 
-#: ../raphodo/preferencedialog.py:323
+#: ../raphodo/preferencedialog.py:408
 msgid "Optimize Cache..."
 msgstr "Оптимизуј оставу..."
 
-#: ../raphodo/preferencedialog.py:336
+#: ../raphodo/preferencedialog.py:421
 msgid "* Takes effect upon program restart"
 msgstr "* Ступа на снагу након пновног покретања програма"
 
-#: ../raphodo/preferencedialog.py:346
+#: ../raphodo/preferencedialog.py:431
 msgid "Skip download"
 msgstr "Прескочи преузимање"
 
-#: ../raphodo/preferencedialog.py:347
+#: ../raphodo/preferencedialog.py:432
 msgid "Don't download the file, and issue an error message"
 msgstr "Не преузима датотеку, и даје поруку грешке"
 
-#: ../raphodo/preferencedialog.py:348
+#: ../raphodo/preferencedialog.py:433
 msgid "Add unique identifier"
 msgstr "Додај јединствену реч"
 
-#: ../raphodo/preferencedialog.py:349
+#: ../raphodo/preferencedialog.py:436
 msgid ""
 "Add an identifier like _1 or _2 to the end of the filename, immediately "
 "before the file's extension"
@@ -2334,23 +2764,23 @@ msgstr ""
 "Додаје одредник као _1 или _2 на крај назива датотеке, одмах пре наставка "
 "датотеке"
 
-#: ../raphodo/preferencedialog.py:355
+#: ../raphodo/preferencedialog.py:444
 msgid "Overwrite"
 msgstr "Препиши"
 
-#: ../raphodo/preferencedialog.py:356
+#: ../raphodo/preferencedialog.py:445
 msgid "Overwrite the previously backed up file"
 msgstr "Преписује претходно направљену резерву датотеке"
 
-#: ../raphodo/preferencedialog.py:357
+#: ../raphodo/preferencedialog.py:446
 msgid "Skip"
 msgstr "Прескочи"
 
-#: ../raphodo/preferencedialog.py:358
+#: ../raphodo/preferencedialog.py:448
 msgid "Don't overwrite the backup file, and issue an error message"
 msgstr "Не преписује датотеку резерве, и даје поруку грешке"
 
-#: ../raphodo/preferencedialog.py:364
+#: ../raphodo/preferencedialog.py:455
 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 identifier:"
@@ -2358,7 +2788,17 @@ msgstr ""
 "Када је већ преузета фотографија или снимак са истим називом, изаберите или "
 "да је прескочите или да јој додате јединствену ознаку:"
 
-#: ../raphodo/preferencedialog.py:378
+#: ../raphodo/preferencedialog.py:464
+msgid ""
+"Using sequence numbers to automatically generate unique filenames is "
+"strongly recommended. Configure file renaming in the Rename panel in the "
+"main window."
+msgstr ""
+"Коришћење бројева у низу за аутоматско стварање јединствених назива датотека "
+"се строго препоручује. Подесите преименовање датотека у панелу преименовања "
+"у главном прозору."
+
+#: ../raphodo/preferencedialog.py:473
 msgid ""
 "When backing up, choose whether to overwrite a file on the backup device "
 "that has the same name, or skip backing it up:"
@@ -2366,38 +2806,39 @@ msgstr ""
 "Приликом прављења резерве, изаберите да ли ће датотека на уређају резерве са "
 "истим називом бити преписана или ће бити прескочена:"
 
-#: ../raphodo/preferencedialog.py:398
+#: ../raphodo/preferencedialog.py:494
 msgid "Program Warnings"
 msgstr "Упозорења програма"
 
-#: ../raphodo/preferencedialog.py:399
+#: ../raphodo/preferencedialog.py:495
 msgid "Show a warning when:"
 msgstr "Покажи упозорење када:"
 
-#: ../raphodo/preferencedialog.py:402
+#: ../raphodo/preferencedialog.py:498
 msgid "Downloading files currently not displayed"
 msgstr "Датотеке преузимања тренутно нису приказане"
 
-#: ../raphodo/preferencedialog.py:403
+#: ../raphodo/preferencedialog.py:499
 msgid ""
 "Warn when about to download files that are not displayed in the main window."
 msgstr ""
 "Упозорава приликом преузимања датотека које нису приказане у главном прозору."
 
-#: ../raphodo/preferencedialog.py:405
+#: ../raphodo/preferencedialog.py:501
 msgid "Backup destinations are missing"
 msgstr "Недостају одредишта резерве"
 
-#: ../raphodo/preferencedialog.py:406
-msgid "Warn before starting a download if it is not possible to back up files."
+#: ../raphodo/preferencedialog.py:502
+msgid ""
+"Warn before starting a download if it is not possible to back up files."
 msgstr ""
 "Упозорава пре почетка преузимања ако није могуће направити резерву датотека."
 
-#: ../raphodo/preferencedialog.py:408
+#: ../raphodo/preferencedialog.py:504
 msgid "Program libraries are missing or broken"
 msgstr "Недостају или су оштећене библиотеке програма"
 
-#: ../raphodo/preferencedialog.py:409
+#: ../raphodo/preferencedialog.py:505
 msgid ""
 "Warn if a software library used by Rapid Photo Downloader is missing or not "
 "functioning."
@@ -2405,11 +2846,11 @@ msgstr ""
 "Упозорава ако софтверске библиотеке које користи Брзи преносилац фотографија "
 "недостају или не функционишу."
 
-#: ../raphodo/preferencedialog.py:412
+#: ../raphodo/preferencedialog.py:508
 msgid "Filesystem metadata cannot be set"
 msgstr "Мета подаци система датотека не могу бити подешени"
 
-#: ../raphodo/preferencedialog.py:413
+#: ../raphodo/preferencedialog.py:509
 msgid ""
 "Warn if there is an error setting a file's filesystem metadata, such as its "
 "modification time."
@@ -2417,11 +2858,11 @@ msgstr ""
 "Упозорава ако постоји грешка подешавања метаподатака система датотека, као "
 "што је њено време измене."
 
-#: ../raphodo/preferencedialog.py:416
+#: ../raphodo/preferencedialog.py:512
 msgid "Encountering unhandled files"
 msgstr "Наиђе на необрадиве датотеке"
 
-#: ../raphodo/preferencedialog.py:417
+#: ../raphodo/preferencedialog.py:513
 msgid ""
 "Warn after scanning a device or this computer if there are unrecognized "
 "files that will not be included in the download."
@@ -2429,11 +2870,11 @@ msgstr ""
 "Упозорава након прегледања уређаја или овог рачунара ако постоје "
 "непрепознате датотеке које неће бити укључене у преузимање."
 
-#: ../raphodo/preferencedialog.py:420
+#: ../raphodo/preferencedialog.py:517
 msgid "Do not warn about unhandled files with extensions:"
 msgstr "Не упозоравај о необрађеним датотекама са наставцима:"
 
-#: ../raphodo/preferencedialog.py:424
+#: ../raphodo/preferencedialog.py:522
 msgid ""
 "File extensions are case insensitive and do not need to include the leading "
 "dot."
@@ -2441,18 +2882,18 @@ msgstr ""
 "Наставци датотека не разликују величину слова и не морају да укључе водећу "
 "тачку."
 
-#: ../raphodo/preferencedialog.py:427
+#: ../raphodo/preferencedialog.py:525
 msgid "Add"
 msgstr "Додај"
 
-#: ../raphodo/preferencedialog.py:428
+#: ../raphodo/preferencedialog.py:526
 msgid ""
 "Add a file extension to the list of unhandled file types to not warn about."
 msgstr ""
 "Додајте наставак датотеке на списак необрађених врста датотека о којима неће "
 "упозоравати."
 
-#: ../raphodo/preferencedialog.py:430
+#: ../raphodo/preferencedialog.py:528
 msgid ""
 "Remove a file extension from the list of unhandled file types to not warn "
 "about."
@@ -2460,31 +2901,152 @@ msgstr ""
 "Уклоните наставак датотеке са списка необрађених врста датотека о којима "
 "неће упозоравати."
 
-#: ../raphodo/preferencedialog.py:434
+#: ../raphodo/preferencedialog.py:532
 msgid ""
 "Clear the list of file extensions of unhandled file types to not warn about."
 msgstr ""
 "Очистите списак наставака датотека необрађених врста датотека о којима неће "
 "упозоравати."
 
-#: ../raphodo/preferencedialog.py:469
+#: ../raphodo/preferencedialog.py:568
+msgid "Photo and Video Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:571
+msgid "Consolidate files across devices and downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:574
+msgid ""
+"Analyze the results of device scans looking for duplicate files and matching "
+"RAW and JPEG pairs,\n"
+"comparing them across multiple devices and download sessions."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:580
+msgid "Treat matching RAW and JPEG files as:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:581
+msgid "One photo"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:582
+msgid "Two photos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:584
+msgid ""
+"Display matching pairs of RAW and JPEG photos as one photo, and if marked, "
+"download both."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:589
+msgid ""
+"Display matching pairs of RAW and JPEG photos as two different photos. You "
+"can still synchronize their sequence numbers."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:598
+msgid "With matching RAW and JPEG photos:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:600
+msgid "Do not mark JPEG for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:601
+msgid "Do not mark RAW for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:602
+msgid "Mark both for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:609
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"JPEG for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+"Када су пронађене сирове и ЈПЕГ фотографије, неће сам означавати ЈПЕГ за\n"
+"преузимање. То ћете моћи још увек сами да урадите."
+
+#: ../raphodo/preferencedialog.py:614
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"RAW for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+"Када су пронађене сирове и ЈПЕГ фотографије, неће сам означавати сирове "
+"слике за\n"
+"преузимање. То ћете моћи још увек сами да урадите."
+
+#: ../raphodo/preferencedialog.py:619
+msgid ""
+"When matching RAW and JPEG photos are found, automatically mark both for "
+"download."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:625
+msgid ""
+"If you disable file consolidation, choose what to do when a download device "
+"is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:631
+msgid ""
+"When a download device is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:642
+msgid "Clear completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:643
+msgid "Keep displaying completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:644
+msgid "Prompt for what to do"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:649
+msgid ""
+"Automatically clear the display of completed downloads whenever a new "
+"download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:654
+msgid ""
+"Keep displaying completed downloads whenever a new download device is "
+"inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:658
+msgid ""
+"Prompt whether to keep displaying completed downloads or clear them whenever "
+"a new download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:702
 msgid "Version Check"
 msgstr "Провера издања"
 
-#: ../raphodo/preferencedialog.py:470
+#: ../raphodo/preferencedialog.py:703
 msgid "Check for new version at startup"
 msgstr "Провери има ли новог издања при покретању"
 
-#: ../raphodo/preferencedialog.py:471
+#: ../raphodo/preferencedialog.py:705
 msgid "Check for a new version of the program each time the program starts."
 msgstr ""
 "Проверите има ли новог издања програма приликом сваког покретања програма."
 
-#: ../raphodo/preferencedialog.py:473
+#: ../raphodo/preferencedialog.py:707
 msgid "Include development releases"
 msgstr "Укључи развојна издања"
 
-#: ../raphodo/preferencedialog.py:474
+#: ../raphodo/preferencedialog.py:709
 msgid ""
 "Include alpha, beta and other development releases when checking for a new "
 "version of the program.\n"
@@ -2497,11 +3059,11 @@ msgstr ""
 "\n"
 "Ако тренутно користите развојно издање, провера ће се увек вршити."
 
-#: ../raphodo/preferencedialog.py:489
+#: ../raphodo/preferencedialog.py:725
 msgid "Ignore DNG date/time metadata on MTP devices"
 msgstr "Занемари ДНГ мета податке датума/времена на МТП уређајима"
 
-#: ../raphodo/preferencedialog.py:490
+#: ../raphodo/preferencedialog.py:727
 msgid ""
 "Ignore date/time metadata in DNG files located on MTP devices, and use the "
 "file's modification time instead.\n"
@@ -2515,15 +3077,19 @@ msgstr ""
 "Корисно за уређаје као што су телефони и таблични уређаји који праве "
 "неисправне ДНГ мета податке."
 
+#: ../raphodo/preferencedialog.py:741
+msgid "Completed Downloads"
+msgstr ""
+
 #. Translators: substituted value is a description for the set of preferences
 #. shown in the preference dialog window, e.g. Devices, Automation, etc.
 #. This string is shown in a tooltip for the "Restore Defaults" button
-#: ../raphodo/preferencedialog.py:710
+#: ../raphodo/preferencedialog.py:1067
 #, python-format
 msgid "Restores default %s preference values"
 msgstr "Враћа подразумеване вредности „%s“ поставке"
 
-#: ../raphodo/preferencedialog.py:832
+#: ../raphodo/preferencedialog.py:1208
 msgid ""
 "Do you want to purge the thumbnail cache? The cache will be purged when the "
 "program is next started."
@@ -2531,11 +3097,11 @@ msgstr ""
 "Да ли желите да очистите оставу сличица? Остава ће бити очишћена приликом "
 "следећег покретања програма."
 
-#: ../raphodo/preferencedialog.py:835
+#: ../raphodo/preferencedialog.py:1212
 msgid "Purge Thumbnail Cache"
 msgstr "Очисти оставу сличица"
 
-#: ../raphodo/preferencedialog.py:847
+#: ../raphodo/preferencedialog.py:1225
 msgid ""
 "Do you want to optimize the thumbnail cache? The cache will be optimized "
 "when the program is next started."
@@ -2543,40 +3109,52 @@ msgstr ""
 "Да ли желите да оптимизујете оставу сличица? Остава ће бити оптимизована "
 "приликом следећег покретања програма."
 
-#: ../raphodo/preferencedialog.py:850
+#: ../raphodo/preferencedialog.py:1229
 msgid "Optimize Thumbnail Cache"
 msgstr "Оптимизуј оставу сличица"
 
-#: ../raphodo/preferencedialog.py:1045
+#: ../raphodo/preferencedialog.py:1481
+msgid "Enter a Folder to Scan"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1482
+msgid "Specify a folder that will be scanned for photos and videos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1483
+msgid "Folder:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1497
 msgid "Enter a Path to Ignore"
 msgstr "Унесите путање за занемаривање"
 
-#: ../raphodo/preferencedialog.py:1046
+#: ../raphodo/preferencedialog.py:1498
 msgid "Specify a path that will never be scanned for photos or videos"
 msgstr ""
 "Одредите путању која никада неће бити прегледана за фотографијама и снимцима"
 
-#: ../raphodo/preferencedialog.py:1047
+#: ../raphodo/preferencedialog.py:1499
 msgid "Path:"
 msgstr "Путања:"
 
-#: ../raphodo/preferencedialog.py:1061
+#: ../raphodo/preferencedialog.py:1513
 msgid "Enter a File Extension"
 msgstr "Унесите наставак датотеке"
 
-#: ../raphodo/preferencedialog.py:1062
+#: ../raphodo/preferencedialog.py:1514
 msgid "Specify a file extension (without the leading dot)"
 msgstr "Наведите наставак датотеке (без водеће тачке)"
 
-#: ../raphodo/preferencedialog.py:1063 ../raphodo/renamepanel.py:122
+#: ../raphodo/preferencedialog.py:1515 ../raphodo/renamepanel.py:122
 msgid "Extension:"
 msgstr "Наставак:"
 
-#: ../raphodo/preferencedialog.py:1078
+#: ../raphodo/preferencedialog.py:1530
 msgid "Invalid File Extension"
 msgstr "Неисправан наставак датотеке"
 
-#: ../raphodo/preferencedialog.py:1079
+#: ../raphodo/preferencedialog.py:1531
 #, python-format
 msgid ""
 "The file extension <b>%s</b> is recognized by Rapid Photo Downloader, so it "
@@ -2585,7 +3163,7 @@ msgstr ""
 "Наставак датотеке <b>%s</b> препознаје Брзи преносилац фотографија, тако да "
 "упозоравање на присутност нема смисла."
 
-#: ../raphodo/preferencedialog.py:1081
+#: ../raphodo/preferencedialog.py:1533
 #, python-format
 msgid ""
 "Recognized file types:\n"
@@ -2624,42 +3202,42 @@ msgstr "Венчање"
 msgid "Birthday"
 msgstr "Рођендан"
 
-#: ../raphodo/preferences.py:614
+#: ../raphodo/preferences.py:624
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Поставке садржане фасцикле не треба да почињу на „%s“"
 
-#: ../raphodo/preferences.py:617
+#: ../raphodo/preferences.py:627
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Поставке садржане фасцикле не треба да се завршавају на „%s“"
 
-#: ../raphodo/preferences.py:622
+#: ../raphodo/preferences.py:632
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
-msgstr "Поставке садржане фасцикле не треба да садрже два „%s“ један за другим"
+msgstr ""
+"Поставке садржане фасцикле не треба да садрже два „%s“ један за другим"
 
-#. self.setFlat(True)
 #: ../raphodo/primarybutton.py:72
 msgid "Download 8 Photos and 10 Videos"
 msgstr "Преузех 8 фотографија и 10 снимака"
 
-#: ../raphodo/problemnotification.py:86 ../raphodo/problemnotification.py:208
+#: ../raphodo/problemnotification.py:87 ../raphodo/problemnotification.py:209
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr "Грешка: %(errno)s %(strerror)s"
 
-#: ../raphodo/problemnotification.py:89
+#: ../raphodo/problemnotification.py:90
 #, python-format
 msgid "Error: %s"
 msgstr "Грешка: %s"
 
-#: ../raphodo/problemnotification.py:116
+#: ../raphodo/problemnotification.py:117
 #, python-format
 msgid "GPhoto2 Error: %s"
 msgstr "Грешка Г-фотоа 2: %s"
 
-#: ../raphodo/problemnotification.py:124
+#: ../raphodo/problemnotification.py:125
 msgid ""
 "Unable to initialize the camera, probably because another program is using "
 "it. No files were copied from it."
@@ -2667,64 +3245,64 @@ msgstr ""
 "Не могу да покренем фото-апарат, вероватно зато што га користи други "
 "програм. Датотеке нису умножене с њега."
 
-#: ../raphodo/problemnotification.py:134
+#: ../raphodo/problemnotification.py:135
 #, python-format
 msgid "Unable to read directory %s"
 msgstr "Не могу да прочитам директоријум „%s“"
 
-#: ../raphodo/problemnotification.py:140
+#: ../raphodo/problemnotification.py:141
 #, python-format
 msgid "Unable to access modification time or size from %s"
 msgstr "Не могу да приступим времену измене или величини из „%s“"
 
-#: ../raphodo/problemnotification.py:146
+#: ../raphodo/problemnotification.py:147
 #, python-format
 msgid "Unable to read file %s"
 msgstr "Не могу да прочитам датотеку „%s“"
 
-#: ../raphodo/problemnotification.py:152
+#: ../raphodo/problemnotification.py:153
 #, python-format
 msgid "Unable to write file %s"
 msgstr "Не могу да запишем датотеку „%s“"
 
-#: ../raphodo/problemnotification.py:158
+#: ../raphodo/problemnotification.py:159
 #, python-format
 msgid "Unable to move file %s"
 msgstr "Не могу да преместим датотеку „%s“"
 
-#: ../raphodo/problemnotification.py:164
+#: ../raphodo/problemnotification.py:165
 #, python-format
 msgid "Unable to remove file %s"
 msgstr "Не могу да уклоним датотеку „%s“"
 
-#: ../raphodo/problemnotification.py:170
+#: ../raphodo/problemnotification.py:171
 #, python-format
 msgid "Unable to copy file %s"
 msgstr "Не могу да умножим датотеку „%s“"
 
-#: ../raphodo/problemnotification.py:176
+#: ../raphodo/problemnotification.py:177
 #, python-format
 msgid "Zero length file %s will not be downloaded"
 msgstr "Датотека нулте дужине „%s“ неће бити преузета"
 
-#: ../raphodo/problemnotification.py:182
+#: ../raphodo/problemnotification.py:183
 #, python-format
 msgid "Could not determine filesystem modification time for %s"
 msgstr "Не могу да одредим време измене система датотека за „%s“"
 
-#: ../raphodo/problemnotification.py:188
+#: ../raphodo/problemnotification.py:189
 #, python-format
 msgid "Unable to load metadata from %s"
 msgstr "Не могу да учитам мета податке из „%s“"
 
-#: ../raphodo/problemnotification.py:194
+#: ../raphodo/problemnotification.py:195
 #, python-format
 msgid ""
 "Unable to load metadata from %(name)s. The %(filetype)s was not downloaded."
 msgstr ""
 "Не могу да учитам мета податке из „%(name)s“. „%(filetype)s“ није преузет."
 
-#: ../raphodo/problemnotification.py:202
+#: ../raphodo/problemnotification.py:203
 #, python-format
 msgid ""
 "An error occurred setting a file's filesystem metadata on the filesystem %s. "
@@ -2735,17 +3313,17 @@ msgstr ""
 "систему датотека „%s“. Ако поново дође до ове грешке на истом систему "
 "датотека, неће бити поново пријављена."
 
-#: ../raphodo/problemnotification.py:216
+#: ../raphodo/problemnotification.py:217
 #, python-format
 msgid "Encountered unhandled file %s. It will not be downloaded."
 msgstr "Наиђох на необрађену датотеку „%s“. Неће бити преузета."
 
-#: ../raphodo/problemnotification.py:223
+#: ../raphodo/problemnotification.py:224
 #, python-format
 msgid "%(filetype)s %(destination)s already exists."
 msgstr "„%(filetype)s %(destination)s“ већ постоји."
 
-#: ../raphodo/problemnotification.py:234 ../raphodo/problemnotification.py:262
+#: ../raphodo/problemnotification.py:235 ../raphodo/problemnotification.py:263
 #, python-format
 msgid ""
 "The existing %(filetype)s %(destination)s was last modified on %(date)s at "
@@ -2754,22 +3332,22 @@ msgstr ""
 "Постојећа „%(filetype)s“ „%(destination)s“ је последњи пут измењена %(date)s "
 "у %(time)s."
 
-#: ../raphodo/problemnotification.py:245
+#: ../raphodo/problemnotification.py:246
 #, python-format
 msgid "The %(filetype)s %(source)s was not downloaded from %(device)s."
 msgstr "„%(filetype)s“ „%(source)s“ није преузета са „%(device)s“."
 
-#: ../raphodo/problemnotification.py:273
+#: ../raphodo/problemnotification.py:274
 #, python-format
 msgid "The %(filetype)s %(source)s was downloaded from %(device)s."
 msgstr "„%(filetype)s“ „%(source)s“ је преузета са „%(device)s“."
 
-#: ../raphodo/problemnotification.py:282
+#: ../raphodo/problemnotification.py:283
 #, python-format
 msgid "The unique identifier '%s' was added to the filename."
 msgstr "Јединствен одредник „%s“ је додат на назив датотеке."
 
-#: ../raphodo/problemnotification.py:298
+#: ../raphodo/problemnotification.py:299
 #, python-format
 msgid ""
 "The existing backup %(filetype)s %(destination)s was last modified on "
@@ -2778,13 +3356,13 @@ msgstr ""
 "Постојећа резерва „%(filetype)s“ „%(destination)s“ је последњи пут измењена "
 "%(date)s у %(time)s."
 
-#: ../raphodo/problemnotification.py:309
+#: ../raphodo/problemnotification.py:310
 #, python-format
 msgid "The %(filetype)s %(source)s was not backed up from %(device)s."
 msgstr ""
 "За „%(filetype)s“ „%(source)s“ није направљена резерва са „%(device)s“."
 
-#: ../raphodo/problemnotification.py:326
+#: ../raphodo/problemnotification.py:327
 #, python-format
 msgid ""
 "The previous backup %(filetype)s %(destination)s was last modified on "
@@ -2793,7 +3371,7 @@ msgstr ""
 "Претходна резерва „%(filetype)s“ „%(destination)s“ је последњи пут измењена "
 "%(date)s у %(time)s."
 
-#: ../raphodo/problemnotification.py:337
+#: ../raphodo/problemnotification.py:338
 #, python-format
 msgid ""
 "The %(filetype)s %(source)s from %(device)s was backed up, overwriting the "
@@ -2802,7 +3380,7 @@ msgstr ""
 "Направљена је резерва за „%(filetype)s“ „%(source)s“ са „%(device)s“, "
 "преписујем претходну резерву „%(filetype)s“."
 
-#: ../raphodo/problemnotification.py:356
+#: ../raphodo/problemnotification.py:357
 #, python-format
 msgid ""
 "When synchronizing RAW + JPEG sequence values, a duplicate %(filetype)s "
@@ -2811,7 +3389,7 @@ msgstr ""
 "Приликом усклађивања вредности низа сирове + ЈПЕГ, наиђох на удвостручену "
 "„%(filetype)s“ „%(file)s“, и није преузета."
 
-#: ../raphodo/problemnotification.py:366
+#: ../raphodo/problemnotification.py:367
 msgid ""
 "When synchronizing RAW + JPEG sequence values, photos were detected with the "
 "same filenames, but taken at different times:"
@@ -2819,7 +3397,7 @@ msgstr ""
 "Приликом усклађивања вредности низа сирове + ЈПЕГ, откривене су фотографије "
 "са истим називима датотека, али снимљене у различим тренуцима:"
 
-#: ../raphodo/problemnotification.py:373
+#: ../raphodo/problemnotification.py:374
 #, python-format
 msgid ""
 "%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
@@ -2828,36 +3406,36 @@ msgstr ""
 "„%(image1)s“ је сликана %(image1_date)s у %(image1_time)s, а „%(image2)s“ "
 "%(image2_date)s у %(image2_time)s."
 
-#: ../raphodo/problemnotification.py:389
+#: ../raphodo/problemnotification.py:390
 #, python-format
 msgid "Unable to finalize the filename for %s"
 msgstr "Не могу да завршим назив датотеке за „%s“"
 
-#: ../raphodo/problemnotification.py:424
+#: ../raphodo/problemnotification.py:425
 #, python-format
 msgid ""
 "The filename %(destination)s was not fully generated for %(filetype)s "
 "%(source)s."
 msgstr ""
-"Назив датотеке „%(destination)s“ није потпуно направљен за "
-"„%(filetype)s“ „%(source)s“."
+"Назив датотеке „%(destination)s“ није потпуно направљен за „%(filetype)s“ "
+"„%(source)s“."
 
-#: ../raphodo/problemnotification.py:433
+#: ../raphodo/problemnotification.py:434
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr "Недостају „%(type)s“ метаподаци."
 
-#: ../raphodo/problemnotification.py:439
+#: ../raphodo/problemnotification.py:440
 #, python-format
 msgid "The following metadata is missing: %s."
 msgstr "Следећи метаподаци недостају: %s."
 
-#: ../raphodo/problemnotification.py:445
+#: ../raphodo/problemnotification.py:446
 #, python-format
 msgid "Date/time conversion failed: %s."
 msgstr "Претварање датума/времена није успело: %s."
 
-#: ../raphodo/problemnotification.py:451
+#: ../raphodo/problemnotification.py:452
 msgid ""
 "Could not extract valid date/time metadata or determine the file "
 "modification time."
@@ -2865,20 +3443,20 @@ msgstr ""
 "Не могу да извучем исправне мета податке датума/времена или да одредим време "
 "измене датотеке."
 
-#: ../raphodo/problemnotification.py:457
+#: ../raphodo/problemnotification.py:458
 msgid "Filename does not have an extension."
 msgstr "Назив датотеке не садржи проширење."
 
-#: ../raphodo/problemnotification.py:460
+#: ../raphodo/problemnotification.py:461
 msgid "Filename does not have a number component."
 msgstr "Назив датотеке нема бројевни састојак."
 
-#: ../raphodo/problemnotification.py:464
+#: ../raphodo/problemnotification.py:465
 #, python-format
 msgid "Error generating component %(component)s. Error: %(error)s"
 msgstr "Грешка стварања састојка „%(component)s“. Грешка: %(error)s"
 
-#: ../raphodo/problemnotification.py:477
+#: ../raphodo/problemnotification.py:478
 #, python-format
 msgid ""
 "The download subfolders %(folder)s were only partially generated for "
@@ -2887,7 +3465,7 @@ msgstr ""
 "Подфасцикле преузимања „%(folder)s“ су само делимично направљене за "
 "„%(filetype)s“ „%(source)s“."
 
-#: ../raphodo/problemnotification.py:486
+#: ../raphodo/problemnotification.py:487
 #, python-format
 msgid ""
 "There is no data with which to generate the %(subfolder_file)s for "
@@ -2896,7 +3474,7 @@ msgstr ""
 "Не постоје подаци са којима ће се направити „%(subfolder_file)s“ за "
 "„%(filename)s“. „%(filetype)s“ није преузета."
 
-#: ../raphodo/problemnotification.py:499
+#: ../raphodo/problemnotification.py:500
 #, python-format
 msgid ""
 "Unable to create the %(filetype)s %(destination)s in %(folder)s. The "
@@ -2905,67 +3483,67 @@ msgstr ""
 "Не могу да направим „%(filetype)s“ „%(destination)s“ у „%(folder)s“. "
 "Датотека преузимања беше „%(source)s“ у „%(device)s“. Није преузета."
 
-#: ../raphodo/problemnotification.py:514
+#: ../raphodo/problemnotification.py:515
 #, python-format
 msgid "Unable to create the download subfolder %s."
 msgstr "Не могу да направим подфасциклу преузимања „%s“."
 
-#: ../raphodo/problemnotification.py:526
+#: ../raphodo/problemnotification.py:527
 #, python-format
 msgid "Unable to create the backup subfolder %s."
 msgstr "Не могу да направим подфасциклу резерве „%s“."
 
-#: ../raphodo/problemnotification.py:577
+#: ../raphodo/problemnotification.py:578
 #, python-format
 msgid "Problems scanning %s"
 msgstr "Проблеми прегледања „%s“"
 
-#: ../raphodo/problemnotification.py:584
+#: ../raphodo/problemnotification.py:585
 #, python-format
 msgid "Problems copying from %s"
 msgstr "Проблеми умножавања из „%s“"
 
-#: ../raphodo/problemnotification.py:591
+#: ../raphodo/problemnotification.py:592
 msgid "Problems while finalizing filenames and generating subfolders"
 msgstr "Проблеми приликом довршавања назива датотека и стварања подфасцикли"
 
-#: ../raphodo/problemnotification.py:598
+#: ../raphodo/problemnotification.py:599
 #, python-format
 msgid "Problems backing up to %s"
 msgstr "Проблеми прављења резерве у „%s“"
 
-#. Translators: for example Nov 3 or Dec 31
+#. Translators: for example Nov 3 2015, 11:25 AM
+#. Translators: for example, Nov 3, 12:15 PM
+#: ../raphodo/proximity.py:188 ../raphodo/proximity.py:213
+#: ../raphodo/proximity.py:236 ../raphodo/proximity.py:239
+#, python-format
+msgid "%(date)s, %(time)s"
+msgstr "%(date)s, %(time)s"
+
+#: ../raphodo/proximity.py:204
+#, python-format
+msgid "%(starttime)s - %(endtime)s"
+msgstr "%(starttime)s — %(endtime)s"
+
 #. The start and end dates are on a different day
 #. Translators: for example Nov 3 or Dec 31
-#: ../raphodo/proximity.py:105 ../raphodo/proximity.py:221
-#: ../raphodo/proximity.py:224 ../raphodo/proximity.py:828
+#: ../raphodo/proximity.py:221 ../raphodo/proximity.py:225
+#: ../raphodo/proximity.py:980 ../raphodo/timeutils.py:105
 #, python-format
 msgid "%(month)s %(numeric_day)s"
 msgstr "%(numeric_day)s. %(month)s"
 
-#. Translators: for example Nov 15 2015
 #. Translators: for example Nov 3 2015
-#: ../raphodo/proximity.py:109 ../raphodo/proximity.py:230
-#: ../raphodo/proximity.py:231 ../raphodo/proximity.py:831
+#. Translators: for example Nov 2 2015
+#. Translators: for example Nov 15 2015
+#: ../raphodo/proximity.py:232 ../raphodo/proximity.py:233
+#: ../raphodo/proximity.py:985 ../raphodo/timeutils.py:110
 #, python-format
 msgid "%(date)s %(year)s"
 msgstr "%(date)s %(year)s."
 
-#. Translators: for example Nov 3 2015, 11:25 AM
-#. Translators: for example, Nov 3, 12:15 PM
-#: ../raphodo/proximity.py:197 ../raphodo/proximity.py:215
-#: ../raphodo/proximity.py:234 ../raphodo/proximity.py:236
-#, python-format
-msgid "%(date)s, %(time)s"
-msgstr "%(date)s, %(time)s"
-
-#: ../raphodo/proximity.py:209
-#, python-format
-msgid "%(starttime)s - %(endtime)s"
-msgstr "%(starttime)s — %(endtime)s"
-
 #. Translators: for example, Nov 3, 12:15 PM - Nov 4, 1:00 AM
-#: ../raphodo/proximity.py:241
+#: ../raphodo/proximity.py:245
 #, python-format
 msgid "%(earlier_time)s - %(later_time)s"
 msgstr "%(earlier_time)s — %(later_time)s"
@@ -2974,7 +3552,7 @@ msgstr "%(earlier_time)s — %(later_time)s"
 #. Nov 3 2012, 12:15 PM -
 #. Nov 4 2012, 1:00 AM
 #. (please keep the line break signified by \n)
-#: ../raphodo/proximity.py:248
+#: ../raphodo/proximity.py:253
 #, python-format
 msgid ""
 "%(earlier_time)s -\n"
@@ -2983,18 +3561,18 @@ msgstr ""
 "%(earlier_time)s —\n"
 "%(later_time)s"
 
-#: ../raphodo/proximity.py:359
+#: ../raphodo/proximity.py:382
 #, python-format
 msgid "%(month)s  %(year)s"
 msgstr "%(month)s  %(year)s"
 
 #. Translators: for example Nov 2015
-#: ../raphodo/proximity.py:833
+#: ../raphodo/proximity.py:987
 #, python-format
 msgid "%(month)s %(year)s"
 msgstr "%(month)s %(year)s"
 
-#: ../raphodo/proximity.py:1344
+#: ../raphodo/proximity.py:1595
 msgid ""
 "The time elapsed between consecutive photos and videos that is used to build "
 "the Timeline"
@@ -3006,26 +3584,26 @@ msgstr ""
 #. Replace the very last character (after the d) with the correct
 #. localized value, keeping everything else. In other words, change
 #. only the m character.
-#: ../raphodo/proximity.py:1406
+#: ../raphodo/proximity.py:1652
 #, python-format
 msgid "%(minutes)dm"
 msgstr "%(minutes)dm"
 
 #. Translators: i.e. "1.5h", which is short for 1.5 hours.
 #. Replace the entire string with the correct localized value
-#: ../raphodo/proximity.py:1410
+#: ../raphodo/proximity.py:1656
 msgid "1.5h"
 msgstr "1.5h"
 
 #. Translators: e.g. "5h", which is short for 5 hours.
 #. Replace the very last character (after the d) with the correct localized value,
 #. keeping everything else. In other words, change only the h character.
-#: ../raphodo/proximity.py:1415
+#: ../raphodo/proximity.py:1661
 #, python-format
 msgid "%(hours)dh"
 msgstr "%(hours)dh"
 
-#: ../raphodo/proximity.py:1461
+#: ../raphodo/proximity.py:1710
 msgid ""
 "The Timeline groups photos and videos based on how much time elapsed between "
 "consecutive shots. Use it to identify photos and videos taken at different "
@@ -3036,7 +3614,7 @@ msgstr ""
 "фотографије и снимке снимљене у различитим периодима у једном дану или у "
 "току узастопних дана."
 
-#: ../raphodo/proximity.py:1464
+#: ../raphodo/proximity.py:1715
 msgid ""
 "Use the slider (below) to adjust the time elapsed between consecutive shots "
 "that is used to build the Timeline."
@@ -3044,15 +3622,15 @@ msgstr ""
 "Користите клизач (испод) да дотерате време протекло између узастопних "
 "снимака које је коришћено за изградњу временске линије."
 
-#: ../raphodo/proximity.py:1466
+#: ../raphodo/proximity.py:1718
 msgid "Timeline build pending..."
 msgstr "Изградња временске линије на чекању..."
 
-#: ../raphodo/proximity.py:1467
+#: ../raphodo/proximity.py:1719
 msgid "Timeline is building..."
 msgstr "Временска линија се изграђује..."
 
-#: ../raphodo/proximity.py:1468
+#: ../raphodo/proximity.py:1721
 msgid ""
 "The Timeline needs to be rebuilt because the file modification time does not "
 "match the time a shot was taken for one or more shots.<br><br>The Timeline "
@@ -3072,16 +3650,16 @@ msgstr ""
 "за када је обављено снимање. Време снимања је потврђено приликом стварања "
 "сличица или преузимања, а то је време читања метаподатака."
 
-#: ../raphodo/rapid.py:485 ../raphodo/rapid.py:2461 ../raphodo/rapid.py:3728
-#: ../raphodo/rapid.py:3846 ../raphodo/rapid.py:3850 ../raphodo/rapid.py:3870
-#: ../raphodo/rapid.py:3874 ../raphodo/rapid.py:3998 ../raphodo/rapid.py:4007
-#: ../raphodo/rapid.py:4495 ../raphodo/rapid.py:4888 ../raphodo/rapid.py:5722
-#: ../raphodo/rememberthisdialog.py:97
+#: ../raphodo/rapid.py:493 ../raphodo/rapid.py:2555 ../raphodo/rapid.py:3934
+#: ../raphodo/rapid.py:4065 ../raphodo/rapid.py:4069 ../raphodo/rapid.py:4092
+#: ../raphodo/rapid.py:4096 ../raphodo/rapid.py:4226 ../raphodo/rapid.py:4237
+#: ../raphodo/rapid.py:4743 ../raphodo/rapid.py:5195 ../raphodo/rapid.py:5997
+#: ../raphodo/rememberthisdialog.py:99
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:3
 msgid "Rapid Photo Downloader"
 msgstr "Брзи преносилац фотографија"
 
-#: ../raphodo/rapid.py:1100
+#: ../raphodo/rapid.py:1131
 msgid ""
 "<b>ExifTool has a problem</b><br><br> Rapid Photo Downloader uses ExifTool "
 "to get metadata from videos and photos. The program will run without it, but "
@@ -3091,11 +3669,11 @@ msgstr ""
 "„ExifTool“ да добави мета податке из снимака и фотографија. Програм ће "
 "радити без њега, али се његова инсталација <b>веома</b> препоручује."
 
-#: ../raphodo/rapid.py:1110 ../raphodo/rapid.py:1130
+#: ../raphodo/rapid.py:1141 ../raphodo/rapid.py:1161
 msgid "Problem with libmediainfo"
 msgstr "Проблем са библиотеком „libmediainfo“"
 
-#: ../raphodo/rapid.py:1119
+#: ../raphodo/rapid.py:1150
 msgid ""
 "<b>The library libmediainfo appears to be missing</b><br><br> Rapid Photo "
 "Downloader uses libmediainfo to get the date and time a video was shot. The "
@@ -3105,17 +3683,17 @@ msgstr ""
 "преносилац фотографија користи „libmediainfo“ да добави датум и време "
 "снимања снимка. Програм ће радити без ње, али се инсталација препоручује."
 
-#: ../raphodo/rapid.py:1417
+#: ../raphodo/rapid.py:1448
 msgid "Download failed"
 msgstr "Преузимање није успело"
 
-#: ../raphodo/rapid.py:1419
+#: ../raphodo/rapid.py:1450
 msgid ""
 "Sorry, the download of the new version of Rapid Photo Downloader failed."
 msgstr ""
 "Извините, преузимање новог издања Брзог преносиоца фотографија није успело"
 
-#: ../raphodo/rapid.py:1425
+#: ../raphodo/rapid.py:1457
 msgid ""
 "The new version was successfully downloaded. Do you want to close Rapid "
 "Photo Downloader and install it now?"
@@ -3123,19 +3701,19 @@ msgstr ""
 "Ново издање је успешно преузето. Да ли желите да затворите програм и да га "
 "инсталирате?"
 
-#: ../raphodo/rapid.py:1428
+#: ../raphodo/rapid.py:1461
 msgid "Update Rapid Photo Downloader"
 msgstr "Освежите Брзог преносиоца фотографија"
 
-#: ../raphodo/rapid.py:1432
+#: ../raphodo/rapid.py:1465
 msgid "Install"
 msgstr "Инсталирај"
 
-#: ../raphodo/rapid.py:1450
+#: ../raphodo/rapid.py:1483
 msgid "New version saved"
 msgstr "Ново издање је сачувано"
 
-#: ../raphodo/rapid.py:1451
+#: ../raphodo/rapid.py:1485
 #, python-format
 msgid ""
 "The tar file and installer script are saved at:\n"
@@ -3146,11 +3724,11 @@ msgstr ""
 "\n"
 " %s"
 
-#: ../raphodo/rapid.py:1468
+#: ../raphodo/rapid.py:1502
 msgid "Upgrade failed"
 msgstr "Надоградња није успела"
 
-#: ../raphodo/rapid.py:1469
+#: ../raphodo/rapid.py:1505
 msgid ""
 "Sorry, upgrading Rapid Photo Downloader failed because there was an error "
 "opening the installer."
@@ -3158,76 +3736,76 @@ msgstr ""
 "Извините, надоградња Брзог преносиоца фотографија није успела због грешке "
 "отварања инсталера."
 
-#: ../raphodo/rapid.py:1667 ../raphodo/rapid.py:2331
+#: ../raphodo/rapid.py:1709 ../raphodo/rapid.py:2425
 msgid "Download"
 msgstr "Преузми"
 
-#: ../raphodo/rapid.py:1671
+#: ../raphodo/rapid.py:1713
 msgid "&Refresh..."
 msgstr "&Освежи..."
 
-#: ../raphodo/rapid.py:1675
+#: ../raphodo/rapid.py:1717
 msgid "&Preferences"
 msgstr "&Поставке"
 
-#: ../raphodo/rapid.py:1679
+#: ../raphodo/rapid.py:1721
 msgid "&Quit"
 msgstr "&Изађи"
 
-#: ../raphodo/rapid.py:1683
+#: ../raphodo/rapid.py:1725
 msgid "Error &Reports"
 msgstr "&Извештаји грешака"
 
-#: ../raphodo/rapid.py:1687
+#: ../raphodo/rapid.py:1729
 msgid "Clear Completed Downloads"
 msgstr "Очисти завршена преузимања"
 
-#: ../raphodo/rapid.py:1691
+#: ../raphodo/rapid.py:1733
 msgid "Get Help Online..."
 msgstr "Нађи помоћ на мрежи..."
 
-#: ../raphodo/rapid.py:1695
+#: ../raphodo/rapid.py:1737
 msgid "&Tip of the Day..."
 msgstr "&Савет дана..."
 
-#: ../raphodo/rapid.py:1699
+#: ../raphodo/rapid.py:1741
 msgid "Report a Problem..."
 msgstr "Извести о проблему..."
 
-#: ../raphodo/rapid.py:1703
+#: ../raphodo/rapid.py:1745
 msgid "Make a Donation..."
 msgstr "Приложите неки динар..."
 
-#: ../raphodo/rapid.py:1707
+#: ../raphodo/rapid.py:1749
 msgid "Translate this Application..."
 msgstr "Преведите овај програм..."
 
-#: ../raphodo/rapid.py:1711
+#: ../raphodo/rapid.py:1753
 msgid "&About..."
 msgstr "&О програму..."
 
-#: ../raphodo/rapid.py:1715
+#: ../raphodo/rapid.py:1757
 msgid "Check for Updates..."
 msgstr "Потражи освежења..."
 
-#: ../raphodo/rapid.py:1797
+#: ../raphodo/rapid.py:1840
 msgid "Timeline"
 msgstr "Временска линија"
 
-#: ../raphodo/rapid.py:1807
+#: ../raphodo/rapid.py:1850
 msgid "Destination"
 msgstr "Одредиште"
 
-#: ../raphodo/rapid.py:1808
+#: ../raphodo/rapid.py:1851
 msgid "Rename"
 msgstr "Преименуј"
 
-#: ../raphodo/rapid.py:1810
+#: ../raphodo/rapid.py:1853
 msgid "Back Up"
 msgstr "Резерва"
 
 #. Devices Header and View
-#: ../raphodo/rapid.py:1926
+#: ../raphodo/rapid.py:1977
 msgid ""
 "Turn on or off the use of devices attached to this computer as download "
 "sources"
@@ -3236,79 +3814,79 @@ msgstr ""
 "извора преузимања"
 
 #. This Computer Header and View
-#: ../raphodo/rapid.py:1940
+#: ../raphodo/rapid.py:1994
 msgid ""
 "Turn on or off the use of a folder on this computer as a download source"
 msgstr ""
 "Укључите или искључите коришћење фасцикле на овом рачунару као извор "
 "преузимања"
 
-#: ../raphodo/rapid.py:1941
+#: ../raphodo/rapid.py:1996
 msgid "This Computer"
 msgstr "Овај рачунар"
 
-#: ../raphodo/rapid.py:1952
+#: ../raphodo/rapid.py:2009
 msgid "Select a source folder"
 msgstr "Изаберите фасциклу извора"
 
-#: ../raphodo/rapid.py:1975
+#: ../raphodo/rapid.py:2038
 msgid "Projected Storage Use"
 msgstr "Пројектовано коришћење смештаја"
 
-#: ../raphodo/rapid.py:1989 ../raphodo/rapid.py:1997
+#: ../raphodo/rapid.py:2056 ../raphodo/rapid.py:2068
 msgid "Select a destination folder"
 msgstr "Изаберите фасциклу одредишта"
 
-#: ../raphodo/rapid.py:2045
+#: ../raphodo/rapid.py:2117
 msgid "All"
 msgstr "Све"
 
-#: ../raphodo/rapid.py:2046
+#: ../raphodo/rapid.py:2118
 msgid "New"
 msgstr "Ново"
 
-#: ../raphodo/rapid.py:2048
+#: ../raphodo/rapid.py:2120
 msgid "Show:"
 msgstr "Покажи:"
 
-#: ../raphodo/rapid.py:2051
+#: ../raphodo/rapid.py:2123
 msgid "Modification Time"
 msgstr "Време измене"
 
-#: ../raphodo/rapid.py:2052
+#: ../raphodo/rapid.py:2124
 msgid "Checked State"
 msgstr "Проверено стање"
 
-#: ../raphodo/rapid.py:2055
+#: ../raphodo/rapid.py:2127
 msgid "File Type"
 msgstr "Врста датотеке"
 
-#: ../raphodo/rapid.py:2056
+#: ../raphodo/rapid.py:2128
 msgid "Device"
 msgstr "Уређај"
 
-#: ../raphodo/rapid.py:2058
+#: ../raphodo/rapid.py:2130
 msgid "Sort:"
 msgstr "Поређај:"
 
-#: ../raphodo/rapid.py:2069
+#: ../raphodo/rapid.py:2141
 msgid "Select All:"
 msgstr "Изабери све:"
 
-#: ../raphodo/rapid.py:2311
+#: ../raphodo/rapid.py:2405
 #, python-format
 msgid "Download %(files)s"
 msgstr "Преузми „%(files)s“"
 
-#: ../raphodo/rapid.py:2327
+#: ../raphodo/rapid.py:2421
 msgid "Resume Download"
 msgstr "Настави преузимање"
 
-#: ../raphodo/rapid.py:2329
+#: ../raphodo/rapid.py:2423
 msgid "Pause"
 msgstr "Паузирај"
 
-#: ../raphodo/rapid.py:2417
+#: ../raphodo/rapid.py:2511
 #, python-brace-format
 msgid ""
 "Please report the problem at <a href=\"{website}\">{website}</a>.<br><br>\n"
@@ -3323,11 +3901,11 @@ msgstr ""
 "дневника).\n"
 "            "
 
-#: ../raphodo/rapid.py:2431
+#: ../raphodo/rapid.py:2525
 msgid "Thank you for reporting a problem in Rapid Photo Downloader"
 msgstr "Хвала вам за пријаву проблема у Брзом преносиоцу фотографија"
 
-#: ../raphodo/rapid.py:2529
+#: ../raphodo/rapid.py:2624
 #, python-format
 msgid ""
 "<b>Changing This Computer source path</b><br><br>Do you really want to "
@@ -3340,11 +3918,11 @@ msgstr ""
 "„%(source_path)s“.<br><br>Ако измените путању, текуће преузимање са овог "
 "рачунара биће отказано."
 
-#: ../raphodo/rapid.py:2595
+#: ../raphodo/rapid.py:2694
 msgid "You cannot change the download destination while downloading."
 msgstr "Не можете изменити одредиште преузимања приликом преузимања."
 
-#: ../raphodo/rapid.py:2604
+#: ../raphodo/rapid.py:2704
 #, python-format
 msgid ""
 "<b>Confirm Download Destination</b><br><br>Are you sure you want to set the "
@@ -3353,26 +3931,18 @@ msgstr ""
 "<b>Потврди одредиште преузимања</b><br><br>Да ли сигурно желите да подесите "
 "одредиште преузимања „%(file_type)s“ у „%(path)s“?"
 
-#: ../raphodo/rapid.py:2682
+#: ../raphodo/rapid.py:2785
 msgid ""
+"\n"
 "<b>Downloading all files</b><br><br>\n"
-"                    A download always includes all files that are checked "
-"for download,\n"
-"                    including those that are not currently displayed because "
-"the Timeline\n"
-"                    is being used or because only new files are being shown."
-"<br><br>\n"
-"                    Do you want to proceed with the download?"
+"A download always includes all files that are checked for download,\n"
+"including those that are not currently displayed because the Timeline\n"
+"is being used or because only new files are being shown.<br><br>\n"
+"Do you want to proceed with the download?\n"
+"                        "
 msgstr ""
-"<b>Преузимање свих датотека</b><br><br>\n"
-"                     Преузимање увек укључује све датотеке које су означене "
-"за преузимање,\n"
-"                     укључујући и оне које тренутно нису приказане јер је "
-"коришћена временска\n"
-"                     линија или су приказане само нове датотеке.<br><br>\n"
-"                     Да ли желите да наставите са преузимањем?"
 
-#: ../raphodo/rapid.py:2820
+#: ../raphodo/rapid.py:2937
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -3383,7 +3953,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: ../raphodo/rapid.py:2824
+#: ../raphodo/rapid.py:2940
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -3392,15 +3962,15 @@ msgstr ""
 "Ова фасцикла преузимања је неисправна:\n"
 "%s"
 
-#: ../raphodo/rapid.py:2827
+#: ../raphodo/rapid.py:2943
 msgid "Download Failure"
 msgstr "Неуспех преузимања"
 
-#: ../raphodo/rapid.py:2828
+#: ../raphodo/rapid.py:2944
 msgid "The download cannot proceed."
 msgstr "Преузимање се не може наставити."
 
-#: ../raphodo/rapid.py:2842
+#: ../raphodo/rapid.py:2962
 msgid ""
 "Photos and videos will not be backed up because there is nowhere to back "
 "them up. Do you still want to start the download?"
@@ -3408,8 +3978,7 @@ msgstr ""
 "Неће бити направљена резерва за фотографије и снимке јер нема места за "
 "смештај. Да ли још увек желите да започнете преузимање?"
 
-#. Translators: filetype will be replaced with 'photos' or 'videos'
-#: ../raphodo/rapid.py:2847 ../raphodo/rapid.py:2854
+#: ../raphodo/rapid.py:2969 ../raphodo/rapid.py:2979
 #, python-format
 msgid ""
 "No backup device exists for backing up %(filetype)s. Do you still want to "
@@ -3418,15 +3987,15 @@ msgstr ""
 "Нема уређаја резерве за смештај резерве „%(filetype)s“. Да ли још увек "
 "желите да започнете преузимање?"
 
-#: ../raphodo/rapid.py:2848 ../raphodo/rpdfile.py:228
+#: ../raphodo/rapid.py:2971 ../raphodo/rpdfile.py:228
 msgid "photos"
 msgstr "фотографије"
 
-#: ../raphodo/rapid.py:2855 ../raphodo/rpdfile.py:223
+#: ../raphodo/rapid.py:2981 ../raphodo/rpdfile.py:223
 msgid "videos"
 msgstr "снимци"
 
-#: ../raphodo/rapid.py:2861
+#: ../raphodo/rapid.py:2989
 msgid ""
 "<b>The photo and video backup destinations do not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
@@ -3434,109 +4003,104 @@ msgstr ""
 "<b>Одредиште резерви фотографија и снимака не постоји или се не може писати "
 "у њега.</b><br><br>Да ли још увек желите да започнете преузимање?"
 
-#: ../raphodo/rapid.py:2869 ../raphodo/rapid.py:2876
+#: ../raphodo/rapid.py:2999 ../raphodo/rapid.py:3008
 #, python-format
 msgid ""
 "<b>The %(filetype)s backup destination does not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
-"<b>Одредиште резерви „%(filetype)s“ не постоји или се не може писати у њега."
-"</b><br><br>Да ли још увек желите да започнете преузимање?"
+"<b>Одредиште резерви „%(filetype)s“ не постоји или се не може писати у "
+"њега.</b><br><br>Да ли још увек желите да започнете преузимање?"
 
-#: ../raphodo/rapid.py:2871 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:818
+#: ../raphodo/rapid.py:3001 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:843
 msgid "photo"
 msgstr "фотографија"
 
-#: ../raphodo/rapid.py:2878 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:858
+#: ../raphodo/rapid.py:3010 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:883
 msgid "video"
 msgstr "снимак"
 
-#: ../raphodo/rapid.py:2886
+#: ../raphodo/rapid.py:3018
 msgid "Backup problem"
 msgstr "Проблем са резервом"
 
-#. Translators - in the middle is a unicode em dash - please retain it
-#. This string is displayed in the status bar when the download is running
-#: ../raphodo/rapid.py:3571
+#: ../raphodo/rapid.py:3756
 #, python-format
 msgid "%(downloading_from)s — %(time_left)s left (%(speed)s)"
 msgstr "%(downloading_from)s — остало је %(time_left)s (%(speed)s)"
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3640
+#: ../raphodo/rapid.py:3828
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s је преузето"
 
-#. Translators: e.g. 2 videos failed to download
-#: ../raphodo/rapid.py:3645
+#: ../raphodo/rapid.py:3836
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "%(noFiles)s %(filetypes)s није преузето"
 
-#: ../raphodo/rapid.py:3650 ../raphodo/rapid.py:3723
+#: ../raphodo/rapid.py:3842 ../raphodo/rapid.py:3927
 msgid "warnings"
 msgstr "упозорења"
 
-#: ../raphodo/rapid.py:3679
+#: ../raphodo/rapid.py:3873
 msgid "All downloads complete"
 msgstr "Сва преузимања су завршена"
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3686 ../raphodo/rapid.py:3695 ../raphodo/rapid.py:3704
-#: ../raphodo/rapid.py:3713 ../raphodo/rapid.py:3721
+#: ../raphodo/rapid.py:3881 ../raphodo/rapid.py:3892 ../raphodo/rapid.py:3903
+#: ../raphodo/rapid.py:3914 ../raphodo/rapid.py:3924
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: ../raphodo/rapid.py:3688 ../raphodo/rapid.py:3706
+#: ../raphodo/rapid.py:3884 ../raphodo/rapid.py:3906
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s је преузето"
 
-#: ../raphodo/rapid.py:3697 ../raphodo/rapid.py:3715
+#: ../raphodo/rapid.py:3895 ../raphodo/rapid.py:3917
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "%(filetype)s није преузето"
 
-#: ../raphodo/rapid.py:3742
+#: ../raphodo/rapid.py:3950
 msgid "1 failure"
 msgstr "1 неуспех"
 
-#: ../raphodo/rapid.py:3744
+#: ../raphodo/rapid.py:3952
 #, python-format
 msgid "%d failures"
 msgstr "%d неуспеха"
 
-#: ../raphodo/rapid.py:3749
+#: ../raphodo/rapid.py:3957
 msgid "1 warning"
 msgstr "1 упозорење"
 
-#: ../raphodo/rapid.py:3751
+#: ../raphodo/rapid.py:3959
 #, python-format
 msgid "%d warnings"
 msgstr "%d упозорења"
 
-#: ../raphodo/rapid.py:3771
+#: ../raphodo/rapid.py:3981
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s"
 msgstr "Преузето је %(no_files_and_types)s са „%(devices)s“"
 
-#: ../raphodo/rapid.py:3774
+#: ../raphodo/rapid.py:3985
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s — %(failures)s"
 msgstr "Преузето је %(no_files_and_types)s са „%(devices)s“ — %(failures)s"
 
-#: ../raphodo/rapid.py:3779
+#: ../raphodo/rapid.py:3989
 #, python-format
 msgid "No files downloaded — %(failures)s"
 msgstr "Није преузета ниједна датотека — %(failures)s"
 
-#: ../raphodo/rapid.py:3781
+#: ../raphodo/rapid.py:3991
 msgid "No files downloaded"
 msgstr "Није преузета ниједна датотека"
 
-#: ../raphodo/rapid.py:3805
+#: ../raphodo/rapid.py:4021
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
@@ -3545,7 +4109,7 @@ msgstr ""
 "Подфасцикле одредишта и временска линија биће поново изграђененакон стварања "
 "свих сличица за „%(camera)s“"
 
-#: ../raphodo/rapid.py:3809
+#: ../raphodo/rapid.py:4026
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for this computer"
@@ -3553,7 +4117,7 @@ msgstr ""
 "Подфасцикле одредишта и временска линија биће поново изграђененакон стварања "
 "свих сличица за овај рачунар"
 
-#: ../raphodo/rapid.py:3812
+#: ../raphodo/rapid.py:4031
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
@@ -3562,7 +4126,7 @@ msgstr ""
 "Подфасцикле одредишта и временска линија биће поново изграђененакон стварања "
 "свих сличица за „%(device)s“"
 
-#: ../raphodo/rapid.py:3820
+#: ../raphodo/rapid.py:4039
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
@@ -3571,7 +4135,7 @@ msgstr ""
 "Подфасцикле одредишта и временска линија биће поново изграђененакон стварања "
 "свих сличица за %(number_devices)s уређаја и за овај рачунар"
 
-#: ../raphodo/rapid.py:3833
+#: ../raphodo/rapid.py:4052
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
@@ -3580,7 +4144,7 @@ msgstr ""
 "Подфасцикле одредишта и временска линија биће поново изграђененакон стварања "
 "свих сличица за „%(camera)s“ и за овај рачунар"
 
-#: ../raphodo/rapid.py:3837
+#: ../raphodo/rapid.py:4056
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
@@ -3589,7 +4153,7 @@ msgstr ""
 "Подфасцикле одредишта и временска линија биће поново изграђененакон стварања "
 "свих сличица за „%(device)s“ и за овај рачунар"
 
-#: ../raphodo/rapid.py:3841
+#: ../raphodo/rapid.py:4060
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
@@ -3598,15 +4162,15 @@ msgstr ""
 "Подфасцикле одредишта и временска линија биће поново изграђененакон стварања "
 "свих сличица за %(number_devices)s уређаја"
 
-#: ../raphodo/rapid.py:3867
+#: ../raphodo/rapid.py:4087
 msgid "The Destination subfolders and Timeline have been rebuilt"
 msgstr "Подфасцикле одредишта и временска линија су поново изграђене"
 
-#: ../raphodo/rapid.py:3922
+#: ../raphodo/rapid.py:4144
 msgid "Program preferences are invalid"
 msgstr "Поставке програма су неисправне"
 
-#: ../raphodo/rapid.py:3999
+#: ../raphodo/rapid.py:4228
 #, python-format
 msgid ""
 "<b>All files on the %(camera)s are inaccessible</b>.<br><br>It may be locked "
@@ -3621,38 +4185,39 @@ msgstr ""
 "подешавање <i>УСБ за пуњење</i> у <i>УСБ за пренос датотека</i>.<br><br>Или "
 "можете да занемарите тај уређај."
 
-#: ../raphodo/rapid.py:4008
+#: ../raphodo/rapid.py:4239
 #, python-format
 msgid ""
-"<b>The %(camera)s appears to be in use by another application.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again.<br><br>Alternatively, you can ignore this "
-"device."
+"<b>The %(camera)s appears to be in use by another "
+"application.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again.<br><br>Alternatively, you "
+"can ignore this device."
 msgstr ""
 "<b>Изгледа да други програм користи „%(camera)s“.</b><br><br>Можете "
 "затворити све друге програме (као што је прегледник датотека) који га "
 "користе и покушате опет. Ако ово не делује, откачите „%(camera)s“ са "
 "рачунара и поново га прикачите.<br><br>Или можете занемарити тај уређај."
 
-#: ../raphodo/rapid.py:4019
+#: ../raphodo/rapid.py:4250
 msgid "&Try Again"
 msgstr "&Пробај поново"
 
-#: ../raphodo/rapid.py:4020
+#: ../raphodo/rapid.py:4251
 msgid "&Ignore This Device"
 msgstr "&Занемари овај уређај"
 
-#: ../raphodo/rapid.py:4086
+#: ../raphodo/rapid.py:4323
 #, python-format
 msgid "Sorry, an unexpected problem occurred while scanning %s."
-msgstr "Извините, дошло је до неочекиваног проблема приликом прегледања „%s“."
+msgstr ""
+"Извините, дошло је до неочекиваног проблема приликом прегледања „%s“."
 
-#: ../raphodo/rapid.py:4087
+#: ../raphodo/rapid.py:4324
 msgid "Unfortunately you cannot download from this device."
 msgstr "На жалост не можете преузети са овог уређаја."
 
-#: ../raphodo/rapid.py:4091
+#: ../raphodo/rapid.py:4328
 msgid ""
 "A possible workaround for the problem might be downloading from the camera's "
 "memory card using a card reader."
@@ -3660,77 +4225,103 @@ msgstr ""
 "Могуће решење проблема може бити преузимање са меморијске картице фото-"
 "апарата коришћењем читача картица."
 
-#: ../raphodo/rapid.py:4096
+#: ../raphodo/rapid.py:4333
 msgid "Device scan failed"
 msgstr "Преглед уређаја није успео"
 
-#: ../raphodo/rapid.py:4472
+#: ../raphodo/rapid.py:4720
 #, python-format
 msgid ""
-"<b>The %(camera)s cannot be scanned because it cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again."
+"<b>The %(camera)s cannot be scanned because it cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again."
 msgstr ""
-"<b>„%(camera)s“ не може бити прегледан јер не може бити откачен.</"
-"b><br><br>Можете затворити све друге програме (као што је прегледник "
-"датотека) који га користе и покушате опет. Ако ово не делује, откачите "
-"„%(camera)s“ са рачунара и поново га прикачите."
+"<b>„%(camera)s“ не може бити прегледан јер не може бити "
+"откачен.</b><br><br>Можете затворити све друге програме (као што је "
+"прегледник датотека) који га користе и покушате опет. Ако ово не делује, "
+"откачите „%(camera)s“ са рачунара и поново га прикачите."
 
-#: ../raphodo/rapid.py:4496
+#: ../raphodo/rapid.py:4745
 #, python-format
 msgid ""
-"<b>The download cannot start because the %(camera)s cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again, and choose which files you want to "
-"download from it."
+"<b>The download cannot start because the %(camera)s cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again, and choose which files "
+"you want to download from it."
+msgstr ""
+"<b>Преузимање не може започети  јер „%(camera)s“ не може бити "
+"откачен.</b><br><br>Можете затворити све друге програме (као што је "
+"прегледник датотека) који га користе и покушате опет. Ако ово не делује, "
+"откачите „%(camera)s“ са рачунара и поново га прикачите, и изаберите које "
+"датотеке желите да преузмете."
+
+#: ../raphodo/rapid.py:4842
+msgid "Completed Downloads Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4844
+#, python-format
+msgid "%s whose download have completed are displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4846
+msgid "Do you want to clear the completed downloads?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4848
+msgid "Completed Download Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4850
+#, python-format
+msgid "%s whose download has completed is displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4852
+msgid "Do you want to clear the completed download?"
 msgstr ""
-"<b>Преузимање не може започети  јер „%(camera)s“ не може бити откачен.</"
-"b><br><br>Можете затворити све друге програме (као што је прегледник "
-"датотека) који га користе и покушате опет. Ако ово не делује, откачите "
-"„%(camera)s“ са рачунара и поново га прикачите, и изаберите које датотеке "
-"желите да преузмете."
 
-#: ../raphodo/rapid.py:4635
+#: ../raphodo/rapid.py:4933
 #, python-format
 msgid ""
 "Do you want to download photos and videos from the device <i>%(device)s</i>?"
 msgstr ""
-"Да ли желите да преузмете фотографије и снимке са уређаја „<i>%(device)s</"
-"i>“?"
+"Да ли желите да преузмете фотографије и снимке са уређаја "
+"„<i>%(device)s</i>“?"
 
-#: ../raphodo/rapid.py:4877
+#: ../raphodo/rapid.py:5183
 #, python-format
 msgid "<b>Do you want to ignore the %s whenever this program is run?</b>"
 msgstr ""
 "<b>Да ли желите да занемарите „%s“ приликом сваког покретања програма?</b>"
 
-#: ../raphodo/rapid.py:4879
+#: ../raphodo/rapid.py:5186
 msgid ""
 "All cameras, phones and tablets with the same model name will be ignored."
 msgstr ""
 "Сви фото-апарати, телефони и таблични уређаји са истим називом модела биће "
 "занемарени."
 
-#: ../raphodo/rapid.py:4883
+#: ../raphodo/rapid.py:5190
 #, python-format
 msgid ""
 "<b>Do you want to ignore the device %s whenever this program is run?</b>"
 msgstr ""
-"<b>Да ли желите да занемарите уређај „%s“ приликом сваког покретања програма?"
-"</b>"
+"<b>Да ли желите да занемарите уређај „%s“ приликом сваког покретања "
+"програма?</b>"
 
-#: ../raphodo/rapid.py:4885
+#: ../raphodo/rapid.py:5192
 msgid "Any device with the same name will be ignored."
 msgstr "Било који уређај са истим називом биће занемарен."
 
-#: ../raphodo/rapid.py:5178
+#: ../raphodo/rapid.py:5492
 #, python-format
 msgid "Downloading from %(location)s on This Computer."
 msgstr "Преузимам са „%(location)s“ на овом рачунару."
 
-#: ../raphodo/rapid.py:5180
+#: ../raphodo/rapid.py:5496
 msgid ""
 "Do you really want to download from here?<br><br>On some systems, scanning "
 "this location can take a very long time."
@@ -3738,17 +4329,17 @@ msgstr ""
 "Да ли заиста желите да преузмете одавде?<br><br>На неким системима, "
 "претраживање те путање може да потраје."
 
-#: ../raphodo/rapid.py:5224
+#: ../raphodo/rapid.py:5537
 #, python-format
 msgid "Generating thumbnails for %s"
 msgstr "Стварам сличице за „%s“"
 
-#: ../raphodo/rapid.py:5227
+#: ../raphodo/rapid.py:5540
 #, python-format
 msgid "Scanning %s"
 msgstr "Претражујем „%s“"
 
-#: ../raphodo/rapid.py:5237
+#: ../raphodo/rapid.py:5551
 #, python-format
 msgid ""
 "%(number)s of %(available files)s checked for download (%(hidden)s hidden)"
@@ -3756,75 +4347,75 @@ msgstr ""
 "%(number)s од %(available files)s је означено за преузимање (скривених "
 "%(hidden)s)"
 
-#: ../raphodo/rapid.py:5243
+#: ../raphodo/rapid.py:5559
 #, python-format
 msgid "%(number)s of %(available files)s checked for download"
 msgstr "%(number)s од %(available files)s је означено за преузимање"
 
-#: ../raphodo/rapid.py:5494
+#: ../raphodo/rapid.py:5764
 msgid "Display program information when run from the command line."
 msgstr "Приказује податке о програму када ради са линије наредби."
 
-#: ../raphodo/rapid.py:5496
+#: ../raphodo/rapid.py:5766
 msgid "Display debugging information when run from the command line."
 msgstr "Приказује податке прочишћавања када ради са линије наредби."
 
-#: ../raphodo/rapid.py:5499
+#: ../raphodo/rapid.py:5769
 msgid "List photo and video file extensions the program recognizes and exit."
 msgstr ""
 "Исписује наставке датотека фотографија и снимака које програм препознаје и "
 "излази."
 
-#: ../raphodo/rapid.py:5502
+#: ../raphodo/rapid.py:5772
 msgid "Turn on or off the the renaming of photos."
 msgstr "Укључите или искључите преименовање фотографија."
 
-#: ../raphodo/rapid.py:5504
+#: ../raphodo/rapid.py:5774
 msgid "turn on or off the the renaming of videos."
 msgstr "Укључите или искључите преименовање снимака."
 
-#: ../raphodo/rapid.py:5506
+#: ../raphodo/rapid.py:5776
 msgid ""
 "Turn on or off the automatic detection of devices from which to download."
 msgstr ""
 "Укључите или искључите аутоматско откривање уређаја са кога преузимати."
 
-#: ../raphodo/rapid.py:5510
+#: ../raphodo/rapid.py:5780
 msgid "Turn on or off downloading from this computer."
 msgstr "Укључите или искључите преузимање са овог рачунара."
 
-#: ../raphodo/rapid.py:5512 ../raphodo/rapid.py:5515 ../raphodo/rapid.py:5518
-#: ../raphodo/rapid.py:5539 ../raphodo/rapid.py:5543
+#: ../raphodo/rapid.py:5782 ../raphodo/rapid.py:5785 ../raphodo/rapid.py:5788
+#: ../raphodo/rapid.py:5809 ../raphodo/rapid.py:5813
 msgid "PATH"
 msgstr "ПУТАЊА"
 
-#: ../raphodo/rapid.py:5513
+#: ../raphodo/rapid.py:5783
 msgid "The PATH on this computer from which to download."
 msgstr "ПУТАЊА на овом рачунару са које ће се вршити преузимање."
 
-#: ../raphodo/rapid.py:5516
+#: ../raphodo/rapid.py:5786
 msgid "The PATH where photos will be downloaded to."
 msgstr "ПУТАЊА на коју ће фотографије бити преузете."
 
-#: ../raphodo/rapid.py:5519
+#: ../raphodo/rapid.py:5789
 msgid "The PATH where videos will be downloaded to."
 msgstr "ПУТАЊА на коју ће снимци бити преузети."
 
-#: ../raphodo/rapid.py:5521
+#: ../raphodo/rapid.py:5791
 msgid "Turn on or off the backing up of photos and videos while downloading."
 msgstr ""
 "Укључите или искључите прављење резерви фотографија и снимака за време "
 "преузимања."
 
-#: ../raphodo/rapid.py:5525
+#: ../raphodo/rapid.py:5795
 msgid "Turn on or off the automatic detection of backup devices."
 msgstr "Укључите или искључите аутоматско откривање уређаја преузимања."
 
-#: ../raphodo/rapid.py:5527 ../raphodo/rapid.py:5533
+#: ../raphodo/rapid.py:5797 ../raphodo/rapid.py:5803
 msgid "FOLDER"
 msgstr "ФАСЦИКЛА"
 
-#: ../raphodo/rapid.py:5528
+#: ../raphodo/rapid.py:5798
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected photo "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3836,7 +4427,7 @@ msgstr ""
 "уређај користи за резерве или не. За сваки уређај који желите да користите "
 "за резерве фотографија, направите фасциклу са овим називом."
 
-#: ../raphodo/rapid.py:5534
+#: ../raphodo/rapid.py:5804
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected video "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3848,7 +4439,7 @@ msgstr ""
 "уређај користи за резерве или не. За сваки уређај који желите да користите "
 "за резерве снимака, направите фасциклу са овим називом."
 
-#: ../raphodo/rapid.py:5540
+#: ../raphodo/rapid.py:5810
 msgid ""
 "The PATH where photos will be backed up when automatic detection of backup "
 "devices is turned off."
@@ -3856,7 +4447,7 @@ msgstr ""
 "ПУТАЊА где ће бити направљена резерва фотографија када је аутоматско "
 "откривање уређаја резерве искључено."
 
-#: ../raphodo/rapid.py:5544
+#: ../raphodo/rapid.py:5814
 msgid ""
 "The PATH where videos will be backed up when automatic detection of backup "
 "devices is turned off."
@@ -3864,21 +4455,23 @@ msgstr ""
 "ПУТАЊА где ће бити направљена резерва снимака када је аутоматско откривање "
 "уређаја резерве искључено."
 
-#: ../raphodo/rapid.py:5547
+#: ../raphodo/rapid.py:5817
 #, python-format
 msgid "Ignore photos with the following extensions: %s"
 msgstr "Занемари фотографије са следећим наставцима: %s"
 
-#: ../raphodo/rapid.py:5551
-msgid "Turn on or off starting downloads as soon as the program itself starts."
+#: ../raphodo/rapid.py:5821
+msgid ""
+"Turn on or off starting downloads as soon as the program itself starts."
 msgstr ""
 "Укључите или искључите започињање преузимања по самом покретању програма."
 
-#: ../raphodo/rapid.py:5554
+#: ../raphodo/rapid.py:5824
 msgid "Turn on or off starting downloads as soon as a device is inserted."
-msgstr "Укључите или искључите започињање преузимања по самом уметању уређаја."
+msgstr ""
+"Укључите или искључите започињање преузимања по самом уметању уређаја."
 
-#: ../raphodo/rapid.py:5557
+#: ../raphodo/rapid.py:5827
 msgid ""
 "Turn on or off use of the Rapid Photo Downloader Thumbnail Cache. Turning it "
 "off does not delete existing cache contents."
@@ -3886,7 +4479,7 @@ msgstr ""
 "Укључите или искључите коришћење оставе сличица Брзог преносиоца "
 "фотографија. Искључивање неће обрисати постојеће садржаје оставе."
 
-#: ../raphodo/rapid.py:5561
+#: ../raphodo/rapid.py:5831
 msgid ""
 "Delete all thumbnails in the Rapid Photo Downloader Thumbnail Cache, and "
 "exit."
@@ -3894,11 +4487,11 @@ msgstr ""
 "Обришите све сличице у остави сличица Брзог преносиоца фотографија, и "
 "изађите."
 
-#: ../raphodo/rapid.py:5565
+#: ../raphodo/rapid.py:5835
 msgid "Forget which files have been previously downloaded, and exit."
 msgstr "Заборавите које су датотеке претходно биле преузете, и изађите."
 
-#: ../raphodo/rapid.py:5568
+#: ../raphodo/rapid.py:5838
 msgid ""
 "Import preferences from an old program version and exit. Requires the "
 "command line program gconftool-2."
@@ -3906,7 +4499,7 @@ msgstr ""
 "Увезите поставке из из старог издања програма и изађите. Захтева програм "
 "линије наредби „gconftool“-2."
 
-#: ../raphodo/rapid.py:5571
+#: ../raphodo/rapid.py:5841
 msgid ""
 "Reset all program settings to their default values, delete all thumbnails in "
 "the Thumbnail cache, forget which files have been previously downloaded, and "
@@ -3916,15 +4509,15 @@ msgstr ""
 "сличице у остави сличица, заборавите које су датотеке биле претходно "
 "преузете, и изађите."
 
-#: ../raphodo/rapid.py:5575
+#: ../raphodo/rapid.py:5845
 msgid "Include gphoto2 debugging information in log files."
 msgstr "Укључите „gphoto2“ податке прочишћавања у датотеке дневника."
 
-#: ../raphodo/rapid.py:5579
+#: ../raphodo/rapid.py:5849
 msgid "Print information to the terminal about attached cameras and exit."
 msgstr "Испишите податке у терминал о прикаченим фото-апаратима и изађите."
 
-#: ../raphodo/rapid.py:5640
+#: ../raphodo/rapid.py:5911
 msgid ""
 "To import preferences from the old version of Rapid Photo Downloader, you "
 "must install the program gconftool-2."
@@ -3932,35 +4525,43 @@ msgstr ""
 "Да увезете поставке из старог издања Брзог преносиоца фотографија, морате да "
 "инсталирате програм „gconftool-2“."
 
-#: ../raphodo/rapid.py:5649
+#: ../raphodo/rapid.py:5920
 msgid "No prior program preferences detected: exiting"
 msgstr "Нисам открио претходне поставке програма: излазим"
 
-#: ../raphodo/rapid.py:5652
+#: ../raphodo/rapid.py:5923
 #, python-format
 msgid "Importing preferences from Rapid Photo Downloader %(version)s"
 msgstr "Увозим поставке из Брзог преносиоца фотографија %(version)s"
 
-#: ../raphodo/rapid.py:5714
+#: ../raphodo/rapid.py:5989
 #, python-format
-msgid "Do you want to copy the stored sequence number, which has the value %d?"
+msgid ""
+"Do you want to copy the stored sequence number, which has the value %d?"
 msgstr "Да ли желите да умножите сачувани број низа, који има вредност %d?"
 
-#: ../raphodo/rapid.py:5726
+#: ../raphodo/rapid.py:6000
 msgid "Program aborting."
 msgstr "Прекид програма."
 
-#: ../raphodo/rapid.py:5736
+#: ../raphodo/rapid.py:6010
 msgid "Never run this program as the sudo / root user."
 msgstr "Никада не покрећите овај програм као администратор."
 
-#: ../raphodo/rapid.py:5740
+#: ../raphodo/rapid.py:6014
 msgid "You must install ExifTool to run Rapid Photo Downloader."
 msgstr ""
 "Морате да инсталирате „ExifTool“ да бисте покренули Брзог преносиоца "
 "фотографија."
 
-#: ../raphodo/rapid.py:5794
+#: ../raphodo/rapid.py:6026
+msgid ""
+"Rapid Photo Downloader is installed in multiple locations.\n"
+"\n"
+"Uninstall all copies except the version you want to run."
+msgstr ""
+
+#: ../raphodo/rapid.py:6083
 msgid ""
 "When specifying a path on the command line, do not also specify an\n"
 "option for device auto detection or a path on \"This Computer\"."
@@ -3968,15 +4569,15 @@ msgstr ""
 "Приликом навођења путање на линији наредби, немојте такође наводити\n"
 "опцију за аутоматско откривање уређаја или путање на „Овом уређају“."
 
-#: ../raphodo/rapid.py:5950
+#: ../raphodo/rapid.py:6243
 msgid "All settings and caches have been reset"
 msgstr "Сва подешавања и оставе су враћене на основне вредности"
 
-#: ../raphodo/rapid.py:5958
+#: ../raphodo/rapid.py:6251
 msgid "Thumbnail Cache has been reset"
 msgstr "Остава сличица је повраћена"
 
-#: ../raphodo/rapid.py:5964
+#: ../raphodo/rapid.py:6257
 msgid "Remembered files have been forgotten"
 msgstr "Запамћене датотеке су заборављене"
 
@@ -3993,15 +4594,15 @@ msgid "&Don't warn me again about missing or broken program libraries"
 msgstr ""
 "&Не упозоравај ме опет о библиотекама програма које недостају или су оштећене"
 
-#: ../raphodo/renameandmovefile.py:546
+#: ../raphodo/renameandmovefile.py:554
 msgid "subfolder and filename"
 msgstr "подфасцикла и назив датотеке"
 
-#: ../raphodo/renameandmovefile.py:548
+#: ../raphodo/renameandmovefile.py:556
 msgid "filename"
 msgstr "назив датотеке"
 
-#: ../raphodo/renameandmovefile.py:550
+#: ../raphodo/renameandmovefile.py:558
 msgid "subfolder"
 msgstr "подфасцикла"
 
@@ -4086,160 +4687,238 @@ msgstr "фотографије и снимци"
 msgid "photos or videos"
 msgstr "фотографије или снимци"
 
-#: ../raphodo/rpdfile.py:306
+#: ../raphodo/rpdfile.py:315
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: ../raphodo/rpdfile.py:318
+#. translators: natural language expression signifying a single video
+#: ../raphodo/rpdfile.py:337
+msgid "a video"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:339
 msgid "1 Video"
 msgstr "1 снимак"
 
-#: ../raphodo/rpdfile.py:323
+#. translators: natural language expression signifying a single photo
+#: ../raphodo/rpdfile.py:346
+msgid "a photo"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:348
 msgid "1 Photo"
 msgstr "1 фотографија"
 
-#: ../raphodo/rpdfile.py:803
+#: ../raphodo/rpdfile.py:828
 #, python-format
 msgid "%(path)s on %(camera)s"
 msgstr "„%(path)s“ на „%(camera)s“"
 
-#: ../raphodo/rpdfile.py:819
+#: ../raphodo/rpdfile.py:844
 msgid "Photo"
 msgstr "Фотографија"
 
-#: ../raphodo/rpdfile.py:859
+#: ../raphodo/rpdfile.py:884
 msgid "Video"
 msgstr "Снимак"
 
-#: ../raphodo/storage.py:138
+#: ../raphodo/storage.py:141
 msgid "File system root"
 msgstr "Корен система датотека"
 
 #. translators: the name of the Pictures folder
-#: ../raphodo/storage.py:433
+#: ../raphodo/storage.py:437
 msgid "Pictures"
 msgstr "Слике"
 
-#: ../raphodo/thumbnaildisplay.py:426
+#: ../raphodo/thumbnaildisplay.py:432
 #, python-format
 msgid "Taken on %(date_time)s (%(human_readable)s)"
 msgstr "Снимљено %(date_time)s (%(human_readable)s)"
 
-#: ../raphodo/thumbnaildisplay.py:431
+#: ../raphodo/thumbnaildisplay.py:439
 #, python-format
 msgid "Modified on %(date_time)s (%(human_readable)s)"
 msgstr "Измењено %(date_time)s (%(human_readable)s)"
 
-#: ../raphodo/thumbnaildisplay.py:437 ../raphodo/thumbnaildisplay.py:466
+#: ../raphodo/thumbnaildisplay.py:447 ../raphodo/thumbnaildisplay.py:481
 #, python-format
 msgid "%(date_time)s (%(human_readable)s)"
 msgstr "%(date_time)s (%(human_readable)s)"
 
-#: ../raphodo/thumbnaildisplay.py:451
+#: ../raphodo/thumbnaildisplay.py:464
 #, python-format
 msgid "Memory cards: %s"
 msgstr "Меморијске картице: %s"
 
-#: ../raphodo/thumbnaildisplay.py:457
+#: ../raphodo/thumbnaildisplay.py:468
+#, python-format
+msgid "Memory card: %s"
+msgstr ""
+
+#: ../raphodo/thumbnaildisplay.py:473
 msgid "Downloaded as:"
 msgstr "Преузето као:"
 
-#: ../raphodo/thumbnaildisplay.py:472
+#: ../raphodo/thumbnaildisplay.py:489
 #, python-format
 msgid "<br><br>Previous download:<br>%(filename)s<br>%(path)s<br>%(date)s"
-msgstr "<br><br>Претходно преузимање:<br>%(filename)s<br>%(path)s<br>%(date)s"
+msgstr ""
+"<br><br>Претходно преузимање:<br>%(filename)s<br>%(path)s<br>%(date)s"
 
-#: ../raphodo/thumbnaildisplay.py:1603
+#: ../raphodo/thumbnaildisplay.py:1645
 msgid "Copy Path"
 msgstr "Путања умножавања"
 
+#. Translators: these values are file size suffixes like B representing bytes, KB representing
+#. kilobytes, etc.
+#: ../raphodo/utilities.py:170
+msgid "B"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "KB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "MB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "GB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "TB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "PB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "EB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "ZB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "YB"
+msgstr ""
+
 #. two things in a list e.g. "device1 and device2"
-#: ../raphodo/utilities.py:391
+#: ../raphodo/utilities.py:394
 #, python-format
 msgid "%(first_item)s and %(last_item)s"
 msgstr "„%(first_item)s“ и „%(last_item)s“"
 
-#: ../raphodo/utilities.py:464
+#: ../raphodo/utilities.py:468
 msgid "one"
 msgstr "један"
 
-#: ../raphodo/utilities.py:465
+#: ../raphodo/utilities.py:469
 msgid "two"
 msgstr "два"
 
-#: ../raphodo/utilities.py:466
+#: ../raphodo/utilities.py:470
 msgid "three"
 msgstr "три"
 
-#: ../raphodo/utilities.py:467
+#: ../raphodo/utilities.py:471
 msgid "four"
 msgstr "четири"
 
-#: ../raphodo/utilities.py:468
+#: ../raphodo/utilities.py:472
 msgid "five"
 msgstr "пет"
 
-#: ../raphodo/utilities.py:469
+#: ../raphodo/utilities.py:473
 msgid "six"
 msgstr "шест"
 
-#: ../raphodo/utilities.py:470
+#: ../raphodo/utilities.py:474
 msgid "seven"
 msgstr "седам"
 
-#: ../raphodo/utilities.py:471
+#: ../raphodo/utilities.py:475
 msgid "eight"
 msgstr "осам"
 
-#: ../raphodo/utilities.py:472
+#: ../raphodo/utilities.py:476
 msgid "nine"
 msgstr "девет"
 
-#: ../raphodo/utilities.py:473
+#: ../raphodo/utilities.py:477
 msgid "ten"
 msgstr "десет"
 
-#: ../raphodo/utilities.py:474
+#: ../raphodo/utilities.py:478
 msgid "eleven"
 msgstr "једанаест"
 
-#: ../raphodo/utilities.py:475
+#: ../raphodo/utilities.py:479
 msgid "twelve"
 msgstr "дванаест"
 
-#: ../raphodo/utilities.py:476
+#: ../raphodo/utilities.py:480
 msgid "thirteen"
 msgstr "тринаест"
 
-#: ../raphodo/utilities.py:477
+#: ../raphodo/utilities.py:481
 msgid "fourteen"
 msgstr "четрнаест"
 
-#: ../raphodo/utilities.py:478
+#: ../raphodo/utilities.py:482
 msgid "fifteen"
 msgstr "петнаест"
 
-#: ../raphodo/utilities.py:479
+#: ../raphodo/utilities.py:483
 msgid "sixteen"
 msgstr "шеснаест"
 
-#: ../raphodo/utilities.py:480
+#: ../raphodo/utilities.py:484
 msgid "seventeen"
 msgstr "седамнаест"
 
-#: ../raphodo/utilities.py:481
+#: ../raphodo/utilities.py:485
 msgid "eighteen"
 msgstr "осамнаест"
 
-#: ../raphodo/utilities.py:482
+#: ../raphodo/utilities.py:486
 msgid "ninenteen"
 msgstr "деветнаест"
 
-#: ../raphodo/utilities.py:483
+#: ../raphodo/utilities.py:487
 msgid "twenty"
 msgstr "двадесет"
 
+#: ../raphodo/viewutils.py:240
+msgid "&OK"
+msgstr ""
+
+#: ../raphodo/viewutils.py:243
+msgid "&Save"
+msgstr ""
+
+#: ../raphodo/viewutils.py:244
+msgid "&Help"
+msgstr ""
+
+#: ../raphodo/viewutils.py:245
+msgid "Restore Defaults"
+msgstr ""
+
+#: ../raphodo/viewutils.py:246
+msgid "&Yes"
+msgstr ""
+
+#: ../raphodo/viewutils.py:247
+msgid "&No"
+msgstr ""
+
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:1
 msgid ""
 "Rapid Photo Downloader imports photos and videos from cameras, phones, "
@@ -4280,19 +4959,19 @@ msgstr ""
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:4
 msgid "The main window"
-msgstr ""
+msgstr "Главни прозор"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:5
 msgid "Downloading"
-msgstr ""
+msgstr "Преузимам"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:6
 msgid "The Timeline"
-msgstr ""
+msgstr "Временска линија"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:7
 msgid "Right-clicking on a device"
-msgstr ""
+msgstr "Десни клик на уређај"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:1
 msgid ""
@@ -4308,11 +4987,11 @@ msgstr "Преносилац фотографија"
 #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:5
 msgid ""
-"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;"
-"memory;card;"
+"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;memory"
+";card;"
 msgstr ""
-"фотографија;преузми;увези;снимак;фото-апарат;телефон;резерва;меморија;"
-"картица;"
+"фотографија;преузми;увези;снимак;фото-"
+"апарат;телефон;резерва;меморија;картица;"
 
 #: ../data/kde/net.damonlynch.rapid-photo-downloader.desktop.in.h:1
 msgid "Download Photos and Videos with Rapid Photo Downloader"
@@ -4357,6 +5036,7 @@ msgstr "Преузмите фотографије и снимке са Брзи�
 #~ msgid "Madrid"
 #~ msgstr "Мадрид"
 
+#, python-format
 #~ msgid "<i>Example: %s</i>"
 #~ msgstr "<i>Пример: %s</i>"
 
@@ -4378,6 +5058,7 @@ msgstr "Преузмите фотографије и снимке са Брзи�
 #~ msgid "and"
 #~ msgstr "и"
 
+#, python-format
 #~ msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 #~ msgstr "Преостало је %(minutes)i:%(seconds)02i"
 
@@ -4390,6 +5071,7 @@ msgstr "Преузмите фотографије и снимке са Брзи�
 #~ msgid "About 1 minute remaining"
 #~ msgstr "Преостао је 1 минут"
 
+#, python-format
 #~ msgid "and %s"
 #~ msgstr "и %s"
 
@@ -4421,8 +5103,7 @@ msgstr "Преузмите фотографије и снимке са Брзи�
 #~ msgstr "Сам пронађи преносне меморијске уређаје"
 
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Rename Options</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Опције за преименовање</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Опције за преименовање</span>"
 
 #~ msgid "Device Detected"
 #~ msgstr "Пронађен је нови уређај"
@@ -4442,15 +5123,18 @@ msgstr "Преузмите фотографије и снимке са Брзи�
 #~ msgid "Rename Options"
 #~ msgstr "Опције преименовања"
 
+#, python-format
 #~ msgid "Source: %(source)s"
 #~ msgstr "Извор: %(source)s"
 
 #~ msgid "Error in Photo Rename preferences"
 #~ msgstr "Грешка у поставкама за преименовање фотографија"
 
+#, python-format
 #~ msgid "Select a folder containing %(file_types)s"
 #~ msgstr "Изаберите фасциклу која садржи %(file_types)s"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s"
 #~ msgstr "%(number)s од %(total)s %(filetypes)s"
 
@@ -4473,6 +5157,7 @@ msgstr "Преузмите фотографије и снимке са Брзи�
 #~ msgid "Photo Rename"
 #~ msgstr "Преименовање фотографија"
 
+#, python-format
 #~ msgid ""
 #~ "%(date)s\n"
 #~ "%(time)s"
@@ -4480,18 +5165,23 @@ msgstr "Преузмите фотографије и снимке са Брзи�
 #~ "%(date)s\n"
 #~ "%(time)s"
 
+#, python-format
 #~ msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
+#, python-format
 #~ msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
+#, python-format
 #~ msgid "%(date)s %(time)s"
 #~ msgstr "%(date)s %(time)s"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 #~ msgstr "%(number)s од %(total)s %(filetypes)s (преостаје %(remaining)s)"
 
+#, python-format
 #~ msgid "Error: %(inst)s"
 #~ msgstr "Грешка: %(inst)s"
 
@@ -4507,12 +5197,15 @@ msgstr "Преузмите фотографије и снимке са Брзи�
 #~ msgid "Free space:"
 #~ msgstr "Слободан простор:"
 
+#, python-format
 #~ msgid "(%(file_type)s)"
 #~ msgstr "(%(file_type)s)"
 
+#, python-format
 #~ msgid "%(free)s %(file_type)s"
 #~ msgstr "%(free)s %(file_type)s"
 
+#, python-format
 #~ msgid "Folder: %s"
 #~ msgstr "Фасцикла: %s"
 
@@ -4522,6 +5215,7 @@ msgstr "Преузмите фотографије и снимке са Брзи�
 #~ msgid "."
 #~ msgstr "."
 
+#, python-format
 #~ msgid ""
 #~ "%(problem)s\n"
 #~ "File: %(file)s"
@@ -4529,27 +5223,33 @@ msgstr "Преузмите фотографије и снимке са Брзи�
 #~ "%(problem)s\n"
 #~ "Датотека: %(file)s"
 
+#, python-format
 #~ msgid "Error: %(errorno)s %(strerror)s"
 #~ msgstr "Грешка: %(errorno)s %(strerror)s"
 
 #~ msgid "The metadata might be corrupt."
 #~ msgstr "Метаподаци су можда неисправни."
 
+#, python-format
 #~ msgid "%s, "
 #~ msgstr "%s, "
 
+#, python-format
 #~ msgid "%(volume)s, "
 #~ msgstr "%(volume)s, "
 
+#, python-format
 #~ msgid "%(volume)s (%(inst)s), "
 #~ msgstr "%(volume)s (%(inst)s), "
 
 #~ msgid "The following metadata is missing: "
 #~ msgstr "Недостају следећи метаподаци: "
 
+#, python-format
 #~ msgid "%(previousproblem)s, and %(backinguperror)s"
 #~ msgstr "%(previousproblem)s, и %(backinguperror)s"
 
+#, python-format
 #~ msgid "Path: %s"
 #~ msgstr "Путања: %s"
 
@@ -4627,8 +5327,7 @@ msgstr "Преузмите фотографије и снимке са Брзи�
 #~ "The filename, extension and Exif information indicate it has already been "
 #~ "downloaded."
 #~ msgstr ""
-#~ "Назив датотеке, проширење и Ексиф подаци указују да је датотека већ "
-#~ "преузета."
+#~ "Назив датотеке, проширење и Ексиф подаци указују да је датотека већ преузета."
 
 #~ msgid "Errors occurred when backing up on the following backup devices: "
 #~ msgstr "Грешка приликом прављења резерве на следећим уређајима: "
@@ -4667,12 +5366,11 @@ msgstr "Преузмите фотографије и снимке са Брзи�
 #~ "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."
+#~ "When this option is enabled, and a potential device is detected, you will be "
+#~ "prompted to determine if it should be scanned or not."
 #~ msgstr ""
-#~ "Уколико омогућите аутоматско налажење преносних уређаја, то може да "
-#~ "потраје када је преносни уређај велики јер ће бити претражен у "
-#~ "потпуности.\n"
+#~ "Уколико омогућите аутоматско налажење преносних уређаја, то може да потраје "
+#~ "када је преносни уређај велики јер ће бити претражен у потпуности.\n"
 #~ "\n"
 #~ "При налажењу одговарајућег уређаја бићете упитани да ли желите да га "
 #~ "претражите или не."
@@ -4707,17 +5405,21 @@ msgstr "Преузмите фотографије и снимке са Брзи�
 #~ msgid "Refresh"
 #~ msgstr "Освежи"
 
+#, python-format
 #~ msgid "No backup device contains a valid folder for backing up %(filetype)s"
 #~ msgstr ""
 #~ "Ниједан уређај резерве не садржи исправну фасциклу за стварање резерве "
 #~ "„%(filetype)s“"
 
+#, python-format
 #~ msgid "Backup %(file_type)s overwritten"
 #~ msgstr "Резерва „%(file_type)s“ је преписана"
 
+#, python-format
 #~ msgid "%(file_type)s not backed up"
 #~ msgstr "није направљена резерва за „%(file_type)s“"
 
+#, python-format
 #~ msgid "The %(filetype)s did not download correctly"
 #~ msgstr "„%(filetype)s“ није исправно преузета"
 
@@ -4730,25 +5432,29 @@ msgstr "Преузмите фотографије и снимке са Брзи�
 #~ msgstr ""
 #~ "Провера датотеке није успела. Преузето издање се разликује од изворног."
 
+#, python-format
 #~ msgid ""
-#~ "File verification failed on %(volume)s. The backed up version is "
-#~ "different from the downloaded version."
+#~ "File verification failed on %(volume)s. The backed up version is different "
+#~ "from the downloaded version."
 #~ msgstr ""
-#~ "Провера датотеке на „%(volume)s“ није успела. Издање резерве се разликује "
-#~ "од преузетог издања."
+#~ "Провера датотеке на „%(volume)s“ није успела. Издање резерве се разликује од "
+#~ "преузетог издања."
 
 #~ msgid "File verification failed on these devices: "
 #~ msgstr "Провера датотеке није успела на овим уређајима: "
 
+#, python-format
 #~ msgid "%(device)s did not unmount"
 #~ msgstr "%(device)s није откачен"
 
 #~ msgid "the root of the file system"
 #~ msgstr "корен система датотека"
 
+#, python-format
 #~ msgid "Downloading from %(location)s."
 #~ msgstr "Преузми са „%(location)s“."
 
+#, python-format
 #~ msgid "About %i seconds remaining"
 #~ msgstr "Преостало је %i секунде"
 
@@ -4770,30 +5476,39 @@ msgstr "Преузмите фотографије и снимке са Брзи�
 #~ msgid "Using backup device"
 #~ msgstr "Употреба уређаја резерве"
 
+#, python-format
 #~ msgid "%(free)s free"
 #~ msgstr "%(free)s је слободно"
 
+#, python-format
 #~ msgid "Backing up photos and videos to %(path)s"
 #~ msgstr "Правим резерву фотографија и снимака у „%(path)s“"
 
+#, python-format
 #~ msgid "Backing up to %(path)s"
 #~ msgstr "Правим резерву у „%(path)s“"
 
+#, python-format
 #~ msgid "Backing up photos to %(path)s and videos to %(path2)s"
 #~ msgstr "Правим резерву слика у „%(path)s“ и снимака у „%(path2)s“"
 
+#, python-format
 #~ msgid "%(freespace)s. %(backuppaths)s."
 #~ msgstr "%(freespace)s. у „%(backuppaths)s“."
 
+#, python-format
 #~ msgid "%(file_type)s download folder does not exist"
 #~ msgstr "Фасцикла за преузимање „%(file_type)s“ датотека не постоји"
 
+#, python-format
 #~ msgid "%(file_type)s download folder is invalid"
 #~ msgstr "Фасцикла за преузимање „%(file_type)s“ датотека је неисправна"
 
+#, python-format
 #~ msgid "%(file_type)s download folder is not writable"
 #~ msgstr "Фасцикла за преузимање „%(file_type)s“ датотека није уписива"
 
+#, python-format
 #~ msgid ""
 #~ "display program information on the command line as the program runs "
 #~ "(default: %default)"
@@ -4809,8 +5524,7 @@ msgstr "Преузмите фотографије и снимке са Брзи�
 
 #~ msgid "list photo and video file extensions the program recognizes and exit"
 #~ msgstr ""
-#~ "исписује проширења подржаних слика и снимака које програм препознаје и "
-#~ "излази"
+#~ "исписује проширења подржаних слика и снимака које програм препознаје и излази"
 
 #~ msgid ""
 #~ "automatically detect devices from which to download, overwriting existing "
@@ -4820,8 +5534,8 @@ msgstr "Преузмите фотографије и снимке са Брзи�
 #~ "програма"
 
 #~ msgid ""
-#~ "manually specify the PATH of the device from which to download, "
-#~ "overwriting existing program preferences"
+#~ "manually specify the PATH of the device from which to download, overwriting "
+#~ "existing program preferences"
 #~ msgstr ""
 #~ "ручно наводи ПУТАЊУ уређаја са ког ће преузети, преписујући постојеће "
 #~ "поставке програма"
@@ -4833,15 +5547,17 @@ msgstr "Преузмите фотографије и снимке са Брзи�
 #~ "Error: specify device auto-detection or manually specify a device's path "
 #~ "from which to download, but do not do both."
 #~ msgstr ""
-#~ "Грешка: наведите само-откривање уређаја или ручно наведите путању уређаја "
-#~ "са којих се преузима, али не оба истовремено."
+#~ "Грешка: наведите само-откривање уређаја или ручно наведите путању уређаја са "
+#~ "којих се преузима, али не оба истовремено."
 
 #~ msgid "All settings and preferences have been reset"
 #~ msgstr "Сва подешавања и поставке су враћене на основне вредности"
 
+#, python-format
 #~ msgid "Destination directory could not be created: %(directory)s\n"
 #~ msgstr "Не могу да направим директоријум одредишта: %(directory)s\n"
 
+#, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
 #~ "Destination: %(destination)s"
@@ -4849,6 +5565,7 @@ msgstr "Преузмите фотографије и снимке са Брзи�
 #~ "Извор: %(source)s\n"
 #~ "Одредиште: %(destination)s"
 
+#, python-format
 #~ msgid "Backup of %(file_type)s already exists"
 #~ msgstr "Већ постоји резерва за „%(file_type)s“"
 
@@ -4887,8 +5604,8 @@ msgstr "Преузмите фотографије и снимке са Брзи�
 #~ "<i><b>Warning:</b> There is insufficient metadata to fully generate the "
 #~ "name. Please use other renaming options.</i>"
 #~ msgstr ""
-#~ "<i><b>Упозорење:</b> Нема довољно метаподатака за образовање пуног "
-#~ "назива. Искористите друге опције за преименовање.</i>"
+#~ "<i><b>Упозорење:</b> Нема довољно метаподатака за образовање пуног назива. "
+#~ "Искористите друге опције за преименовање.</i>"
 
 #~ msgid ""
 #~ "<i><b>Warning:</b> There is insufficient metadata to fully generate "
@@ -4897,6 +5614,7 @@ msgstr "Преузмите фотографије и снимке са Брзи�
 #~ "<i><b>Упозорење:</b> Нема довољно метаподатака за образовање садржаних "
 #~ "фасцикли. Искористите другу опцију за именовање садржаних фасцикли.</i>"
 
+#, python-format
 #~ msgid ""
 #~ "The %(filetype)s subfolder preferences entered are invalid and cannot be "
 #~ "used.\n"
@@ -4906,6 +5624,7 @@ msgstr "Преузмите фотографије и снимке са Брзи�
 #~ "коришћене.\n"
 #~ "Враћам поставке на основне вредности."
 
+#, python-format
 #~ msgid ""
 #~ "The following regular expressions are invalid, and will be removed unless "
 #~ "you correct them:\n"
@@ -4914,9 +5633,10 @@ msgstr "Преузмите фотографије и снимке са Брзи�
 #~ "Следећи изрази су неисправни и биће уклоњени уколико их не исправите:\n"
 #~ " %s"
 
+#, python-format
 #~ msgid ""
-#~ "This regular expression is invalid, and will be removed unless you "
-#~ "correct it:\n"
+#~ "This regular expression is invalid, and will be removed unless you correct "
+#~ "it:\n"
 #~ " %s"
 #~ msgstr ""
 #~ "Следећи израз је неисправан и биће уклоњен уколико га не исправите:\n"
@@ -4943,24 +5663,31 @@ msgstr "Преузмите фотографије и снимке са Брзи�
 #~ msgid "Stockholm"
 #~ msgstr "Вршац"
 
+#, python-format
 #~ msgid "Date time value %s appears invalid."
 #~ msgstr "Вредност датума и времена „%s“ изгледа да је неисправна."
 
+#, python-format
 #~ msgid "Error generating component %s."
 #~ msgstr "Грешка стварања састојка назива „%s“."
 
+#, python-format
 #~ msgid "%(filetype)s metadata cannot be read"
 #~ msgstr "Не могу да читам „%(filetype)s“ метаподатке"
 
+#, python-format
 #~ msgid "%(filetype)s %(area)s could not be generated"
 #~ msgstr "Не могу да створим „%(filetype)s %(area)s“"
 
+#, python-format
 #~ msgid "An error occurred when copying the %(filetype)s"
 #~ msgstr "Грешка приликом умножавања „%(filetype)s“"
 
+#, python-format
 #~ msgid "%(filetype)s already exists"
 #~ msgstr "Већ постоји „%(filetype)s“"
 
+#, python-format
 #~ msgid ""
 #~ "%(filetype)s could not be backed up because no suitable backup locations "
 #~ "were found."
@@ -4968,78 +5695,94 @@ msgstr "Преузмите фотографије и снимке са Брзи�
 #~ "Не могу да направим резерву „%(filetype)s“ датотека јер нисам нашао "
 #~ "одговарајућу путању."
 
+#, python-format
 #~ msgid "%(filetype)s was already downloaded"
 #~ msgstr "„%(filetype)s“ је већ преузето"
 
+#, python-format
 #~ msgid ""
-#~ "The existing %(filetype)s was last modified on %(date)s at %(time)s. "
-#~ "Unique identifier '%(identifier)s' added."
+#~ "The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
+#~ "identifier '%(identifier)s' added."
 #~ msgstr ""
 #~ "Постојећи „%(filetype)s“ је измењен %(date)s у %(time)s. Додат је "
 #~ "јединствени одредник „%(identifier)s“."
 
+#, python-format
 #~ msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
 #~ msgstr "Постојећи „%(filetype)s“ је измењен %(date)s у %(time)s."
 
+#, python-format
 #~ msgid "There is no data with which to name the %(filetype)s."
 #~ msgstr "Не постоје подаци са којима ће се именовати „%(filetype)s“."
 
+#, python-format
 #~ msgid " It was backed up to %(volume)s"
 #~ msgstr " Резерва је смештена на „%(volume)s“"
 
 #~ msgid " It was backed up to these devices: "
 #~ msgstr " Резерва је смештена на следећим уређајима: "
 
+#, python-format
 #~ msgid "%(volumes)s and %(final_volume)s."
 #~ msgstr "„%(volumes)s“ и „%(final_volume)s“."
 
+#, python-format
 #~ msgid ""
 #~ "Photos detected with the same filenames, but taken at different times: "
 #~ "%(details)s"
 #~ msgstr ""
-#~ "Откривене су фотографије са истим називом датотека, али сликане у "
-#~ "различито време: %(details)s"
+#~ "Откривене су фотографије са истим називом датотека, али сликане у различито "
+#~ "време: %(details)s"
 
+#, python-format
 #~ msgid "An error occurred when backing up on %(volume)s: %(inst)s."
 #~ msgstr "Грешка приликом прављења резерве на „%(volume)s“: %(inst)s."
 
+#, python-format
 #~ msgid "An error occurred when backing up on %(volume)s."
 #~ msgstr "Грешка приликом прављења резерве на „%(volume)s“."
 
+#, python-format
 #~ msgid "%(volumes)s and %(volume)s (%(inst)s)."
 #~ msgstr "„%(volumes)s“ и „%(volume)s“ (%(inst)s)."
 
+#, python-format
 #~ msgid "%(volumes)s and %(volume)s."
 #~ msgstr "„%(volumes)s“ и „%(volume)s“."
 
+#, python-format
 #~ msgid "Backup already exists on %(volume)s."
 #~ msgstr "Већ постоји резерва на „%(volume)s“."
 
+#, python-format
 #~ msgid "Backup overwritten on %(volume)s."
 #~ msgstr "Преписана је резерва на „%(volume)s“."
 
 #~ msgid "Backups overwritten on these devices: "
 #~ msgstr "Преписане су резерве на овим уређајима: "
 
+#, python-format
 #~ msgid "An error occurred when creating directories on %(volume)s: %(inst)s."
 #~ msgstr "Грешка приликом стварања директоријума на „%(volume)s“: %(inst)s."
 
 #~ msgid ""
-#~ "Errors occurred when creating directories on the following backup "
-#~ "devices: "
+#~ "Errors occurred when creating directories on the following backup devices: "
 #~ msgstr "Грешка приликом стварања директоријума на следећим уређајима: "
 
+#, python-format
 #~ msgid "%(previousproblem)s Additionally, %(newproblem)s"
 #~ msgstr "„%(previousproblem)s“ додатно, %(newproblem)s"
 
+#, python-format
 #~ msgid " Furthermore, there were %(problems)s."
 #~ msgstr " Такође, дошло је и до „%(problems)s“."
 
+#, python-format
 #~ msgid " Furthermore, there was a %(problem)s."
 #~ msgstr " Такође, дошло је и до „%(problem)s“."
 
-#~ msgid ""
-#~ "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
+#, python-format
+#~ msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
 #~ msgstr ""
 #~ "„%(missing_metadata_elements)s“ и „%(final_missing_metadata_element)s“."
 
@@ -5049,27 +5792,29 @@ msgstr "Преузмите фотографије и снимке са Брзи�
 #~ msgid "Problem in subfolder and filename generation"
 #~ msgstr "Проблем стварања садржане фасцикле и назива датотеке"
 
+#, python-format
 #~ msgid "Problems in %s generation"
 #~ msgstr "Проблеми стварања „%s“"
 
+#, python-format
 #~ msgid "Problem in %s generation"
 #~ msgstr "Проблем стварања „%s“"
 
+#, python-format
 #~ msgid "%(filetype)s already exists, but it was backed up"
 #~ msgstr "Већ постоји „%(filetype)s“, али је направљена резерва"
 
-#~ msgid ""
-#~ "An error occurred when copying the %(filetype)s, but it was backed up"
+#, python-format
+#~ msgid "An error occurred when copying the %(filetype)s, but it was backed up"
 #~ msgstr ""
 #~ "Дошло је до грешке приликом умножавања „%(filetype)s“, али је направљена "
 #~ "резерва"
 
-#~ msgid ""
-#~ "Photos detected with the same filenames, but taken at different times"
+#~ msgid "Photos detected with the same filenames, but taken at different times"
 #~ msgstr ""
-#~ "Откривене су фотографије са истим називом, које су сликане у различито "
-#~ "време"
+#~ "Откривене су фотографије са истим називом, које су сликане у различито време"
 
+#, python-format
 #~ msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
 #~ msgstr "прегледам (нађох %(photos)s фотографије и %(videos)s снимка)..."
 
@@ -5108,8 +5853,8 @@ msgstr "Преузмите фотографије и снимке са Брзи�
 
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Photo Download Folders</span>"
 #~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Фасцикле за преузете фотографије</"
-#~ "span>"
+#~ "<span weight=\"bold\" size=\"x-large\">Фасцикле за преузете "
+#~ "фотографије</span>"
 
 #~ msgid "<i>Example: /home/user/Pictures</i>"
 #~ msgstr "<i>Пример: „/home/user/Фотографије“</i>"
@@ -5124,8 +5869,8 @@ msgstr "Преузмите фотографије и снимке са Брзи�
 #~ "Choose the download folder. Subfolders for the downloaded photos will be "
 #~ "automatically created in this folder using the structure specified below."
 #~ msgstr ""
-#~ "Изаберите фасциклу за чување преузетих фотографија. Садржане фасцикле "
-#~ "биће направљене на основу задатог редоследа."
+#~ "Изаберите фасциклу за чување преузетих фотографија. Садржане фасцикле биће "
+#~ "направљене на основу задатог редоследа."
 
 #~ msgid "<b>Download Folder</b>"
 #~ msgstr "<b>Фасцикла за преузимања</b>"
@@ -5141,27 +5886,26 @@ msgstr "Преузмите фотографије и снимке са Брзи�
 #~ "<span weight=\"bold\" size=\"x-large\">Фасцикла за преузете снимке</span>"
 
 #~ 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>."
+#~ "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 ""
 #~ "Извините, преузимање снимака је искључено. За преузимање снимака "
-#~ "инсталирајте „<i>hachoir metadata</i>“ и „<i>kaa metadata</i>“ за Питон, "
-#~ "или „<i>exiftool</i>“."
+#~ "инсталирајте „<i>hachoir metadata</i>“ и „<i>kaa metadata</i>“ за Питон, или "
+#~ "„<i>exiftool</i>“."
 
 #~ msgid ""
 #~ "Choose the download folder. Subfolders for the downloaded videos will be "
 #~ "automatically created in this folder using the structure specified below."
 #~ msgstr ""
-#~ "Изаберите фасциклу за чување снимака. Садржане фасцикле биће направљене "
-#~ "на основу задатог редоследа."
+#~ "Изаберите фасциклу за чување снимака. Садржане фасцикле биће направљене на "
+#~ "основу задатог редоследа."
 
 #~ msgid "Video Folders"
 #~ msgstr "Фасцикле снимака"
 
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Преименовање снимака</span>\t"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Преименовање снимака</span>\t"
 
 #~ msgid "Video Rename"
 #~ msgstr "Преименовање снимака"
@@ -5193,13 +5937,13 @@ msgstr "Преузмите фотографије и снимке са Брзи�
 #~ "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"
+#~ "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>"
+#~ "<i>Downloading directly from cameras is currently an experimental feature. "
+#~ "If downloading directly from your camera works poorly or not at all, try "
+#~ "setting it to PTP mode. If that is not possible, a card reader must be "
+#~ "used.</i>"
 #~ msgstr ""
 #~ "Уређаји са којих се преузимају слике или снимци, као што су фото-апарати, "
 #~ "меморијске картице или преносна складишта.\n"
@@ -5207,32 +5951,32 @@ msgstr "Преузмите фотографије и снимке са Брзи�
 #~ "Можете преузимати податке са више уређаја у исто време или уместо уређаја "
 #~ "изабрати одређено место са вашег диска.\n"
 #~ "\n"
-#~ "<i>Директно преузимање са фото-апарата је још увек у развојној фази. "
-#~ "Уколико приметите да је брзина преузимања мала, или да преузимање уопште "
-#~ "не ради, поставите апарат у ПТП режим или купите читач картица.</i>"
+#~ "<i>Директно преузимање са фото-апарата је још увек у развојној фази. Уколико "
+#~ "приметите да је брзина преузимања мала, или да преузимање уопште не ради, "
+#~ "поставите апарат у ПТП режим или купите читач картица.</i>"
 
 #~ msgid "Location:"
 #~ msgstr "Путања:"
 
 #~ msgid ""
-#~ "If you disable automatic detection, choose the exact location of the "
-#~ "photos and videos."
+#~ "If you disable automatic detection, choose the exact location of the photos "
+#~ "and videos."
 #~ msgstr ""
 #~ "Уколико искључите аутоматско налажење уређаја, изаберите место до "
 #~ "фотографија и снимака."
 
 #~ 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."
+#~ "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 ""
-#~ "Запамћене путање су оне придружене уређајима које желите увек да "
-#~ "претражите или занемарите при самосталном тражењу уређаја."
+#~ "Запамћене путање су оне придружене уређајима које желите увек да претражите "
+#~ "или занемарите при самосталном тражењу уређаја."
 
 #~ 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."
+#~ "devices for photos or videos. Any path ending with the values below will not "
+#~ "be scanned."
 #~ msgstr ""
 #~ "Унесите део назива путања које желите да занемарите приликом претраживања "
 #~ "уређаја. Све путање које се завршавају овим називом биће занемарене."
@@ -5244,8 +5988,8 @@ msgstr "Преузмите фотографије и снимке са Брзи�
 #~ "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>"
+#~ "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 ""
 #~ "Наведите фасциклу на уређају у којој се чувају резерве.  \n"
 #~ "\n"
@@ -5278,20 +6022,19 @@ msgstr "Преузмите фотографије и снимке са Брзи�
 #~ msgstr "<b>Сукоби назива снимака и фотографија</b>"
 
 #~ 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."
+#~ "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 ""
-#~ "Када је већ преузета фотографија или снимак са истим називом, изаберите "
-#~ "или да је прескочите или да јој додате јединствену ознаку."
+#~ "Када је већ преузета фотографија или снимак са истим називом, изаберите или "
+#~ "да је прескочите или да јој додате јединствену ознаку."
 
 #~ 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 ""
-#~ "Приликом прављења резерве, изаберите да ли ће датотека са истим називом "
-#~ "бити преписана на уређају резерве или ће бити прескочена приликом "
-#~ "прављења резерве."
+#~ "Приликом прављења резерве, изаберите да ли ће датотека са истим називом бити "
+#~ "преписана на уређају резерве или ће бити прескочена приликом прављења "
+#~ "резерве."
 
 #~ msgid "Import your photos and videos efficiently and reliably"
 #~ msgstr "Увезите ваше фотографије и снимке брзо и поуздано"
diff --git a/po/sv.po b/po/sv.po
index 228f0e4..c400797 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,35 +7,386 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: damonlynch@gmail.com\n"
-"POT-Creation-Date: 2017-07-08 19:16-0500\n"
-"PO-Revision-Date: 2017-07-04 11:06+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2017-09-12 17:01-0400\n"
+"PO-Revision-Date: 2017-09-13 18:38+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
-"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-07-05 23:04+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-09-26 22:04+0000\n"
+"X-Generator: Launchpad (build 18463)\n"
+"Language: sv\n"
+
+#: ../install.py:65
+msgid "Rapid Photo Downloader installer"
+msgstr ""
+
+#: ../install.py:66
+msgid "Download and install latest version of Rapid Photo Downloader."
+msgstr ""
+
+#: ../install.py:236 ../install.py:1732
+msgid "Installer not found:"
+msgstr ""
+
+#. Translators: do not translate the term tar.gz
+#: ../install.py:240 ../install.py:1736
+msgid "Installer not in tar.gz format:"
+msgstr ""
+
+#: ../install.py:465
+msgid ""
+"Incorrect folder ownership detected. Changing ownership of and resetting "
+"permissions for"
+msgstr ""
+
+#: ../install.py:540
+msgid "The following command will be run:"
+msgstr ""
+
+#: ../install.py:543 ../install.py:1479 ../install.py:1484
+msgid "sudo may prompt you for the sudo password."
+msgstr ""
+
+#: ../install.py:547
+msgid "Would you like to run the command now?"
+msgstr ""
+
+#: ../install.py:549
+msgid "Answer is not yes, exiting."
+msgstr ""
+
+#: ../install.py:559 ../install.py:751 ../install.py:966
+msgid "Command failed"
+msgstr ""
+
+#: ../install.py:561 ../install.py:752 ../install.py:967
+msgid "Exiting"
+msgstr ""
+
+#: ../install.py:582
+msgid "The Universe repository must be enabled."
+msgstr ""
+
+#: ../install.py:606
+msgid ""
+"Do you want to to uninstall the previous version of Rapid Photo Downloader:"
+msgstr ""
+
+#: ../install.py:715 ../install.py:740
+msgid ""
+"Querying package system to see if an older version of Rapid Photo Downloader "
+"is installed (this may take a while)..."
+msgstr ""
+
+#: ../install.py:726
+msgid ""
+"Unable to query package system. Please check your Internet connection and "
+"try again"
+msgstr ""
+
+#: ../install.py:756
+msgid "Checking if previous version installed with pip..."
+msgstr ""
+
+#: ../install.py:850
+msgid "The following package is unknown on your system: {}\n"
+msgstr ""
+
+#: ../install.py:857 ../install.py:929 ../install.py:974
+msgid ""
+"To continue, some packages required to run the application will be installed."
+msgstr ""
+
+#: ../install.py:886
+msgid "Querying installed and available packages (this may take a while)"
+msgstr ""
+
+#: ../install.py:958
+msgid ""
+"Querying zypper to see if any required packages are already installed (this "
+"may take a while)... "
+msgstr ""
+
+#: ../install.py:1004
+msgid "Query to confirm action at each step."
+msgstr ""
+
+#: ../install.py:1011
+msgid ""
+"When downloading the latest version, install the development version if it "
+"is newer than the stable version."
+msgstr ""
+
+#: ../install.py:1020
+msgid ""
+"Optional tar.gz Rapid Photo Downloader installer archive. If not specified, "
+"the latest version is downloaded from the Internet."
+msgstr ""
+
+#: ../install.py:1043
+msgid ""
+"Do not run the installer in the tar.gz Rapid Photo Downloader installer "
+"archive if it is newer than this version ({}). The default is to run "
+"whichever installer is newer."
+msgstr ""
+
+#: ../install.py:1050
+msgid ""
+"Uninstall Rapid Photo Downloader that was installed with pip, keeping its "
+"dependencies."
+msgstr ""
+
+#: ../install.py:1054
+msgid ""
+"Uninstall the dependencies installed by pip during Rapid Photo Downloader's "
+"installation, and Rapid Photo Downloader itself, then exit."
+msgstr ""
+
+#: ../install.py:1059
+msgid ""
+"Note: this will not uninstall any version of Rapid Photo Downloader "
+"installed by your Linux distribution's package manager."
+msgstr ""
+
+#: ../install.py:1066
+msgid ""
+"Dependencies will only be removed if they are not required by other programs."
+msgstr ""
+
+#: ../install.py:1072
+msgid ""
+"Note: this option will remove the dependencies regardless of whether they "
+"are required by another program pip has installed. Upgrade to pip 9.0 or "
+"above if you want to avoid this behavior. You can do so using the command "
+"'python3 -m pip install pip -U --user'. Also note that any version of Rapid "
+"Photo Downloader installed by your Linux distribution's package manager will "
+"not be uninstalled."
+msgstr ""
+
+#: ../install.py:1122
+msgid "Failed to download versions file"
+msgstr ""
+
+#: ../install.py:1126
+msgid "Got error code {} while accessing versions file"
+msgstr ""
+
+#: ../install.py:1234
+msgid ""
+"Sorry, could not locate installer. Please check your Internet connection and "
+"verify if you can reach https://www.damonlynch.net\n"
+"\n"
+"Exiting.\n"
+msgstr ""
+
+#: ../install.py:1408
+msgid "Installing application requirements..."
+msgstr ""
+
+#: ../install.py:1424
+msgid "Received error code"
+msgstr ""
+
+#: ../install.py:1425
+msgid "Failed to install application requirements: exiting"
+msgstr ""
+
+#: ../install.py:1428
+msgid "Installing application..."
+msgstr ""
+
+#: ../install.py:1441
+msgid "Failed to install application: exiting..."
+msgstr ""
+
+#: ../install.py:1465
+msgid ""
+"You may have to restart the computer to be able to run the program from the "
+"commmand line or application launcher."
+msgstr ""
+
+#: ../install.py:1476
+msgid "Do you want to install the application's man pages?"
+msgstr ""
+
+#: ../install.py:1477
+msgid "They will be installed into {}"
+msgstr ""
+
+#: ../install.py:1478 ../install.py:1483
+msgid "If you uninstall the application, remove these manpages yourself."
+msgstr ""
+
+#: ../install.py:1480
+msgid "Do want to install the man pages?"
+msgstr ""
+
+#: ../install.py:1482
+msgid "Installing man pages into {}"
+msgstr ""
+
+#: ../install.py:1499
+msgid "Failed to create man page directory: exiting"
+msgstr ""
+
+#: ../install.py:1511
+msgid "Failed to copy man page."
+msgstr ""
+
+#: ../install.py:1521
+msgid "(If a segmentation fault occurs at exit, you can ignore it...)"
+msgstr ""
+
+#: ../install.py:1534
+msgid ""
+"The python3 tool pip is required to uninstall a version of Rapid Photo "
+"Downloader that was installed with pip.\n"
+"Cannot continue. Exiting."
+msgstr ""
+
+#: ../install.py:1575
+msgid ""
+"Do not run this installer script as sudo / root user.\n"
+"Run it using the user who will run the program.\n"
+msgstr ""
+
+#: ../install.py:1585 ../install.py:1599
+msgid "Do not include any other command line arguments when specifying"
+msgstr ""
+
+#: ../install.py:1614
+msgid ""
+"Sorry, this installer does not support a custom python installation.\n"
+"Exiting..."
+msgstr ""
+
+#: ../install.py:1620
+msgid "Restarting script using system python..."
+msgstr ""
+
+#: ../install.py:1651
+msgid "Exiting..."
+msgstr ""
+
+#. Translators: do not translate the term python3-apt
+#: ../install.py:1670
+msgid "To continue, the package python3-apt must be installed."
+msgstr ""
+
+#: ../install.py:1689
+msgid ""
+"Install the following packages using your Linux distribution's standard "
+"package manager, and then rerun this installer"
+msgstr ""
+
+#: ../install.py:1698
+msgid ""
+"To run this program, programs to assist Python 3 and its package management "
+"must be installed."
+msgstr ""
+
+#. Translators: do not translate the terms Python 3, pip and setuptools
+#: ../install.py:1713
+msgid "Python 3's pip and setuptools must be upgraded for your user."
+msgstr ""
+
+#. Translators: do not translate the term python or requests
+#: ../install.py:1726
+msgid "Installing python requests"
+msgstr ""
+
+#: ../upgrade.py:79
+msgid "Upgrade Rapid Photo Downloader"
+msgstr ""
+
+#: ../upgrade.py:401 ../raphodo/viewutils.py:242
+msgid "&Cancel"
+msgstr ""
+
+#: ../upgrade.py:405
+msgid "&Upgrade"
+msgstr ""
+
+#: ../upgrade.py:410
+#, python-format
+msgid "Click the Upgrade button to upgrade to version %s."
+msgstr ""
+
+#: ../upgrade.py:413
+msgid "Click the Upgrade button to start the upgrade."
+msgstr ""
+
+#: ../upgrade.py:416 ../upgrade.py:422 ../raphodo/viewutils.py:241
+msgid "&Close"
+msgstr ""
+
+#: ../upgrade.py:417
+msgid "&Run"
+msgstr ""
 
-#. type: QPushButton
-#: ../raphodo/aboutdialog.py:217
+#: ../upgrade.py:447
+msgid "Close Rapid Photo Downloader before running this upgrade"
+msgstr ""
+
+#: ../upgrade.py:450
+msgid "Upgrade running..."
+msgstr ""
+
+#: ../upgrade.py:486
+#, python-format
+msgid ""
+"Successfully upgraded to %s. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:491
+msgid ""
+"Upgrade finished successfully. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:495
+msgid "Upgrade failed. Click Close to exit."
+msgstr ""
+
+#: ../upgrade.py:6967
+#, python-format
+msgid "Upgrading %s..."
+msgstr ""
+
+#: ../upgrade.py:6969
+msgid "Press any key to continue..."
+msgstr ""
+
+#: ../upgrade.py:6982
+msgid "Rapid Photo Downloader upgrade failed"
+msgstr ""
+
+#: ../upgrade.py:6984
+#, python-format
+msgid ""
+"The python package %s could not be updated. The upgrade cannot continue."
+msgstr ""
+
+#: ../raphodo/aboutdialog.py:225
 msgid "Credits"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:239
+#: ../raphodo/backuppanel.py:240
 msgid "Backups are not configured"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:241
+#: ../raphodo/backuppanel.py:242
 msgid "No backup devices detected"
 msgstr "Hittade inga enheter för säkerhetskopiering"
 
-#: ../raphodo/backuppanel.py:243
+#: ../raphodo/backuppanel.py:244
 msgid "Valid backup locations not yet specified"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:401
+#: ../raphodo/backuppanel.py:404
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
@@ -43,97 +394,106 @@ msgstr ""
 "Du kan säkerhetskopiera dina bilder och filmer till flera mål när de "
 "överförs, till exempel externa hårddiskar."
 
-#: ../raphodo/backuppanel.py:407
+#: ../raphodo/backuppanel.py:412
 msgid "Back up photos and videos when downloading"
 msgstr "Säkerhetskopiera bilder och filmer under överföringen"
 
-#: ../raphodo/backuppanel.py:413
+#: ../raphodo/backuppanel.py:418
 msgid "Automatically detect backup devices"
 msgstr "Hitta enheter för säkerhetskopiering automatiskt"
 
-#: ../raphodo/backuppanel.py:417
+#: ../raphodo/backuppanel.py:424
 msgid ""
-"Specify the folder in which backups are stored on the device."
-"<br><br><i>Note: the presence of a folder with this name is used to "
+"Specify the folder in which backups are stored on the "
+"device.<br><br><i>Note: the presence of a folder with this name is used to "
 "determine if 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 folder names. By "
 "adding both folders, the same device can be used to back up both photos and "
 "videos.</i>"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:428
+#: ../raphodo/backuppanel.py:439
 msgid "Photo folder name:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:433
+#: ../raphodo/backuppanel.py:444
 msgid "Video folder name:"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:438 ../raphodo/nameeditor.py:883
+#: ../raphodo/backuppanel.py:449 ../raphodo/nameeditor.py:890
 #: ../raphodo/renamepanel.py:123
 msgid "Example:"
 msgstr "Exempel:"
 
-#: ../raphodo/backuppanel.py:448
-msgid "If you disable automatic detection, choose the exact backup locations."
+#: ../raphodo/backuppanel.py:460
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
 "Om du inaktiverar automatisk sökning, måste du ange exakta platser för "
 "säkerhetskopiorna."
 
-#: ../raphodo/backuppanel.py:452
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:468
 msgid "Photo backup location:"
 msgstr "Plats för säkerhetskopiering av bilder:"
 
-#: ../raphodo/backuppanel.py:454
+#: ../raphodo/backuppanel.py:474
 msgid "Select Photo Backup Location"
 msgstr "Välj plats för säkerhetskopiering av bilder"
 
-#: ../raphodo/backuppanel.py:460
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:485
 msgid "Video backup location:"
 msgstr "Plats för säkerhetskopiering av filmer:"
 
-#: ../raphodo/backuppanel.py:462
+#: ../raphodo/backuppanel.py:491
 msgid "Select Video Backup Location"
 msgstr "Välj plats för säkerhetskopiering av filmer"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:564
+#: ../raphodo/backuppanel.py:595
 msgid "drive1"
 msgstr "disk1"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:567
+#: ../raphodo/backuppanel.py:598
 msgid "drive2"
 msgstr "disk2"
 
-#: ../raphodo/backuppanel.py:628
+#: ../raphodo/backuppanel.py:663
 msgid "Projected Backup Storage Use"
 msgstr "Uppskattad storlek för säkerhetskopian"
 
-#: ../raphodo/backuppanel.py:632
+#: ../raphodo/backuppanel.py:669
 msgid "Backup Options"
 msgstr "Säkerhetskopieringsalternativ"
 
 #. translators: refers to the video thumbnail file that some
 #. cameras generate -- it has a .THM file extension
-#: ../raphodo/copyfiles.py:476
+#: ../raphodo/copyfiles.py:491
 msgid "video THM"
 msgstr ""
 
-#: ../raphodo/copyfiles.py:482
+#: ../raphodo/copyfiles.py:497
 msgid "audio"
 msgstr "ljud"
 
 #: ../raphodo/destinationdisplay.py:78 ../raphodo/devicedisplay.py:1079
-#: ../raphodo/rpdfile.py:321
+#: ../raphodo/rpdfile.py:342
 #, python-format
 msgid "%(no_photos)s Photos"
 msgstr "%(no_photos)s bilder"
 
 #: ../raphodo/destinationdisplay.py:82 ../raphodo/devicedisplay.py:1081
-#: ../raphodo/rpdfile.py:316
+#: ../raphodo/rpdfile.py:333
 #, python-format
 msgid "%(no_videos)s Videos"
 msgstr "%(no_videos)s filmer"
@@ -161,15 +521,15 @@ msgid "%(size_free)s free of %(size_total)s"
 msgstr "%(size_free)s ledigt av %(size_total)s"
 
 #: ../raphodo/destinationdisplay.py:190 ../raphodo/devicedisplay.py:993
-#: ../raphodo/rapid.py:1964 ../raphodo/rapid.py:2079 ../raphodo/rapid.py:5753
-#: ../raphodo/rpdfile.py:905
+#: ../raphodo/rapid.py:2023 ../raphodo/rapid.py:2151 ../raphodo/rapid.py:6043
+#: ../raphodo/rpdfile.py:930
 msgid "Photos"
 msgstr "Bilder"
 
 #. translators: the name of the Videos folder
 #: ../raphodo/destinationdisplay.py:191 ../raphodo/devicedisplay.py:994
-#: ../raphodo/rapid.py:1967 ../raphodo/rapid.py:2080 ../raphodo/rapid.py:5754
-#: ../raphodo/rpdfile.py:933 ../raphodo/storage.py:445
+#: ../raphodo/rapid.py:2028 ../raphodo/rapid.py:2152 ../raphodo/rapid.py:6044
+#: ../raphodo/rpdfile.py:958 ../raphodo/storage.py:449
 msgid "Videos"
 msgstr "Filmer"
 
@@ -177,7 +537,7 @@ msgstr "Filmer"
 msgid "Projected storage use after download"
 msgstr "Uppskattad lagringsanvändning efter hämtning"
 
-#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:516
+#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:521
 msgid "Custom..."
 msgstr "Anpassad..."
 
@@ -215,57 +575,58 @@ msgstr "Sök igen"
 msgid "%s full"
 msgstr "%s använt"
 
-#: ../raphodo/devices.py:459
+#: ../raphodo/devices.py:463
 msgid "Cameras"
 msgstr "Kameror"
 
-#: ../raphodo/devices.py:460 ../raphodo/devices.py:920
-#: ../raphodo/preferencedialog.py:85 ../raphodo/rapid.py:1927
+#: ../raphodo/devices.py:464 ../raphodo/devices.py:927
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/rapid.py:1979
 msgid "Devices"
 msgstr "Enheter"
 
-#: ../raphodo/devices.py:720
+#: ../raphodo/devices.py:724
 #, python-format
 msgid "Downloading from %(device_names)s"
 msgstr "Hämtar från %(device_names)s"
 
 #. Translators: e.g. Three Devices
-#: ../raphodo/devices.py:780
+#: ../raphodo/devices.py:784
 #, python-format
 msgid "%(no_devices)s %(device_type)s"
 msgstr "%(no_devices)s %(device_type)s"
 
-#: ../raphodo/devices.py:905 ../raphodo/rapid.py:1764
+#: ../raphodo/devices.py:912 ../raphodo/rapid.py:1807
 msgid "Select Source"
 msgstr "Välj källa"
 
-#: ../raphodo/devices.py:936 ../raphodo/devices.py:947
+#: ../raphodo/devices.py:943 ../raphodo/devices.py:954
 #, python-format
 msgid "%(device1)s + %(device2)s"
 msgstr "%(device1)s + %(device2)s"
 
 #. Number of cameras e.g. 3 Cameras
-#: ../raphodo/devices.py:958
+#: ../raphodo/devices.py:965
 #, python-format
 msgid "%(no_cameras)s Cameras"
 msgstr "%(no_cameras)s kameror"
 
-#: ../raphodo/devices.py:963
+#: ../raphodo/devices.py:970
 #, python-format
 msgid "%(no_devices)s Devices"
 msgstr "%(no_devices)s enheter"
 
 #. Translators: two folder names, separated by a plus sign
-#: ../raphodo/devices.py:1258
+#: ../raphodo/devices.py:1265
 #, python-format
 msgid "%s + %s"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:44
+#: ../raphodo/didyouknow.py:45
 msgid "Click on a file's checkbox to mark or unmark it for download."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:50
+#: ../raphodo/didyouknow.py:51
 msgid ""
 "Files that have already been downloaded are remembered. You can still mark "
 "previously downloaded files to download again, but they are unchecked by "
@@ -273,34 +634,67 @@ msgid ""
 "files that are yet to be downloaded."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:59
+#: ../raphodo/didyouknow.py:60
 msgid ""
 "If more than one file is selected, they'll all take the mark of the file "
 "whose checkbox was clicked, regardless of whether they previously had a "
 "checkmark or not."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:67
+#: ../raphodo/didyouknow.py:68
 msgid ""
 "Click on a device's checkbox to quickly mark or unmark all its files for "
 "downloading."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:74
+#: ../raphodo/didyouknow.py:75
+msgid ""
+"After a download finishes, an icon replaces the thumbnail's checkbox. The "
+"icon's color indicates whether the download was successful (green), had file "
+"renaming problems (yellow/orange), or failed (red)."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:83
+msgid ""
+"\n"
+"            In case of any problems, a red icon will appear at the bottom of "
+"the window\n"
+"            indicating how many error reports there are. Clicking on it "
+"opens the Error Report \n"
+"            window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:91
+msgid ""
+"\n"
+"            The Error Report window lists any problems encountered before, "
+"during or after the \n"
+"            download. An orange triangle represents a warning, a red circle "
+"indicates a failure, \n"
+"            and a black circle indicates more serious failures. You can "
+"click on the hyperlinks to \n"
+"            open its file or device in a file manager. You can also search "
+"the reports using the \n"
+"            search box in the lower left of the Error Report window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:103
 msgid ""
 "You can simultaneously download from multiple cameras, smartphones, memory "
 "cards, and hard drives&mdash;as many devices as your computer can handle at "
 "one time."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:81
+#: ../raphodo/didyouknow.py:110
 msgid ""
 "The <b>Timeline</b> groups photos and videos based on how much time elapsed "
 "between consecutive shots. Use it to identify photos and videos taken at "
 "different periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:88
+#: ../raphodo/didyouknow.py:117
 msgid ""
 "\n"
 "<p>In the illustration above, the first row of the Timeline is black because "
@@ -312,7 +706,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:99
+#: ../raphodo/didyouknow.py:128
 msgid ""
 "To view photos and videos for a particular time range, use the mouse "
 "(optionally in combination with the <tt>Shift</tt> or <tt>Ctrl</tt> keys) to "
@@ -320,20 +714,20 @@ msgid ""
 "the left side of the main window will be highlighted."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:106
+#: ../raphodo/didyouknow.py:135
 msgid ""
 "A download always includes all files that are checked for download, "
 "including those that are not currently displayed because the Timeline is "
 "being used."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:113
+#: ../raphodo/didyouknow.py:142
 msgid ""
 "You can hide or display the download sources by clicking on the name of the "
 "device you're downloading from at the top left of the program window."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:120
+#: ../raphodo/didyouknow.py:149
 msgid ""
 "\n"
 "          Thumbnails can be sorted using a variety of criteria:\n"
@@ -352,33 +746,33 @@ msgid ""
 "</ol> "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:137
+#: ../raphodo/didyouknow.py:166
 msgid ""
 "One of Rapid Photo Downloader's most useful features is its ability to "
 "automatically generate download subfolders and rename files as it downloads, "
 "using a scheme of your choosing."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:143
+#: ../raphodo/didyouknow.py:172
 msgid ""
 "To specify where you want your files downloaded and how you want them named, "
 "open the appropriate panel on the right-side of the application window: "
 "<b>Destination</b>, <b>Rename</b>, or <b>Job Code</b>."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:150
+#: ../raphodo/didyouknow.py:179
 msgid ""
 "\n"
 "When thinking about your download directory structure, keep in mind two "
 "different types\n"
 "of directory:\n"
 "<ol>\n"
-"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, &quot;"
-"Photos&quot;, or\n"
+"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, "
+"&quot;Photos&quot;, or\n"
 "&quot;Videos&quot;. This directory should already exist on your computer. In "
 "the illustration \n"
-"below, the destination folders are &quot;Pictures&quot; and &quot;"
-"Videos&quot;. The\n"
+"below, the destination folders are &quot;Pictures&quot; and "
+"&quot;Videos&quot;. The\n"
 "name of the destination folder is displayed in the grey bar directly above "
 "the folder tree, \n"
 "with a folder icon to its left and a gear icon to its far right.</li>\n"
@@ -391,7 +785,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:167
+#: ../raphodo/didyouknow.py:196
 msgid ""
 "\n"
 "You can download photos and videos to the same destination folder, or "
@@ -404,14 +798,14 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:177
+#: ../raphodo/didyouknow.py:206
 msgid ""
 "Automatically generated download subfolders can contain further "
 "automatically generated subfolders if need be. A common scheme is to create "
 "a year subfolder and then a series of year-month-day subfolders within it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:186
+#: ../raphodo/didyouknow.py:215
 msgid ""
 "\n"
 "Whenever possible, the program previews the download subfolders of photos "
@@ -429,7 +823,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:201
+#: ../raphodo/didyouknow.py:230
 msgid ""
 "\n"
 "Download subfolder names are typically generated using some or all of the "
@@ -453,7 +847,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:219
+#: ../raphodo/didyouknow.py:248
 msgid ""
 "\n"
 "To automatically create download subfolders as you download, \n"
@@ -463,7 +857,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:227
+#: ../raphodo/didyouknow.py:256
 msgid ""
 "\n"
 "Using the drop-down menu, select a built-in preset or click on <b>Custom</b> "
@@ -473,20 +867,20 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:237
+#: ../raphodo/didyouknow.py:266
 msgid ""
 "It's easy to download raw images into one folder, and jpeg images into "
 "another. Simply use the <b>Filename Extension</b> as part of your download "
 "subfolder generation scheme:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:242
+#: ../raphodo/didyouknow.py:271
 msgid ""
 "This illustration shows a saved custom preset named &quot;My custom "
 "preset&quot;."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:246
+#: ../raphodo/didyouknow.py:275
 msgid ""
 "\n"
 "You do not have to create nested download subfolders. This illustration "
@@ -497,7 +891,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:256
+#: ../raphodo/didyouknow.py:285
 msgid ""
 "\n"
 "Although there are many built-in date/time naming options, you may find that "
@@ -511,7 +905,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:265
+#: ../raphodo/didyouknow.py:294
 msgid ""
 "\n"
 "Read more about all the ways you can generate download subfolder names and "
@@ -521,7 +915,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:273
+#: ../raphodo/didyouknow.py:302
 msgid ""
 "\n"
 "<b>Job Codes</b> let you easily enter text that describes sets of photos and "
@@ -533,7 +927,7 @@ msgid ""
 "&quot;Green Bazaar&quot;: \n"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:282
+#: ../raphodo/didyouknow.py:311
 msgid ""
 "\n"
 "You can apply new or existing Job Codes before you start a download. If "
@@ -544,36 +938,36 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:291
+#: ../raphodo/didyouknow.py:320
 msgid "Look for hints to guide you when working with Job Codes:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:295
+#: ../raphodo/didyouknow.py:324
 msgid ""
 "Hints will vary depending on the context, such as when the mouse is hovering "
 "over a button."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:301
+#: ../raphodo/didyouknow.py:330
 msgid ""
 "\n"
 "When you give your photos and videos unique filenames, you'll never be "
 "confused as to \n"
 "which file is which. Using <b>sequence numbers</b> to make filenames unique "
 "is highly \n"
-"recommended!.\n"
+"recommended!\n"
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:309
+#: ../raphodo/didyouknow.py:338
 msgid ""
 "\n"
 "<p>Four types of sequence values are available to help you assign unique "
 "names to your photos and \n"
 "videos:\n"
 "<ol>\n"
-"<li><b>Downloads today</b>: tracks downloads completed during that day.</"
-"li>\n"
+"<li><b>Downloads today</b>: tracks downloads completed during that "
+"day.</li>\n"
 "<li><b>Stored number</b>: similar to Downloads today, but it is remembered "
 "from the last time the  \n"
 "program was run.</li>\n"
@@ -587,7 +981,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:327
+#: ../raphodo/didyouknow.py:356
 msgid ""
 "\n"
 "The <b>Rename</b> panel allows you to configure file renaming. To rename "
@@ -596,7 +990,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:334
+#: ../raphodo/didyouknow.py:363
 msgid ""
 "\n"
 "<p>The <b>Synchronize RAW + JPEG</b> option is useful if you use the RAW + "
@@ -615,7 +1009,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:348
+#: ../raphodo/didyouknow.py:377
 msgid ""
 "\n"
 "You can have your photos and videos backed up to multiple locations as they "
@@ -626,13 +1020,13 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:356
+#: ../raphodo/didyouknow.py:385
 msgid ""
 "In this example, the drive <b>photobackup</b> does not contain a folder "
 "named <tt>Videos</tt>, so videos will not be backed up to it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:362
+#: ../raphodo/didyouknow.py:391
 msgid ""
 "\n"
 "Several of the program's preferences can be set from the command line, "
@@ -643,7 +1037,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:372
+#: ../raphodo/didyouknow.py:396
+msgid "You can also import program preferences from the older 0.4 version."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:401
 msgid ""
 "\n"
 "Rapid Photo Downloader deals with three types of cache:\n"
@@ -653,8 +1051,8 @@ msgid ""
 "memory cards, and other devices.</li>\n"
 "<li>A <b>temporary cache</b> of files downloaded from a camera, one for "
 "photos and another for \n"
-"videos. They are located in temporary subfolders in the download destination."
-"</li>\n"
+"videos. They are located in temporary subfolders in the download "
+"destination.</li>\n"
 "<li>The <b>desktop's thumbnail cache</b>, in which Rapid Photo Downloader "
 "stores thumbnails of \n"
 "RAW and TIFF photos once they have been downloaded. File browsers like Gnome "
@@ -669,23 +1067,23 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:431
+#: ../raphodo/didyouknow.py:460
 msgid "Tip of the Day"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:439
+#: ../raphodo/didyouknow.py:468
 msgid "Did you know...?"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:466
+#: ../raphodo/didyouknow.py:495
 msgid "Show tips on startup"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:470
+#: ../raphodo/didyouknow.py:499
 msgid "&Next"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:471
+#: ../raphodo/didyouknow.py:500
 msgid "&Previous"
 msgstr ""
 
@@ -792,68 +1190,68 @@ msgstr "%d dygn, 1 timme"
 msgid "%(days)d days, %(hours)d hours"
 msgstr "%(days)d dygn, %(hours)d timmar"
 
-#: ../raphodo/errorlog.py:65
+#: ../raphodo/errorlog.py:66
 msgid "Find"
 msgstr ""
 
-#: ../raphodo/errorlog.py:135
+#: ../raphodo/errorlog.py:136
 msgid "Error Reports - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/errorlog.py:170
+#: ../raphodo/errorlog.py:171
 msgid "Find in reports"
 msgstr ""
 
-#: ../raphodo/errorlog.py:187
+#: ../raphodo/errorlog.py:188
 msgid "Find the previous occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:192
+#: ../raphodo/errorlog.py:193
 msgid "Find the next occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:194
+#: ../raphodo/errorlog.py:195
 msgid "&Highlight All"
 msgstr ""
 
-#: ../raphodo/errorlog.py:195
+#: ../raphodo/errorlog.py:196
 msgid "Highlight all occurrences of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:196
+#: ../raphodo/errorlog.py:197
 msgid "&Match Case"
 msgstr ""
 
-#: ../raphodo/errorlog.py:197
+#: ../raphodo/errorlog.py:198
 msgid "Search with case sensitivity"
 msgstr ""
 
-#: ../raphodo/errorlog.py:198
+#: ../raphodo/errorlog.py:199
 msgid "&Whole Words"
 msgstr ""
 
-#: ../raphodo/errorlog.py:199
+#: ../raphodo/errorlog.py:200
 msgid "Search whole words only"
 msgstr ""
 
-#: ../raphodo/errorlog.py:209 ../raphodo/errorlog.py:341
+#: ../raphodo/errorlog.py:210 ../raphodo/errorlog.py:345
 #, python-format
 msgid "%s of %s matches"
 msgstr ""
 
-#: ../raphodo/errorlog.py:228
+#: ../raphodo/errorlog.py:232
 msgid "Clear"
 msgstr ""
 
-#: ../raphodo/errorlog.py:328
+#: ../raphodo/errorlog.py:332
 msgid "Phrase not found"
 msgstr ""
 
-#: ../raphodo/errorlog.py:487
+#: ../raphodo/errorlog.py:491
 msgid "Search pending..."
 msgstr ""
 
-#: ../raphodo/errorlog.py:535
+#: ../raphodo/errorlog.py:539
 msgid ""
 "The number of new entries added to the Error Report since it was last open. "
 "Click to open the Error Report."
@@ -867,8 +1265,8 @@ msgstr ""
 #, python-brace-format
 msgid ""
 "<b>A problem occurred in Rapid Photo Downloader</b><br><br>\n"
-"    Please report the problem at <a href=\"{website}\">{website}</a>."
-"<br><br>\n"
+"    Please report the problem at <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
 "    Attach the log file <i>{log_file}</i> to your bug report (click\n"
 "    <a href=\"{log_path}\">here</a> to open the log directory).<br><br>If "
 "the same problem occurs\n"
@@ -889,7 +1287,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1601
+#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1643
 msgid "Open in File Browser..."
 msgstr ""
 
@@ -907,531 +1305,531 @@ msgstr ""
 msgid "%s (location does not exist)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:186
+#: ../raphodo/generatenameconfig.py:190
 msgid "Date time"
 msgstr "Datumtid"
 
-#: ../raphodo/generatenameconfig.py:187
+#: ../raphodo/generatenameconfig.py:191
 msgid "Text"
 msgstr "Text"
 
-#: ../raphodo/generatenameconfig.py:188 ../raphodo/rapid.py:2053
+#: ../raphodo/generatenameconfig.py:192 ../raphodo/rapid.py:2125
 msgid "Filename"
 msgstr "Filnamn"
 
-#: ../raphodo/generatenameconfig.py:189 ../raphodo/preferencedialog.py:488
+#: ../raphodo/generatenameconfig.py:193 ../raphodo/preferencedialog.py:724
 msgid "Metadata"
 msgstr "Metadata"
 
-#: ../raphodo/generatenameconfig.py:190
+#: ../raphodo/generatenameconfig.py:194
 msgid "Sequences"
 msgstr "Sekvenser"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: ../raphodo/generatenameconfig.py:193
+#: ../raphodo/generatenameconfig.py:197
 msgid "Job code"
 msgstr "Fototillfälle"
 
-#: ../raphodo/generatenameconfig.py:194
+#: ../raphodo/generatenameconfig.py:198
 msgid "Image date"
 msgstr "Bilddatum"
 
-#: ../raphodo/generatenameconfig.py:195
+#: ../raphodo/generatenameconfig.py:199
 msgid "Video date"
 msgstr "Filmdatum"
 
-#: ../raphodo/generatenameconfig.py:196
+#: ../raphodo/generatenameconfig.py:200
 msgid "Today"
 msgstr "Idag"
 
-#: ../raphodo/generatenameconfig.py:197
+#: ../raphodo/generatenameconfig.py:201
 msgid "Yesterday"
 msgstr "Igår"
 
 #. Translators: Download time is the time and date that the download started (when the
 #. user clicked the Download button)
-#: ../raphodo/generatenameconfig.py:200
+#: ../raphodo/generatenameconfig.py:204
 msgid "Download time"
 msgstr "Nedladdningsögonblick"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:203
+#: ../raphodo/generatenameconfig.py:207
 msgid "Name"
 msgstr "Namn"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:206 ../raphodo/rapid.py:2054
+#: ../raphodo/generatenameconfig.py:210 ../raphodo/rapid.py:2126
 msgid "Extension"
 msgstr "Filändelse"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:209
+#: ../raphodo/generatenameconfig.py:213
 msgid "Image number"
 msgstr "Bildnummer"
 
-#: ../raphodo/generatenameconfig.py:210
+#: ../raphodo/generatenameconfig.py:214
 msgid "Video number"
 msgstr "Filmnummer"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:213
+#: ../raphodo/generatenameconfig.py:217
 msgid "Aperture"
 msgstr "Bländare"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:216
+#: ../raphodo/generatenameconfig.py:220
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:219
+#: ../raphodo/generatenameconfig.py:223
 msgid "Exposure time"
 msgstr "Exponeringstid"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:222
+#: ../raphodo/generatenameconfig.py:226
 msgid "Focal length"
 msgstr "Brännvidd"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:225
+#: ../raphodo/generatenameconfig.py:229
 msgid "Camera make"
 msgstr "Kameratillverkare"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:228
+#: ../raphodo/generatenameconfig.py:232
 msgid "Camera model"
 msgstr "Kameramodell"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:231
+#: ../raphodo/generatenameconfig.py:235
 msgid "Short camera model"
 msgstr "Förkortning på kameramodell"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:234
+#: ../raphodo/generatenameconfig.py:238
 msgid "Hyphenated short camera model"
 msgstr "Utökad förkortning på kameramodell"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:237
+#: ../raphodo/generatenameconfig.py:241
 msgid "Serial number"
 msgstr "Serienummer"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:240
+#: ../raphodo/generatenameconfig.py:244
 msgid "Shutter count"
 msgstr "Antal exponeringar"
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: ../raphodo/generatenameconfig.py:242
+#: ../raphodo/generatenameconfig.py:246
 msgid "File number"
 msgstr "Filnummer"
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:244
+#: ../raphodo/generatenameconfig.py:248
 msgid "Folder only"
 msgstr "Endast mappen"
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:246
+#: ../raphodo/generatenameconfig.py:250
 msgid "Folder and file"
 msgstr "Mapp och fil"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:249
+#: ../raphodo/generatenameconfig.py:253
 msgid "Owner name"
 msgstr "Ägarens namn"
 
-#: ../raphodo/generatenameconfig.py:250
+#: ../raphodo/generatenameconfig.py:254
 msgid "Codec"
 msgstr "Avkodare"
 
-#: ../raphodo/generatenameconfig.py:251
+#: ../raphodo/generatenameconfig.py:255
 msgid "Width"
 msgstr "Bredd"
 
-#: ../raphodo/generatenameconfig.py:252
+#: ../raphodo/generatenameconfig.py:256
 msgid "Height"
 msgstr "Höjd"
 
-#: ../raphodo/generatenameconfig.py:253
+#: ../raphodo/generatenameconfig.py:257
 msgid "Length"
 msgstr "Längd"
 
-#: ../raphodo/generatenameconfig.py:254
+#: ../raphodo/generatenameconfig.py:258
 msgid "Frames Per Second"
 msgstr "Bildrutor per sekund"
 
-#: ../raphodo/generatenameconfig.py:255
+#: ../raphodo/generatenameconfig.py:259
 msgid "Artist"
 msgstr "Artist"
 
-#: ../raphodo/generatenameconfig.py:256
+#: ../raphodo/generatenameconfig.py:260
 msgid "Copyright"
 msgstr "Upphovsrätt"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:259
+#: ../raphodo/generatenameconfig.py:263
 msgid "Downloads today"
 msgstr "Överföringar idag"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:262
+#: ../raphodo/generatenameconfig.py:266
 msgid "Session number"
 msgstr "Sessionsnummer"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:265
+#: ../raphodo/generatenameconfig.py:269
 msgid "Subfolder number"
 msgstr "Nummer på undermapp"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:268
+#: ../raphodo/generatenameconfig.py:272
 msgid "Stored number"
 msgstr "Tidigare sekvensnummer"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: ../raphodo/generatenameconfig.py:271
+#: ../raphodo/generatenameconfig.py:275
 msgid "Sequence letter"
 msgstr "Sekvensbokstav"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:274
+#: ../raphodo/generatenameconfig.py:278
 msgid "All digits"
 msgstr "Enbart siffror"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:277
+#: ../raphodo/generatenameconfig.py:281
 msgid "Last digit"
 msgstr "Senaste siffra"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:280
+#: ../raphodo/generatenameconfig.py:284
 msgid "Last 2 digits"
 msgstr "Senaste två siffrorna"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:283
+#: ../raphodo/generatenameconfig.py:287
 msgid "Last 3 digits"
 msgstr "Senaste tre siffrorna"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:286
+#: ../raphodo/generatenameconfig.py:290
 msgid "Last 4 digits"
 msgstr "Senaste fyra siffrorna"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:289
+#: ../raphodo/generatenameconfig.py:293
 msgid "Original Case"
 msgstr "Använd ursprungligt skiftläge"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:292
+#: ../raphodo/generatenameconfig.py:296
 msgid "UPPERCASE"
 msgstr "VERSALER"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:295
+#: ../raphodo/generatenameconfig.py:299
 msgid "lowercase"
 msgstr "gemener"
 
-#: ../raphodo/generatenameconfig.py:296
+#: ../raphodo/generatenameconfig.py:300
 msgid "One digit"
 msgstr "En siffra"
 
-#: ../raphodo/generatenameconfig.py:297
+#: ../raphodo/generatenameconfig.py:301
 msgid "Two digits"
 msgstr "Två siffror"
 
-#: ../raphodo/generatenameconfig.py:298
+#: ../raphodo/generatenameconfig.py:302
 msgid "Three digits"
 msgstr "Tre siffror"
 
-#: ../raphodo/generatenameconfig.py:299
+#: ../raphodo/generatenameconfig.py:303
 msgid "Four digits"
 msgstr "Fyra siffror"
 
-#: ../raphodo/generatenameconfig.py:300
+#: ../raphodo/generatenameconfig.py:304
 msgid "Five digits"
 msgstr "Fem siffror"
 
-#: ../raphodo/generatenameconfig.py:301
+#: ../raphodo/generatenameconfig.py:305
 msgid "Six digits"
 msgstr "Sex siffror"
 
-#: ../raphodo/generatenameconfig.py:302
+#: ../raphodo/generatenameconfig.py:306
 msgid "Seven digits"
 msgstr "Sju siffror"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:305
+#: ../raphodo/generatenameconfig.py:309
 msgid "Subseconds"
 msgstr "Sekunddelar"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:308 ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:312 ../raphodo/generatenameconfig.py:393
 msgid "YYYYMMDD"
 msgstr "ÅÅÅÅMMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:311 ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:315 ../raphodo/generatenameconfig.py:394
 msgid "YYYY-MM-DD"
 msgstr "ÅÅÅÅ-MM-DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:314 ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:318 ../raphodo/generatenameconfig.py:395
 msgid "YYYY_MM_DD"
 msgstr "ÅÅÅÅ_MM_DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:317
+#: ../raphodo/generatenameconfig.py:321
 msgid "YYMMDD"
 msgstr "ÅÅMMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:320
+#: ../raphodo/generatenameconfig.py:324
 msgid "YY-MM-DD"
 msgstr "ÅÅ-MM-DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:323
+#: ../raphodo/generatenameconfig.py:327
 msgid "YY_MM_DD"
 msgstr "ÅÅ_MM_DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:326
+#: ../raphodo/generatenameconfig.py:330
 msgid "MMDDYYYY"
 msgstr "MMDDÅÅÅÅ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:329
+#: ../raphodo/generatenameconfig.py:333
 msgid "MMDDYY"
 msgstr "MMDDÅÅ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:332
+#: ../raphodo/generatenameconfig.py:336
 msgid "MMDD"
 msgstr "MMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:335
+#: ../raphodo/generatenameconfig.py:339
 msgid "DDMMYYYY"
 msgstr "DDMMÅÅÅÅ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:338
+#: ../raphodo/generatenameconfig.py:342
 msgid "DDMMYY"
 msgstr "DDMMÅÅ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:341 ../raphodo/generatenameconfig.py:389
-#: ../raphodo/generatenameconfig.py:390 ../raphodo/generatenameconfig.py:391
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:345 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:394 ../raphodo/generatenameconfig.py:395
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:397
 msgid "YYYY"
 msgstr "ÅÅÅÅ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:344
+#: ../raphodo/generatenameconfig.py:348
 msgid "YY"
 msgstr "ÅÅ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:347
+#: ../raphodo/generatenameconfig.py:351
 msgid "MM"
 msgstr "MM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:350
+#: ../raphodo/generatenameconfig.py:354
 msgid "DD"
 msgstr "DD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:353
+#: ../raphodo/generatenameconfig.py:357
 msgid "Month (full)"
 msgstr "Månad (fullständigt namn)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:356
+#: ../raphodo/generatenameconfig.py:360
 msgid "Month (abbreviated)"
 msgstr "Månad (förkortad)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:359
+#: ../raphodo/generatenameconfig.py:363
 msgid "HHMMSS"
 msgstr "HHMMSS"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:362
+#: ../raphodo/generatenameconfig.py:366
 msgid "HHMM"
 msgstr "HHMM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:365
+#: ../raphodo/generatenameconfig.py:369
 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
-#: ../raphodo/generatenameconfig.py:368
+#: ../raphodo/generatenameconfig.py:372
 msgid "HH-MM"
 msgstr "HH-MM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:371
+#: ../raphodo/generatenameconfig.py:375
 msgid "HH"
 msgstr "HH"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:374
+#: ../raphodo/generatenameconfig.py:378
 msgid "MM (minutes)"
 msgstr "MM (minuter)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:377
+#: ../raphodo/generatenameconfig.py:381
 msgid "SS"
 msgstr "SS"
 
-#: ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:393
 msgid "Date"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:394
 msgid "Date (hyphens)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:395
 msgid "Date (underscores)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:438
-#: ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:442
+#: ../raphodo/generatenameconfig.py:537
 msgid "Date and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392
+#: ../raphodo/generatenameconfig.py:396
 msgid "YYYYMM_Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "Date and Job Code Subfolder"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "YYYYMM"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393 ../raphodo/jobcodepanel.py:198
-#: ../raphodo/nameeditor.py:827 ../raphodo/rapid.py:1809
+#: ../raphodo/generatenameconfig.py:397 ../raphodo/jobcodepanel.py:199
+#: ../raphodo/nameeditor.py:833 ../raphodo/rapid.py:1852
 #: ../raphodo/renamepanel.py:83 ../raphodo/renamepanel.py:241
 msgid "Job Code"
 msgstr "Fototillfälle"
 
-#: ../raphodo/generatenameconfig.py:433 ../raphodo/generatenameconfig.py:512
+#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:532
 msgid "Original Filename"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "Date-Time and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "YYYYMMDD-HHMM-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "Date and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "YYYYMMDD-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "Date-Time and Image number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "YYYYMMDD-1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "Date-Time and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "YYYYMMDD-HHMM-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:442 ../raphodo/generatenameconfig.py:537
 msgid "YYYYMMDD-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "Date-Time and Video number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "YYYYMMDD_1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "Resolution"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "YYYYMMDD-HHMM-1-1920x1080"
 msgstr ""
 
@@ -1490,76 +1888,77 @@ msgstr ""
 msgid "&Remember this choice"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:185
+#: ../raphodo/jobcodepanel.py:186
 msgid ""
 "Select photos and videos to be able to apply a new or existing Job Code to "
 "them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:186
-msgid "The new Job Code will be applied to all selected photos and/or videos."
+#: ../raphodo/jobcodepanel.py:187
+msgid ""
+"The new Job Code will be applied to all selected photos and/or videos."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:187
+#: ../raphodo/jobcodepanel.py:188
 msgid ""
 "Click the Apply button to apply the current Job Code to all selected photos "
 "and/or videos. You can also simply double click the Job Code."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:189
+#: ../raphodo/jobcodepanel.py:190
 msgid ""
 "Removing a Job Code removes it only from the list of saved Job Codes, not "
 "from any photos or videos that it may have been applied to."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:191
+#: ../raphodo/jobcodepanel.py:192
 msgid ""
 "If you want to use Job Codes, configure file renaming or destination "
 "subfolder names to use them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:197
+#: ../raphodo/jobcodepanel.py:198
 msgid "Last Used"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:202
+#: ../raphodo/jobcodepanel.py:203
 msgid "Job Code Sort:"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:205 ../raphodo/rapid.py:2061
+#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2133
 msgid "Ascending"
 msgstr "Stigande"
 
-#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2062
+#: ../raphodo/jobcodepanel.py:207 ../raphodo/rapid.py:2134
 msgid "Descending"
 msgstr "Fallande"
 
-#: ../raphodo/jobcodepanel.py:216
+#: ../raphodo/jobcodepanel.py:217
 msgid "&New..."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:220
+#: ../raphodo/jobcodepanel.py:221
 msgid "&Apply"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:224
+#: ../raphodo/jobcodepanel.py:225
 msgid "&Remove"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:228 ../raphodo/preferencedialog.py:125
-#: ../raphodo/preferencedialog.py:154 ../raphodo/preferencedialog.py:433
+#: ../raphodo/jobcodepanel.py:229 ../raphodo/preferencedialog.py:200
+#: ../raphodo/preferencedialog.py:229 ../raphodo/preferencedialog.py:531
 msgid "Remove All"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:427
+#: ../raphodo/jobcodepanel.py:428
 msgid "Do you really want to remove all the Job Codes?"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:429
+#: ../raphodo/jobcodepanel.py:430
 msgid "Remove all Job Codes"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:492
+#: ../raphodo/jobcodepanel.py:493
 msgid "Job Codes"
 msgstr "Fototillfällen"
 
@@ -1570,42 +1969,58 @@ msgstr "Fototillfällen"
 msgid "<i><b>Hint:</b> %(message)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:418 ../raphodo/nameeditor.py:432
+#: ../raphodo/nameeditor.py:423 ../raphodo/nameeditor.py:437
 #, python-format
 msgid "%(description)s - %(elements)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:512
+#: ../raphodo/nameeditor.py:517
 msgid "Save New Custom Preset..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:513
+#: ../raphodo/nameeditor.py:518
 msgid "Remove All Custom Presets..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:559
+#: ../raphodo/nameeditor.py:564
 msgid "(New Custom Preset)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:576
+#: ../raphodo/nameeditor.py:581
 #, python-format
 msgid "%s (edited)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:579 ../raphodo/nameeditor.py:1370
+#: ../raphodo/nameeditor.py:584 ../raphodo/nameeditor.py:1379
 #, python-format
 msgid "Update Custom Preset \"%s\""
 msgstr ""
 
-#: ../raphodo/nameeditor.py:667
+#: ../raphodo/nameeditor.py:672
 msgid "Save New Custom Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:675
+#: ../raphodo/nameeditor.py:680
 msgid "Preset Name:"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:836
+#: ../raphodo/nameeditor.py:799
+msgid "Photo Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:805
+msgid "Video Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:811
+msgid "Photo Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:817
+msgid "Video Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:842
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>There is insufficient data to "
 "fully generate the name. Please use other renaming options.</i>"
@@ -1614,7 +2029,7 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees.
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:846
+#: ../raphodo/nameeditor.py:853
 #, python-format
 msgid "The character</i> %(separator)s <i>creates a new subfolder level."
 msgstr ""
@@ -1622,50 +2037,50 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:851
+#: ../raphodo/nameeditor.py:858
 #, python-format
 msgid ""
 "There is no need start or end with the folder separator </i> "
 "%(separator)s<i>, because it is added automatically."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:859
+#: ../raphodo/nameeditor.py:866
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>Unique filenames may not be "
 "generated. Make filenames unique by using Sequence values.</i>"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:882 ../raphodo/renamepanel.py:121
+#: ../raphodo/nameeditor.py:889 ../raphodo/renamepanel.py:121
 msgid "Preset:"
 msgstr ""
 
 #. Translators: appears in a combobox, e.g. Image Date (YYYY)
-#: ../raphodo/nameeditor.py:959 ../raphodo/nameeditor.py:980
+#: ../raphodo/nameeditor.py:966 ../raphodo/nameeditor.py:987
 #, python-brace-format
 msgid "{choice} ({variant})"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1005 ../raphodo/preferencedialog.py:530
+#: ../raphodo/nameeditor.py:1012 ../raphodo/preferencedialog.py:783
 msgid "Get help online..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1025
+#: ../raphodo/nameeditor.py:1034
 msgid "Insert"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1351
+#: ../raphodo/nameeditor.py:1360
 msgid "Save Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1356
+#: ../raphodo/nameeditor.py:1365
 msgid ""
-"<b>Do you want to save the changes in a new custom preset?</"
-"b><br><br>Creating a custom preset is not required, but can help you keep "
-"organized.<br><br>The changes to the preferences will still be applied "
-"regardless of whether you create a new custom preset or not."
+"<b>Do you want to save the changes in a new custom "
+"preset?</b><br><br>Creating a custom preset is not required, but can help "
+"you keep organized.<br><br>The changes to the preferences will still be "
+"applied regardless of whether you create a new custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1365
+#: ../raphodo/nameeditor.py:1374
 msgid ""
 "<b>Do you want to save the changes in a custom preset?</b><br><br>If you "
 "like, you can create a new custom preset or update the existing custom "
@@ -1673,136 +2088,167 @@ msgid ""
 "regardless of whether you save a custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1372
+#: ../raphodo/nameeditor.py:1381
 msgid "Save New Custom Preset"
 msgstr ""
 
-#: ../raphodo/newversion.py:306
+#: ../raphodo/newversion.py:312
 msgid "Checking for new version..."
 msgstr ""
 
-#: ../raphodo/newversion.py:307
+#: ../raphodo/newversion.py:313
 msgid "You are running the latest version."
 msgstr ""
 
-#: ../raphodo/newversion.py:308
+#: ../raphodo/newversion.py:314
 msgid "Failed to contact the update server."
 msgstr ""
 
-#: ../raphodo/newversion.py:310
+#: ../raphodo/newversion.py:316
 #, python-format
 msgid "A new version of Rapid Photo Downloader (%s) is available."
 msgstr ""
 
-#: ../raphodo/newversion.py:312
+#: ../raphodo/newversion.py:318
 msgid "Do you want to download the new version?"
 msgstr ""
 
-#: ../raphodo/newversion.py:313
+#: ../raphodo/newversion.py:319
 #, python-format
 msgid "Changes in the new release can be viewed <a href=\"%s\">here</a>."
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the s key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:340 ../raphodo/newversion.py:353
+#: ../raphodo/newversion.py:348 ../raphodo/newversion.py:363
 msgid "&Skip this release"
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the o key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:356
+#: ../raphodo/newversion.py:366
 msgid "&Open Download Page"
 msgstr ""
 
-#: ../raphodo/newversion.py:376
+#: ../raphodo/newversion.py:386
 msgid "Rapid Photo Downloader updates"
 msgstr ""
 
 #. Translators: shows how much of a file has been downloaded e.g  123 KB of 1.3 MB
-#: ../raphodo/newversion.py:478
+#: ../raphodo/newversion.py:488
 #, python-format
 msgid "%(downloaded)s of %(total)s"
 msgstr ""
 
-#: ../raphodo/newversion.py:495
+#: ../raphodo/newversion.py:507
 msgid "Downloading..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:76
+#: ../raphodo/preferencedialog.py:86
 msgid "Preferences"
 msgstr "Inställningar"
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Automation"
 msgstr "Automatisering"
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Thumbnails"
 msgstr "Miniatyrbilder"
 
-#: ../raphodo/preferencedialog.py:85 ../raphodo/preferencedialog.py:343
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/preferencedialog.py:428
 msgid "Error Handling"
 msgstr "Felhantering"
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:109
+msgid "Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:109 ../raphodo/preferencedialog.py:119
 msgid "Miscellaneous"
 msgstr "Diverse"
 
-#: ../raphodo/preferencedialog.py:94
+#: ../raphodo/preferencedialog.py:147
 msgid "Device Scanning"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:96
+#: ../raphodo/preferencedialog.py:148
 msgid "Scan only external devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:98
+#: ../raphodo/preferencedialog.py:150
 msgid ""
 "Scan for photos and videos only on devices that are external to the "
 "computer,\n"
 "including cameras, memory cards, external hard drives, and USB flash drives."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:102
-msgid "Scan non-camera devices lacking a DCIM folder"
+#: ../raphodo/preferencedialog.py:153
+msgid "Scan only specific folders on devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:104
+#: ../raphodo/preferencedialog.py:155
 msgid ""
-"Scan the entirety of a device for photos and videos, irrespective of whether "
-"it contains a DCIM folder,\n"
-"as opposed to only scanning within a DCIM folder.\n"
+"Scan for photos and videos only in the folders specified below (except "
+"paths\n"
+"specified in Ignored Paths).\n"
 "\n"
-"Changing this setting causes all devices to be scanned again.\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:161
+msgid "Folders to scan:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:164
+msgid ""
+"Folders at the base level of device file systems that will be scanned\n"
+"for photos and videos."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:167 ../raphodo/preferencedialog.py:219
+msgid "Add..."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:169
+msgid ""
+"Add a folder to the list of folders to scan for photos and videos.\n"
 "\n"
-"Note: With cameras, only the DCIM folder is scanned."
+"Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:116
+#: ../raphodo/preferencedialog.py:172 ../raphodo/preferencedialog.py:198
+#: ../raphodo/preferencedialog.py:224 ../raphodo/preferencedialog.py:529
+msgid "Remove"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:174
+msgid ""
+"Remove a folder from the list of folders to scan for photos and videos.\n"
+"\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:191
 msgid "Devices that have been set to automatically ignore or download from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:117
+#: ../raphodo/preferencedialog.py:192
 msgid "Remembered Devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:121
+#: ../raphodo/preferencedialog.py:196
 msgid ""
 "Remove a device from the list of devices to automatically ignore or download "
 "from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:123 ../raphodo/preferencedialog.py:149
-#: ../raphodo/preferencedialog.py:431
-msgid "Remove"
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:127
+#: ../raphodo/preferencedialog.py:202
 msgid ""
 "Clear the list of devices from which to automatically ignore or download "
 "from.\n"
@@ -1810,315 +2256,436 @@ msgid ""
 "Note: Changes take effect when the computer is next scanned for devices."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:140
+#: ../raphodo/preferencedialog.py:215
 msgid "Ignored Paths"
 msgstr "Ignorerade sökvägar"
 
-#: ../raphodo/preferencedialog.py:141
+#: ../raphodo/preferencedialog.py:216
 msgid ""
 "The end part of a path that should never be scanned for photos or videos."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:144
-msgid "Add..."
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:146
+#: ../raphodo/preferencedialog.py:221
 msgid ""
 "Add a path to the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:151
+#: ../raphodo/preferencedialog.py:226
 msgid ""
 "Remove a path from the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:156
+#: ../raphodo/preferencedialog.py:231
 msgid ""
 "Clear the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:164
+#: ../raphodo/preferencedialog.py:239
 msgid ""
-"Use python-style <a href=\"http://damonlynch.net/rapid/documentation/"
-"#regularexpressions\">regular expressions</a>"
+"Use python-style <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">regula"
+"r expressions</a>"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:168
+#: ../raphodo/preferencedialog.py:243
 msgid ""
 "Use regular expressions in the list of ignored paths.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:208
+#: ../raphodo/preferencedialog.py:283
 msgid "Program Automation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:209
+#: ../raphodo/preferencedialog.py:284
 msgid "Start downloading at program startup"
 msgstr "Påbörja överföringen när programmet startar"
 
-#: ../raphodo/preferencedialog.py:210
+#: ../raphodo/preferencedialog.py:285
 msgid "Start downloading upon device insertion"
 msgstr "Påbörja överföring när en enhet sätts i"
 
-#: ../raphodo/preferencedialog.py:211
+#: ../raphodo/preferencedialog.py:286
 msgid "Unmount (eject) device upon download completion"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:212
+#: ../raphodo/preferencedialog.py:287
 msgid "Exit program when download completes"
 msgstr "Avsluta programmet när överföringen är färdig"
 
-#: ../raphodo/preferencedialog.py:213
+#: ../raphodo/preferencedialog.py:288
 msgid "Exit program even if download had warnings or errors"
 msgstr "Avsluta programmet även om fel eller varningar uppstod"
 
-#: ../raphodo/preferencedialog.py:240
+#: ../raphodo/preferencedialog.py:315
 msgid "Thumbnail Generation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:241
+#: ../raphodo/preferencedialog.py:316
 msgid "Generate thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:242
+#: ../raphodo/preferencedialog.py:318
 msgid "Generate thumbnails to show in the main program window"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:244
+#: ../raphodo/preferencedialog.py:320
 msgid "Cache thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:245
+#: ../raphodo/preferencedialog.py:323
 msgid ""
 "Save thumbnails shown in the main program window in a thumbnail cache unique "
 "to Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:247
+#: ../raphodo/preferencedialog.py:327
 msgid "Generate system thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:248
+#: ../raphodo/preferencedialog.py:330
 msgid ""
 "While downloading, save thumbnails that can be used by desktop file managers "
 "and other programs"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:255
+#: ../raphodo/preferencedialog.py:339
 msgid "Number of CPU cores used to generate thumbnails."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:256
+#: ../raphodo/preferencedialog.py:340
 msgid "CPU cores:"
 msgstr ""
 
 #. Translators: the * acts as an asterisk to denote a reference to an annotation
 #. such as '* Takes effect upon program restart'
-#: ../raphodo/preferencedialog.py:271 ../raphodo/preferencedialog.py:317
+#: ../raphodo/preferencedialog.py:355 ../raphodo/preferencedialog.py:401
 msgid "*"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:294
+#: ../raphodo/preferencedialog.py:378
 msgid "Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:296
+#: ../raphodo/preferencedialog.py:380
 msgid "Calculating..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:302
+#: ../raphodo/preferencedialog.py:386
 msgid "days"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:303
+#: ../raphodo/preferencedialog.py:387
 msgid "forever"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:308
+#: ../raphodo/preferencedialog.py:392
 msgid "Cache size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:310
+#: ../raphodo/preferencedialog.py:394
 msgid "Number of thumbnails:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:312
+#: ../raphodo/preferencedialog.py:396
 msgid "Database size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:314
+#: ../raphodo/preferencedialog.py:398
 msgid "Cache unaccessed thumbnails for:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:322
+#: ../raphodo/preferencedialog.py:406
 msgid "Purge Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:323
+#: ../raphodo/preferencedialog.py:408
 msgid "Optimize Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:336
+#: ../raphodo/preferencedialog.py:421
 msgid "* Takes effect upon program restart"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:346
+#: ../raphodo/preferencedialog.py:431
 msgid "Skip download"
 msgstr "Hoppa över överföring"
 
-#: ../raphodo/preferencedialog.py:347
+#: ../raphodo/preferencedialog.py:432
 msgid "Don't download the file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:348
+#: ../raphodo/preferencedialog.py:433
 msgid "Add unique identifier"
 msgstr "Lägg till unik identifierare"
 
-#: ../raphodo/preferencedialog.py:349
+#: ../raphodo/preferencedialog.py:436
 msgid ""
 "Add an identifier like _1 or _2 to the end of the filename, immediately "
 "before the file's extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:355
+#: ../raphodo/preferencedialog.py:444
 msgid "Overwrite"
 msgstr "Skriv över"
 
-#: ../raphodo/preferencedialog.py:356
+#: ../raphodo/preferencedialog.py:445
 msgid "Overwrite the previously backed up file"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:357
+#: ../raphodo/preferencedialog.py:446
 msgid "Skip"
 msgstr "Hoppa över"
 
-#: ../raphodo/preferencedialog.py:358
+#: ../raphodo/preferencedialog.py:448
 msgid "Don't overwrite the backup file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:364
+#: ../raphodo/preferencedialog.py:455
 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 identifier:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:378
+#: ../raphodo/preferencedialog.py:464
+msgid ""
+"Using sequence numbers to automatically generate unique filenames is "
+"strongly recommended. Configure file renaming in the Rename panel in the "
+"main window."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:473
 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 ""
 
-#: ../raphodo/preferencedialog.py:398
+#: ../raphodo/preferencedialog.py:494
 msgid "Program Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:399
+#: ../raphodo/preferencedialog.py:495
 msgid "Show a warning when:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:402
+#: ../raphodo/preferencedialog.py:498
 msgid "Downloading files currently not displayed"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:403
+#: ../raphodo/preferencedialog.py:499
 msgid ""
 "Warn when about to download files that are not displayed in the main window."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:405
+#: ../raphodo/preferencedialog.py:501
 msgid "Backup destinations are missing"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:406
-msgid "Warn before starting a download if it is not possible to back up files."
+#: ../raphodo/preferencedialog.py:502
+msgid ""
+"Warn before starting a download if it is not possible to back up files."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:408
+#: ../raphodo/preferencedialog.py:504
 msgid "Program libraries are missing or broken"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:409
+#: ../raphodo/preferencedialog.py:505
 msgid ""
 "Warn if a software library used by Rapid Photo Downloader is missing or not "
 "functioning."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:412
+#: ../raphodo/preferencedialog.py:508
 msgid "Filesystem metadata cannot be set"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:413
+#: ../raphodo/preferencedialog.py:509
 msgid ""
 "Warn if there is an error setting a file's filesystem metadata, such as its "
 "modification time."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:416
+#: ../raphodo/preferencedialog.py:512
 msgid "Encountering unhandled files"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:417
+#: ../raphodo/preferencedialog.py:513
 msgid ""
 "Warn after scanning a device or this computer if there are unrecognized "
 "files that will not be included in the download."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:420
+#: ../raphodo/preferencedialog.py:517
 msgid "Do not warn about unhandled files with extensions:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:424
+#: ../raphodo/preferencedialog.py:522
 msgid ""
 "File extensions are case insensitive and do not need to include the leading "
 "dot."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:427
+#: ../raphodo/preferencedialog.py:525
 msgid "Add"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:428
+#: ../raphodo/preferencedialog.py:526
 msgid ""
 "Add a file extension to the list of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:430
+#: ../raphodo/preferencedialog.py:528
 msgid ""
 "Remove a file extension from the list of unhandled file types to not warn "
 "about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:434
+#: ../raphodo/preferencedialog.py:532
 msgid ""
 "Clear the list of file extensions of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:469
+#: ../raphodo/preferencedialog.py:568
+msgid "Photo and Video Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:571
+msgid "Consolidate files across devices and downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:574
+msgid ""
+"Analyze the results of device scans looking for duplicate files and matching "
+"RAW and JPEG pairs,\n"
+"comparing them across multiple devices and download sessions."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:580
+msgid "Treat matching RAW and JPEG files as:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:581
+msgid "One photo"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:582
+msgid "Two photos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:584
+msgid ""
+"Display matching pairs of RAW and JPEG photos as one photo, and if marked, "
+"download both."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:589
+msgid ""
+"Display matching pairs of RAW and JPEG photos as two different photos. You "
+"can still synchronize their sequence numbers."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:598
+msgid "With matching RAW and JPEG photos:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:600
+msgid "Do not mark JPEG for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:601
+msgid "Do not mark RAW for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:602
+msgid "Mark both for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:609
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"JPEG for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:614
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"RAW for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:619
+msgid ""
+"When matching RAW and JPEG photos are found, automatically mark both for "
+"download."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:625
+msgid ""
+"If you disable file consolidation, choose what to do when a download device "
+"is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:631
+msgid ""
+"When a download device is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:642
+msgid "Clear completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:643
+msgid "Keep displaying completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:644
+msgid "Prompt for what to do"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:649
+msgid ""
+"Automatically clear the display of completed downloads whenever a new "
+"download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:654
+msgid ""
+"Keep displaying completed downloads whenever a new download device is "
+"inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:658
+msgid ""
+"Prompt whether to keep displaying completed downloads or clear them whenever "
+"a new download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:702
 msgid "Version Check"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:470
+#: ../raphodo/preferencedialog.py:703
 msgid "Check for new version at startup"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:471
+#: ../raphodo/preferencedialog.py:705
 msgid "Check for a new version of the program each time the program starts."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:473
+#: ../raphodo/preferencedialog.py:707
 msgid "Include development releases"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:474
+#: ../raphodo/preferencedialog.py:709
 msgid ""
 "Include alpha, beta and other development releases when checking for a new "
 "version of the program.\n"
@@ -2127,11 +2694,11 @@ msgid ""
 "occur."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:489
+#: ../raphodo/preferencedialog.py:725
 msgid "Ignore DNG date/time metadata on MTP devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:490
+#: ../raphodo/preferencedialog.py:727
 msgid ""
 "Ignore date/time metadata in DNG files located on MTP devices, and use the "
 "file's modification time instead.\n"
@@ -2140,70 +2707,87 @@ msgid ""
 "metadata."
 msgstr ""
 
+#: ../raphodo/preferencedialog.py:741
+msgid "Completed Downloads"
+msgstr ""
+
 #. Translators: substituted value is a description for the set of preferences
 #. shown in the preference dialog window, e.g. Devices, Automation, etc.
 #. This string is shown in a tooltip for the "Restore Defaults" button
-#: ../raphodo/preferencedialog.py:710
+#: ../raphodo/preferencedialog.py:1067
 #, python-format
 msgid "Restores default %s preference values"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:832
+#: ../raphodo/preferencedialog.py:1208
 msgid ""
 "Do you want to purge the thumbnail cache? The cache will be purged when the "
 "program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:835
+#: ../raphodo/preferencedialog.py:1212
 msgid "Purge Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:847
+#: ../raphodo/preferencedialog.py:1225
 msgid ""
 "Do you want to optimize the thumbnail cache? The cache will be optimized "
 "when the program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:850
+#: ../raphodo/preferencedialog.py:1229
 msgid "Optimize Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1045
+#: ../raphodo/preferencedialog.py:1481
+msgid "Enter a Folder to Scan"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1482
+msgid "Specify a folder that will be scanned for photos and videos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1483
+msgid "Folder:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1497
 msgid "Enter a Path to Ignore"
 msgstr "Ange sökväg att ignorera"
 
-#: ../raphodo/preferencedialog.py:1046
+#: ../raphodo/preferencedialog.py:1498
 msgid "Specify a path that will never be scanned for photos or videos"
-msgstr "Ange en sökväg som aldrig kommer att avsökas efter bilder eller videor"
+msgstr ""
+"Ange en sökväg som aldrig kommer att avsökas efter bilder eller videor"
 
-#: ../raphodo/preferencedialog.py:1047
+#: ../raphodo/preferencedialog.py:1499
 msgid "Path:"
 msgstr "Sökväg:"
 
-#: ../raphodo/preferencedialog.py:1061
+#: ../raphodo/preferencedialog.py:1513
 msgid "Enter a File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1062
+#: ../raphodo/preferencedialog.py:1514
 msgid "Specify a file extension (without the leading dot)"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1063 ../raphodo/renamepanel.py:122
+#: ../raphodo/preferencedialog.py:1515 ../raphodo/renamepanel.py:122
 msgid "Extension:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1078
+#: ../raphodo/preferencedialog.py:1530
 msgid "Invalid File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1079
+#: ../raphodo/preferencedialog.py:1531
 #, python-format
 msgid ""
 "The file extension <b>%s</b> is recognized by Rapid Photo Downloader, so it "
 "makes no sense to warn about its presence."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1081
+#: ../raphodo/preferencedialog.py:1533
 #, python-format
 msgid ""
 "Recognized file types:\n"
@@ -2229,104 +2813,103 @@ msgstr ""
 msgid "Birthday"
 msgstr ""
 
-#: ../raphodo/preferences.py:614
+#: ../raphodo/preferences.py:624
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Inställningen för undermappar ska inte börja med %s"
 
-#: ../raphodo/preferences.py:617
+#: ../raphodo/preferences.py:627
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Inställningen för undermappar ska inte sluta med %s"
 
-#: ../raphodo/preferences.py:622
+#: ../raphodo/preferences.py:632
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr "Inställningen för undermappen ska inte innehålla två %s i rad"
 
-#. self.setFlat(True)
 #: ../raphodo/primarybutton.py:72
 msgid "Download 8 Photos and 10 Videos"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:86 ../raphodo/problemnotification.py:208
+#: ../raphodo/problemnotification.py:87 ../raphodo/problemnotification.py:209
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:89
+#: ../raphodo/problemnotification.py:90
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:116
+#: ../raphodo/problemnotification.py:117
 #, python-format
 msgid "GPhoto2 Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:124
+#: ../raphodo/problemnotification.py:125
 msgid ""
 "Unable to initialize the camera, probably because another program is using "
 "it. No files were copied from it."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:134
+#: ../raphodo/problemnotification.py:135
 #, python-format
 msgid "Unable to read directory %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:140
+#: ../raphodo/problemnotification.py:141
 #, python-format
 msgid "Unable to access modification time or size from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:146
+#: ../raphodo/problemnotification.py:147
 #, python-format
 msgid "Unable to read file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:152
+#: ../raphodo/problemnotification.py:153
 #, python-format
 msgid "Unable to write file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:158
+#: ../raphodo/problemnotification.py:159
 #, python-format
 msgid "Unable to move file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:164
+#: ../raphodo/problemnotification.py:165
 #, python-format
 msgid "Unable to remove file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:170
+#: ../raphodo/problemnotification.py:171
 #, python-format
 msgid "Unable to copy file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:176
+#: ../raphodo/problemnotification.py:177
 #, python-format
 msgid "Zero length file %s will not be downloaded"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:182
+#: ../raphodo/problemnotification.py:183
 #, python-format
 msgid "Could not determine filesystem modification time for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:188
+#: ../raphodo/problemnotification.py:189
 #, python-format
 msgid "Unable to load metadata from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:194
+#: ../raphodo/problemnotification.py:195
 #, python-format
 msgid ""
 "Unable to load metadata from %(name)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:202
+#: ../raphodo/problemnotification.py:203
 #, python-format
 msgid ""
 "An error occurred setting a file's filesystem metadata on the filesystem %s. "
@@ -2334,78 +2917,78 @@ msgid ""
 "again."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:216
+#: ../raphodo/problemnotification.py:217
 #, python-format
 msgid "Encountered unhandled file %s. It will not be downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:223
+#: ../raphodo/problemnotification.py:224
 #, python-format
 msgid "%(filetype)s %(destination)s already exists."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:234 ../raphodo/problemnotification.py:262
+#: ../raphodo/problemnotification.py:235 ../raphodo/problemnotification.py:263
 #, python-format
 msgid ""
 "The existing %(filetype)s %(destination)s was last modified on %(date)s at "
 "%(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:245
+#: ../raphodo/problemnotification.py:246
 #, python-format
 msgid "The %(filetype)s %(source)s was not downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:273
+#: ../raphodo/problemnotification.py:274
 #, python-format
 msgid "The %(filetype)s %(source)s was downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:282
+#: ../raphodo/problemnotification.py:283
 #, python-format
 msgid "The unique identifier '%s' was added to the filename."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:298
+#: ../raphodo/problemnotification.py:299
 #, python-format
 msgid ""
 "The existing backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:309
+#: ../raphodo/problemnotification.py:310
 #, python-format
 msgid "The %(filetype)s %(source)s was not backed up from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:326
+#: ../raphodo/problemnotification.py:327
 #, python-format
 msgid ""
 "The previous backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:337
+#: ../raphodo/problemnotification.py:338
 #, python-format
 msgid ""
 "The %(filetype)s %(source)s from %(device)s was backed up, overwriting the "
 "previous backup %(filetype)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:356
+#: ../raphodo/problemnotification.py:357
 #, python-format
 msgid ""
 "When synchronizing RAW + JPEG sequence values, a duplicate %(filetype)s "
 "%(file)s was encountered, and was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:366
+#: ../raphodo/problemnotification.py:367
 msgid ""
 "When synchronizing RAW + JPEG sequence values, photos were detected with the "
 "same filenames, but taken at different times:"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:373
+#: ../raphodo/problemnotification.py:374
 #, python-format
 msgid ""
 "%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
@@ -2414,134 +2997,134 @@ msgstr ""
 "%(image1)s togs den %(image1_date)s kl. %(image1_time)s och %(image2)s den "
 "%(image2_date)s kl. %(image2_time)s."
 
-#: ../raphodo/problemnotification.py:389
+#: ../raphodo/problemnotification.py:390
 #, python-format
 msgid "Unable to finalize the filename for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:424
+#: ../raphodo/problemnotification.py:425
 #, python-format
 msgid ""
 "The filename %(destination)s was not fully generated for %(filetype)s "
 "%(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:433
+#: ../raphodo/problemnotification.py:434
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr "%(type)s metadata saknas."
 
-#: ../raphodo/problemnotification.py:439
+#: ../raphodo/problemnotification.py:440
 #, python-format
 msgid "The following metadata is missing: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:445
+#: ../raphodo/problemnotification.py:446
 #, python-format
 msgid "Date/time conversion failed: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:451
+#: ../raphodo/problemnotification.py:452
 msgid ""
 "Could not extract valid date/time metadata or determine the file "
 "modification time."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:457
+#: ../raphodo/problemnotification.py:458
 msgid "Filename does not have an extension."
 msgstr "Filnamnet saknar filändelse."
 
-#: ../raphodo/problemnotification.py:460
+#: ../raphodo/problemnotification.py:461
 msgid "Filename does not have a number component."
 msgstr "Filnamnet saknar sekvensnummer."
 
-#: ../raphodo/problemnotification.py:464
+#: ../raphodo/problemnotification.py:465
 #, python-format
 msgid "Error generating component %(component)s. Error: %(error)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:477
+#: ../raphodo/problemnotification.py:478
 #, python-format
 msgid ""
 "The download subfolders %(folder)s were only partially generated for "
 "%(filetype)s %(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:486
+#: ../raphodo/problemnotification.py:487
 #, python-format
 msgid ""
 "There is no data with which to generate the %(subfolder_file)s for "
 "%(filename)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:499
+#: ../raphodo/problemnotification.py:500
 #, python-format
 msgid ""
 "Unable to create the %(filetype)s %(destination)s in %(folder)s. The "
 "download file was %(source)s in %(device)s. It was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:514
+#: ../raphodo/problemnotification.py:515
 #, python-format
 msgid "Unable to create the download subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:526
+#: ../raphodo/problemnotification.py:527
 #, python-format
 msgid "Unable to create the backup subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:577
+#: ../raphodo/problemnotification.py:578
 #, python-format
 msgid "Problems scanning %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:584
+#: ../raphodo/problemnotification.py:585
 #, python-format
 msgid "Problems copying from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:591
+#: ../raphodo/problemnotification.py:592
 msgid "Problems while finalizing filenames and generating subfolders"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:598
+#: ../raphodo/problemnotification.py:599
 #, python-format
 msgid "Problems backing up to %s"
 msgstr ""
 
-#. Translators: for example Nov 3 or Dec 31
+#. Translators: for example Nov 3 2015, 11:25 AM
+#. Translators: for example, Nov 3, 12:15 PM
+#: ../raphodo/proximity.py:188 ../raphodo/proximity.py:213
+#: ../raphodo/proximity.py:236 ../raphodo/proximity.py:239
+#, python-format
+msgid "%(date)s, %(time)s"
+msgstr "%(date)s, %(time)s"
+
+#: ../raphodo/proximity.py:204
+#, python-format
+msgid "%(starttime)s - %(endtime)s"
+msgstr "%(starttime)s - %(endtime)s"
+
 #. The start and end dates are on a different day
 #. Translators: for example Nov 3 or Dec 31
-#: ../raphodo/proximity.py:105 ../raphodo/proximity.py:221
-#: ../raphodo/proximity.py:224 ../raphodo/proximity.py:828
+#: ../raphodo/proximity.py:221 ../raphodo/proximity.py:225
+#: ../raphodo/proximity.py:980 ../raphodo/timeutils.py:105
 #, python-format
 msgid "%(month)s %(numeric_day)s"
 msgstr "%(month)s %(numeric_day)s"
 
-#. Translators: for example Nov 15 2015
 #. Translators: for example Nov 3 2015
-#: ../raphodo/proximity.py:109 ../raphodo/proximity.py:230
-#: ../raphodo/proximity.py:231 ../raphodo/proximity.py:831
+#. Translators: for example Nov 2 2015
+#. Translators: for example Nov 15 2015
+#: ../raphodo/proximity.py:232 ../raphodo/proximity.py:233
+#: ../raphodo/proximity.py:985 ../raphodo/timeutils.py:110
 #, python-format
 msgid "%(date)s %(year)s"
 msgstr "%(date)s %(year)s"
 
-#. Translators: for example Nov 3 2015, 11:25 AM
-#. Translators: for example, Nov 3, 12:15 PM
-#: ../raphodo/proximity.py:197 ../raphodo/proximity.py:215
-#: ../raphodo/proximity.py:234 ../raphodo/proximity.py:236
-#, python-format
-msgid "%(date)s, %(time)s"
-msgstr "%(date)s, %(time)s"
-
-#: ../raphodo/proximity.py:209
-#, python-format
-msgid "%(starttime)s - %(endtime)s"
-msgstr "%(starttime)s - %(endtime)s"
-
 #. Translators: for example, Nov 3, 12:15 PM - Nov 4, 1:00 AM
-#: ../raphodo/proximity.py:241
+#: ../raphodo/proximity.py:245
 #, python-format
 msgid "%(earlier_time)s - %(later_time)s"
 msgstr "%(earlier_time)s - %(later_time)s"
@@ -2550,7 +3133,7 @@ msgstr "%(earlier_time)s - %(later_time)s"
 #. Nov 3 2012, 12:15 PM -
 #. Nov 4 2012, 1:00 AM
 #. (please keep the line break signified by \n)
-#: ../raphodo/proximity.py:248
+#: ../raphodo/proximity.py:253
 #, python-format
 msgid ""
 "%(earlier_time)s -\n"
@@ -2559,18 +3142,18 @@ msgstr ""
 "%(earlier_time)s -\n"
 "%(later_time)s"
 
-#: ../raphodo/proximity.py:359
+#: ../raphodo/proximity.py:382
 #, python-format
 msgid "%(month)s  %(year)s"
 msgstr "%(month)s  %(year)s"
 
 #. Translators: for example Nov 2015
-#: ../raphodo/proximity.py:833
+#: ../raphodo/proximity.py:987
 #, python-format
 msgid "%(month)s %(year)s"
 msgstr "%(month)s %(year)s"
 
-#: ../raphodo/proximity.py:1344
+#: ../raphodo/proximity.py:1595
 msgid ""
 "The time elapsed between consecutive photos and videos that is used to build "
 "the Timeline"
@@ -2580,26 +3163,26 @@ msgstr ""
 #. Replace the very last character (after the d) with the correct
 #. localized value, keeping everything else. In other words, change
 #. only the m character.
-#: ../raphodo/proximity.py:1406
+#: ../raphodo/proximity.py:1652
 #, python-format
 msgid "%(minutes)dm"
 msgstr ""
 
 #. Translators: i.e. "1.5h", which is short for 1.5 hours.
 #. Replace the entire string with the correct localized value
-#: ../raphodo/proximity.py:1410
+#: ../raphodo/proximity.py:1656
 msgid "1.5h"
 msgstr "1,5t"
 
 #. Translators: e.g. "5h", which is short for 5 hours.
 #. Replace the very last character (after the d) with the correct localized value,
 #. keeping everything else. In other words, change only the h character.
-#: ../raphodo/proximity.py:1415
+#: ../raphodo/proximity.py:1661
 #, python-format
 msgid "%(hours)dh"
 msgstr "%(hours)dt"
 
-#: ../raphodo/proximity.py:1461
+#: ../raphodo/proximity.py:1710
 msgid ""
 "The Timeline groups photos and videos based on how much time elapsed between "
 "consecutive shots. Use it to identify photos and videos taken at different "
@@ -2609,7 +3192,7 @@ msgstr ""
 "mellan tagningarna. Använd den för att identifiera bilder och filmer som "
 "tagits vid olika tidpunkter samma dag, eller över flera dagar."
 
-#: ../raphodo/proximity.py:1464
+#: ../raphodo/proximity.py:1715
 msgid ""
 "Use the slider (below) to adjust the time elapsed between consecutive shots "
 "that is used to build the Timeline."
@@ -2617,15 +3200,15 @@ msgstr ""
 "Använd handtaget (nedanför) för att justera tiden mellan tagningarna, som "
 "används för att bygga tidslinjen."
 
-#: ../raphodo/proximity.py:1466
+#: ../raphodo/proximity.py:1718
 msgid "Timeline build pending..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1467
+#: ../raphodo/proximity.py:1719
 msgid "Timeline is building..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1468
+#: ../raphodo/proximity.py:1721
 msgid ""
 "The Timeline needs to be rebuilt because the file modification time does not "
 "match the time a shot was taken for one or more shots.<br><br>The Timeline "
@@ -2637,61 +3220,61 @@ msgid ""
 "downloading, which is when the metadata is read."
 msgstr ""
 
-#: ../raphodo/rapid.py:485 ../raphodo/rapid.py:2461 ../raphodo/rapid.py:3728
-#: ../raphodo/rapid.py:3846 ../raphodo/rapid.py:3850 ../raphodo/rapid.py:3870
-#: ../raphodo/rapid.py:3874 ../raphodo/rapid.py:3998 ../raphodo/rapid.py:4007
-#: ../raphodo/rapid.py:4495 ../raphodo/rapid.py:4888 ../raphodo/rapid.py:5722
-#: ../raphodo/rememberthisdialog.py:97
+#: ../raphodo/rapid.py:493 ../raphodo/rapid.py:2555 ../raphodo/rapid.py:3934
+#: ../raphodo/rapid.py:4065 ../raphodo/rapid.py:4069 ../raphodo/rapid.py:4092
+#: ../raphodo/rapid.py:4096 ../raphodo/rapid.py:4226 ../raphodo/rapid.py:4237
+#: ../raphodo/rapid.py:4743 ../raphodo/rapid.py:5195 ../raphodo/rapid.py:5997
+#: ../raphodo/rememberthisdialog.py:99
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:3
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: ../raphodo/rapid.py:1100
+#: ../raphodo/rapid.py:1131
 msgid ""
 "<b>ExifTool has a problem</b><br><br> Rapid Photo Downloader uses ExifTool "
 "to get metadata from videos and photos. The program will run without it, but "
 "installing it is <b>highly</b> recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1110 ../raphodo/rapid.py:1130
+#: ../raphodo/rapid.py:1141 ../raphodo/rapid.py:1161
 msgid "Problem with libmediainfo"
 msgstr ""
 
-#: ../raphodo/rapid.py:1119
+#: ../raphodo/rapid.py:1150
 msgid ""
 "<b>The library libmediainfo appears to be missing</b><br><br> Rapid Photo "
 "Downloader uses libmediainfo to get the date and time a video was shot. The "
 "program will run  without it, but installing it is recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1417
+#: ../raphodo/rapid.py:1448
 msgid "Download failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1419
+#: ../raphodo/rapid.py:1450
 msgid ""
 "Sorry, the download of the new version of Rapid Photo Downloader failed."
 msgstr ""
 
-#: ../raphodo/rapid.py:1425
+#: ../raphodo/rapid.py:1457
 msgid ""
 "The new version was successfully downloaded. Do you want to close Rapid "
 "Photo Downloader and install it now?"
 msgstr ""
 
-#: ../raphodo/rapid.py:1428
+#: ../raphodo/rapid.py:1461
 msgid "Update Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:1432
+#: ../raphodo/rapid.py:1465
 msgid "Install"
 msgstr ""
 
-#: ../raphodo/rapid.py:1450
+#: ../raphodo/rapid.py:1483
 msgid "New version saved"
 msgstr ""
 
-#: ../raphodo/rapid.py:1451
+#: ../raphodo/rapid.py:1485
 #, python-format
 msgid ""
 "The tar file and installer script are saved at:\n"
@@ -2699,165 +3282,165 @@ msgid ""
 " %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:1468
+#: ../raphodo/rapid.py:1502
 msgid "Upgrade failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1469
+#: ../raphodo/rapid.py:1505
 msgid ""
 "Sorry, upgrading Rapid Photo Downloader failed because there was an error "
 "opening the installer."
 msgstr ""
 
-#: ../raphodo/rapid.py:1667 ../raphodo/rapid.py:2331
+#: ../raphodo/rapid.py:1709 ../raphodo/rapid.py:2425
 msgid "Download"
 msgstr "Starta överföringen"
 
-#: ../raphodo/rapid.py:1671
+#: ../raphodo/rapid.py:1713
 msgid "&Refresh..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1675
+#: ../raphodo/rapid.py:1717
 msgid "&Preferences"
 msgstr "&Inställningar"
 
-#: ../raphodo/rapid.py:1679
+#: ../raphodo/rapid.py:1721
 msgid "&Quit"
 msgstr "&Avsluta"
 
-#: ../raphodo/rapid.py:1683
+#: ../raphodo/rapid.py:1725
 msgid "Error &Reports"
 msgstr ""
 
-#: ../raphodo/rapid.py:1687
+#: ../raphodo/rapid.py:1729
 msgid "Clear Completed Downloads"
 msgstr "Rensa genomförda hämtningar"
 
-#: ../raphodo/rapid.py:1691
+#: ../raphodo/rapid.py:1733
 msgid "Get Help Online..."
 msgstr "Få hjälp på nätet..."
 
-#: ../raphodo/rapid.py:1695
+#: ../raphodo/rapid.py:1737
 msgid "&Tip of the Day..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1699
+#: ../raphodo/rapid.py:1741
 msgid "Report a Problem..."
 msgstr "Rapportera problem..."
 
-#: ../raphodo/rapid.py:1703
+#: ../raphodo/rapid.py:1745
 msgid "Make a Donation..."
 msgstr "Donera..."
 
-#: ../raphodo/rapid.py:1707
+#: ../raphodo/rapid.py:1749
 msgid "Translate this Application..."
 msgstr "Översätt detta program..."
 
-#: ../raphodo/rapid.py:1711
+#: ../raphodo/rapid.py:1753
 msgid "&About..."
 msgstr "&Om..."
 
-#: ../raphodo/rapid.py:1715
+#: ../raphodo/rapid.py:1757
 msgid "Check for Updates..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1797
+#: ../raphodo/rapid.py:1840
 msgid "Timeline"
 msgstr "Tidslinje"
 
-#: ../raphodo/rapid.py:1807
+#: ../raphodo/rapid.py:1850
 msgid "Destination"
 msgstr "Mål"
 
-#: ../raphodo/rapid.py:1808
+#: ../raphodo/rapid.py:1851
 msgid "Rename"
 msgstr "Byt namn"
 
-#: ../raphodo/rapid.py:1810
+#: ../raphodo/rapid.py:1853
 msgid "Back Up"
 msgstr "Säkerhetskopiera"
 
 #. Devices Header and View
-#: ../raphodo/rapid.py:1926
+#: ../raphodo/rapid.py:1977
 msgid ""
 "Turn on or off the use of devices attached to this computer as download "
 "sources"
 msgstr "Slå på eller stäng av anslutna enheter som källa för hämtningen."
 
 #. This Computer Header and View
-#: ../raphodo/rapid.py:1940
+#: ../raphodo/rapid.py:1994
 msgid ""
 "Turn on or off the use of a folder on this computer as a download source"
 msgstr ""
 "Slå på eller stäng av användandet av en mapp på datorn som källa för "
 "hämtningen."
 
-#: ../raphodo/rapid.py:1941
+#: ../raphodo/rapid.py:1996
 msgid "This Computer"
 msgstr "Den här datorn"
 
-#: ../raphodo/rapid.py:1952
+#: ../raphodo/rapid.py:2009
 msgid "Select a source folder"
 msgstr "Välj en källmapp"
 
-#: ../raphodo/rapid.py:1975
+#: ../raphodo/rapid.py:2038
 msgid "Projected Storage Use"
 msgstr ""
 
-#: ../raphodo/rapid.py:1989 ../raphodo/rapid.py:1997
+#: ../raphodo/rapid.py:2056 ../raphodo/rapid.py:2068
 msgid "Select a destination folder"
 msgstr "Välj en målmapp"
 
-#: ../raphodo/rapid.py:2045
+#: ../raphodo/rapid.py:2117
 msgid "All"
 msgstr "Alla"
 
-#: ../raphodo/rapid.py:2046
+#: ../raphodo/rapid.py:2118
 msgid "New"
 msgstr ""
 
-#: ../raphodo/rapid.py:2048
+#: ../raphodo/rapid.py:2120
 msgid "Show:"
 msgstr "Visa:"
 
-#: ../raphodo/rapid.py:2051
+#: ../raphodo/rapid.py:2123
 msgid "Modification Time"
 msgstr "Ändringstid"
 
-#: ../raphodo/rapid.py:2052
+#: ../raphodo/rapid.py:2124
 msgid "Checked State"
 msgstr ""
 
-#: ../raphodo/rapid.py:2055
+#: ../raphodo/rapid.py:2127
 msgid "File Type"
 msgstr "Filtyp"
 
-#: ../raphodo/rapid.py:2056
+#: ../raphodo/rapid.py:2128
 msgid "Device"
 msgstr "Enhet"
 
-#: ../raphodo/rapid.py:2058
+#: ../raphodo/rapid.py:2130
 msgid "Sort:"
 msgstr "Sortera:"
 
-#: ../raphodo/rapid.py:2069
+#: ../raphodo/rapid.py:2141
 msgid "Select All:"
 msgstr "Markera alla:"
 
-#: ../raphodo/rapid.py:2311
+#: ../raphodo/rapid.py:2405
 #, python-format
 msgid "Download %(files)s"
 msgstr "Hämta %(files)s"
 
-#: ../raphodo/rapid.py:2327
+#: ../raphodo/rapid.py:2421
 msgid "Resume Download"
 msgstr "Återuppta hämtning"
 
-#: ../raphodo/rapid.py:2329
+#: ../raphodo/rapid.py:2423
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../raphodo/rapid.py:2417
+#: ../raphodo/rapid.py:2511
 #, python-brace-format
 msgid ""
 "Please report the problem at <a href=\"{website}\">{website}</a>.<br><br>\n"
@@ -2866,11 +3449,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/rapid.py:2431
+#: ../raphodo/rapid.py:2525
 msgid "Thank you for reporting a problem in Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:2529
+#: ../raphodo/rapid.py:2624
 #, python-format
 msgid ""
 "<b>Changing This Computer source path</b><br><br>Do you really want to "
@@ -2879,11 +3462,11 @@ msgid ""
 "from This Computer will be cancelled."
 msgstr ""
 
-#: ../raphodo/rapid.py:2595
+#: ../raphodo/rapid.py:2694
 msgid "You cannot change the download destination while downloading."
 msgstr "Du kan inte ändra målet för hämtningen när en hämtning pågår."
 
-#: ../raphodo/rapid.py:2604
+#: ../raphodo/rapid.py:2704
 #, python-format
 msgid ""
 "<b>Confirm Download Destination</b><br><br>Are you sure you want to set the "
@@ -2892,19 +3475,18 @@ msgstr ""
 "<b>Bekräfta ändring av målmapp</b><br><br>Är du säker på att %(file_type)s "
 "ska hämtas till %(path)s?"
 
-#: ../raphodo/rapid.py:2682
+#: ../raphodo/rapid.py:2785
 msgid ""
+"\n"
 "<b>Downloading all files</b><br><br>\n"
-"                    A download always includes all files that are checked "
-"for download,\n"
-"                    including those that are not currently displayed because "
-"the Timeline\n"
-"                    is being used or because only new files are being shown."
-"<br><br>\n"
-"                    Do you want to proceed with the download?"
+"A download always includes all files that are checked for download,\n"
+"including those that are not currently displayed because the Timeline\n"
+"is being used or because only new files are being shown.<br><br>\n"
+"Do you want to proceed with the download?\n"
+"                        "
 msgstr ""
 
-#: ../raphodo/rapid.py:2820
+#: ../raphodo/rapid.py:2937
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -2915,7 +3497,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: ../raphodo/rapid.py:2824
+#: ../raphodo/rapid.py:2940
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -2924,143 +3506,137 @@ msgstr ""
 "Denna nedladdningsmapp är ogiltig:\n"
 "%s"
 
-#: ../raphodo/rapid.py:2827
+#: ../raphodo/rapid.py:2943
 msgid "Download Failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:2828
+#: ../raphodo/rapid.py:2944
 msgid "The download cannot proceed."
 msgstr ""
 
-#: ../raphodo/rapid.py:2842
+#: ../raphodo/rapid.py:2962
 msgid ""
 "Photos and videos will not be backed up because there is nowhere to back "
 "them up. Do you still want to start the download?"
 msgstr ""
 
-#. Translators: filetype will be replaced with 'photos' or 'videos'
-#: ../raphodo/rapid.py:2847 ../raphodo/rapid.py:2854
+#: ../raphodo/rapid.py:2969 ../raphodo/rapid.py:2979
 #, python-format
 msgid ""
 "No backup device exists for backing up %(filetype)s. Do you still want to "
 "start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2848 ../raphodo/rpdfile.py:228
+#: ../raphodo/rapid.py:2971 ../raphodo/rpdfile.py:228
 msgid "photos"
 msgstr "bilder"
 
-#: ../raphodo/rapid.py:2855 ../raphodo/rpdfile.py:223
+#: ../raphodo/rapid.py:2981 ../raphodo/rpdfile.py:223
 msgid "videos"
 msgstr "filmer"
 
-#: ../raphodo/rapid.py:2861
+#: ../raphodo/rapid.py:2989
 msgid ""
 "<b>The photo and video backup destinations do not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2869 ../raphodo/rapid.py:2876
+#: ../raphodo/rapid.py:2999 ../raphodo/rapid.py:3008
 #, python-format
 msgid ""
 "<b>The %(filetype)s backup destination does not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2871 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:818
+#: ../raphodo/rapid.py:3001 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:843
 msgid "photo"
 msgstr "bild"
 
-#: ../raphodo/rapid.py:2878 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:858
+#: ../raphodo/rapid.py:3010 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:883
 msgid "video"
 msgstr "film"
 
-#: ../raphodo/rapid.py:2886
+#: ../raphodo/rapid.py:3018
 msgid "Backup problem"
 msgstr "Ett problem uppstod vid säkerhetskopieringen"
 
-#. Translators - in the middle is a unicode em dash - please retain it
-#. This string is displayed in the status bar when the download is running
-#: ../raphodo/rapid.py:3571
+#: ../raphodo/rapid.py:3756
 #, python-format
 msgid "%(downloading_from)s — %(time_left)s left (%(speed)s)"
 msgstr "%(downloading_from)s — %(time_left)s återstår (%(speed)s)"
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3640
+#: ../raphodo/rapid.py:3828
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s hämtades"
 
-#. Translators: e.g. 2 videos failed to download
-#: ../raphodo/rapid.py:3645
+#: ../raphodo/rapid.py:3836
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "%(noFiles)s %(filetypes)s gick inte att hämta"
 
-#: ../raphodo/rapid.py:3650 ../raphodo/rapid.py:3723
+#: ../raphodo/rapid.py:3842 ../raphodo/rapid.py:3927
 msgid "warnings"
 msgstr "varningar"
 
-#: ../raphodo/rapid.py:3679
+#: ../raphodo/rapid.py:3873
 msgid "All downloads complete"
 msgstr "Alla överföringar är färdiga"
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3686 ../raphodo/rapid.py:3695 ../raphodo/rapid.py:3704
-#: ../raphodo/rapid.py:3713 ../raphodo/rapid.py:3721
+#: ../raphodo/rapid.py:3881 ../raphodo/rapid.py:3892 ../raphodo/rapid.py:3903
+#: ../raphodo/rapid.py:3914 ../raphodo/rapid.py:3924
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: ../raphodo/rapid.py:3688 ../raphodo/rapid.py:3706
+#: ../raphodo/rapid.py:3884 ../raphodo/rapid.py:3906
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s hämtades"
 
-#: ../raphodo/rapid.py:3697 ../raphodo/rapid.py:3715
+#: ../raphodo/rapid.py:3895 ../raphodo/rapid.py:3917
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "%(filetype)s gick inte att hämta"
 
-#: ../raphodo/rapid.py:3742
+#: ../raphodo/rapid.py:3950
 msgid "1 failure"
 msgstr "1 fel"
 
-#: ../raphodo/rapid.py:3744
+#: ../raphodo/rapid.py:3952
 #, python-format
 msgid "%d failures"
 msgstr "%d fel"
 
-#: ../raphodo/rapid.py:3749
+#: ../raphodo/rapid.py:3957
 msgid "1 warning"
 msgstr "1 varning"
 
-#: ../raphodo/rapid.py:3751
+#: ../raphodo/rapid.py:3959
 #, python-format
 msgid "%d warnings"
 msgstr "%d varningar"
 
-#: ../raphodo/rapid.py:3771
+#: ../raphodo/rapid.py:3981
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s"
 msgstr "Hämtade %(no_files_and_types)s från %(devices)s"
 
-#: ../raphodo/rapid.py:3774
+#: ../raphodo/rapid.py:3985
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s — %(failures)s"
 msgstr "Hämtade %(no_files_and_types)s från %(devices)s — %(failures)s"
 
-#: ../raphodo/rapid.py:3779
+#: ../raphodo/rapid.py:3989
 #, python-format
 msgid "No files downloaded — %(failures)s"
 msgstr "Inga filer hämtades— %(failures)s"
 
-#: ../raphodo/rapid.py:3781
+#: ../raphodo/rapid.py:3991
 msgid "No files downloaded"
 msgstr "Inga filer hämtades"
 
-#: ../raphodo/rapid.py:3805
+#: ../raphodo/rapid.py:4021
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
@@ -3069,7 +3645,7 @@ msgstr ""
 "Målmappens undermappar, samt Tidslinjen kommer att återskapas efter att alla "
 "förhandsvisningar skapats för %(camera)s"
 
-#: ../raphodo/rapid.py:3809
+#: ../raphodo/rapid.py:4026
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for this computer"
@@ -3077,7 +3653,7 @@ msgstr ""
 "Målmappens undermappar, samt Tidslinjen kommer att återskapas efter att alla "
 "förhandsvisningar skapats för den här datorn"
 
-#: ../raphodo/rapid.py:3812
+#: ../raphodo/rapid.py:4031
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
@@ -3086,7 +3662,7 @@ msgstr ""
 "Målmappens undermappar, samt Tidslinjen kommer att återskapas efter att alla "
 "förhandsvisningar skapats för %(device)s"
 
-#: ../raphodo/rapid.py:3820
+#: ../raphodo/rapid.py:4039
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
@@ -3095,7 +3671,7 @@ msgstr ""
 "Målmappens undermappar, samt Tidslinjen kommer att återskapas efter att alla "
 "förhandsvisningar skapats för %(number_devices)s enheter och den här datorn"
 
-#: ../raphodo/rapid.py:3833
+#: ../raphodo/rapid.py:4052
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
@@ -3104,7 +3680,7 @@ msgstr ""
 "Målmappens undermappar, samt Tidslinjen kommer att återskapas efter att alla "
 "förhandsvisningar skapats för %(camera)s och den här datorn"
 
-#: ../raphodo/rapid.py:3837
+#: ../raphodo/rapid.py:4056
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
@@ -3113,7 +3689,7 @@ msgstr ""
 "Målmappens undermappar, samt Tidslinjen kommer att återskapas efter att alla "
 "förhandsvisningar skapats för %(device)s och den här datorn"
 
-#: ../raphodo/rapid.py:3841
+#: ../raphodo/rapid.py:4060
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
@@ -3122,15 +3698,15 @@ msgstr ""
 "Målmappens undermappar, samt Tidslinjen kommer att återskapas efter att alla "
 "förhandsvisningar skapats för %(number_devices)s enheter"
 
-#: ../raphodo/rapid.py:3867
+#: ../raphodo/rapid.py:4087
 msgid "The Destination subfolders and Timeline have been rebuilt"
 msgstr "Målmappens undermappar, samt Tidslinjen har återskapats"
 
-#: ../raphodo/rapid.py:3922
+#: ../raphodo/rapid.py:4144
 msgid "Program preferences are invalid"
 msgstr "Programinställningarna är ogiltiga"
 
-#: ../raphodo/rapid.py:3999
+#: ../raphodo/rapid.py:4228
 #, python-format
 msgid ""
 "<b>All files on the %(camera)s are inaccessible</b>.<br><br>It may be locked "
@@ -3140,182 +3716,208 @@ msgid ""
 "ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4008
+#: ../raphodo/rapid.py:4239
 #, python-format
 msgid ""
-"<b>The %(camera)s appears to be in use by another application.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again.<br><br>Alternatively, you can ignore this "
-"device."
+"<b>The %(camera)s appears to be in use by another "
+"application.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again.<br><br>Alternatively, you "
+"can ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4019
+#: ../raphodo/rapid.py:4250
 msgid "&Try Again"
 msgstr "&Försök igen"
 
-#: ../raphodo/rapid.py:4020
+#: ../raphodo/rapid.py:4251
 msgid "&Ignore This Device"
 msgstr ""
 
-#: ../raphodo/rapid.py:4086
+#: ../raphodo/rapid.py:4323
 #, python-format
 msgid "Sorry, an unexpected problem occurred while scanning %s."
 msgstr ""
 
-#: ../raphodo/rapid.py:4087
+#: ../raphodo/rapid.py:4324
 msgid "Unfortunately you cannot download from this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4091
+#: ../raphodo/rapid.py:4328
 msgid ""
 "A possible workaround for the problem might be downloading from the camera's "
 "memory card using a card reader."
 msgstr ""
 
-#: ../raphodo/rapid.py:4096
+#: ../raphodo/rapid.py:4333
 msgid "Device scan failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:4472
+#: ../raphodo/rapid.py:4720
 #, python-format
 msgid ""
-"<b>The %(camera)s cannot be scanned because it cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again."
+"<b>The %(camera)s cannot be scanned because it cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again."
 msgstr ""
 
-#: ../raphodo/rapid.py:4496
+#: ../raphodo/rapid.py:4745
 #, python-format
 msgid ""
-"<b>The download cannot start because the %(camera)s cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again, and choose which files you want to "
-"download from it."
+"<b>The download cannot start because the %(camera)s cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again, and choose which files "
+"you want to download from it."
+msgstr ""
+
+#: ../raphodo/rapid.py:4842
+msgid "Completed Downloads Present"
 msgstr ""
 
-#: ../raphodo/rapid.py:4635
+#: ../raphodo/rapid.py:4844
+#, python-format
+msgid "%s whose download have completed are displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4846
+msgid "Do you want to clear the completed downloads?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4848
+msgid "Completed Download Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4850
+#, python-format
+msgid "%s whose download has completed is displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4852
+msgid "Do you want to clear the completed download?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4933
 #, python-format
 msgid ""
 "Do you want to download photos and videos from the device <i>%(device)s</i>?"
 msgstr ""
 
-#: ../raphodo/rapid.py:4877
+#: ../raphodo/rapid.py:5183
 #, python-format
 msgid "<b>Do you want to ignore the %s whenever this program is run?</b>"
 msgstr "<b>Vill du ignorera %s när programmet körs?</b>"
 
-#: ../raphodo/rapid.py:4879
+#: ../raphodo/rapid.py:5186
 msgid ""
 "All cameras, phones and tablets with the same model name will be ignored."
 msgstr ""
 "Alla kameror, telefoner och surfplattor med samma modellnamn kommer att "
 "ignoreras."
 
-#: ../raphodo/rapid.py:4883
+#: ../raphodo/rapid.py:5190
 #, python-format
 msgid ""
 "<b>Do you want to ignore the device %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4885
+#: ../raphodo/rapid.py:5192
 msgid "Any device with the same name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:5178
+#: ../raphodo/rapid.py:5492
 #, python-format
 msgid "Downloading from %(location)s on This Computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5180
+#: ../raphodo/rapid.py:5496
 msgid ""
 "Do you really want to download from here?<br><br>On some systems, scanning "
 "this location can take a very long time."
 msgstr ""
 
-#: ../raphodo/rapid.py:5224
+#: ../raphodo/rapid.py:5537
 #, python-format
 msgid "Generating thumbnails for %s"
 msgstr "Skapar förhandsvisningar för %s"
 
-#: ../raphodo/rapid.py:5227
+#: ../raphodo/rapid.py:5540
 #, python-format
 msgid "Scanning %s"
 msgstr "Läser in %s"
 
-#: ../raphodo/rapid.py:5237
+#: ../raphodo/rapid.py:5551
 #, python-format
 msgid ""
 "%(number)s of %(available files)s checked for download (%(hidden)s hidden)"
 msgstr ""
 "%(number)s av %(available files)s markerade för hämtning (%(hidden)s hidden)"
 
-#: ../raphodo/rapid.py:5243
+#: ../raphodo/rapid.py:5559
 #, python-format
 msgid "%(number)s of %(available files)s checked for download"
 msgstr "%(number)s av %(available files)s markerade för hämtning"
 
-#: ../raphodo/rapid.py:5494
+#: ../raphodo/rapid.py:5764
 msgid "Display program information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5496
+#: ../raphodo/rapid.py:5766
 msgid "Display debugging information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5499
+#: ../raphodo/rapid.py:5769
 msgid "List photo and video file extensions the program recognizes and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5502
+#: ../raphodo/rapid.py:5772
 msgid "Turn on or off the the renaming of photos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5504
+#: ../raphodo/rapid.py:5774
 msgid "turn on or off the the renaming of videos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5506
+#: ../raphodo/rapid.py:5776
 msgid ""
 "Turn on or off the automatic detection of devices from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5510
+#: ../raphodo/rapid.py:5780
 msgid "Turn on or off downloading from this computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5512 ../raphodo/rapid.py:5515 ../raphodo/rapid.py:5518
-#: ../raphodo/rapid.py:5539 ../raphodo/rapid.py:5543
+#: ../raphodo/rapid.py:5782 ../raphodo/rapid.py:5785 ../raphodo/rapid.py:5788
+#: ../raphodo/rapid.py:5809 ../raphodo/rapid.py:5813
 msgid "PATH"
 msgstr "SÖKVÄG"
 
-#: ../raphodo/rapid.py:5513
+#: ../raphodo/rapid.py:5783
 msgid "The PATH on this computer from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5516
+#: ../raphodo/rapid.py:5786
 msgid "The PATH where photos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5519
+#: ../raphodo/rapid.py:5789
 msgid "The PATH where videos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5521
+#: ../raphodo/rapid.py:5791
 msgid "Turn on or off the backing up of photos and videos while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:5525
+#: ../raphodo/rapid.py:5795
 msgid "Turn on or off the automatic detection of backup devices."
 msgstr ""
 
-#: ../raphodo/rapid.py:5527 ../raphodo/rapid.py:5533
+#: ../raphodo/rapid.py:5797 ../raphodo/rapid.py:5803
 msgid "FOLDER"
 msgstr ""
 
-#: ../raphodo/rapid.py:5528
+#: ../raphodo/rapid.py:5798
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected photo "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3323,7 +3925,7 @@ msgid ""
 "photos up to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5534
+#: ../raphodo/rapid.py:5804
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected video "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3331,115 +3933,124 @@ msgid ""
 "up videos to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5540
+#: ../raphodo/rapid.py:5810
 msgid ""
 "The PATH where photos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5544
+#: ../raphodo/rapid.py:5814
 msgid ""
 "The PATH where videos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5547
+#: ../raphodo/rapid.py:5817
 #, python-format
 msgid "Ignore photos with the following extensions: %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5551
-msgid "Turn on or off starting downloads as soon as the program itself starts."
+#: ../raphodo/rapid.py:5821
+msgid ""
+"Turn on or off starting downloads as soon as the program itself starts."
 msgstr ""
 
-#: ../raphodo/rapid.py:5554
+#: ../raphodo/rapid.py:5824
 msgid "Turn on or off starting downloads as soon as a device is inserted."
 msgstr ""
 
-#: ../raphodo/rapid.py:5557
+#: ../raphodo/rapid.py:5827
 msgid ""
 "Turn on or off use of the Rapid Photo Downloader Thumbnail Cache. Turning it "
 "off does not delete existing cache contents."
 msgstr ""
 
-#: ../raphodo/rapid.py:5561
+#: ../raphodo/rapid.py:5831
 msgid ""
 "Delete all thumbnails in the Rapid Photo Downloader Thumbnail Cache, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5565
+#: ../raphodo/rapid.py:5835
 msgid "Forget which files have been previously downloaded, and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5568
+#: ../raphodo/rapid.py:5838
 msgid ""
 "Import preferences from an old program version and exit. Requires the "
 "command line program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5571
+#: ../raphodo/rapid.py:5841
 msgid ""
 "Reset all program settings to their default values, delete all thumbnails in "
 "the Thumbnail cache, forget which files have been previously downloaded, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5575
+#: ../raphodo/rapid.py:5845
 msgid "Include gphoto2 debugging information in log files."
 msgstr ""
 
-#: ../raphodo/rapid.py:5579
+#: ../raphodo/rapid.py:5849
 msgid "Print information to the terminal about attached cameras and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5640
+#: ../raphodo/rapid.py:5911
 msgid ""
 "To import preferences from the old version of Rapid Photo Downloader, you "
 "must install the program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5649
+#: ../raphodo/rapid.py:5920
 msgid "No prior program preferences detected: exiting"
 msgstr ""
 
-#: ../raphodo/rapid.py:5652
+#: ../raphodo/rapid.py:5923
 #, python-format
 msgid "Importing preferences from Rapid Photo Downloader %(version)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5714
+#: ../raphodo/rapid.py:5989
 #, python-format
-msgid "Do you want to copy the stored sequence number, which has the value %d?"
+msgid ""
+"Do you want to copy the stored sequence number, which has the value %d?"
 msgstr ""
 
-#: ../raphodo/rapid.py:5726
+#: ../raphodo/rapid.py:6000
 msgid "Program aborting."
 msgstr ""
 
-#: ../raphodo/rapid.py:5736
+#: ../raphodo/rapid.py:6010
 msgid "Never run this program as the sudo / root user."
 msgstr ""
 
-#: ../raphodo/rapid.py:5740
+#: ../raphodo/rapid.py:6014
 msgid "You must install ExifTool to run Rapid Photo Downloader."
 msgstr ""
 
-#: ../raphodo/rapid.py:5794
+#: ../raphodo/rapid.py:6026
+msgid ""
+"Rapid Photo Downloader is installed in multiple locations.\n"
+"\n"
+"Uninstall all copies except the version you want to run."
+msgstr ""
+
+#: ../raphodo/rapid.py:6083
 msgid ""
 "When specifying a path on the command line, do not also specify an\n"
 "option for device auto detection or a path on \"This Computer\"."
 msgstr ""
 
-#: ../raphodo/rapid.py:5950
+#: ../raphodo/rapid.py:6243
 msgid "All settings and caches have been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5958
+#: ../raphodo/rapid.py:6251
 msgid "Thumbnail Cache has been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5964
+#: ../raphodo/rapid.py:6257
 msgid "Remembered files have been forgotten"
 msgstr ""
 
@@ -3455,15 +4066,15 @@ msgstr ""
 msgid "&Don't warn me again about missing or broken program libraries"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:546
+#: ../raphodo/renameandmovefile.py:554
 msgid "subfolder and filename"
 msgstr "undermapp och filnamn"
 
-#: ../raphodo/renameandmovefile.py:548
+#: ../raphodo/renameandmovefile.py:556
 msgid "filename"
 msgstr "filnamn"
 
-#: ../raphodo/renameandmovefile.py:550
+#: ../raphodo/renameandmovefile.py:558
 msgid "subfolder"
 msgstr "undermapp"
 
@@ -3543,160 +4154,237 @@ msgstr "bilder och filmer"
 msgid "photos or videos"
 msgstr "bilder eller filmer"
 
-#: ../raphodo/rpdfile.py:306
+#: ../raphodo/rpdfile.py:315
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: ../raphodo/rpdfile.py:318
+#. translators: natural language expression signifying a single video
+#: ../raphodo/rpdfile.py:337
+msgid "a video"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:339
 msgid "1 Video"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:323
+#. translators: natural language expression signifying a single photo
+#: ../raphodo/rpdfile.py:346
+msgid "a photo"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:348
 msgid "1 Photo"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:803
+#: ../raphodo/rpdfile.py:828
 #, python-format
 msgid "%(path)s on %(camera)s"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:819
+#: ../raphodo/rpdfile.py:844
 msgid "Photo"
 msgstr "Bild"
 
-#: ../raphodo/rpdfile.py:859
+#: ../raphodo/rpdfile.py:884
 msgid "Video"
 msgstr "Film"
 
-#: ../raphodo/storage.py:138
+#: ../raphodo/storage.py:141
 msgid "File system root"
 msgstr ""
 
 #. translators: the name of the Pictures folder
-#: ../raphodo/storage.py:433
+#: ../raphodo/storage.py:437
 msgid "Pictures"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:426
+#: ../raphodo/thumbnaildisplay.py:432
 #, python-format
 msgid "Taken on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:431
+#: ../raphodo/thumbnaildisplay.py:439
 #, python-format
 msgid "Modified on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:437 ../raphodo/thumbnaildisplay.py:466
+#: ../raphodo/thumbnaildisplay.py:447 ../raphodo/thumbnaildisplay.py:481
 #, python-format
 msgid "%(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:451
+#: ../raphodo/thumbnaildisplay.py:464
 #, python-format
 msgid "Memory cards: %s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:457
+#: ../raphodo/thumbnaildisplay.py:468
+#, python-format
+msgid "Memory card: %s"
+msgstr ""
+
+#: ../raphodo/thumbnaildisplay.py:473
 msgid "Downloaded as:"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:472
+#: ../raphodo/thumbnaildisplay.py:489
 #, python-format
 msgid "<br><br>Previous download:<br>%(filename)s<br>%(path)s<br>%(date)s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:1603
+#: ../raphodo/thumbnaildisplay.py:1645
 msgid "Copy Path"
 msgstr ""
 
+#. Translators: these values are file size suffixes like B representing bytes, KB representing
+#. kilobytes, etc.
+#: ../raphodo/utilities.py:170
+msgid "B"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "KB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "MB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "GB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "TB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "PB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "EB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "ZB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "YB"
+msgstr ""
+
 #. two things in a list e.g. "device1 and device2"
-#: ../raphodo/utilities.py:391
+#: ../raphodo/utilities.py:394
 #, python-format
 msgid "%(first_item)s and %(last_item)s"
 msgstr ""
 
-#: ../raphodo/utilities.py:464
+#: ../raphodo/utilities.py:468
 msgid "one"
 msgstr ""
 
-#: ../raphodo/utilities.py:465
+#: ../raphodo/utilities.py:469
 msgid "two"
 msgstr ""
 
-#: ../raphodo/utilities.py:466
+#: ../raphodo/utilities.py:470
 msgid "three"
 msgstr ""
 
-#: ../raphodo/utilities.py:467
+#: ../raphodo/utilities.py:471
 msgid "four"
 msgstr ""
 
-#: ../raphodo/utilities.py:468
+#: ../raphodo/utilities.py:472
 msgid "five"
 msgstr ""
 
-#: ../raphodo/utilities.py:469
+#: ../raphodo/utilities.py:473
 msgid "six"
 msgstr ""
 
-#: ../raphodo/utilities.py:470
+#: ../raphodo/utilities.py:474
 msgid "seven"
 msgstr ""
 
-#: ../raphodo/utilities.py:471
+#: ../raphodo/utilities.py:475
 msgid "eight"
 msgstr ""
 
-#: ../raphodo/utilities.py:472
+#: ../raphodo/utilities.py:476
 msgid "nine"
 msgstr ""
 
-#: ../raphodo/utilities.py:473
+#: ../raphodo/utilities.py:477
 msgid "ten"
 msgstr ""
 
-#: ../raphodo/utilities.py:474
+#: ../raphodo/utilities.py:478
 msgid "eleven"
 msgstr ""
 
-#: ../raphodo/utilities.py:475
+#: ../raphodo/utilities.py:479
 msgid "twelve"
 msgstr ""
 
-#: ../raphodo/utilities.py:476
+#: ../raphodo/utilities.py:480
 msgid "thirteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:477
+#: ../raphodo/utilities.py:481
 msgid "fourteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:478
+#: ../raphodo/utilities.py:482
 msgid "fifteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:479
+#: ../raphodo/utilities.py:483
 msgid "sixteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:480
+#: ../raphodo/utilities.py:484
 msgid "seventeen"
 msgstr ""
 
-#: ../raphodo/utilities.py:481
+#: ../raphodo/utilities.py:485
 msgid "eighteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:482
+#: ../raphodo/utilities.py:486
 msgid "ninenteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:483
+#: ../raphodo/utilities.py:487
 msgid "twenty"
 msgstr ""
 
+#: ../raphodo/viewutils.py:240
+msgid "&OK"
+msgstr ""
+
+#: ../raphodo/viewutils.py:243
+msgid "&Save"
+msgstr ""
+
+#: ../raphodo/viewutils.py:244
+msgid "&Help"
+msgstr ""
+
+#: ../raphodo/viewutils.py:245
+msgid "Restore Defaults"
+msgstr ""
+
+#: ../raphodo/viewutils.py:246
+msgid "&Yes"
+msgstr ""
+
+#: ../raphodo/viewutils.py:247
+msgid "&No"
+msgstr ""
+
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:1
 msgid ""
 "Rapid Photo Downloader imports photos and videos from cameras, phones, "
@@ -3750,14 +4438,15 @@ msgstr ""
 #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:5
 msgid ""
-"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;"
-"memory;card;"
+"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;memory"
+";card;"
 msgstr ""
 
 #: ../data/kde/net.damonlynch.rapid-photo-downloader.desktop.in.h:1
 msgid "Download Photos and Videos with Rapid Photo Downloader"
 msgstr ""
 
+#, python-format
 #~ msgid "<i>Example: %s</i>"
 #~ msgstr "<i>Exempel: %s</i>"
 
@@ -3800,9 +4489,11 @@ msgstr ""
 #~ msgid "Using backup devices"
 #~ msgstr "Använder enheter för säkerhetskopiering"
 
+#, python-format
 #~ msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 #~ msgstr "Ungefär %(minutes)i:%(seconds)02i minuter återstår"
 
+#, python-format
 #~ msgid "and %s"
 #~ msgstr "och %s"
 
@@ -3941,6 +4632,7 @@ msgstr ""
 #~ msgid "R_emove All"
 #~ msgstr "_Ta bort alla"
 
+#, python-format
 #~ msgid "Source: %(source)s"
 #~ msgstr "Källa: %(source)s"
 
@@ -3965,6 +4657,7 @@ msgstr ""
 #~ msgid "Error in Photo Rename preferences"
 #~ msgstr "Fel i inställningarna för bildnamnbyte"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s"
 #~ msgstr "%(number)s av %(total)s %(filetypes)s"
 
@@ -3980,6 +4673,7 @@ msgstr ""
 #~ msgid "Videos:"
 #~ msgstr "Filmer:"
 
+#, python-format
 #~ msgid "Backing up to %(path)s"
 #~ msgstr "Säkerhetskopierar till %(path)s"
 
@@ -4007,12 +4701,15 @@ msgstr ""
 #~ msgid "<b>Backup</b>"
 #~ msgstr "<b>Säkerhetskopia</b>"
 
+#, python-format
 #~ msgid "%(device)s did not unmount"
 #~ msgstr "%(device)s enheter avmonterades inte"
 
+#, python-format
 #~ msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
+#, python-format
 #~ msgid ""
 #~ "%(date)s\n"
 #~ "%(time)s"
@@ -4020,9 +4717,11 @@ msgstr ""
 #~ "%(date)s\n"
 #~ "%(time)s"
 
+#, python-format
 #~ msgid "%(date)s %(time)s"
 #~ msgstr "%(date)s %(time)s"
 
+#, python-format
 #~ msgid "%(free)s free"
 #~ msgstr "%(free)s tillgängligt"
 
@@ -4035,33 +4734,43 @@ msgstr ""
 #~ msgid "."
 #~ msgstr "."
 
+#, python-format
 #~ msgid "(%(file_type)s)"
 #~ msgstr "(%(file_type)s)"
 
+#, python-format
 #~ msgid "%(free)s %(file_type)s"
 #~ msgstr "%(free)s %(file_type)s"
 
+#, python-format
 #~ msgid "Backing up photos and videos to %(path)s"
 #~ msgstr "Säkerhetskopierar bilder och filmer till %(path)s"
 
+#, 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)"
 
+#, python-format
 #~ msgid "%(file_type)s download folder is not writable"
 #~ msgstr "%(file_type)s nedladdningsmapp är inte skrivbar"
 
+#, python-format
 #~ msgid "Folder: %s"
 #~ msgstr "Mapp: %s"
 
+#, python-format
 #~ msgid "%(file_type)s download folder is invalid"
 #~ msgstr "%(file_type)s nedladdningsmapp är ogiltig"
 
+#, python-format
 #~ msgid "%(file_type)s download folder does not exist"
 #~ msgstr "%(file_type)s nedladdningsmapp saknas"
 
+#, python-format
 #~ msgid "%(freespace)s. %(backuppaths)s."
 #~ msgstr "%(freespace)s. %(backuppaths)s."
 
+#, python-format
 #~ msgid ""
 #~ "%(problem)s\n"
 #~ "File: %(file)s"
@@ -4081,24 +4790,30 @@ msgstr ""
 #~ msgid "Remove all Ignored Paths?"
 #~ msgstr "Ta bort alla ignorerade sökvägar?"
 
+#, python-format
 #~ msgid "Error: %(inst)s"
 #~ msgstr "Fel: %(inst)s"
 
 #~ msgid "Invalid regular expression"
 #~ msgstr "Ogiltigt reguljärt uttryck"
 
+#, python-format
 #~ msgid "Error generating component %s."
 #~ msgstr "Ett fel uppstod när nummer %s skulle skapas."
 
+#, python-format
 #~ msgid "An error occurred when copying the %(filetype)s"
 #~ msgstr "Ett fel uppstod när %(filetype)s skulle kopieras"
 
+#, python-format
 #~ msgid "%(filetype)s %(area)s could not be generated"
 #~ msgstr "%(filetype)s %(area)s kunde inte skapas."
 
+#, python-format
 #~ msgid "%(filetype)s already exists"
 #~ msgstr "%(filetype)s finns redan"
 
+#, python-format
 #~ msgid ""
 #~ "%(filetype)s could not be backed up because no suitable backup locations "
 #~ "were found."
@@ -4106,52 +4821,65 @@ msgstr ""
 #~ "%(filetype)s kunde inte säkerhetskopieras, eftersom ingen plats för "
 #~ "säkerhetskopior hittades."
 
+#, python-format
 #~ msgid "%(filetype)s was already downloaded"
 #~ msgstr "%(filetype)s är redan nedladdad"
 
+#, python-format
 #~ msgid ""
-#~ "The existing %(filetype)s was last modified on %(date)s at %(time)s. "
-#~ "Unique identifier '%(identifier)s' added."
+#~ "The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
+#~ "identifier '%(identifier)s' added."
 #~ msgstr ""
-#~ "Den existerande %(filetype)s ändrades senast den %(date)s kl %(time)s. "
-#~ "Den har fått '%(identifier)s' som unik identifierare."
+#~ "Den existerande %(filetype)s ändrades senast den %(date)s kl %(time)s. Den "
+#~ "har fått '%(identifier)s' som unik identifierare."
 
+#, python-format
 #~ msgid "There is no data with which to name the %(filetype)s."
 #~ msgstr "Det saknas data för att namnge %(filetype)s."
 
+#, python-format
 #~ msgid "Error: %(errorno)s %(strerror)s"
 #~ msgstr "Fel: %(errorno)s %(strerror)s"
 
+#, python-format
 #~ msgid " It was backed up to %(volume)s"
 #~ msgstr " Den har säkerhetskopierats till %(volume)s"
 
+#, python-format
 #~ msgid "%(volume)s, "
 #~ msgstr "%(volume)s, "
 
+#, python-format
 #~ msgid "%(volume)s (%(inst)s), "
 #~ msgstr "%(volume)s (%(inst)s), "
 
+#, python-format
 #~ msgid "%(volumes)s and %(volume)s (%(inst)s)."
 #~ msgstr "%(volumes)s och %(volume)s (%(inst)s)."
 
 #~ msgid " It was backed up to these devices: "
 #~ msgstr " Den har säkerhetskopierats till följande enheter: "
 
+#, python-format
 #~ msgid "%s, "
 #~ msgstr "%s, "
 
+#, python-format
 #~ msgid "%(volumes)s and %(final_volume)s."
 #~ msgstr "%(volumes)s och %(final_volume)s."
 
+#, python-format
 #~ msgid "%(volumes)s and %(volume)s."
 #~ msgstr "%(volumes)s och %(volume)s."
 
+#, python-format
 #~ msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
 #~ msgid "Photo has already been downloaded"
 #~ msgstr "Bilden har redan överförts"
 
+#, python-format
 #~ msgid "Path: %s"
 #~ msgstr "Sökväg: %s"
 
@@ -4194,6 +4922,7 @@ msgstr ""
 #~ msgid "Performance"
 #~ msgstr "Prestanda"
 
+#, python-format
 #~ msgid "%(filetype)s already exists, but it was backed up"
 #~ msgstr "%(filetype)s finns redan, men säkerhetskopierades"
 
@@ -4207,17 +4936,17 @@ msgstr ""
 #~ msgstr "Ta bo_rt alla"
 
 #~ 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."
+#~ "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 ""
 #~ "Sparade sökvägar är sådana som förknippas med enheter där du har valt att "
 #~ "alltid avsöka eller ignorera, när automatisk avsökning är påslaget."
 
 #~ 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."
+#~ "devices for photos or videos. Any path ending with the values below will not "
+#~ "be scanned."
 #~ msgstr "Ange namnändelse på sökvägar som du inte vill att de ska avsökas."
 
 #~ msgid "Copy"
@@ -4244,6 +4973,7 @@ msgstr ""
 #~ msgid "Select a folder to download photos to"
 #~ msgstr "Välj en mapp att överföra bilder till"
 
+#, 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"
 
@@ -4254,21 +4984,22 @@ msgstr ""
 #~ "Error: specify device auto-detection or manually specify a device's path "
 #~ "from which to download, but do not do both."
 #~ msgstr ""
-#~ "Fel: Aktivera antingen automatisk upptäckt av enheter eller ange en "
-#~ "sökvägen manuellt. Du kan inte välja båda."
+#~ "Fel: Aktivera antingen automatisk upptäckt av enheter eller ange en sökvägen "
+#~ "manuellt. Du kan inte välja båda."
 
 #~ msgid "list photo and video file extensions the program recognizes and exit"
 #~ msgstr "visa de filändelser som programmet stödjer och avsluta"
 
+#, python-format
 #~ msgid "Destination directory could not be created: %(directory)s\n"
 #~ msgstr "Målmappen kunde inte skapas: %(directory)s\n"
 
 #~ msgid ""
-#~ "manually specify the PATH of the device from which to download, "
-#~ "overwriting existing program preferences"
+#~ "manually specify the PATH of the device from which to download, overwriting "
+#~ "existing program preferences"
 #~ msgstr ""
-#~ "ange SÖKVÄGEN manuellt till den enhet från vilken du önskar hämta objekt "
-#~ "och ersätt de nuvarande programinställningarna"
+#~ "ange SÖKVÄGEN manuellt till den enhet från vilken du önskar hämta objekt och "
+#~ "ersätt de nuvarande programinställningarna"
 
 #~ msgid ""
 #~ "automatically detect devices from which to download, overwriting existing "
@@ -4287,6 +5018,7 @@ msgstr ""
 #~ msgid "Select a folder in which to backup videos"
 #~ msgstr "Välj den mapp där du vill säkerhetskopiera filmerna"
 
+#, python-format
 #~ msgid ""
 #~ "The following regular expressions are invalid, and will be removed unless "
 #~ "you correct them:\n"
@@ -4296,15 +5028,17 @@ msgstr ""
 #~ "ändrar dem:\n"
 #~ " %s"
 
+#, python-format
 #~ msgid ""
-#~ "This regular expression is invalid, and will be removed unless you "
-#~ "correct it:\n"
+#~ "This regular expression is invalid, and will be removed unless you correct "
+#~ "it:\n"
 #~ " %s"
 #~ msgstr ""
 #~ "Detta reguljära uttryck är ogiltigt och kommer att tas bort om du inte "
 #~ "ändrar det:\n"
 #~ " %s"
 
+#, python-format
 #~ msgid ""
 #~ "The %(filetype)s subfolder preferences entered are invalid and cannot be "
 #~ "used.\n"
@@ -4331,9 +5065,11 @@ msgstr ""
 #~ msgid "Jakarta"
 #~ msgstr "Jakarta"
 
+#, python-format
 #~ msgid "Date time value %s appears invalid."
 #~ msgstr "Datum/tid-värdet %s verkar vara ogiltigt."
 
+#, python-format
 #~ msgid "%(filetype)s metadata cannot be read"
 #~ msgstr "Metadata i %(filetype)s kan inte avläsas."
 
@@ -4348,55 +5084,65 @@ msgstr ""
 #~ msgid "Errors occurred when backing up on the following backup devices: "
 #~ msgstr "Ett fel uppstod vid säkerhetskopiering till följande enheter: "
 
+#, python-format
 #~ msgid "An error occurred when backing up on %(volume)s."
 #~ msgstr "Ett fel uppstod vid säkerhetskopiering till %(volume)s."
 
 #~ msgid "Backups already exist in these locations: "
 #~ msgstr "En säkerhetskopia finns redan i: "
 
+#, python-format
 #~ msgid "Backup already exists on %(volume)s."
 #~ msgstr "En säkerhetskopia finns redan på %(volume)s."
 
+#, python-format
 #~ msgid ""
 #~ "Photos detected with the same filenames, but taken at different times: "
 #~ "%(details)s"
 #~ msgstr ""
 #~ "Hittade bilder med samma filnamn tagna vid olika tillfällen: %(details)s"
 
+#, 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."
 
 #~ msgid "Backups overwritten on these devices: "
 #~ msgstr "Den befintliga säkerhetskopian skrevs över på: "
 
+#, python-format
 #~ msgid "Backup overwritten on %(volume)s."
 #~ msgstr "Den befintliga säkerhetskopian skrevs över på %(volume)s."
 
-#~ msgid ""
-#~ "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
+#, python-format
+#~ msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
 #~ msgstr ""
 #~ "%(missing_metadata_elements)s och %(final_missing_metadata_element)s."
 
+#, python-format
 #~ msgid "%(previousproblem)s Additionally, %(newproblem)s"
 #~ msgstr "%(previousproblem)s Dessutom, %(newproblem)s"
 
+#, python-format
 #~ msgid " Furthermore, there were %(problems)s."
 #~ msgstr " Dessutom uppstod %(problems)s."
 
+#, 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."
 
 #~ msgid ""
-#~ "Errors occurred when creating directories on the following backup "
-#~ "devices: "
+#~ "Errors occurred when creating directories on the following backup devices: "
 #~ msgstr "Ett fel uppstod när mappar skulle skapas på följande enheter: "
 
+#, python-format
 #~ msgid " Furthermore, there was a %(problem)s."
 #~ msgstr " Dessutom uppstod %(problem)s."
 
+#, python-format
 #~ msgid "Problem in %s generation"
 #~ msgstr "Problem vid namngivning av %s"
 
+#, python-format
 #~ msgid "Problems in %s generation"
 #~ msgstr "Problem vid namngivning av %s"
 
@@ -4415,13 +5161,13 @@ msgstr ""
 #~ msgid "Problem in subfolder and filename generation"
 #~ msgstr "Problem vid namngivning av undermappar och filnamn"
 
-#~ msgid ""
-#~ "Photos detected with the same filenames, but taken at different times"
+#~ msgid "Photos detected with the same filenames, but taken at different times"
 #~ msgstr "Bilder med samma filnamn, tagna vid olika tillfällen, hittades"
 
 #~ msgid "there was an error backing up"
 #~ msgstr "det uppstod ett fel vid säkerhetskopieringen"
 
+#, python-format
 #~ msgid "%(previousproblem)s, and %(backinguperror)s"
 #~ msgstr "%(previousproblem)s och %(backinguperror)s"
 
@@ -4431,6 +5177,7 @@ msgstr ""
 #~ msgid "Failed to create download subfolder"
 #~ msgstr "Misslyckades med att skapa nedladdningmappen"
 
+#, 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)…"
 
@@ -4474,9 +5221,9 @@ msgstr ""
 #~ "<span weight=\"bold\" size=\"x-large\">Alternativ för namngivning</span>"
 
 #~ 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>."
+#~ "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 ""
 #~ "Ledsen, men filmhämtningsfunktionen har inaktiverats. För att föra över "
 #~ "filmer, installera antingen paketen <i>hachoir metadata</i> och <i>kaa "
@@ -4506,8 +5253,8 @@ msgstr ""
 #~ "Specify whether photo, video and folder names should have any characters "
 #~ "removed that are not allowed by other operating systems."
 #~ msgstr ""
-#~ "Ange om specialtecken som inte tillåts i andra operativsystem ska tas "
-#~ "bort från fil- och mappnamn."
+#~ "Ange om specialtecken som inte tillåts i andra operativsystem ska tas bort "
+#~ "från fil- och mappnamn."
 
 #~ msgid "Synchronize RAW + JPEG sequence numbers"
 #~ msgstr "Använd samma sekvensnummer för både RAW- och JPEG-filer"
@@ -4523,13 +5270,13 @@ msgstr ""
 #~ "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"
+#~ "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>"
+#~ "<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 ""
 #~ "Du kan överföra bilder och filmer från kameror, minneskort eller externa "
 #~ "enheter som t.ex hårddiskar.\n"
@@ -4538,31 +5285,31 @@ msgstr ""
 #~ "hårddisk.\n"
 #~ "\n"
 #~ "<i>Överföring direkt från kameran är en experimentell funktion. Om det "
-#~ "fungerar dåligt eller inte alls, prova att aktivera PTP läge på din "
-#~ "kamera. Om det ändå inte fungerar måste du använda en kortläsare.</i>"
+#~ "fungerar dåligt eller inte alls, prova att aktivera PTP läge på din kamera. "
+#~ "Om det ändå inte fungerar måste du använda en kortläsare.</i>"
 
 #~ msgid "Rename Options"
 #~ msgstr "Inställningar för namngivning"
 
 #~ msgid ""
-#~ "If you disable automatic detection, choose the exact location of the "
-#~ "photos and videos."
+#~ "If you disable automatic detection, choose the exact location of the photos "
+#~ "and videos."
 #~ msgstr ""
-#~ "Om du inaktiverar automatisk sökning, måste du ange exakt plats för "
-#~ "bilder och filmer."
+#~ "Om du inaktiverar automatisk sökning, måste du ange exakt plats för bilder "
+#~ "och filmer."
 
 #~ 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."
+#~ "When this option is enabled, and a potential device is detected, you will be "
+#~ "prompted to determine if it should be scanned or not."
 #~ msgstr ""
 #~ "Om du aktiverar sökning av externa enheter så kommer hela enheten att "
 #~ "avsökas. På stora enheter kan det ta en stund.\n"
 #~ "\n"
-#~ "När denna inställning är påslagen och en möjlig enhet hittas, så kommer "
-#~ "du att tillfrågas om den ska avsökas eller ej."
+#~ "När denna inställning är påslagen och en möjlig enhet hittas, så kommer du "
+#~ "att tillfrågas om den ska avsökas eller ej."
 
 #~ msgid "Use _python-style regular expressions"
 #~ msgstr "Använd _Python-kompatibla reguljära uttryck"
@@ -4571,14 +5318,14 @@ msgstr ""
 #~ "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>"
+#~ "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 ""
 #~ "Välj i vilken mapp på enheten som används till säkerhetskopior.\n"
 #~ "\n"
 #~ "<i>Observera att mappen kommer användas för att avgöra om enheten används "
-#~ "till säkerhetskopior. För varje enhet du vill använda till "
-#~ "säkerhetskopior kan du skapa en mapp med ett av dessa namn.</i>"
+#~ "till säkerhetskopior. För varje enhet du vill använda till säkerhetskopior "
+#~ "kan du skapa en mapp med ett av dessa namn.</i>"
 
 #~ msgid "<b>Program Automation</b>"
 #~ msgstr "<b>Automatisera programmet</b>"
@@ -4602,9 +5349,8 @@ msgstr ""
 #~ msgstr "Skapa miniatyrbilder (långsammare)"
 
 #~ 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."
+#~ "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 ""
 #~ "Ange om en bild eller film med ett namn som redan finns, ska hoppas över "
 #~ "eller tilldelas ett unikt nummer."
@@ -4613,9 +5359,10 @@ msgstr ""
 #~ "When backing up, choose whether to overwrite a file on the backup device "
 #~ "that has the same name, or skip backing it up."
 #~ msgstr ""
-#~ "Ange om en bild eller film med ett namn som redan finns på "
-#~ "säkerhetskopian, ska hoppas över eller skrivas över."
+#~ "Ange om en bild eller film med ett namn som redan finns på säkerhetskopian, "
+#~ "ska hoppas över eller skrivas över."
 
+#, python-format
 #~ msgid "About %i seconds remaining"
 #~ msgstr "Ungefär %i sekunder återstår"
 
@@ -4629,15 +5376,18 @@ msgstr ""
 #~ "Do you really want to download from here? On some systems, scanning this "
 #~ "location can take a very long time."
 #~ 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."
+#~ "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."
 
+#, python-format
 #~ msgid "Downloading from %(location)s."
 #~ msgstr "För över från %(location)s."
 
+#, python-format
 #~ msgid "Select a folder containing %(file_types)s"
 #~ msgstr "Välj en mapp innehållande %(file_types)s"
 
+#, python-format
 #~ msgid ""
 #~ "display program information on the command line as the program runs "
 #~ "(default: %default)"
@@ -4666,22 +5416,27 @@ msgstr ""
 #~ msgid "Refresh"
 #~ msgstr "Läs om"
 
+#, python-format
 #~ msgid "Backup %(file_type)s overwritten"
 #~ msgstr "Säkerhetskopian av %(file_type)s skrevs över"
 
+#, python-format
 #~ msgid "%(file_type)s not backed up"
 #~ msgstr "%(file_type)s säkerhetskopierades inte"
 
+#, python-format
 #~ msgid "Backup of %(file_type)s already exists"
 #~ msgstr "En säkerhetskopia av %(file_type)s finns redan"
 
+#, python-format
 #~ msgid ""
-#~ "File verification failed on %(volume)s. The backed up version is "
-#~ "different from the downloaded version."
+#~ "File verification failed on %(volume)s. The backed up version is different "
+#~ "from the downloaded version."
 #~ msgstr ""
 #~ "Filverifikationen misslyckades på %(volume)s. Säkerhetskopian skiljer sig "
 #~ "från originalet."
 
+#, python-format
 #~ msgid "The %(filetype)s did not download correctly"
 #~ msgstr "%(filetype)s hämtades inte på ett korrekt sätt"
 
@@ -4691,10 +5446,10 @@ msgstr ""
 #~ msgid "File verification failed on these devices: "
 #~ msgstr "Filverifikationen misslyckades på dessa enheter: "
 
+#, python-format
 #~ msgid "No backup device contains a valid folder for backing up %(filetype)s"
 #~ msgstr ""
-#~ "Ingen enhet innehåller en giltig mapp för att säkerhetskopiera "
-#~ "%(filetype)s"
+#~ "Ingen enhet innehåller en giltig mapp för att säkerhetskopiera %(filetype)s"
 
 #~ msgid ""
 #~ "File verification failed. The downloaded version is different from the "
@@ -4706,6 +5461,7 @@ msgstr ""
 #~ msgid "Verify files as they are downloaded"
 #~ msgstr "Verifiera filerna när de hämtas"
 
+#, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
 #~ "Destination: %(destination)s"
@@ -4713,12 +5469,13 @@ msgstr ""
 #~ "Källa: %(source)s\n"
 #~ "Mål: %(destination)s"
 
+#, 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."
 
-#~ msgid ""
-#~ "An error occurred when copying the %(filetype)s, but it was backed up"
+#, 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 den säkerhetskopierades"
 
diff --git a/po/tr.po b/po/tr.po
index 8308562..61aeab7 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -7,35 +7,386 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: damonlynch@gmail.com\n"
-"POT-Creation-Date: 2017-07-08 19:16-0500\n"
-"PO-Revision-Date: 2017-07-04 11:06+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2017-09-12 17:01-0400\n"
+"PO-Revision-Date: 2017-09-13 18:42+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: Turkish <tr@li.org>\n"
-"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-07-05 23:04+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-09-26 22:04+0000\n"
+"X-Generator: Launchpad (build 18463)\n"
+"Language: tr\n"
+
+#: ../install.py:65
+msgid "Rapid Photo Downloader installer"
+msgstr ""
+
+#: ../install.py:66
+msgid "Download and install latest version of Rapid Photo Downloader."
+msgstr ""
+
+#: ../install.py:236 ../install.py:1732
+msgid "Installer not found:"
+msgstr ""
+
+#. Translators: do not translate the term tar.gz
+#: ../install.py:240 ../install.py:1736
+msgid "Installer not in tar.gz format:"
+msgstr ""
+
+#: ../install.py:465
+msgid ""
+"Incorrect folder ownership detected. Changing ownership of and resetting "
+"permissions for"
+msgstr ""
+
+#: ../install.py:540
+msgid "The following command will be run:"
+msgstr ""
+
+#: ../install.py:543 ../install.py:1479 ../install.py:1484
+msgid "sudo may prompt you for the sudo password."
+msgstr ""
+
+#: ../install.py:547
+msgid "Would you like to run the command now?"
+msgstr ""
+
+#: ../install.py:549
+msgid "Answer is not yes, exiting."
+msgstr ""
+
+#: ../install.py:559 ../install.py:751 ../install.py:966
+msgid "Command failed"
+msgstr ""
+
+#: ../install.py:561 ../install.py:752 ../install.py:967
+msgid "Exiting"
+msgstr ""
+
+#: ../install.py:582
+msgid "The Universe repository must be enabled."
+msgstr ""
+
+#: ../install.py:606
+msgid ""
+"Do you want to to uninstall the previous version of Rapid Photo Downloader:"
+msgstr ""
+
+#: ../install.py:715 ../install.py:740
+msgid ""
+"Querying package system to see if an older version of Rapid Photo Downloader "
+"is installed (this may take a while)..."
+msgstr ""
+
+#: ../install.py:726
+msgid ""
+"Unable to query package system. Please check your Internet connection and "
+"try again"
+msgstr ""
+
+#: ../install.py:756
+msgid "Checking if previous version installed with pip..."
+msgstr ""
+
+#: ../install.py:850
+msgid "The following package is unknown on your system: {}\n"
+msgstr ""
+
+#: ../install.py:857 ../install.py:929 ../install.py:974
+msgid ""
+"To continue, some packages required to run the application will be installed."
+msgstr ""
+
+#: ../install.py:886
+msgid "Querying installed and available packages (this may take a while)"
+msgstr ""
+
+#: ../install.py:958
+msgid ""
+"Querying zypper to see if any required packages are already installed (this "
+"may take a while)... "
+msgstr ""
+
+#: ../install.py:1004
+msgid "Query to confirm action at each step."
+msgstr ""
+
+#: ../install.py:1011
+msgid ""
+"When downloading the latest version, install the development version if it "
+"is newer than the stable version."
+msgstr ""
+
+#: ../install.py:1020
+msgid ""
+"Optional tar.gz Rapid Photo Downloader installer archive. If not specified, "
+"the latest version is downloaded from the Internet."
+msgstr ""
+
+#: ../install.py:1043
+msgid ""
+"Do not run the installer in the tar.gz Rapid Photo Downloader installer "
+"archive if it is newer than this version ({}). The default is to run "
+"whichever installer is newer."
+msgstr ""
+
+#: ../install.py:1050
+msgid ""
+"Uninstall Rapid Photo Downloader that was installed with pip, keeping its "
+"dependencies."
+msgstr ""
+
+#: ../install.py:1054
+msgid ""
+"Uninstall the dependencies installed by pip during Rapid Photo Downloader's "
+"installation, and Rapid Photo Downloader itself, then exit."
+msgstr ""
+
+#: ../install.py:1059
+msgid ""
+"Note: this will not uninstall any version of Rapid Photo Downloader "
+"installed by your Linux distribution's package manager."
+msgstr ""
+
+#: ../install.py:1066
+msgid ""
+"Dependencies will only be removed if they are not required by other programs."
+msgstr ""
+
+#: ../install.py:1072
+msgid ""
+"Note: this option will remove the dependencies regardless of whether they "
+"are required by another program pip has installed. Upgrade to pip 9.0 or "
+"above if you want to avoid this behavior. You can do so using the command "
+"'python3 -m pip install pip -U --user'. Also note that any version of Rapid "
+"Photo Downloader installed by your Linux distribution's package manager will "
+"not be uninstalled."
+msgstr ""
+
+#: ../install.py:1122
+msgid "Failed to download versions file"
+msgstr ""
+
+#: ../install.py:1126
+msgid "Got error code {} while accessing versions file"
+msgstr ""
+
+#: ../install.py:1234
+msgid ""
+"Sorry, could not locate installer. Please check your Internet connection and "
+"verify if you can reach https://www.damonlynch.net\n"
+"\n"
+"Exiting.\n"
+msgstr ""
+
+#: ../install.py:1408
+msgid "Installing application requirements..."
+msgstr ""
+
+#: ../install.py:1424
+msgid "Received error code"
+msgstr ""
+
+#: ../install.py:1425
+msgid "Failed to install application requirements: exiting"
+msgstr ""
+
+#: ../install.py:1428
+msgid "Installing application..."
+msgstr ""
+
+#: ../install.py:1441
+msgid "Failed to install application: exiting..."
+msgstr ""
+
+#: ../install.py:1465
+msgid ""
+"You may have to restart the computer to be able to run the program from the "
+"commmand line or application launcher."
+msgstr ""
+
+#: ../install.py:1476
+msgid "Do you want to install the application's man pages?"
+msgstr ""
+
+#: ../install.py:1477
+msgid "They will be installed into {}"
+msgstr ""
+
+#: ../install.py:1478 ../install.py:1483
+msgid "If you uninstall the application, remove these manpages yourself."
+msgstr ""
+
+#: ../install.py:1480
+msgid "Do want to install the man pages?"
+msgstr ""
+
+#: ../install.py:1482
+msgid "Installing man pages into {}"
+msgstr ""
+
+#: ../install.py:1499
+msgid "Failed to create man page directory: exiting"
+msgstr ""
+
+#: ../install.py:1511
+msgid "Failed to copy man page."
+msgstr ""
+
+#: ../install.py:1521
+msgid "(If a segmentation fault occurs at exit, you can ignore it...)"
+msgstr ""
+
+#: ../install.py:1534
+msgid ""
+"The python3 tool pip is required to uninstall a version of Rapid Photo "
+"Downloader that was installed with pip.\n"
+"Cannot continue. Exiting."
+msgstr ""
+
+#: ../install.py:1575
+msgid ""
+"Do not run this installer script as sudo / root user.\n"
+"Run it using the user who will run the program.\n"
+msgstr ""
+
+#: ../install.py:1585 ../install.py:1599
+msgid "Do not include any other command line arguments when specifying"
+msgstr ""
+
+#: ../install.py:1614
+msgid ""
+"Sorry, this installer does not support a custom python installation.\n"
+"Exiting..."
+msgstr ""
+
+#: ../install.py:1620
+msgid "Restarting script using system python..."
+msgstr ""
+
+#: ../install.py:1651
+msgid "Exiting..."
+msgstr ""
+
+#. Translators: do not translate the term python3-apt
+#: ../install.py:1670
+msgid "To continue, the package python3-apt must be installed."
+msgstr ""
+
+#: ../install.py:1689
+msgid ""
+"Install the following packages using your Linux distribution's standard "
+"package manager, and then rerun this installer"
+msgstr ""
+
+#: ../install.py:1698
+msgid ""
+"To run this program, programs to assist Python 3 and its package management "
+"must be installed."
+msgstr ""
+
+#. Translators: do not translate the terms Python 3, pip and setuptools
+#: ../install.py:1713
+msgid "Python 3's pip and setuptools must be upgraded for your user."
+msgstr ""
+
+#. Translators: do not translate the term python or requests
+#: ../install.py:1726
+msgid "Installing python requests"
+msgstr ""
 
-#. type: QPushButton
-#: ../raphodo/aboutdialog.py:217
+#: ../upgrade.py:79
+msgid "Upgrade Rapid Photo Downloader"
+msgstr ""
+
+#: ../upgrade.py:401 ../raphodo/viewutils.py:242
+msgid "&Cancel"
+msgstr ""
+
+#: ../upgrade.py:405
+msgid "&Upgrade"
+msgstr ""
+
+#: ../upgrade.py:410
+#, python-format
+msgid "Click the Upgrade button to upgrade to version %s."
+msgstr ""
+
+#: ../upgrade.py:413
+msgid "Click the Upgrade button to start the upgrade."
+msgstr ""
+
+#: ../upgrade.py:416 ../upgrade.py:422 ../raphodo/viewutils.py:241
+msgid "&Close"
+msgstr ""
+
+#: ../upgrade.py:417
+msgid "&Run"
+msgstr ""
+
+#: ../upgrade.py:447
+msgid "Close Rapid Photo Downloader before running this upgrade"
+msgstr ""
+
+#: ../upgrade.py:450
+msgid "Upgrade running..."
+msgstr ""
+
+#: ../upgrade.py:486
+#, python-format
+msgid ""
+"Successfully upgraded to %s. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:491
+msgid ""
+"Upgrade finished successfully. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:495
+msgid "Upgrade failed. Click Close to exit."
+msgstr ""
+
+#: ../upgrade.py:6967
+#, python-format
+msgid "Upgrading %s..."
+msgstr ""
+
+#: ../upgrade.py:6969
+msgid "Press any key to continue..."
+msgstr ""
+
+#: ../upgrade.py:6982
+msgid "Rapid Photo Downloader upgrade failed"
+msgstr ""
+
+#: ../upgrade.py:6984
+#, python-format
+msgid ""
+"The python package %s could not be updated. The upgrade cannot continue."
+msgstr ""
+
+#: ../raphodo/aboutdialog.py:225
 msgid "Credits"
 msgstr "Destekleyenler"
 
-#: ../raphodo/backuppanel.py:239
+#: ../raphodo/backuppanel.py:240
 msgid "Backups are not configured"
 msgstr "Yedeklemeler yapılandırılmadı"
 
-#: ../raphodo/backuppanel.py:241
+#: ../raphodo/backuppanel.py:242
 msgid "No backup devices detected"
 msgstr "Yedekleme ünitesi bulunamadı"
 
-#: ../raphodo/backuppanel.py:243
+#: ../raphodo/backuppanel.py:244
 msgid "Valid backup locations not yet specified"
 msgstr "Geçerli yedekleme yerleri henüz belirtilmemiş"
 
-#: ../raphodo/backuppanel.py:401
+#: ../raphodo/backuppanel.py:404
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
@@ -43,96 +394,105 @@ msgstr ""
 "Fotoğraflarınızı ve videolarınızı, indirildikçe birden fazla yere "
 "yedeklenmesini sağlayabilirsiniz, ör. Harici sabit sürücüler."
 
-#: ../raphodo/backuppanel.py:407
+#: ../raphodo/backuppanel.py:412
 msgid "Back up photos and videos when downloading"
 msgstr "İndirirken fotoğrafları ve videoları yedekle"
 
-#: ../raphodo/backuppanel.py:413
+#: ../raphodo/backuppanel.py:418
 msgid "Automatically detect backup devices"
 msgstr "Yedekleme aygıtlarını otomatik olarak algıla"
 
-#: ../raphodo/backuppanel.py:417
+#: ../raphodo/backuppanel.py:424
 msgid ""
-"Specify the folder in which backups are stored on the device."
-"<br><br><i>Note: the presence of a folder with this name is used to "
+"Specify the folder in which backups are stored on the "
+"device.<br><br><i>Note: the presence of a folder with this name is used to "
 "determine if 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 folder names. By "
 "adding both folders, the same device can be used to back up both photos and "
 "videos.</i>"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:428
+#: ../raphodo/backuppanel.py:439
 msgid "Photo folder name:"
 msgstr "Fotoğraf klasörü adı:"
 
-#: ../raphodo/backuppanel.py:433
+#: ../raphodo/backuppanel.py:444
 msgid "Video folder name:"
 msgstr "Video klasörü adı:"
 
-#: ../raphodo/backuppanel.py:438 ../raphodo/nameeditor.py:883
+#: ../raphodo/backuppanel.py:449 ../raphodo/nameeditor.py:890
 #: ../raphodo/renamepanel.py:123
 msgid "Example:"
 msgstr "Örnek:"
 
-#: ../raphodo/backuppanel.py:448
-msgid "If you disable automatic detection, choose the exact backup locations."
+#: ../raphodo/backuppanel.py:460
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
 "Otomatik algılamayı devre dışı bırakırsanız, tam yedekleme konumlarını seçin."
 
-#: ../raphodo/backuppanel.py:452
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:468
 msgid "Photo backup location:"
 msgstr "Fotoğraf yedekleme konumu:"
 
-#: ../raphodo/backuppanel.py:454
+#: ../raphodo/backuppanel.py:474
 msgid "Select Photo Backup Location"
 msgstr "Fotoğraf Yedekleme Konumunu Seçin"
 
-#: ../raphodo/backuppanel.py:460
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:485
 msgid "Video backup location:"
 msgstr "Video yedekleme konumu:"
 
-#: ../raphodo/backuppanel.py:462
+#: ../raphodo/backuppanel.py:491
 msgid "Select Video Backup Location"
 msgstr "Video Yedekleme Konumunu Seçin"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:564
+#: ../raphodo/backuppanel.py:595
 msgid "drive1"
 msgstr "sürücü1"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:567
+#: ../raphodo/backuppanel.py:598
 msgid "drive2"
 msgstr "sürücü2"
 
-#: ../raphodo/backuppanel.py:628
+#: ../raphodo/backuppanel.py:663
 msgid "Projected Backup Storage Use"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:632
+#: ../raphodo/backuppanel.py:669
 msgid "Backup Options"
 msgstr "Yedekleme Seçenekleri"
 
 #. translators: refers to the video thumbnail file that some
 #. cameras generate -- it has a .THM file extension
-#: ../raphodo/copyfiles.py:476
+#: ../raphodo/copyfiles.py:491
 msgid "video THM"
 msgstr ""
 
-#: ../raphodo/copyfiles.py:482
+#: ../raphodo/copyfiles.py:497
 msgid "audio"
 msgstr "ses"
 
 #: ../raphodo/destinationdisplay.py:78 ../raphodo/devicedisplay.py:1079
-#: ../raphodo/rpdfile.py:321
+#: ../raphodo/rpdfile.py:342
 #, python-format
 msgid "%(no_photos)s Photos"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:82 ../raphodo/devicedisplay.py:1081
-#: ../raphodo/rpdfile.py:316
+#: ../raphodo/rpdfile.py:333
 #, python-format
 msgid "%(no_videos)s Videos"
 msgstr ""
@@ -160,15 +520,15 @@ msgid "%(size_free)s free of %(size_total)s"
 msgstr "%(size_free)s / %(size_total)s boş"
 
 #: ../raphodo/destinationdisplay.py:190 ../raphodo/devicedisplay.py:993
-#: ../raphodo/rapid.py:1964 ../raphodo/rapid.py:2079 ../raphodo/rapid.py:5753
-#: ../raphodo/rpdfile.py:905
+#: ../raphodo/rapid.py:2023 ../raphodo/rapid.py:2151 ../raphodo/rapid.py:6043
+#: ../raphodo/rpdfile.py:930
 msgid "Photos"
 msgstr "Fotoğraflar"
 
 #. translators: the name of the Videos folder
 #: ../raphodo/destinationdisplay.py:191 ../raphodo/devicedisplay.py:994
-#: ../raphodo/rapid.py:1967 ../raphodo/rapid.py:2080 ../raphodo/rapid.py:5754
-#: ../raphodo/rpdfile.py:933 ../raphodo/storage.py:445
+#: ../raphodo/rapid.py:2028 ../raphodo/rapid.py:2152 ../raphodo/rapid.py:6044
+#: ../raphodo/rpdfile.py:958 ../raphodo/storage.py:449
 msgid "Videos"
 msgstr "Videolar"
 
@@ -176,7 +536,7 @@ msgstr "Videolar"
 msgid "Projected storage use after download"
 msgstr ""
 
-#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:516
+#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:521
 msgid "Custom..."
 msgstr ""
 
@@ -214,57 +574,58 @@ msgstr ""
 msgid "%s full"
 msgstr ""
 
-#: ../raphodo/devices.py:459
+#: ../raphodo/devices.py:463
 msgid "Cameras"
 msgstr ""
 
-#: ../raphodo/devices.py:460 ../raphodo/devices.py:920
-#: ../raphodo/preferencedialog.py:85 ../raphodo/rapid.py:1927
+#: ../raphodo/devices.py:464 ../raphodo/devices.py:927
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/rapid.py:1979
 msgid "Devices"
 msgstr ""
 
-#: ../raphodo/devices.py:720
+#: ../raphodo/devices.py:724
 #, python-format
 msgid "Downloading from %(device_names)s"
 msgstr ""
 
 #. Translators: e.g. Three Devices
-#: ../raphodo/devices.py:780
+#: ../raphodo/devices.py:784
 #, python-format
 msgid "%(no_devices)s %(device_type)s"
 msgstr ""
 
-#: ../raphodo/devices.py:905 ../raphodo/rapid.py:1764
+#: ../raphodo/devices.py:912 ../raphodo/rapid.py:1807
 msgid "Select Source"
 msgstr ""
 
-#: ../raphodo/devices.py:936 ../raphodo/devices.py:947
+#: ../raphodo/devices.py:943 ../raphodo/devices.py:954
 #, python-format
 msgid "%(device1)s + %(device2)s"
 msgstr ""
 
 #. Number of cameras e.g. 3 Cameras
-#: ../raphodo/devices.py:958
+#: ../raphodo/devices.py:965
 #, python-format
 msgid "%(no_cameras)s Cameras"
 msgstr ""
 
-#: ../raphodo/devices.py:963
+#: ../raphodo/devices.py:970
 #, python-format
 msgid "%(no_devices)s Devices"
 msgstr ""
 
 #. Translators: two folder names, separated by a plus sign
-#: ../raphodo/devices.py:1258
+#: ../raphodo/devices.py:1265
 #, python-format
 msgid "%s + %s"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:44
+#: ../raphodo/didyouknow.py:45
 msgid "Click on a file's checkbox to mark or unmark it for download."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:50
+#: ../raphodo/didyouknow.py:51
 msgid ""
 "Files that have already been downloaded are remembered. You can still mark "
 "previously downloaded files to download again, but they are unchecked by "
@@ -272,34 +633,67 @@ msgid ""
 "files that are yet to be downloaded."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:59
+#: ../raphodo/didyouknow.py:60
 msgid ""
 "If more than one file is selected, they'll all take the mark of the file "
 "whose checkbox was clicked, regardless of whether they previously had a "
 "checkmark or not."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:67
+#: ../raphodo/didyouknow.py:68
 msgid ""
 "Click on a device's checkbox to quickly mark or unmark all its files for "
 "downloading."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:74
+#: ../raphodo/didyouknow.py:75
+msgid ""
+"After a download finishes, an icon replaces the thumbnail's checkbox. The "
+"icon's color indicates whether the download was successful (green), had file "
+"renaming problems (yellow/orange), or failed (red)."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:83
+msgid ""
+"\n"
+"            In case of any problems, a red icon will appear at the bottom of "
+"the window\n"
+"            indicating how many error reports there are. Clicking on it "
+"opens the Error Report \n"
+"            window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:91
+msgid ""
+"\n"
+"            The Error Report window lists any problems encountered before, "
+"during or after the \n"
+"            download. An orange triangle represents a warning, a red circle "
+"indicates a failure, \n"
+"            and a black circle indicates more serious failures. You can "
+"click on the hyperlinks to \n"
+"            open its file or device in a file manager. You can also search "
+"the reports using the \n"
+"            search box in the lower left of the Error Report window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:103
 msgid ""
 "You can simultaneously download from multiple cameras, smartphones, memory "
 "cards, and hard drives&mdash;as many devices as your computer can handle at "
 "one time."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:81
+#: ../raphodo/didyouknow.py:110
 msgid ""
 "The <b>Timeline</b> groups photos and videos based on how much time elapsed "
 "between consecutive shots. Use it to identify photos and videos taken at "
 "different periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:88
+#: ../raphodo/didyouknow.py:117
 msgid ""
 "\n"
 "<p>In the illustration above, the first row of the Timeline is black because "
@@ -311,7 +705,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:99
+#: ../raphodo/didyouknow.py:128
 msgid ""
 "To view photos and videos for a particular time range, use the mouse "
 "(optionally in combination with the <tt>Shift</tt> or <tt>Ctrl</tt> keys) to "
@@ -319,20 +713,20 @@ msgid ""
 "the left side of the main window will be highlighted."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:106
+#: ../raphodo/didyouknow.py:135
 msgid ""
 "A download always includes all files that are checked for download, "
 "including those that are not currently displayed because the Timeline is "
 "being used."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:113
+#: ../raphodo/didyouknow.py:142
 msgid ""
 "You can hide or display the download sources by clicking on the name of the "
 "device you're downloading from at the top left of the program window."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:120
+#: ../raphodo/didyouknow.py:149
 msgid ""
 "\n"
 "          Thumbnails can be sorted using a variety of criteria:\n"
@@ -351,33 +745,33 @@ msgid ""
 "</ol> "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:137
+#: ../raphodo/didyouknow.py:166
 msgid ""
 "One of Rapid Photo Downloader's most useful features is its ability to "
 "automatically generate download subfolders and rename files as it downloads, "
 "using a scheme of your choosing."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:143
+#: ../raphodo/didyouknow.py:172
 msgid ""
 "To specify where you want your files downloaded and how you want them named, "
 "open the appropriate panel on the right-side of the application window: "
 "<b>Destination</b>, <b>Rename</b>, or <b>Job Code</b>."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:150
+#: ../raphodo/didyouknow.py:179
 msgid ""
 "\n"
 "When thinking about your download directory structure, keep in mind two "
 "different types\n"
 "of directory:\n"
 "<ol>\n"
-"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, &quot;"
-"Photos&quot;, or\n"
+"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, "
+"&quot;Photos&quot;, or\n"
 "&quot;Videos&quot;. This directory should already exist on your computer. In "
 "the illustration \n"
-"below, the destination folders are &quot;Pictures&quot; and &quot;"
-"Videos&quot;. The\n"
+"below, the destination folders are &quot;Pictures&quot; and "
+"&quot;Videos&quot;. The\n"
 "name of the destination folder is displayed in the grey bar directly above "
 "the folder tree, \n"
 "with a folder icon to its left and a gear icon to its far right.</li>\n"
@@ -390,7 +784,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:167
+#: ../raphodo/didyouknow.py:196
 msgid ""
 "\n"
 "You can download photos and videos to the same destination folder, or "
@@ -403,14 +797,14 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:177
+#: ../raphodo/didyouknow.py:206
 msgid ""
 "Automatically generated download subfolders can contain further "
 "automatically generated subfolders if need be. A common scheme is to create "
 "a year subfolder and then a series of year-month-day subfolders within it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:186
+#: ../raphodo/didyouknow.py:215
 msgid ""
 "\n"
 "Whenever possible, the program previews the download subfolders of photos "
@@ -428,7 +822,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:201
+#: ../raphodo/didyouknow.py:230
 msgid ""
 "\n"
 "Download subfolder names are typically generated using some or all of the "
@@ -452,7 +846,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:219
+#: ../raphodo/didyouknow.py:248
 msgid ""
 "\n"
 "To automatically create download subfolders as you download, \n"
@@ -462,7 +856,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:227
+#: ../raphodo/didyouknow.py:256
 msgid ""
 "\n"
 "Using the drop-down menu, select a built-in preset or click on <b>Custom</b> "
@@ -472,20 +866,20 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:237
+#: ../raphodo/didyouknow.py:266
 msgid ""
 "It's easy to download raw images into one folder, and jpeg images into "
 "another. Simply use the <b>Filename Extension</b> as part of your download "
 "subfolder generation scheme:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:242
+#: ../raphodo/didyouknow.py:271
 msgid ""
 "This illustration shows a saved custom preset named &quot;My custom "
 "preset&quot;."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:246
+#: ../raphodo/didyouknow.py:275
 msgid ""
 "\n"
 "You do not have to create nested download subfolders. This illustration "
@@ -496,7 +890,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:256
+#: ../raphodo/didyouknow.py:285
 msgid ""
 "\n"
 "Although there are many built-in date/time naming options, you may find that "
@@ -510,7 +904,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:265
+#: ../raphodo/didyouknow.py:294
 msgid ""
 "\n"
 "Read more about all the ways you can generate download subfolder names and "
@@ -520,7 +914,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:273
+#: ../raphodo/didyouknow.py:302
 msgid ""
 "\n"
 "<b>Job Codes</b> let you easily enter text that describes sets of photos and "
@@ -532,7 +926,7 @@ msgid ""
 "&quot;Green Bazaar&quot;: \n"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:282
+#: ../raphodo/didyouknow.py:311
 msgid ""
 "\n"
 "You can apply new or existing Job Codes before you start a download. If "
@@ -543,36 +937,36 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:291
+#: ../raphodo/didyouknow.py:320
 msgid "Look for hints to guide you when working with Job Codes:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:295
+#: ../raphodo/didyouknow.py:324
 msgid ""
 "Hints will vary depending on the context, such as when the mouse is hovering "
 "over a button."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:301
+#: ../raphodo/didyouknow.py:330
 msgid ""
 "\n"
 "When you give your photos and videos unique filenames, you'll never be "
 "confused as to \n"
 "which file is which. Using <b>sequence numbers</b> to make filenames unique "
 "is highly \n"
-"recommended!.\n"
+"recommended!\n"
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:309
+#: ../raphodo/didyouknow.py:338
 msgid ""
 "\n"
 "<p>Four types of sequence values are available to help you assign unique "
 "names to your photos and \n"
 "videos:\n"
 "<ol>\n"
-"<li><b>Downloads today</b>: tracks downloads completed during that day.</"
-"li>\n"
+"<li><b>Downloads today</b>: tracks downloads completed during that "
+"day.</li>\n"
 "<li><b>Stored number</b>: similar to Downloads today, but it is remembered "
 "from the last time the  \n"
 "program was run.</li>\n"
@@ -586,7 +980,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:327
+#: ../raphodo/didyouknow.py:356
 msgid ""
 "\n"
 "The <b>Rename</b> panel allows you to configure file renaming. To rename "
@@ -595,7 +989,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:334
+#: ../raphodo/didyouknow.py:363
 msgid ""
 "\n"
 "<p>The <b>Synchronize RAW + JPEG</b> option is useful if you use the RAW + "
@@ -614,7 +1008,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:348
+#: ../raphodo/didyouknow.py:377
 msgid ""
 "\n"
 "You can have your photos and videos backed up to multiple locations as they "
@@ -625,13 +1019,13 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:356
+#: ../raphodo/didyouknow.py:385
 msgid ""
 "In this example, the drive <b>photobackup</b> does not contain a folder "
 "named <tt>Videos</tt>, so videos will not be backed up to it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:362
+#: ../raphodo/didyouknow.py:391
 msgid ""
 "\n"
 "Several of the program's preferences can be set from the command line, "
@@ -642,7 +1036,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:372
+#: ../raphodo/didyouknow.py:396
+msgid "You can also import program preferences from the older 0.4 version."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:401
 msgid ""
 "\n"
 "Rapid Photo Downloader deals with three types of cache:\n"
@@ -652,8 +1050,8 @@ msgid ""
 "memory cards, and other devices.</li>\n"
 "<li>A <b>temporary cache</b> of files downloaded from a camera, one for "
 "photos and another for \n"
-"videos. They are located in temporary subfolders in the download destination."
-"</li>\n"
+"videos. They are located in temporary subfolders in the download "
+"destination.</li>\n"
 "<li>The <b>desktop's thumbnail cache</b>, in which Rapid Photo Downloader "
 "stores thumbnails of \n"
 "RAW and TIFF photos once they have been downloaded. File browsers like Gnome "
@@ -668,23 +1066,23 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:431
+#: ../raphodo/didyouknow.py:460
 msgid "Tip of the Day"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:439
+#: ../raphodo/didyouknow.py:468
 msgid "Did you know...?"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:466
+#: ../raphodo/didyouknow.py:495
 msgid "Show tips on startup"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:470
+#: ../raphodo/didyouknow.py:499
 msgid "&Next"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:471
+#: ../raphodo/didyouknow.py:500
 msgid "&Previous"
 msgstr ""
 
@@ -791,68 +1189,68 @@ msgstr ""
 msgid "%(days)d days, %(hours)d hours"
 msgstr ""
 
-#: ../raphodo/errorlog.py:65
+#: ../raphodo/errorlog.py:66
 msgid "Find"
 msgstr ""
 
-#: ../raphodo/errorlog.py:135
+#: ../raphodo/errorlog.py:136
 msgid "Error Reports - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/errorlog.py:170
+#: ../raphodo/errorlog.py:171
 msgid "Find in reports"
 msgstr ""
 
-#: ../raphodo/errorlog.py:187
+#: ../raphodo/errorlog.py:188
 msgid "Find the previous occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:192
+#: ../raphodo/errorlog.py:193
 msgid "Find the next occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:194
+#: ../raphodo/errorlog.py:195
 msgid "&Highlight All"
 msgstr ""
 
-#: ../raphodo/errorlog.py:195
+#: ../raphodo/errorlog.py:196
 msgid "Highlight all occurrences of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:196
+#: ../raphodo/errorlog.py:197
 msgid "&Match Case"
 msgstr ""
 
-#: ../raphodo/errorlog.py:197
+#: ../raphodo/errorlog.py:198
 msgid "Search with case sensitivity"
 msgstr ""
 
-#: ../raphodo/errorlog.py:198
+#: ../raphodo/errorlog.py:199
 msgid "&Whole Words"
 msgstr ""
 
-#: ../raphodo/errorlog.py:199
+#: ../raphodo/errorlog.py:200
 msgid "Search whole words only"
 msgstr ""
 
-#: ../raphodo/errorlog.py:209 ../raphodo/errorlog.py:341
+#: ../raphodo/errorlog.py:210 ../raphodo/errorlog.py:345
 #, python-format
 msgid "%s of %s matches"
 msgstr ""
 
-#: ../raphodo/errorlog.py:228
+#: ../raphodo/errorlog.py:232
 msgid "Clear"
 msgstr ""
 
-#: ../raphodo/errorlog.py:328
+#: ../raphodo/errorlog.py:332
 msgid "Phrase not found"
 msgstr ""
 
-#: ../raphodo/errorlog.py:487
+#: ../raphodo/errorlog.py:491
 msgid "Search pending..."
 msgstr ""
 
-#: ../raphodo/errorlog.py:535
+#: ../raphodo/errorlog.py:539
 msgid ""
 "The number of new entries added to the Error Report since it was last open. "
 "Click to open the Error Report."
@@ -866,8 +1264,8 @@ msgstr ""
 #, python-brace-format
 msgid ""
 "<b>A problem occurred in Rapid Photo Downloader</b><br><br>\n"
-"    Please report the problem at <a href=\"{website}\">{website}</a>."
-"<br><br>\n"
+"    Please report the problem at <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
 "    Attach the log file <i>{log_file}</i> to your bug report (click\n"
 "    <a href=\"{log_path}\">here</a> to open the log directory).<br><br>If "
 "the same problem occurs\n"
@@ -888,7 +1286,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1601
+#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1643
 msgid "Open in File Browser..."
 msgstr ""
 
@@ -906,531 +1304,531 @@ msgstr ""
 msgid "%s (location does not exist)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:186
+#: ../raphodo/generatenameconfig.py:190
 msgid "Date time"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:187
+#: ../raphodo/generatenameconfig.py:191
 msgid "Text"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:188 ../raphodo/rapid.py:2053
+#: ../raphodo/generatenameconfig.py:192 ../raphodo/rapid.py:2125
 msgid "Filename"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:189 ../raphodo/preferencedialog.py:488
+#: ../raphodo/generatenameconfig.py:193 ../raphodo/preferencedialog.py:724
 msgid "Metadata"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:190
+#: ../raphodo/generatenameconfig.py:194
 msgid "Sequences"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: ../raphodo/generatenameconfig.py:193
+#: ../raphodo/generatenameconfig.py:197
 msgid "Job code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:194
+#: ../raphodo/generatenameconfig.py:198
 msgid "Image date"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:195
+#: ../raphodo/generatenameconfig.py:199
 msgid "Video date"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:196
+#: ../raphodo/generatenameconfig.py:200
 msgid "Today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:197
+#: ../raphodo/generatenameconfig.py:201
 msgid "Yesterday"
 msgstr ""
 
 #. Translators: Download time is the time and date that the download started (when the
 #. user clicked the Download button)
-#: ../raphodo/generatenameconfig.py:200
+#: ../raphodo/generatenameconfig.py:204
 msgid "Download time"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:203
+#: ../raphodo/generatenameconfig.py:207
 msgid "Name"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:206 ../raphodo/rapid.py:2054
+#: ../raphodo/generatenameconfig.py:210 ../raphodo/rapid.py:2126
 msgid "Extension"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:209
+#: ../raphodo/generatenameconfig.py:213
 msgid "Image number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:210
+#: ../raphodo/generatenameconfig.py:214
 msgid "Video number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:213
+#: ../raphodo/generatenameconfig.py:217
 msgid "Aperture"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:216
+#: ../raphodo/generatenameconfig.py:220
 msgid "ISO"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:219
+#: ../raphodo/generatenameconfig.py:223
 msgid "Exposure time"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:222
+#: ../raphodo/generatenameconfig.py:226
 msgid "Focal length"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:225
+#: ../raphodo/generatenameconfig.py:229
 msgid "Camera make"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:228
+#: ../raphodo/generatenameconfig.py:232
 msgid "Camera model"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:231
+#: ../raphodo/generatenameconfig.py:235
 msgid "Short camera model"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:234
+#: ../raphodo/generatenameconfig.py:238
 msgid "Hyphenated short camera model"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:237
+#: ../raphodo/generatenameconfig.py:241
 msgid "Serial number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:240
+#: ../raphodo/generatenameconfig.py:244
 msgid "Shutter count"
 msgstr ""
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: ../raphodo/generatenameconfig.py:242
+#: ../raphodo/generatenameconfig.py:246
 msgid "File number"
 msgstr ""
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:244
+#: ../raphodo/generatenameconfig.py:248
 msgid "Folder only"
 msgstr ""
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:246
+#: ../raphodo/generatenameconfig.py:250
 msgid "Folder and file"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:249
+#: ../raphodo/generatenameconfig.py:253
 msgid "Owner name"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:250
+#: ../raphodo/generatenameconfig.py:254
 msgid "Codec"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:251
+#: ../raphodo/generatenameconfig.py:255
 msgid "Width"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:252
+#: ../raphodo/generatenameconfig.py:256
 msgid "Height"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:253
+#: ../raphodo/generatenameconfig.py:257
 msgid "Length"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:254
+#: ../raphodo/generatenameconfig.py:258
 msgid "Frames Per Second"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:255
+#: ../raphodo/generatenameconfig.py:259
 msgid "Artist"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:256
+#: ../raphodo/generatenameconfig.py:260
 msgid "Copyright"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:259
+#: ../raphodo/generatenameconfig.py:263
 msgid "Downloads today"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:262
+#: ../raphodo/generatenameconfig.py:266
 msgid "Session number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:265
+#: ../raphodo/generatenameconfig.py:269
 msgid "Subfolder number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:268
+#: ../raphodo/generatenameconfig.py:272
 msgid "Stored number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: ../raphodo/generatenameconfig.py:271
+#: ../raphodo/generatenameconfig.py:275
 msgid "Sequence letter"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:274
+#: ../raphodo/generatenameconfig.py:278
 msgid "All digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:277
+#: ../raphodo/generatenameconfig.py:281
 msgid "Last digit"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:280
+#: ../raphodo/generatenameconfig.py:284
 msgid "Last 2 digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:283
+#: ../raphodo/generatenameconfig.py:287
 msgid "Last 3 digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:286
+#: ../raphodo/generatenameconfig.py:290
 msgid "Last 4 digits"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:289
+#: ../raphodo/generatenameconfig.py:293
 msgid "Original Case"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:292
+#: ../raphodo/generatenameconfig.py:296
 msgid "UPPERCASE"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:295
+#: ../raphodo/generatenameconfig.py:299
 msgid "lowercase"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:296
+#: ../raphodo/generatenameconfig.py:300
 msgid "One digit"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:297
+#: ../raphodo/generatenameconfig.py:301
 msgid "Two digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:298
+#: ../raphodo/generatenameconfig.py:302
 msgid "Three digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:299
+#: ../raphodo/generatenameconfig.py:303
 msgid "Four digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:300
+#: ../raphodo/generatenameconfig.py:304
 msgid "Five digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:301
+#: ../raphodo/generatenameconfig.py:305
 msgid "Six digits"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:302
+#: ../raphodo/generatenameconfig.py:306
 msgid "Seven digits"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:305
+#: ../raphodo/generatenameconfig.py:309
 msgid "Subseconds"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:308 ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:312 ../raphodo/generatenameconfig.py:393
 msgid "YYYYMMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:311 ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:315 ../raphodo/generatenameconfig.py:394
 msgid "YYYY-MM-DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:314 ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:318 ../raphodo/generatenameconfig.py:395
 msgid "YYYY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:317
+#: ../raphodo/generatenameconfig.py:321
 msgid "YYMMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:320
+#: ../raphodo/generatenameconfig.py:324
 msgid "YY-MM-DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:323
+#: ../raphodo/generatenameconfig.py:327
 msgid "YY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:326
+#: ../raphodo/generatenameconfig.py:330
 msgid "MMDDYYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:329
+#: ../raphodo/generatenameconfig.py:333
 msgid "MMDDYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:332
+#: ../raphodo/generatenameconfig.py:336
 msgid "MMDD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:335
+#: ../raphodo/generatenameconfig.py:339
 msgid "DDMMYYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:338
+#: ../raphodo/generatenameconfig.py:342
 msgid "DDMMYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:341 ../raphodo/generatenameconfig.py:389
-#: ../raphodo/generatenameconfig.py:390 ../raphodo/generatenameconfig.py:391
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:345 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:394 ../raphodo/generatenameconfig.py:395
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:397
 msgid "YYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:344
+#: ../raphodo/generatenameconfig.py:348
 msgid "YY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:347
+#: ../raphodo/generatenameconfig.py:351
 msgid "MM"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:350
+#: ../raphodo/generatenameconfig.py:354
 msgid "DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:353
+#: ../raphodo/generatenameconfig.py:357
 msgid "Month (full)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:356
+#: ../raphodo/generatenameconfig.py:360
 msgid "Month (abbreviated)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:359
+#: ../raphodo/generatenameconfig.py:363
 msgid "HHMMSS"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:362
+#: ../raphodo/generatenameconfig.py:366
 msgid "HHMM"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:365
+#: ../raphodo/generatenameconfig.py:369
 msgid "HH-MM-SS"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:368
+#: ../raphodo/generatenameconfig.py:372
 msgid "HH-MM"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:371
+#: ../raphodo/generatenameconfig.py:375
 msgid "HH"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:374
+#: ../raphodo/generatenameconfig.py:378
 msgid "MM (minutes)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:377
+#: ../raphodo/generatenameconfig.py:381
 msgid "SS"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:393
 msgid "Date"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:394
 msgid "Date (hyphens)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:395
 msgid "Date (underscores)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:438
-#: ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:442
+#: ../raphodo/generatenameconfig.py:537
 msgid "Date and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392
+#: ../raphodo/generatenameconfig.py:396
 msgid "YYYYMM_Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "Date and Job Code Subfolder"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "YYYYMM"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393 ../raphodo/jobcodepanel.py:198
-#: ../raphodo/nameeditor.py:827 ../raphodo/rapid.py:1809
+#: ../raphodo/generatenameconfig.py:397 ../raphodo/jobcodepanel.py:199
+#: ../raphodo/nameeditor.py:833 ../raphodo/rapid.py:1852
 #: ../raphodo/renamepanel.py:83 ../raphodo/renamepanel.py:241
 msgid "Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:433 ../raphodo/generatenameconfig.py:512
+#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:532
 msgid "Original Filename"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "Date-Time and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "YYYYMMDD-HHMM-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "Date and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "YYYYMMDD-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "Date-Time and Image number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "YYYYMMDD-1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "Date-Time and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "YYYYMMDD-HHMM-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:442 ../raphodo/generatenameconfig.py:537
 msgid "YYYYMMDD-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "Date-Time and Video number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "YYYYMMDD_1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "Resolution"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "YYYYMMDD-HHMM-1-1920x1080"
 msgstr ""
 
@@ -1489,76 +1887,77 @@ msgstr ""
 msgid "&Remember this choice"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:185
+#: ../raphodo/jobcodepanel.py:186
 msgid ""
 "Select photos and videos to be able to apply a new or existing Job Code to "
 "them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:186
-msgid "The new Job Code will be applied to all selected photos and/or videos."
+#: ../raphodo/jobcodepanel.py:187
+msgid ""
+"The new Job Code will be applied to all selected photos and/or videos."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:187
+#: ../raphodo/jobcodepanel.py:188
 msgid ""
 "Click the Apply button to apply the current Job Code to all selected photos "
 "and/or videos. You can also simply double click the Job Code."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:189
+#: ../raphodo/jobcodepanel.py:190
 msgid ""
 "Removing a Job Code removes it only from the list of saved Job Codes, not "
 "from any photos or videos that it may have been applied to."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:191
+#: ../raphodo/jobcodepanel.py:192
 msgid ""
 "If you want to use Job Codes, configure file renaming or destination "
 "subfolder names to use them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:197
+#: ../raphodo/jobcodepanel.py:198
 msgid "Last Used"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:202
+#: ../raphodo/jobcodepanel.py:203
 msgid "Job Code Sort:"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:205 ../raphodo/rapid.py:2061
+#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2133
 msgid "Ascending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2062
+#: ../raphodo/jobcodepanel.py:207 ../raphodo/rapid.py:2134
 msgid "Descending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:216
+#: ../raphodo/jobcodepanel.py:217
 msgid "&New..."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:220
+#: ../raphodo/jobcodepanel.py:221
 msgid "&Apply"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:224
+#: ../raphodo/jobcodepanel.py:225
 msgid "&Remove"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:228 ../raphodo/preferencedialog.py:125
-#: ../raphodo/preferencedialog.py:154 ../raphodo/preferencedialog.py:433
+#: ../raphodo/jobcodepanel.py:229 ../raphodo/preferencedialog.py:200
+#: ../raphodo/preferencedialog.py:229 ../raphodo/preferencedialog.py:531
 msgid "Remove All"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:427
+#: ../raphodo/jobcodepanel.py:428
 msgid "Do you really want to remove all the Job Codes?"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:429
+#: ../raphodo/jobcodepanel.py:430
 msgid "Remove all Job Codes"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:492
+#: ../raphodo/jobcodepanel.py:493
 msgid "Job Codes"
 msgstr ""
 
@@ -1569,42 +1968,58 @@ msgstr ""
 msgid "<i><b>Hint:</b> %(message)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:418 ../raphodo/nameeditor.py:432
+#: ../raphodo/nameeditor.py:423 ../raphodo/nameeditor.py:437
 #, python-format
 msgid "%(description)s - %(elements)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:512
+#: ../raphodo/nameeditor.py:517
 msgid "Save New Custom Preset..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:513
+#: ../raphodo/nameeditor.py:518
 msgid "Remove All Custom Presets..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:559
+#: ../raphodo/nameeditor.py:564
 msgid "(New Custom Preset)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:576
+#: ../raphodo/nameeditor.py:581
 #, python-format
 msgid "%s (edited)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:579 ../raphodo/nameeditor.py:1370
+#: ../raphodo/nameeditor.py:584 ../raphodo/nameeditor.py:1379
 #, python-format
 msgid "Update Custom Preset \"%s\""
 msgstr ""
 
-#: ../raphodo/nameeditor.py:667
+#: ../raphodo/nameeditor.py:672
 msgid "Save New Custom Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:675
+#: ../raphodo/nameeditor.py:680
 msgid "Preset Name:"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:836
+#: ../raphodo/nameeditor.py:799
+msgid "Photo Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:805
+msgid "Video Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:811
+msgid "Photo Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:817
+msgid "Video Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:842
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>There is insufficient data to "
 "fully generate the name. Please use other renaming options.</i>"
@@ -1613,7 +2028,7 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees.
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:846
+#: ../raphodo/nameeditor.py:853
 #, python-format
 msgid "The character</i> %(separator)s <i>creates a new subfolder level."
 msgstr ""
@@ -1621,50 +2036,50 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:851
+#: ../raphodo/nameeditor.py:858
 #, python-format
 msgid ""
 "There is no need start or end with the folder separator </i> "
 "%(separator)s<i>, because it is added automatically."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:859
+#: ../raphodo/nameeditor.py:866
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>Unique filenames may not be "
 "generated. Make filenames unique by using Sequence values.</i>"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:882 ../raphodo/renamepanel.py:121
+#: ../raphodo/nameeditor.py:889 ../raphodo/renamepanel.py:121
 msgid "Preset:"
 msgstr ""
 
 #. Translators: appears in a combobox, e.g. Image Date (YYYY)
-#: ../raphodo/nameeditor.py:959 ../raphodo/nameeditor.py:980
+#: ../raphodo/nameeditor.py:966 ../raphodo/nameeditor.py:987
 #, python-brace-format
 msgid "{choice} ({variant})"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1005 ../raphodo/preferencedialog.py:530
+#: ../raphodo/nameeditor.py:1012 ../raphodo/preferencedialog.py:783
 msgid "Get help online..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1025
+#: ../raphodo/nameeditor.py:1034
 msgid "Insert"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1351
+#: ../raphodo/nameeditor.py:1360
 msgid "Save Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1356
+#: ../raphodo/nameeditor.py:1365
 msgid ""
-"<b>Do you want to save the changes in a new custom preset?</"
-"b><br><br>Creating a custom preset is not required, but can help you keep "
-"organized.<br><br>The changes to the preferences will still be applied "
-"regardless of whether you create a new custom preset or not."
+"<b>Do you want to save the changes in a new custom "
+"preset?</b><br><br>Creating a custom preset is not required, but can help "
+"you keep organized.<br><br>The changes to the preferences will still be "
+"applied regardless of whether you create a new custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1365
+#: ../raphodo/nameeditor.py:1374
 msgid ""
 "<b>Do you want to save the changes in a custom preset?</b><br><br>If you "
 "like, you can create a new custom preset or update the existing custom "
@@ -1672,136 +2087,167 @@ msgid ""
 "regardless of whether you save a custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1372
+#: ../raphodo/nameeditor.py:1381
 msgid "Save New Custom Preset"
 msgstr ""
 
-#: ../raphodo/newversion.py:306
+#: ../raphodo/newversion.py:312
 msgid "Checking for new version..."
 msgstr ""
 
-#: ../raphodo/newversion.py:307
+#: ../raphodo/newversion.py:313
 msgid "You are running the latest version."
 msgstr ""
 
-#: ../raphodo/newversion.py:308
+#: ../raphodo/newversion.py:314
 msgid "Failed to contact the update server."
 msgstr ""
 
-#: ../raphodo/newversion.py:310
+#: ../raphodo/newversion.py:316
 #, python-format
 msgid "A new version of Rapid Photo Downloader (%s) is available."
 msgstr ""
 
-#: ../raphodo/newversion.py:312
+#: ../raphodo/newversion.py:318
 msgid "Do you want to download the new version?"
 msgstr ""
 
-#: ../raphodo/newversion.py:313
+#: ../raphodo/newversion.py:319
 #, python-format
 msgid "Changes in the new release can be viewed <a href=\"%s\">here</a>."
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the s key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:340 ../raphodo/newversion.py:353
+#: ../raphodo/newversion.py:348 ../raphodo/newversion.py:363
 msgid "&Skip this release"
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the o key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:356
+#: ../raphodo/newversion.py:366
 msgid "&Open Download Page"
 msgstr ""
 
-#: ../raphodo/newversion.py:376
+#: ../raphodo/newversion.py:386
 msgid "Rapid Photo Downloader updates"
 msgstr ""
 
 #. Translators: shows how much of a file has been downloaded e.g  123 KB of 1.3 MB
-#: ../raphodo/newversion.py:478
+#: ../raphodo/newversion.py:488
 #, python-format
 msgid "%(downloaded)s of %(total)s"
 msgstr ""
 
-#: ../raphodo/newversion.py:495
+#: ../raphodo/newversion.py:507
 msgid "Downloading..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:76
+#: ../raphodo/preferencedialog.py:86
 msgid "Preferences"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Automation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Thumbnails"
 msgstr "Küçük resimler"
 
-#: ../raphodo/preferencedialog.py:85 ../raphodo/preferencedialog.py:343
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/preferencedialog.py:428
 msgid "Error Handling"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:109
+msgid "Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:109 ../raphodo/preferencedialog.py:119
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:94
+#: ../raphodo/preferencedialog.py:147
 msgid "Device Scanning"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:96
+#: ../raphodo/preferencedialog.py:148
 msgid "Scan only external devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:98
+#: ../raphodo/preferencedialog.py:150
 msgid ""
 "Scan for photos and videos only on devices that are external to the "
 "computer,\n"
 "including cameras, memory cards, external hard drives, and USB flash drives."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:102
-msgid "Scan non-camera devices lacking a DCIM folder"
+#: ../raphodo/preferencedialog.py:153
+msgid "Scan only specific folders on devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:104
+#: ../raphodo/preferencedialog.py:155
 msgid ""
-"Scan the entirety of a device for photos and videos, irrespective of whether "
-"it contains a DCIM folder,\n"
-"as opposed to only scanning within a DCIM folder.\n"
+"Scan for photos and videos only in the folders specified below (except "
+"paths\n"
+"specified in Ignored Paths).\n"
 "\n"
-"Changing this setting causes all devices to be scanned again.\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:161
+msgid "Folders to scan:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:164
+msgid ""
+"Folders at the base level of device file systems that will be scanned\n"
+"for photos and videos."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:167 ../raphodo/preferencedialog.py:219
+msgid "Add..."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:169
+msgid ""
+"Add a folder to the list of folders to scan for photos and videos.\n"
 "\n"
-"Note: With cameras, only the DCIM folder is scanned."
+"Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:116
+#: ../raphodo/preferencedialog.py:172 ../raphodo/preferencedialog.py:198
+#: ../raphodo/preferencedialog.py:224 ../raphodo/preferencedialog.py:529
+msgid "Remove"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:174
+msgid ""
+"Remove a folder from the list of folders to scan for photos and videos.\n"
+"\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:191
 msgid "Devices that have been set to automatically ignore or download from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:117
+#: ../raphodo/preferencedialog.py:192
 msgid "Remembered Devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:121
+#: ../raphodo/preferencedialog.py:196
 msgid ""
 "Remove a device from the list of devices to automatically ignore or download "
 "from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:123 ../raphodo/preferencedialog.py:149
-#: ../raphodo/preferencedialog.py:431
-msgid "Remove"
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:127
+#: ../raphodo/preferencedialog.py:202
 msgid ""
 "Clear the list of devices from which to automatically ignore or download "
 "from.\n"
@@ -1809,315 +2255,436 @@ msgid ""
 "Note: Changes take effect when the computer is next scanned for devices."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:140
+#: ../raphodo/preferencedialog.py:215
 msgid "Ignored Paths"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:141
+#: ../raphodo/preferencedialog.py:216
 msgid ""
 "The end part of a path that should never be scanned for photos or videos."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:144
-msgid "Add..."
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:146
+#: ../raphodo/preferencedialog.py:221
 msgid ""
 "Add a path to the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:151
+#: ../raphodo/preferencedialog.py:226
 msgid ""
 "Remove a path from the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:156
+#: ../raphodo/preferencedialog.py:231
 msgid ""
 "Clear the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:164
+#: ../raphodo/preferencedialog.py:239
 msgid ""
-"Use python-style <a href=\"http://damonlynch.net/rapid/documentation/"
-"#regularexpressions\">regular expressions</a>"
+"Use python-style <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">regula"
+"r expressions</a>"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:168
+#: ../raphodo/preferencedialog.py:243
 msgid ""
 "Use regular expressions in the list of ignored paths.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:208
+#: ../raphodo/preferencedialog.py:283
 msgid "Program Automation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:209
+#: ../raphodo/preferencedialog.py:284
 msgid "Start downloading at program startup"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:210
+#: ../raphodo/preferencedialog.py:285
 msgid "Start downloading upon device insertion"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:211
+#: ../raphodo/preferencedialog.py:286
 msgid "Unmount (eject) device upon download completion"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:212
+#: ../raphodo/preferencedialog.py:287
 msgid "Exit program when download completes"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:213
+#: ../raphodo/preferencedialog.py:288
 msgid "Exit program even if download had warnings or errors"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:240
+#: ../raphodo/preferencedialog.py:315
 msgid "Thumbnail Generation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:241
+#: ../raphodo/preferencedialog.py:316
 msgid "Generate thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:242
+#: ../raphodo/preferencedialog.py:318
 msgid "Generate thumbnails to show in the main program window"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:244
+#: ../raphodo/preferencedialog.py:320
 msgid "Cache thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:245
+#: ../raphodo/preferencedialog.py:323
 msgid ""
 "Save thumbnails shown in the main program window in a thumbnail cache unique "
 "to Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:247
+#: ../raphodo/preferencedialog.py:327
 msgid "Generate system thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:248
+#: ../raphodo/preferencedialog.py:330
 msgid ""
 "While downloading, save thumbnails that can be used by desktop file managers "
 "and other programs"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:255
+#: ../raphodo/preferencedialog.py:339
 msgid "Number of CPU cores used to generate thumbnails."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:256
+#: ../raphodo/preferencedialog.py:340
 msgid "CPU cores:"
 msgstr ""
 
 #. Translators: the * acts as an asterisk to denote a reference to an annotation
 #. such as '* Takes effect upon program restart'
-#: ../raphodo/preferencedialog.py:271 ../raphodo/preferencedialog.py:317
+#: ../raphodo/preferencedialog.py:355 ../raphodo/preferencedialog.py:401
 msgid "*"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:294
+#: ../raphodo/preferencedialog.py:378
 msgid "Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:296
+#: ../raphodo/preferencedialog.py:380
 msgid "Calculating..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:302
+#: ../raphodo/preferencedialog.py:386
 msgid "days"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:303
+#: ../raphodo/preferencedialog.py:387
 msgid "forever"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:308
+#: ../raphodo/preferencedialog.py:392
 msgid "Cache size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:310
+#: ../raphodo/preferencedialog.py:394
 msgid "Number of thumbnails:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:312
+#: ../raphodo/preferencedialog.py:396
 msgid "Database size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:314
+#: ../raphodo/preferencedialog.py:398
 msgid "Cache unaccessed thumbnails for:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:322
+#: ../raphodo/preferencedialog.py:406
 msgid "Purge Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:323
+#: ../raphodo/preferencedialog.py:408
 msgid "Optimize Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:336
+#: ../raphodo/preferencedialog.py:421
 msgid "* Takes effect upon program restart"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:346
+#: ../raphodo/preferencedialog.py:431
 msgid "Skip download"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:347
+#: ../raphodo/preferencedialog.py:432
 msgid "Don't download the file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:348
+#: ../raphodo/preferencedialog.py:433
 msgid "Add unique identifier"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:349
+#: ../raphodo/preferencedialog.py:436
 msgid ""
 "Add an identifier like _1 or _2 to the end of the filename, immediately "
 "before the file's extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:355
+#: ../raphodo/preferencedialog.py:444
 msgid "Overwrite"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:356
+#: ../raphodo/preferencedialog.py:445
 msgid "Overwrite the previously backed up file"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:357
+#: ../raphodo/preferencedialog.py:446
 msgid "Skip"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:358
+#: ../raphodo/preferencedialog.py:448
 msgid "Don't overwrite the backup file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:364
+#: ../raphodo/preferencedialog.py:455
 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 identifier:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:378
+#: ../raphodo/preferencedialog.py:464
+msgid ""
+"Using sequence numbers to automatically generate unique filenames is "
+"strongly recommended. Configure file renaming in the Rename panel in the "
+"main window."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:473
 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 ""
 
-#: ../raphodo/preferencedialog.py:398
+#: ../raphodo/preferencedialog.py:494
 msgid "Program Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:399
+#: ../raphodo/preferencedialog.py:495
 msgid "Show a warning when:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:402
+#: ../raphodo/preferencedialog.py:498
 msgid "Downloading files currently not displayed"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:403
+#: ../raphodo/preferencedialog.py:499
 msgid ""
 "Warn when about to download files that are not displayed in the main window."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:405
+#: ../raphodo/preferencedialog.py:501
 msgid "Backup destinations are missing"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:406
-msgid "Warn before starting a download if it is not possible to back up files."
+#: ../raphodo/preferencedialog.py:502
+msgid ""
+"Warn before starting a download if it is not possible to back up files."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:408
+#: ../raphodo/preferencedialog.py:504
 msgid "Program libraries are missing or broken"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:409
+#: ../raphodo/preferencedialog.py:505
 msgid ""
 "Warn if a software library used by Rapid Photo Downloader is missing or not "
 "functioning."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:412
+#: ../raphodo/preferencedialog.py:508
 msgid "Filesystem metadata cannot be set"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:413
+#: ../raphodo/preferencedialog.py:509
 msgid ""
 "Warn if there is an error setting a file's filesystem metadata, such as its "
 "modification time."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:416
+#: ../raphodo/preferencedialog.py:512
 msgid "Encountering unhandled files"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:417
+#: ../raphodo/preferencedialog.py:513
 msgid ""
 "Warn after scanning a device or this computer if there are unrecognized "
 "files that will not be included in the download."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:420
+#: ../raphodo/preferencedialog.py:517
 msgid "Do not warn about unhandled files with extensions:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:424
+#: ../raphodo/preferencedialog.py:522
 msgid ""
 "File extensions are case insensitive and do not need to include the leading "
 "dot."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:427
+#: ../raphodo/preferencedialog.py:525
 msgid "Add"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:428
+#: ../raphodo/preferencedialog.py:526
 msgid ""
 "Add a file extension to the list of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:430
+#: ../raphodo/preferencedialog.py:528
 msgid ""
 "Remove a file extension from the list of unhandled file types to not warn "
 "about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:434
+#: ../raphodo/preferencedialog.py:532
 msgid ""
 "Clear the list of file extensions of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:469
+#: ../raphodo/preferencedialog.py:568
+msgid "Photo and Video Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:571
+msgid "Consolidate files across devices and downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:574
+msgid ""
+"Analyze the results of device scans looking for duplicate files and matching "
+"RAW and JPEG pairs,\n"
+"comparing them across multiple devices and download sessions."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:580
+msgid "Treat matching RAW and JPEG files as:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:581
+msgid "One photo"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:582
+msgid "Two photos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:584
+msgid ""
+"Display matching pairs of RAW and JPEG photos as one photo, and if marked, "
+"download both."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:589
+msgid ""
+"Display matching pairs of RAW and JPEG photos as two different photos. You "
+"can still synchronize their sequence numbers."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:598
+msgid "With matching RAW and JPEG photos:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:600
+msgid "Do not mark JPEG for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:601
+msgid "Do not mark RAW for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:602
+msgid "Mark both for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:609
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"JPEG for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:614
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"RAW for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:619
+msgid ""
+"When matching RAW and JPEG photos are found, automatically mark both for "
+"download."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:625
+msgid ""
+"If you disable file consolidation, choose what to do when a download device "
+"is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:631
+msgid ""
+"When a download device is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:642
+msgid "Clear completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:643
+msgid "Keep displaying completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:644
+msgid "Prompt for what to do"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:649
+msgid ""
+"Automatically clear the display of completed downloads whenever a new "
+"download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:654
+msgid ""
+"Keep displaying completed downloads whenever a new download device is "
+"inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:658
+msgid ""
+"Prompt whether to keep displaying completed downloads or clear them whenever "
+"a new download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:702
 msgid "Version Check"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:470
+#: ../raphodo/preferencedialog.py:703
 msgid "Check for new version at startup"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:471
+#: ../raphodo/preferencedialog.py:705
 msgid "Check for a new version of the program each time the program starts."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:473
+#: ../raphodo/preferencedialog.py:707
 msgid "Include development releases"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:474
+#: ../raphodo/preferencedialog.py:709
 msgid ""
 "Include alpha, beta and other development releases when checking for a new "
 "version of the program.\n"
@@ -2126,11 +2693,11 @@ msgid ""
 "occur."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:489
+#: ../raphodo/preferencedialog.py:725
 msgid "Ignore DNG date/time metadata on MTP devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:490
+#: ../raphodo/preferencedialog.py:727
 msgid ""
 "Ignore date/time metadata in DNG files located on MTP devices, and use the "
 "file's modification time instead.\n"
@@ -2139,70 +2706,86 @@ msgid ""
 "metadata."
 msgstr ""
 
+#: ../raphodo/preferencedialog.py:741
+msgid "Completed Downloads"
+msgstr ""
+
 #. Translators: substituted value is a description for the set of preferences
 #. shown in the preference dialog window, e.g. Devices, Automation, etc.
 #. This string is shown in a tooltip for the "Restore Defaults" button
-#: ../raphodo/preferencedialog.py:710
+#: ../raphodo/preferencedialog.py:1067
 #, python-format
 msgid "Restores default %s preference values"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:832
+#: ../raphodo/preferencedialog.py:1208
 msgid ""
 "Do you want to purge the thumbnail cache? The cache will be purged when the "
 "program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:835
+#: ../raphodo/preferencedialog.py:1212
 msgid "Purge Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:847
+#: ../raphodo/preferencedialog.py:1225
 msgid ""
 "Do you want to optimize the thumbnail cache? The cache will be optimized "
 "when the program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:850
+#: ../raphodo/preferencedialog.py:1229
 msgid "Optimize Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1045
+#: ../raphodo/preferencedialog.py:1481
+msgid "Enter a Folder to Scan"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1482
+msgid "Specify a folder that will be scanned for photos and videos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1483
+msgid "Folder:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1497
 msgid "Enter a Path to Ignore"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1046
+#: ../raphodo/preferencedialog.py:1498
 msgid "Specify a path that will never be scanned for photos or videos"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1047
+#: ../raphodo/preferencedialog.py:1499
 msgid "Path:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1061
+#: ../raphodo/preferencedialog.py:1513
 msgid "Enter a File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1062
+#: ../raphodo/preferencedialog.py:1514
 msgid "Specify a file extension (without the leading dot)"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1063 ../raphodo/renamepanel.py:122
+#: ../raphodo/preferencedialog.py:1515 ../raphodo/renamepanel.py:122
 msgid "Extension:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1078
+#: ../raphodo/preferencedialog.py:1530
 msgid "Invalid File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1079
+#: ../raphodo/preferencedialog.py:1531
 #, python-format
 msgid ""
 "The file extension <b>%s</b> is recognized by Rapid Photo Downloader, so it "
 "makes no sense to warn about its presence."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1081
+#: ../raphodo/preferencedialog.py:1533
 #, python-format
 msgid ""
 "Recognized file types:\n"
@@ -2228,104 +2811,103 @@ msgstr ""
 msgid "Birthday"
 msgstr ""
 
-#: ../raphodo/preferences.py:614
+#: ../raphodo/preferences.py:624
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr ""
 
-#: ../raphodo/preferences.py:617
+#: ../raphodo/preferences.py:627
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr ""
 
-#: ../raphodo/preferences.py:622
+#: ../raphodo/preferences.py:632
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr ""
 
-#. self.setFlat(True)
 #: ../raphodo/primarybutton.py:72
 msgid "Download 8 Photos and 10 Videos"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:86 ../raphodo/problemnotification.py:208
+#: ../raphodo/problemnotification.py:87 ../raphodo/problemnotification.py:209
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:89
+#: ../raphodo/problemnotification.py:90
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:116
+#: ../raphodo/problemnotification.py:117
 #, python-format
 msgid "GPhoto2 Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:124
+#: ../raphodo/problemnotification.py:125
 msgid ""
 "Unable to initialize the camera, probably because another program is using "
 "it. No files were copied from it."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:134
+#: ../raphodo/problemnotification.py:135
 #, python-format
 msgid "Unable to read directory %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:140
+#: ../raphodo/problemnotification.py:141
 #, python-format
 msgid "Unable to access modification time or size from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:146
+#: ../raphodo/problemnotification.py:147
 #, python-format
 msgid "Unable to read file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:152
+#: ../raphodo/problemnotification.py:153
 #, python-format
 msgid "Unable to write file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:158
+#: ../raphodo/problemnotification.py:159
 #, python-format
 msgid "Unable to move file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:164
+#: ../raphodo/problemnotification.py:165
 #, python-format
 msgid "Unable to remove file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:170
+#: ../raphodo/problemnotification.py:171
 #, python-format
 msgid "Unable to copy file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:176
+#: ../raphodo/problemnotification.py:177
 #, python-format
 msgid "Zero length file %s will not be downloaded"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:182
+#: ../raphodo/problemnotification.py:183
 #, python-format
 msgid "Could not determine filesystem modification time for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:188
+#: ../raphodo/problemnotification.py:189
 #, python-format
 msgid "Unable to load metadata from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:194
+#: ../raphodo/problemnotification.py:195
 #, python-format
 msgid ""
 "Unable to load metadata from %(name)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:202
+#: ../raphodo/problemnotification.py:203
 #, python-format
 msgid ""
 "An error occurred setting a file's filesystem metadata on the filesystem %s. "
@@ -2333,212 +2915,212 @@ msgid ""
 "again."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:216
+#: ../raphodo/problemnotification.py:217
 #, python-format
 msgid "Encountered unhandled file %s. It will not be downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:223
+#: ../raphodo/problemnotification.py:224
 #, python-format
 msgid "%(filetype)s %(destination)s already exists."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:234 ../raphodo/problemnotification.py:262
+#: ../raphodo/problemnotification.py:235 ../raphodo/problemnotification.py:263
 #, python-format
 msgid ""
 "The existing %(filetype)s %(destination)s was last modified on %(date)s at "
 "%(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:245
+#: ../raphodo/problemnotification.py:246
 #, python-format
 msgid "The %(filetype)s %(source)s was not downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:273
+#: ../raphodo/problemnotification.py:274
 #, python-format
 msgid "The %(filetype)s %(source)s was downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:282
+#: ../raphodo/problemnotification.py:283
 #, python-format
 msgid "The unique identifier '%s' was added to the filename."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:298
+#: ../raphodo/problemnotification.py:299
 #, python-format
 msgid ""
 "The existing backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:309
+#: ../raphodo/problemnotification.py:310
 #, python-format
 msgid "The %(filetype)s %(source)s was not backed up from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:326
+#: ../raphodo/problemnotification.py:327
 #, python-format
 msgid ""
 "The previous backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:337
+#: ../raphodo/problemnotification.py:338
 #, python-format
 msgid ""
 "The %(filetype)s %(source)s from %(device)s was backed up, overwriting the "
 "previous backup %(filetype)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:356
+#: ../raphodo/problemnotification.py:357
 #, python-format
 msgid ""
 "When synchronizing RAW + JPEG sequence values, a duplicate %(filetype)s "
 "%(file)s was encountered, and was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:366
+#: ../raphodo/problemnotification.py:367
 msgid ""
 "When synchronizing RAW + JPEG sequence values, photos were detected with the "
 "same filenames, but taken at different times:"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:373
+#: ../raphodo/problemnotification.py:374
 #, 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 ""
 
-#: ../raphodo/problemnotification.py:389
+#: ../raphodo/problemnotification.py:390
 #, python-format
 msgid "Unable to finalize the filename for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:424
+#: ../raphodo/problemnotification.py:425
 #, python-format
 msgid ""
 "The filename %(destination)s was not fully generated for %(filetype)s "
 "%(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:433
+#: ../raphodo/problemnotification.py:434
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:439
+#: ../raphodo/problemnotification.py:440
 #, python-format
 msgid "The following metadata is missing: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:445
+#: ../raphodo/problemnotification.py:446
 #, python-format
 msgid "Date/time conversion failed: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:451
+#: ../raphodo/problemnotification.py:452
 msgid ""
 "Could not extract valid date/time metadata or determine the file "
 "modification time."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:457
+#: ../raphodo/problemnotification.py:458
 msgid "Filename does not have an extension."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:460
+#: ../raphodo/problemnotification.py:461
 msgid "Filename does not have a number component."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:464
+#: ../raphodo/problemnotification.py:465
 #, python-format
 msgid "Error generating component %(component)s. Error: %(error)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:477
+#: ../raphodo/problemnotification.py:478
 #, python-format
 msgid ""
 "The download subfolders %(folder)s were only partially generated for "
 "%(filetype)s %(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:486
+#: ../raphodo/problemnotification.py:487
 #, python-format
 msgid ""
 "There is no data with which to generate the %(subfolder_file)s for "
 "%(filename)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:499
+#: ../raphodo/problemnotification.py:500
 #, python-format
 msgid ""
 "Unable to create the %(filetype)s %(destination)s in %(folder)s. The "
 "download file was %(source)s in %(device)s. It was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:514
+#: ../raphodo/problemnotification.py:515
 #, python-format
 msgid "Unable to create the download subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:526
+#: ../raphodo/problemnotification.py:527
 #, python-format
 msgid "Unable to create the backup subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:577
+#: ../raphodo/problemnotification.py:578
 #, python-format
 msgid "Problems scanning %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:584
+#: ../raphodo/problemnotification.py:585
 #, python-format
 msgid "Problems copying from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:591
+#: ../raphodo/problemnotification.py:592
 msgid "Problems while finalizing filenames and generating subfolders"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:598
+#: ../raphodo/problemnotification.py:599
 #, python-format
 msgid "Problems backing up to %s"
 msgstr ""
 
-#. Translators: for example Nov 3 or Dec 31
-#. The start and end dates are on a different day
-#. Translators: for example Nov 3 or Dec 31
-#: ../raphodo/proximity.py:105 ../raphodo/proximity.py:221
-#: ../raphodo/proximity.py:224 ../raphodo/proximity.py:828
+#. Translators: for example Nov 3 2015, 11:25 AM
+#. Translators: for example, Nov 3, 12:15 PM
+#: ../raphodo/proximity.py:188 ../raphodo/proximity.py:213
+#: ../raphodo/proximity.py:236 ../raphodo/proximity.py:239
 #, python-format
-msgid "%(month)s %(numeric_day)s"
+msgid "%(date)s, %(time)s"
 msgstr ""
 
-#. Translators: for example Nov 15 2015
-#. Translators: for example Nov 3 2015
-#: ../raphodo/proximity.py:109 ../raphodo/proximity.py:230
-#: ../raphodo/proximity.py:231 ../raphodo/proximity.py:831
+#: ../raphodo/proximity.py:204
 #, python-format
-msgid "%(date)s %(year)s"
+msgid "%(starttime)s - %(endtime)s"
 msgstr ""
 
-#. Translators: for example Nov 3 2015, 11:25 AM
-#. Translators: for example, Nov 3, 12:15 PM
-#: ../raphodo/proximity.py:197 ../raphodo/proximity.py:215
-#: ../raphodo/proximity.py:234 ../raphodo/proximity.py:236
+#. The start and end dates are on a different day
+#. Translators: for example Nov 3 or Dec 31
+#: ../raphodo/proximity.py:221 ../raphodo/proximity.py:225
+#: ../raphodo/proximity.py:980 ../raphodo/timeutils.py:105
 #, python-format
-msgid "%(date)s, %(time)s"
+msgid "%(month)s %(numeric_day)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:209
+#. Translators: for example Nov 3 2015
+#. Translators: for example Nov 2 2015
+#. Translators: for example Nov 15 2015
+#: ../raphodo/proximity.py:232 ../raphodo/proximity.py:233
+#: ../raphodo/proximity.py:985 ../raphodo/timeutils.py:110
 #, python-format
-msgid "%(starttime)s - %(endtime)s"
+msgid "%(date)s %(year)s"
 msgstr ""
 
 #. Translators: for example, Nov 3, 12:15 PM - Nov 4, 1:00 AM
-#: ../raphodo/proximity.py:241
+#: ../raphodo/proximity.py:245
 #, python-format
 msgid "%(earlier_time)s - %(later_time)s"
 msgstr ""
@@ -2547,25 +3129,25 @@ msgstr ""
 #. Nov 3 2012, 12:15 PM -
 #. Nov 4 2012, 1:00 AM
 #. (please keep the line break signified by \n)
-#: ../raphodo/proximity.py:248
+#: ../raphodo/proximity.py:253
 #, python-format
 msgid ""
 "%(earlier_time)s -\n"
 "%(later_time)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:359
+#: ../raphodo/proximity.py:382
 #, python-format
 msgid "%(month)s  %(year)s"
 msgstr ""
 
 #. Translators: for example Nov 2015
-#: ../raphodo/proximity.py:833
+#: ../raphodo/proximity.py:987
 #, python-format
 msgid "%(month)s %(year)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:1344
+#: ../raphodo/proximity.py:1595
 msgid ""
 "The time elapsed between consecutive photos and videos that is used to build "
 "the Timeline"
@@ -2575,47 +3157,47 @@ msgstr ""
 #. Replace the very last character (after the d) with the correct
 #. localized value, keeping everything else. In other words, change
 #. only the m character.
-#: ../raphodo/proximity.py:1406
+#: ../raphodo/proximity.py:1652
 #, python-format
 msgid "%(minutes)dm"
 msgstr ""
 
 #. Translators: i.e. "1.5h", which is short for 1.5 hours.
 #. Replace the entire string with the correct localized value
-#: ../raphodo/proximity.py:1410
+#: ../raphodo/proximity.py:1656
 msgid "1.5h"
 msgstr ""
 
 #. Translators: e.g. "5h", which is short for 5 hours.
 #. Replace the very last character (after the d) with the correct localized value,
 #. keeping everything else. In other words, change only the h character.
-#: ../raphodo/proximity.py:1415
+#: ../raphodo/proximity.py:1661
 #, python-format
 msgid "%(hours)dh"
 msgstr ""
 
-#: ../raphodo/proximity.py:1461
+#: ../raphodo/proximity.py:1710
 msgid ""
 "The Timeline groups photos and videos based on how much time elapsed between "
 "consecutive shots. Use it to identify photos and videos taken at different "
 "periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/proximity.py:1464
+#: ../raphodo/proximity.py:1715
 msgid ""
 "Use the slider (below) to adjust the time elapsed between consecutive shots "
 "that is used to build the Timeline."
 msgstr ""
 
-#: ../raphodo/proximity.py:1466
+#: ../raphodo/proximity.py:1718
 msgid "Timeline build pending..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1467
+#: ../raphodo/proximity.py:1719
 msgid "Timeline is building..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1468
+#: ../raphodo/proximity.py:1721
 msgid ""
 "The Timeline needs to be rebuilt because the file modification time does not "
 "match the time a shot was taken for one or more shots.<br><br>The Timeline "
@@ -2627,61 +3209,61 @@ msgid ""
 "downloading, which is when the metadata is read."
 msgstr ""
 
-#: ../raphodo/rapid.py:485 ../raphodo/rapid.py:2461 ../raphodo/rapid.py:3728
-#: ../raphodo/rapid.py:3846 ../raphodo/rapid.py:3850 ../raphodo/rapid.py:3870
-#: ../raphodo/rapid.py:3874 ../raphodo/rapid.py:3998 ../raphodo/rapid.py:4007
-#: ../raphodo/rapid.py:4495 ../raphodo/rapid.py:4888 ../raphodo/rapid.py:5722
-#: ../raphodo/rememberthisdialog.py:97
+#: ../raphodo/rapid.py:493 ../raphodo/rapid.py:2555 ../raphodo/rapid.py:3934
+#: ../raphodo/rapid.py:4065 ../raphodo/rapid.py:4069 ../raphodo/rapid.py:4092
+#: ../raphodo/rapid.py:4096 ../raphodo/rapid.py:4226 ../raphodo/rapid.py:4237
+#: ../raphodo/rapid.py:4743 ../raphodo/rapid.py:5195 ../raphodo/rapid.py:5997
+#: ../raphodo/rememberthisdialog.py:99
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:3
 msgid "Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:1100
+#: ../raphodo/rapid.py:1131
 msgid ""
 "<b>ExifTool has a problem</b><br><br> Rapid Photo Downloader uses ExifTool "
 "to get metadata from videos and photos. The program will run without it, but "
 "installing it is <b>highly</b> recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1110 ../raphodo/rapid.py:1130
+#: ../raphodo/rapid.py:1141 ../raphodo/rapid.py:1161
 msgid "Problem with libmediainfo"
 msgstr ""
 
-#: ../raphodo/rapid.py:1119
+#: ../raphodo/rapid.py:1150
 msgid ""
 "<b>The library libmediainfo appears to be missing</b><br><br> Rapid Photo "
 "Downloader uses libmediainfo to get the date and time a video was shot. The "
 "program will run  without it, but installing it is recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1417
+#: ../raphodo/rapid.py:1448
 msgid "Download failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1419
+#: ../raphodo/rapid.py:1450
 msgid ""
 "Sorry, the download of the new version of Rapid Photo Downloader failed."
 msgstr ""
 
-#: ../raphodo/rapid.py:1425
+#: ../raphodo/rapid.py:1457
 msgid ""
 "The new version was successfully downloaded. Do you want to close Rapid "
 "Photo Downloader and install it now?"
 msgstr ""
 
-#: ../raphodo/rapid.py:1428
+#: ../raphodo/rapid.py:1461
 msgid "Update Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:1432
+#: ../raphodo/rapid.py:1465
 msgid "Install"
 msgstr ""
 
-#: ../raphodo/rapid.py:1450
+#: ../raphodo/rapid.py:1483
 msgid "New version saved"
 msgstr ""
 
-#: ../raphodo/rapid.py:1451
+#: ../raphodo/rapid.py:1485
 #, python-format
 msgid ""
 "The tar file and installer script are saved at:\n"
@@ -2689,163 +3271,163 @@ msgid ""
 " %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:1468
+#: ../raphodo/rapid.py:1502
 msgid "Upgrade failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1469
+#: ../raphodo/rapid.py:1505
 msgid ""
 "Sorry, upgrading Rapid Photo Downloader failed because there was an error "
 "opening the installer."
 msgstr ""
 
-#: ../raphodo/rapid.py:1667 ../raphodo/rapid.py:2331
+#: ../raphodo/rapid.py:1709 ../raphodo/rapid.py:2425
 msgid "Download"
 msgstr "İndir"
 
-#: ../raphodo/rapid.py:1671
+#: ../raphodo/rapid.py:1713
 msgid "&Refresh..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1675
+#: ../raphodo/rapid.py:1717
 msgid "&Preferences"
 msgstr ""
 
-#: ../raphodo/rapid.py:1679
+#: ../raphodo/rapid.py:1721
 msgid "&Quit"
 msgstr ""
 
-#: ../raphodo/rapid.py:1683
+#: ../raphodo/rapid.py:1725
 msgid "Error &Reports"
 msgstr ""
 
-#: ../raphodo/rapid.py:1687
+#: ../raphodo/rapid.py:1729
 msgid "Clear Completed Downloads"
 msgstr ""
 
-#: ../raphodo/rapid.py:1691
+#: ../raphodo/rapid.py:1733
 msgid "Get Help Online..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1695
+#: ../raphodo/rapid.py:1737
 msgid "&Tip of the Day..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1699
+#: ../raphodo/rapid.py:1741
 msgid "Report a Problem..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1703
+#: ../raphodo/rapid.py:1745
 msgid "Make a Donation..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1707
+#: ../raphodo/rapid.py:1749
 msgid "Translate this Application..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1711
+#: ../raphodo/rapid.py:1753
 msgid "&About..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1715
+#: ../raphodo/rapid.py:1757
 msgid "Check for Updates..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1797
+#: ../raphodo/rapid.py:1840
 msgid "Timeline"
 msgstr ""
 
-#: ../raphodo/rapid.py:1807
+#: ../raphodo/rapid.py:1850
 msgid "Destination"
 msgstr ""
 
-#: ../raphodo/rapid.py:1808
+#: ../raphodo/rapid.py:1851
 msgid "Rename"
 msgstr ""
 
-#: ../raphodo/rapid.py:1810
+#: ../raphodo/rapid.py:1853
 msgid "Back Up"
 msgstr ""
 
 #. Devices Header and View
-#: ../raphodo/rapid.py:1926
+#: ../raphodo/rapid.py:1977
 msgid ""
 "Turn on or off the use of devices attached to this computer as download "
 "sources"
 msgstr ""
 
 #. This Computer Header and View
-#: ../raphodo/rapid.py:1940
+#: ../raphodo/rapid.py:1994
 msgid ""
 "Turn on or off the use of a folder on this computer as a download source"
 msgstr ""
 
-#: ../raphodo/rapid.py:1941
+#: ../raphodo/rapid.py:1996
 msgid "This Computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:1952
+#: ../raphodo/rapid.py:2009
 msgid "Select a source folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:1975
+#: ../raphodo/rapid.py:2038
 msgid "Projected Storage Use"
 msgstr ""
 
-#: ../raphodo/rapid.py:1989 ../raphodo/rapid.py:1997
+#: ../raphodo/rapid.py:2056 ../raphodo/rapid.py:2068
 msgid "Select a destination folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:2045
+#: ../raphodo/rapid.py:2117
 msgid "All"
 msgstr ""
 
-#: ../raphodo/rapid.py:2046
+#: ../raphodo/rapid.py:2118
 msgid "New"
 msgstr ""
 
-#: ../raphodo/rapid.py:2048
+#: ../raphodo/rapid.py:2120
 msgid "Show:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2051
+#: ../raphodo/rapid.py:2123
 msgid "Modification Time"
 msgstr ""
 
-#: ../raphodo/rapid.py:2052
+#: ../raphodo/rapid.py:2124
 msgid "Checked State"
 msgstr ""
 
-#: ../raphodo/rapid.py:2055
+#: ../raphodo/rapid.py:2127
 msgid "File Type"
 msgstr ""
 
-#: ../raphodo/rapid.py:2056
+#: ../raphodo/rapid.py:2128
 msgid "Device"
 msgstr "Aygıt"
 
-#: ../raphodo/rapid.py:2058
+#: ../raphodo/rapid.py:2130
 msgid "Sort:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2069
+#: ../raphodo/rapid.py:2141
 msgid "Select All:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2311
+#: ../raphodo/rapid.py:2405
 #, python-format
 msgid "Download %(files)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2327
+#: ../raphodo/rapid.py:2421
 msgid "Resume Download"
 msgstr ""
 
-#: ../raphodo/rapid.py:2329
+#: ../raphodo/rapid.py:2423
 msgid "Pause"
 msgstr "Duraklat"
 
-#: ../raphodo/rapid.py:2417
+#: ../raphodo/rapid.py:2511
 #, python-brace-format
 msgid ""
 "Please report the problem at <a href=\"{website}\">{website}</a>.<br><br>\n"
@@ -2854,11 +3436,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/rapid.py:2431
+#: ../raphodo/rapid.py:2525
 msgid "Thank you for reporting a problem in Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:2529
+#: ../raphodo/rapid.py:2624
 #, python-format
 msgid ""
 "<b>Changing This Computer source path</b><br><br>Do you really want to "
@@ -2867,30 +3449,29 @@ msgid ""
 "from This Computer will be cancelled."
 msgstr ""
 
-#: ../raphodo/rapid.py:2595
+#: ../raphodo/rapid.py:2694
 msgid "You cannot change the download destination while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:2604
+#: ../raphodo/rapid.py:2704
 #, python-format
 msgid ""
 "<b>Confirm Download Destination</b><br><br>Are you sure you want to set the "
 "%(file_type)s download destination to %(path)s?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2682
+#: ../raphodo/rapid.py:2785
 msgid ""
+"\n"
 "<b>Downloading all files</b><br><br>\n"
-"                    A download always includes all files that are checked "
-"for download,\n"
-"                    including those that are not currently displayed because "
-"the Timeline\n"
-"                    is being used or because only new files are being shown."
-"<br><br>\n"
-"                    Do you want to proceed with the download?"
+"A download always includes all files that are checked for download,\n"
+"including those that are not currently displayed because the Timeline\n"
+"is being used or because only new files are being shown.<br><br>\n"
+"Do you want to proceed with the download?\n"
+"                        "
 msgstr ""
 
-#: ../raphodo/rapid.py:2820
+#: ../raphodo/rapid.py:2937
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -2898,7 +3479,7 @@ msgid ""
 "%(folder2)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2824
+#: ../raphodo/rapid.py:2940
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -2907,199 +3488,193 @@ msgstr ""
 "Bu indirme klasörü geçersiz:\n"
 "%s"
 
-#: ../raphodo/rapid.py:2827
+#: ../raphodo/rapid.py:2943
 msgid "Download Failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:2828
+#: ../raphodo/rapid.py:2944
 msgid "The download cannot proceed."
 msgstr ""
 
-#: ../raphodo/rapid.py:2842
+#: ../raphodo/rapid.py:2962
 msgid ""
 "Photos and videos will not be backed up because there is nowhere to back "
 "them up. Do you still want to start the download?"
 msgstr ""
 
-#. Translators: filetype will be replaced with 'photos' or 'videos'
-#: ../raphodo/rapid.py:2847 ../raphodo/rapid.py:2854
+#: ../raphodo/rapid.py:2969 ../raphodo/rapid.py:2979
 #, python-format
 msgid ""
 "No backup device exists for backing up %(filetype)s. Do you still want to "
 "start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2848 ../raphodo/rpdfile.py:228
+#: ../raphodo/rapid.py:2971 ../raphodo/rpdfile.py:228
 msgid "photos"
 msgstr "fotoğraflar"
 
-#: ../raphodo/rapid.py:2855 ../raphodo/rpdfile.py:223
+#: ../raphodo/rapid.py:2981 ../raphodo/rpdfile.py:223
 msgid "videos"
 msgstr "videolar"
 
-#: ../raphodo/rapid.py:2861
+#: ../raphodo/rapid.py:2989
 msgid ""
 "<b>The photo and video backup destinations do not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2869 ../raphodo/rapid.py:2876
+#: ../raphodo/rapid.py:2999 ../raphodo/rapid.py:3008
 #, python-format
 msgid ""
 "<b>The %(filetype)s backup destination does not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2871 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:818
+#: ../raphodo/rapid.py:3001 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:843
 msgid "photo"
 msgstr "fotoğraf"
 
-#: ../raphodo/rapid.py:2878 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:858
+#: ../raphodo/rapid.py:3010 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:883
 msgid "video"
 msgstr "video"
 
-#: ../raphodo/rapid.py:2886
+#: ../raphodo/rapid.py:3018
 msgid "Backup problem"
 msgstr ""
 
-#. Translators - in the middle is a unicode em dash - please retain it
-#. This string is displayed in the status bar when the download is running
-#: ../raphodo/rapid.py:3571
+#: ../raphodo/rapid.py:3756
 #, python-format
 msgid "%(downloading_from)s — %(time_left)s left (%(speed)s)"
 msgstr ""
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3640
+#: ../raphodo/rapid.py:3828
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr ""
 
-#. Translators: e.g. 2 videos failed to download
-#: ../raphodo/rapid.py:3645
+#: ../raphodo/rapid.py:3836
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr ""
 
-#: ../raphodo/rapid.py:3650 ../raphodo/rapid.py:3723
+#: ../raphodo/rapid.py:3842 ../raphodo/rapid.py:3927
 msgid "warnings"
 msgstr "uyarılar"
 
-#: ../raphodo/rapid.py:3679
+#: ../raphodo/rapid.py:3873
 msgid "All downloads complete"
 msgstr "Bütün yüklemeler tamamlandı"
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3686 ../raphodo/rapid.py:3695 ../raphodo/rapid.py:3704
-#: ../raphodo/rapid.py:3713 ../raphodo/rapid.py:3721
+#: ../raphodo/rapid.py:3881 ../raphodo/rapid.py:3892 ../raphodo/rapid.py:3903
+#: ../raphodo/rapid.py:3914 ../raphodo/rapid.py:3924
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3688 ../raphodo/rapid.py:3706
+#: ../raphodo/rapid.py:3884 ../raphodo/rapid.py:3906
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr ""
 
-#: ../raphodo/rapid.py:3697 ../raphodo/rapid.py:3715
+#: ../raphodo/rapid.py:3895 ../raphodo/rapid.py:3917
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr ""
 
-#: ../raphodo/rapid.py:3742
+#: ../raphodo/rapid.py:3950
 msgid "1 failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:3744
+#: ../raphodo/rapid.py:3952
 #, python-format
 msgid "%d failures"
 msgstr ""
 
-#: ../raphodo/rapid.py:3749
+#: ../raphodo/rapid.py:3957
 msgid "1 warning"
 msgstr ""
 
-#: ../raphodo/rapid.py:3751
+#: ../raphodo/rapid.py:3959
 #, python-format
 msgid "%d warnings"
 msgstr ""
 
-#: ../raphodo/rapid.py:3771
+#: ../raphodo/rapid.py:3981
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3774
+#: ../raphodo/rapid.py:3985
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3779
+#: ../raphodo/rapid.py:3989
 #, python-format
 msgid "No files downloaded — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3781
+#: ../raphodo/rapid.py:3991
 msgid "No files downloaded"
 msgstr ""
 
-#: ../raphodo/rapid.py:3805
+#: ../raphodo/rapid.py:4021
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3809
+#: ../raphodo/rapid.py:4026
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3812
+#: ../raphodo/rapid.py:4031
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3820
+#: ../raphodo/rapid.py:4039
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3833
+#: ../raphodo/rapid.py:4052
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3837
+#: ../raphodo/rapid.py:4056
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3841
+#: ../raphodo/rapid.py:4060
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices"
 msgstr ""
 
-#: ../raphodo/rapid.py:3867
+#: ../raphodo/rapid.py:4087
 msgid "The Destination subfolders and Timeline have been rebuilt"
 msgstr ""
 
-#: ../raphodo/rapid.py:3922
+#: ../raphodo/rapid.py:4144
 msgid "Program preferences are invalid"
 msgstr "Uygulama tercihleri geçersiz"
 
-#: ../raphodo/rapid.py:3999
+#: ../raphodo/rapid.py:4228
 #, python-format
 msgid ""
 "<b>All files on the %(camera)s are inaccessible</b>.<br><br>It may be locked "
@@ -3109,179 +3684,205 @@ msgid ""
 "ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4008
+#: ../raphodo/rapid.py:4239
 #, python-format
 msgid ""
-"<b>The %(camera)s appears to be in use by another application.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again.<br><br>Alternatively, you can ignore this "
-"device."
+"<b>The %(camera)s appears to be in use by another "
+"application.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again.<br><br>Alternatively, you "
+"can ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4019
+#: ../raphodo/rapid.py:4250
 msgid "&Try Again"
 msgstr ""
 
-#: ../raphodo/rapid.py:4020
+#: ../raphodo/rapid.py:4251
 msgid "&Ignore This Device"
 msgstr ""
 
-#: ../raphodo/rapid.py:4086
+#: ../raphodo/rapid.py:4323
 #, python-format
 msgid "Sorry, an unexpected problem occurred while scanning %s."
 msgstr ""
 
-#: ../raphodo/rapid.py:4087
+#: ../raphodo/rapid.py:4324
 msgid "Unfortunately you cannot download from this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4091
+#: ../raphodo/rapid.py:4328
 msgid ""
 "A possible workaround for the problem might be downloading from the camera's "
 "memory card using a card reader."
 msgstr ""
 
-#: ../raphodo/rapid.py:4096
+#: ../raphodo/rapid.py:4333
 msgid "Device scan failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:4472
+#: ../raphodo/rapid.py:4720
 #, python-format
 msgid ""
-"<b>The %(camera)s cannot be scanned because it cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again."
+"<b>The %(camera)s cannot be scanned because it cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again."
 msgstr ""
 
-#: ../raphodo/rapid.py:4496
+#: ../raphodo/rapid.py:4745
 #, python-format
 msgid ""
-"<b>The download cannot start because the %(camera)s cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again, and choose which files you want to "
-"download from it."
+"<b>The download cannot start because the %(camera)s cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again, and choose which files "
+"you want to download from it."
+msgstr ""
+
+#: ../raphodo/rapid.py:4842
+msgid "Completed Downloads Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4844
+#, python-format
+msgid "%s whose download have completed are displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4846
+msgid "Do you want to clear the completed downloads?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4848
+msgid "Completed Download Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4850
+#, python-format
+msgid "%s whose download has completed is displayed."
 msgstr ""
 
-#: ../raphodo/rapid.py:4635
+#: ../raphodo/rapid.py:4852
+msgid "Do you want to clear the completed download?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4933
 #, python-format
 msgid ""
 "Do you want to download photos and videos from the device <i>%(device)s</i>?"
 msgstr ""
 
-#: ../raphodo/rapid.py:4877
+#: ../raphodo/rapid.py:5183
 #, python-format
 msgid "<b>Do you want to ignore the %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4879
+#: ../raphodo/rapid.py:5186
 msgid ""
 "All cameras, phones and tablets with the same model name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:4883
+#: ../raphodo/rapid.py:5190
 #, python-format
 msgid ""
 "<b>Do you want to ignore the device %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4885
+#: ../raphodo/rapid.py:5192
 msgid "Any device with the same name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:5178
+#: ../raphodo/rapid.py:5492
 #, python-format
 msgid "Downloading from %(location)s on This Computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5180
+#: ../raphodo/rapid.py:5496
 msgid ""
 "Do you really want to download from here?<br><br>On some systems, scanning "
 "this location can take a very long time."
 msgstr ""
 
-#: ../raphodo/rapid.py:5224
+#: ../raphodo/rapid.py:5537
 #, python-format
 msgid "Generating thumbnails for %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5227
+#: ../raphodo/rapid.py:5540
 #, python-format
 msgid "Scanning %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5237
+#: ../raphodo/rapid.py:5551
 #, python-format
 msgid ""
 "%(number)s of %(available files)s checked for download (%(hidden)s hidden)"
 msgstr ""
 
-#: ../raphodo/rapid.py:5243
+#: ../raphodo/rapid.py:5559
 #, python-format
 msgid "%(number)s of %(available files)s checked for download"
 msgstr ""
 
-#: ../raphodo/rapid.py:5494
+#: ../raphodo/rapid.py:5764
 msgid "Display program information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5496
+#: ../raphodo/rapid.py:5766
 msgid "Display debugging information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5499
+#: ../raphodo/rapid.py:5769
 msgid "List photo and video file extensions the program recognizes and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5502
+#: ../raphodo/rapid.py:5772
 msgid "Turn on or off the the renaming of photos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5504
+#: ../raphodo/rapid.py:5774
 msgid "turn on or off the the renaming of videos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5506
+#: ../raphodo/rapid.py:5776
 msgid ""
 "Turn on or off the automatic detection of devices from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5510
+#: ../raphodo/rapid.py:5780
 msgid "Turn on or off downloading from this computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5512 ../raphodo/rapid.py:5515 ../raphodo/rapid.py:5518
-#: ../raphodo/rapid.py:5539 ../raphodo/rapid.py:5543
+#: ../raphodo/rapid.py:5782 ../raphodo/rapid.py:5785 ../raphodo/rapid.py:5788
+#: ../raphodo/rapid.py:5809 ../raphodo/rapid.py:5813
 msgid "PATH"
 msgstr ""
 
-#: ../raphodo/rapid.py:5513
+#: ../raphodo/rapid.py:5783
 msgid "The PATH on this computer from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5516
+#: ../raphodo/rapid.py:5786
 msgid "The PATH where photos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5519
+#: ../raphodo/rapid.py:5789
 msgid "The PATH where videos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5521
+#: ../raphodo/rapid.py:5791
 msgid "Turn on or off the backing up of photos and videos while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:5525
+#: ../raphodo/rapid.py:5795
 msgid "Turn on or off the automatic detection of backup devices."
 msgstr ""
 
-#: ../raphodo/rapid.py:5527 ../raphodo/rapid.py:5533
+#: ../raphodo/rapid.py:5797 ../raphodo/rapid.py:5803
 msgid "FOLDER"
 msgstr ""
 
-#: ../raphodo/rapid.py:5528
+#: ../raphodo/rapid.py:5798
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected photo "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3289,7 +3890,7 @@ msgid ""
 "photos up to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5534
+#: ../raphodo/rapid.py:5804
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected video "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3297,115 +3898,124 @@ msgid ""
 "up videos to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5540
+#: ../raphodo/rapid.py:5810
 msgid ""
 "The PATH where photos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5544
+#: ../raphodo/rapid.py:5814
 msgid ""
 "The PATH where videos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5547
+#: ../raphodo/rapid.py:5817
 #, python-format
 msgid "Ignore photos with the following extensions: %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5551
-msgid "Turn on or off starting downloads as soon as the program itself starts."
+#: ../raphodo/rapid.py:5821
+msgid ""
+"Turn on or off starting downloads as soon as the program itself starts."
 msgstr ""
 
-#: ../raphodo/rapid.py:5554
+#: ../raphodo/rapid.py:5824
 msgid "Turn on or off starting downloads as soon as a device is inserted."
 msgstr ""
 
-#: ../raphodo/rapid.py:5557
+#: ../raphodo/rapid.py:5827
 msgid ""
 "Turn on or off use of the Rapid Photo Downloader Thumbnail Cache. Turning it "
 "off does not delete existing cache contents."
 msgstr ""
 
-#: ../raphodo/rapid.py:5561
+#: ../raphodo/rapid.py:5831
 msgid ""
 "Delete all thumbnails in the Rapid Photo Downloader Thumbnail Cache, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5565
+#: ../raphodo/rapid.py:5835
 msgid "Forget which files have been previously downloaded, and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5568
+#: ../raphodo/rapid.py:5838
 msgid ""
 "Import preferences from an old program version and exit. Requires the "
 "command line program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5571
+#: ../raphodo/rapid.py:5841
 msgid ""
 "Reset all program settings to their default values, delete all thumbnails in "
 "the Thumbnail cache, forget which files have been previously downloaded, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5575
+#: ../raphodo/rapid.py:5845
 msgid "Include gphoto2 debugging information in log files."
 msgstr ""
 
-#: ../raphodo/rapid.py:5579
+#: ../raphodo/rapid.py:5849
 msgid "Print information to the terminal about attached cameras and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5640
+#: ../raphodo/rapid.py:5911
 msgid ""
 "To import preferences from the old version of Rapid Photo Downloader, you "
 "must install the program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5649
+#: ../raphodo/rapid.py:5920
 msgid "No prior program preferences detected: exiting"
 msgstr ""
 
-#: ../raphodo/rapid.py:5652
+#: ../raphodo/rapid.py:5923
 #, python-format
 msgid "Importing preferences from Rapid Photo Downloader %(version)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5714
+#: ../raphodo/rapid.py:5989
 #, python-format
-msgid "Do you want to copy the stored sequence number, which has the value %d?"
+msgid ""
+"Do you want to copy the stored sequence number, which has the value %d?"
 msgstr ""
 
-#: ../raphodo/rapid.py:5726
+#: ../raphodo/rapid.py:6000
 msgid "Program aborting."
 msgstr ""
 
-#: ../raphodo/rapid.py:5736
+#: ../raphodo/rapid.py:6010
 msgid "Never run this program as the sudo / root user."
 msgstr ""
 
-#: ../raphodo/rapid.py:5740
+#: ../raphodo/rapid.py:6014
 msgid "You must install ExifTool to run Rapid Photo Downloader."
 msgstr ""
 
-#: ../raphodo/rapid.py:5794
+#: ../raphodo/rapid.py:6026
+msgid ""
+"Rapid Photo Downloader is installed in multiple locations.\n"
+"\n"
+"Uninstall all copies except the version you want to run."
+msgstr ""
+
+#: ../raphodo/rapid.py:6083
 msgid ""
 "When specifying a path on the command line, do not also specify an\n"
 "option for device auto detection or a path on \"This Computer\"."
 msgstr ""
 
-#: ../raphodo/rapid.py:5950
+#: ../raphodo/rapid.py:6243
 msgid "All settings and caches have been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5958
+#: ../raphodo/rapid.py:6251
 msgid "Thumbnail Cache has been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5964
+#: ../raphodo/rapid.py:6257
 msgid "Remembered files have been forgotten"
 msgstr ""
 
@@ -3421,15 +4031,15 @@ msgstr ""
 msgid "&Don't warn me again about missing or broken program libraries"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:546
+#: ../raphodo/renameandmovefile.py:554
 msgid "subfolder and filename"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:548
+#: ../raphodo/renameandmovefile.py:556
 msgid "filename"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:550
+#: ../raphodo/renameandmovefile.py:558
 msgid "subfolder"
 msgstr ""
 
@@ -3509,160 +4119,237 @@ msgstr "fotoğraflar ve videolar"
 msgid "photos or videos"
 msgstr "fotoğraflar veya videolar"
 
-#: ../raphodo/rpdfile.py:306
+#: ../raphodo/rpdfile.py:315
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:318
+#. translators: natural language expression signifying a single video
+#: ../raphodo/rpdfile.py:337
+msgid "a video"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:339
 msgid "1 Video"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:323
+#. translators: natural language expression signifying a single photo
+#: ../raphodo/rpdfile.py:346
+msgid "a photo"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:348
 msgid "1 Photo"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:803
+#: ../raphodo/rpdfile.py:828
 #, python-format
 msgid "%(path)s on %(camera)s"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:819
+#: ../raphodo/rpdfile.py:844
 msgid "Photo"
 msgstr "Fotoğraf"
 
-#: ../raphodo/rpdfile.py:859
+#: ../raphodo/rpdfile.py:884
 msgid "Video"
 msgstr "Video"
 
-#: ../raphodo/storage.py:138
+#: ../raphodo/storage.py:141
 msgid "File system root"
 msgstr ""
 
 #. translators: the name of the Pictures folder
-#: ../raphodo/storage.py:433
+#: ../raphodo/storage.py:437
 msgid "Pictures"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:426
+#: ../raphodo/thumbnaildisplay.py:432
 #, python-format
 msgid "Taken on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:431
+#: ../raphodo/thumbnaildisplay.py:439
 #, python-format
 msgid "Modified on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:437 ../raphodo/thumbnaildisplay.py:466
+#: ../raphodo/thumbnaildisplay.py:447 ../raphodo/thumbnaildisplay.py:481
 #, python-format
 msgid "%(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:451
+#: ../raphodo/thumbnaildisplay.py:464
 #, python-format
 msgid "Memory cards: %s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:457
+#: ../raphodo/thumbnaildisplay.py:468
+#, python-format
+msgid "Memory card: %s"
+msgstr ""
+
+#: ../raphodo/thumbnaildisplay.py:473
 msgid "Downloaded as:"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:472
+#: ../raphodo/thumbnaildisplay.py:489
 #, python-format
 msgid "<br><br>Previous download:<br>%(filename)s<br>%(path)s<br>%(date)s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:1603
+#: ../raphodo/thumbnaildisplay.py:1645
 msgid "Copy Path"
 msgstr ""
 
+#. Translators: these values are file size suffixes like B representing bytes, KB representing
+#. kilobytes, etc.
+#: ../raphodo/utilities.py:170
+msgid "B"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "KB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "MB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "GB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "TB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "PB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "EB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "ZB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "YB"
+msgstr ""
+
 #. two things in a list e.g. "device1 and device2"
-#: ../raphodo/utilities.py:391
+#: ../raphodo/utilities.py:394
 #, python-format
 msgid "%(first_item)s and %(last_item)s"
 msgstr ""
 
-#: ../raphodo/utilities.py:464
+#: ../raphodo/utilities.py:468
 msgid "one"
 msgstr ""
 
-#: ../raphodo/utilities.py:465
+#: ../raphodo/utilities.py:469
 msgid "two"
 msgstr ""
 
-#: ../raphodo/utilities.py:466
+#: ../raphodo/utilities.py:470
 msgid "three"
 msgstr ""
 
-#: ../raphodo/utilities.py:467
+#: ../raphodo/utilities.py:471
 msgid "four"
 msgstr ""
 
-#: ../raphodo/utilities.py:468
+#: ../raphodo/utilities.py:472
 msgid "five"
 msgstr ""
 
-#: ../raphodo/utilities.py:469
+#: ../raphodo/utilities.py:473
 msgid "six"
 msgstr ""
 
-#: ../raphodo/utilities.py:470
+#: ../raphodo/utilities.py:474
 msgid "seven"
 msgstr ""
 
-#: ../raphodo/utilities.py:471
+#: ../raphodo/utilities.py:475
 msgid "eight"
 msgstr ""
 
-#: ../raphodo/utilities.py:472
+#: ../raphodo/utilities.py:476
 msgid "nine"
 msgstr ""
 
-#: ../raphodo/utilities.py:473
+#: ../raphodo/utilities.py:477
 msgid "ten"
 msgstr ""
 
-#: ../raphodo/utilities.py:474
+#: ../raphodo/utilities.py:478
 msgid "eleven"
 msgstr ""
 
-#: ../raphodo/utilities.py:475
+#: ../raphodo/utilities.py:479
 msgid "twelve"
 msgstr ""
 
-#: ../raphodo/utilities.py:476
+#: ../raphodo/utilities.py:480
 msgid "thirteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:477
+#: ../raphodo/utilities.py:481
 msgid "fourteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:478
+#: ../raphodo/utilities.py:482
 msgid "fifteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:479
+#: ../raphodo/utilities.py:483
 msgid "sixteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:480
+#: ../raphodo/utilities.py:484
 msgid "seventeen"
 msgstr ""
 
-#: ../raphodo/utilities.py:481
+#: ../raphodo/utilities.py:485
 msgid "eighteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:482
+#: ../raphodo/utilities.py:486
 msgid "ninenteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:483
+#: ../raphodo/utilities.py:487
 msgid "twenty"
 msgstr ""
 
+#: ../raphodo/viewutils.py:240
+msgid "&OK"
+msgstr ""
+
+#: ../raphodo/viewutils.py:243
+msgid "&Save"
+msgstr ""
+
+#: ../raphodo/viewutils.py:244
+msgid "&Help"
+msgstr ""
+
+#: ../raphodo/viewutils.py:245
+msgid "Restore Defaults"
+msgstr ""
+
+#: ../raphodo/viewutils.py:246
+msgid "&Yes"
+msgstr ""
+
+#: ../raphodo/viewutils.py:247
+msgid "&No"
+msgstr ""
+
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:1
 msgid ""
 "Rapid Photo Downloader imports photos and videos from cameras, phones, "
@@ -3716,8 +4403,8 @@ msgstr ""
 #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:5
 msgid ""
-"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;"
-"memory;card;"
+"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;memory"
+";card;"
 msgstr ""
 
 #: ../data/kde/net.damonlynch.rapid-photo-downloader.desktop.in.h:1
@@ -3787,9 +4474,11 @@ msgstr ""
 #~ msgid "scanning..."
 #~ msgstr "taranıyor..."
 
+#, python-format
 #~ msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 #~ msgstr "Yaklaşık %(minutes)i:%(seconds)02i dakika kaldı"
 
+#, python-format
 #~ msgid "About %i seconds remaining"
 #~ msgstr "Yaklaşık %i saniye kaldı"
 
@@ -3817,15 +4506,17 @@ msgstr ""
 #~ msgid "Using backup device"
 #~ msgstr "Yedekleme ünitesi kullanma"
 
+#, python-format
 #~ msgid "Folder: %s"
 #~ msgstr "Klasör: %s"
 
+#, python-format
 #~ msgid ""
 #~ "display program information on the command line as the program runs "
 #~ "(default: %default)"
 #~ msgstr ""
-#~ "Uygulama bilgilerini, uygulama çalışırken komut satırında "
-#~ "göster(öntanımlı: %default)"
+#~ "Uygulama bilgilerini, uygulama çalışırken komut satırında göster(öntanımlı: "
+#~ "%default)"
 
 #~ msgid "display debugging information when run from the command line"
 #~ msgstr "Komut satırında çalışırken  hata ayıklama bilgisini göster"
@@ -3842,6 +4533,7 @@ msgstr ""
 #~ msgid "Videos:"
 #~ msgstr "Videolar:"
 
+#, python-format
 #~ msgid "and %s"
 #~ msgstr "ve %s"
 
diff --git a/po/uk.po b/po/uk.po
index 76fcbee..69b1901 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8,35 +8,386 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: damonlynch@gmail.com\n"
-"POT-Creation-Date: 2017-07-08 19:16-0500\n"
-"PO-Revision-Date: 2017-07-04 11:06+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2017-09-12 17:01-0400\n"
+"PO-Revision-Date: 2017-09-13 18:33+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
-"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-07-05 23:04+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-09-26 22:04+0000\n"
+"X-Generator: Launchpad (build 18463)\n"
+"Language: uk\n"
+
+#: ../install.py:65
+msgid "Rapid Photo Downloader installer"
+msgstr ""
+
+#: ../install.py:66
+msgid "Download and install latest version of Rapid Photo Downloader."
+msgstr ""
+
+#: ../install.py:236 ../install.py:1732
+msgid "Installer not found:"
+msgstr ""
+
+#. Translators: do not translate the term tar.gz
+#: ../install.py:240 ../install.py:1736
+msgid "Installer not in tar.gz format:"
+msgstr ""
+
+#: ../install.py:465
+msgid ""
+"Incorrect folder ownership detected. Changing ownership of and resetting "
+"permissions for"
+msgstr ""
+
+#: ../install.py:540
+msgid "The following command will be run:"
+msgstr ""
+
+#: ../install.py:543 ../install.py:1479 ../install.py:1484
+msgid "sudo may prompt you for the sudo password."
+msgstr ""
+
+#: ../install.py:547
+msgid "Would you like to run the command now?"
+msgstr ""
+
+#: ../install.py:549
+msgid "Answer is not yes, exiting."
+msgstr ""
+
+#: ../install.py:559 ../install.py:751 ../install.py:966
+msgid "Command failed"
+msgstr ""
+
+#: ../install.py:561 ../install.py:752 ../install.py:967
+msgid "Exiting"
+msgstr ""
+
+#: ../install.py:582
+msgid "The Universe repository must be enabled."
+msgstr ""
+
+#: ../install.py:606
+msgid ""
+"Do you want to to uninstall the previous version of Rapid Photo Downloader:"
+msgstr ""
+
+#: ../install.py:715 ../install.py:740
+msgid ""
+"Querying package system to see if an older version of Rapid Photo Downloader "
+"is installed (this may take a while)..."
+msgstr ""
+
+#: ../install.py:726
+msgid ""
+"Unable to query package system. Please check your Internet connection and "
+"try again"
+msgstr ""
+
+#: ../install.py:756
+msgid "Checking if previous version installed with pip..."
+msgstr ""
+
+#: ../install.py:850
+msgid "The following package is unknown on your system: {}\n"
+msgstr ""
+
+#: ../install.py:857 ../install.py:929 ../install.py:974
+msgid ""
+"To continue, some packages required to run the application will be installed."
+msgstr ""
+
+#: ../install.py:886
+msgid "Querying installed and available packages (this may take a while)"
+msgstr ""
+
+#: ../install.py:958
+msgid ""
+"Querying zypper to see if any required packages are already installed (this "
+"may take a while)... "
+msgstr ""
+
+#: ../install.py:1004
+msgid "Query to confirm action at each step."
+msgstr ""
+
+#: ../install.py:1011
+msgid ""
+"When downloading the latest version, install the development version if it "
+"is newer than the stable version."
+msgstr ""
+
+#: ../install.py:1020
+msgid ""
+"Optional tar.gz Rapid Photo Downloader installer archive. If not specified, "
+"the latest version is downloaded from the Internet."
+msgstr ""
+
+#: ../install.py:1043
+msgid ""
+"Do not run the installer in the tar.gz Rapid Photo Downloader installer "
+"archive if it is newer than this version ({}). The default is to run "
+"whichever installer is newer."
+msgstr ""
+
+#: ../install.py:1050
+msgid ""
+"Uninstall Rapid Photo Downloader that was installed with pip, keeping its "
+"dependencies."
+msgstr ""
+
+#: ../install.py:1054
+msgid ""
+"Uninstall the dependencies installed by pip during Rapid Photo Downloader's "
+"installation, and Rapid Photo Downloader itself, then exit."
+msgstr ""
+
+#: ../install.py:1059
+msgid ""
+"Note: this will not uninstall any version of Rapid Photo Downloader "
+"installed by your Linux distribution's package manager."
+msgstr ""
+
+#: ../install.py:1066
+msgid ""
+"Dependencies will only be removed if they are not required by other programs."
+msgstr ""
+
+#: ../install.py:1072
+msgid ""
+"Note: this option will remove the dependencies regardless of whether they "
+"are required by another program pip has installed. Upgrade to pip 9.0 or "
+"above if you want to avoid this behavior. You can do so using the command "
+"'python3 -m pip install pip -U --user'. Also note that any version of Rapid "
+"Photo Downloader installed by your Linux distribution's package manager will "
+"not be uninstalled."
+msgstr ""
+
+#: ../install.py:1122
+msgid "Failed to download versions file"
+msgstr ""
+
+#: ../install.py:1126
+msgid "Got error code {} while accessing versions file"
+msgstr ""
+
+#: ../install.py:1234
+msgid ""
+"Sorry, could not locate installer. Please check your Internet connection and "
+"verify if you can reach https://www.damonlynch.net\n"
+"\n"
+"Exiting.\n"
+msgstr ""
+
+#: ../install.py:1408
+msgid "Installing application requirements..."
+msgstr ""
+
+#: ../install.py:1424
+msgid "Received error code"
+msgstr ""
+
+#: ../install.py:1425
+msgid "Failed to install application requirements: exiting"
+msgstr ""
+
+#: ../install.py:1428
+msgid "Installing application..."
+msgstr ""
+
+#: ../install.py:1441
+msgid "Failed to install application: exiting..."
+msgstr ""
+
+#: ../install.py:1465
+msgid ""
+"You may have to restart the computer to be able to run the program from the "
+"commmand line or application launcher."
+msgstr ""
+
+#: ../install.py:1476
+msgid "Do you want to install the application's man pages?"
+msgstr ""
+
+#: ../install.py:1477
+msgid "They will be installed into {}"
+msgstr ""
+
+#: ../install.py:1478 ../install.py:1483
+msgid "If you uninstall the application, remove these manpages yourself."
+msgstr ""
+
+#: ../install.py:1480
+msgid "Do want to install the man pages?"
+msgstr ""
+
+#: ../install.py:1482
+msgid "Installing man pages into {}"
+msgstr ""
+
+#: ../install.py:1499
+msgid "Failed to create man page directory: exiting"
+msgstr ""
+
+#: ../install.py:1511
+msgid "Failed to copy man page."
+msgstr ""
+
+#: ../install.py:1521
+msgid "(If a segmentation fault occurs at exit, you can ignore it...)"
+msgstr ""
+
+#: ../install.py:1534
+msgid ""
+"The python3 tool pip is required to uninstall a version of Rapid Photo "
+"Downloader that was installed with pip.\n"
+"Cannot continue. Exiting."
+msgstr ""
+
+#: ../install.py:1575
+msgid ""
+"Do not run this installer script as sudo / root user.\n"
+"Run it using the user who will run the program.\n"
+msgstr ""
+
+#: ../install.py:1585 ../install.py:1599
+msgid "Do not include any other command line arguments when specifying"
+msgstr ""
+
+#: ../install.py:1614
+msgid ""
+"Sorry, this installer does not support a custom python installation.\n"
+"Exiting..."
+msgstr ""
+
+#: ../install.py:1620
+msgid "Restarting script using system python..."
+msgstr ""
+
+#: ../install.py:1651
+msgid "Exiting..."
+msgstr ""
+
+#. Translators: do not translate the term python3-apt
+#: ../install.py:1670
+msgid "To continue, the package python3-apt must be installed."
+msgstr ""
+
+#: ../install.py:1689
+msgid ""
+"Install the following packages using your Linux distribution's standard "
+"package manager, and then rerun this installer"
+msgstr ""
+
+#: ../install.py:1698
+msgid ""
+"To run this program, programs to assist Python 3 and its package management "
+"must be installed."
+msgstr ""
+
+#. Translators: do not translate the terms Python 3, pip and setuptools
+#: ../install.py:1713
+msgid "Python 3's pip and setuptools must be upgraded for your user."
+msgstr ""
+
+#. Translators: do not translate the term python or requests
+#: ../install.py:1726
+msgid "Installing python requests"
+msgstr ""
+
+#: ../upgrade.py:79
+msgid "Upgrade Rapid Photo Downloader"
+msgstr ""
+
+#: ../upgrade.py:401 ../raphodo/viewutils.py:242
+msgid "&Cancel"
+msgstr ""
+
+#: ../upgrade.py:405
+msgid "&Upgrade"
+msgstr ""
+
+#: ../upgrade.py:410
+#, python-format
+msgid "Click the Upgrade button to upgrade to version %s."
+msgstr ""
 
-#. type: QPushButton
-#: ../raphodo/aboutdialog.py:217
+#: ../upgrade.py:413
+msgid "Click the Upgrade button to start the upgrade."
+msgstr ""
+
+#: ../upgrade.py:416 ../upgrade.py:422 ../raphodo/viewutils.py:241
+msgid "&Close"
+msgstr ""
+
+#: ../upgrade.py:417
+msgid "&Run"
+msgstr ""
+
+#: ../upgrade.py:447
+msgid "Close Rapid Photo Downloader before running this upgrade"
+msgstr ""
+
+#: ../upgrade.py:450
+msgid "Upgrade running..."
+msgstr ""
+
+#: ../upgrade.py:486
+#, python-format
+msgid ""
+"Successfully upgraded to %s. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:491
+msgid ""
+"Upgrade finished successfully. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:495
+msgid "Upgrade failed. Click Close to exit."
+msgstr ""
+
+#: ../upgrade.py:6967
+#, python-format
+msgid "Upgrading %s..."
+msgstr ""
+
+#: ../upgrade.py:6969
+msgid "Press any key to continue..."
+msgstr ""
+
+#: ../upgrade.py:6982
+msgid "Rapid Photo Downloader upgrade failed"
+msgstr ""
+
+#: ../upgrade.py:6984
+#, python-format
+msgid ""
+"The python package %s could not be updated. The upgrade cannot continue."
+msgstr ""
+
+#: ../raphodo/aboutdialog.py:225
 msgid "Credits"
 msgstr "Подяки"
 
-#: ../raphodo/backuppanel.py:239
+#: ../raphodo/backuppanel.py:240
 msgid "Backups are not configured"
 msgstr "Резервні копії не налаштовано"
 
-#: ../raphodo/backuppanel.py:241
+#: ../raphodo/backuppanel.py:242
 msgid "No backup devices detected"
 msgstr "Пристроїв для резервного копіювання не виявлено"
 
-#: ../raphodo/backuppanel.py:243
+#: ../raphodo/backuppanel.py:244
 msgid "Valid backup locations not yet specified"
 msgstr "Дійсні місця для резервного копіювання ще не задано"
 
-#: ../raphodo/backuppanel.py:401
+#: ../raphodo/backuppanel.py:404
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
@@ -44,103 +395,112 @@ msgstr ""
 "Ви можете створювати резервні копії фото та відео в кількох місцях прямо під "
 "час завантаження, наприклад, на зовнішніх жорстких дисках."
 
-#: ../raphodo/backuppanel.py:407
+#: ../raphodo/backuppanel.py:412
 msgid "Back up photos and videos when downloading"
 msgstr "Резервне копіювання фото та відео під час завантаження"
 
-#: ../raphodo/backuppanel.py:413
+#: ../raphodo/backuppanel.py:418
 msgid "Automatically detect backup devices"
 msgstr "Автоматичне виявляти пристрої для резервного копіювання"
 
-#: ../raphodo/backuppanel.py:417
+#: ../raphodo/backuppanel.py:424
 msgid ""
-"Specify the folder in which backups are stored on the device."
-"<br><br><i>Note: the presence of a folder with this name is used to "
+"Specify the folder in which backups are stored on the "
+"device.<br><br><i>Note: the presence of a folder with this name is used to "
 "determine if 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 folder names. By "
 "adding both folders, the same device can be used to back up both photos and "
 "videos.</i>"
 msgstr ""
-"Вкажіть папку для збереження резервних копій на пристрої."
-"<br><br><i>Примітка: наявність папки з цим іменем використовується для "
-"визначення того, чи пристрій використовується для резервного копіювання. "
+"Вкажіть папку для збереження резервних копій на "
+"пристрої.<br><br><i>Примітка: наявність папки з цим іменем використовується "
+"для визначення того, чи пристрій використовується для резервного копіювання. "
 "Створіть папку з однією з цих назв для кожного пристрою, який хочете "
 "використовувати для резервного копіювання. Додавши обидві папки, один і той "
 "самий пристрій може використовуватися для резервного копіювання і фотографій "
 "і відео.</i>"
 
-#: ../raphodo/backuppanel.py:428
+#: ../raphodo/backuppanel.py:439
 msgid "Photo folder name:"
 msgstr "Назва папки для фотографій:"
 
-#: ../raphodo/backuppanel.py:433
+#: ../raphodo/backuppanel.py:444
 msgid "Video folder name:"
 msgstr "Назва папки для відео:"
 
-#: ../raphodo/backuppanel.py:438 ../raphodo/nameeditor.py:883
+#: ../raphodo/backuppanel.py:449 ../raphodo/nameeditor.py:890
 #: ../raphodo/renamepanel.py:123
 msgid "Example:"
 msgstr "Приклад:"
 
-#: ../raphodo/backuppanel.py:448
-msgid "If you disable automatic detection, choose the exact backup locations."
+#: ../raphodo/backuppanel.py:460
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr ""
 "Якщо ви вимикаєте автовизначення, оберіть місце для резервного копіювання."
 
-#: ../raphodo/backuppanel.py:452
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:468
 msgid "Photo backup location:"
 msgstr "Розміщення для резервного копіювання фото:"
 
-#: ../raphodo/backuppanel.py:454
+#: ../raphodo/backuppanel.py:474
 msgid "Select Photo Backup Location"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:460
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:485
 msgid "Video backup location:"
 msgstr "Розміщення для резервного копіювання відео:"
 
-#: ../raphodo/backuppanel.py:462
+#: ../raphodo/backuppanel.py:491
 msgid "Select Video Backup Location"
 msgstr ""
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:564
+#: ../raphodo/backuppanel.py:595
 msgid "drive1"
 msgstr "диск1"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:567
+#: ../raphodo/backuppanel.py:598
 msgid "drive2"
 msgstr "диск2"
 
-#: ../raphodo/backuppanel.py:628
+#: ../raphodo/backuppanel.py:663
 msgid "Projected Backup Storage Use"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:632
+#: ../raphodo/backuppanel.py:669
 msgid "Backup Options"
 msgstr ""
 
 #. translators: refers to the video thumbnail file that some
 #. cameras generate -- it has a .THM file extension
-#: ../raphodo/copyfiles.py:476
+#: ../raphodo/copyfiles.py:491
 msgid "video THM"
 msgstr ""
 
-#: ../raphodo/copyfiles.py:482
+#: ../raphodo/copyfiles.py:497
 msgid "audio"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:78 ../raphodo/devicedisplay.py:1079
-#: ../raphodo/rpdfile.py:321
+#: ../raphodo/rpdfile.py:342
 #, python-format
 msgid "%(no_photos)s Photos"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:82 ../raphodo/devicedisplay.py:1081
-#: ../raphodo/rpdfile.py:316
+#: ../raphodo/rpdfile.py:333
 #, python-format
 msgid "%(no_videos)s Videos"
 msgstr ""
@@ -168,15 +528,15 @@ msgid "%(size_free)s free of %(size_total)s"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:190 ../raphodo/devicedisplay.py:993
-#: ../raphodo/rapid.py:1964 ../raphodo/rapid.py:2079 ../raphodo/rapid.py:5753
-#: ../raphodo/rpdfile.py:905
+#: ../raphodo/rapid.py:2023 ../raphodo/rapid.py:2151 ../raphodo/rapid.py:6043
+#: ../raphodo/rpdfile.py:930
 msgid "Photos"
 msgstr ""
 
 #. translators: the name of the Videos folder
 #: ../raphodo/destinationdisplay.py:191 ../raphodo/devicedisplay.py:994
-#: ../raphodo/rapid.py:1967 ../raphodo/rapid.py:2080 ../raphodo/rapid.py:5754
-#: ../raphodo/rpdfile.py:933 ../raphodo/storage.py:445
+#: ../raphodo/rapid.py:2028 ../raphodo/rapid.py:2152 ../raphodo/rapid.py:6044
+#: ../raphodo/rpdfile.py:958 ../raphodo/storage.py:449
 msgid "Videos"
 msgstr ""
 
@@ -184,7 +544,7 @@ msgstr ""
 msgid "Projected storage use after download"
 msgstr ""
 
-#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:516
+#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:521
 msgid "Custom..."
 msgstr "Змінити ..."
 
@@ -222,59 +582,60 @@ msgstr "Пересканувати"
 msgid "%s full"
 msgstr ""
 
-#: ../raphodo/devices.py:459
+#: ../raphodo/devices.py:463
 msgid "Cameras"
 msgstr "Камери"
 
-#: ../raphodo/devices.py:460 ../raphodo/devices.py:920
-#: ../raphodo/preferencedialog.py:85 ../raphodo/rapid.py:1927
+#: ../raphodo/devices.py:464 ../raphodo/devices.py:927
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/rapid.py:1979
 msgid "Devices"
 msgstr "Пристрої"
 
-#: ../raphodo/devices.py:720
+#: ../raphodo/devices.py:724
 #, python-format
 msgid "Downloading from %(device_names)s"
 msgstr ""
 
 #. Translators: e.g. Three Devices
-#: ../raphodo/devices.py:780
+#: ../raphodo/devices.py:784
 #, python-format
 msgid "%(no_devices)s %(device_type)s"
 msgstr ""
 
-#: ../raphodo/devices.py:905 ../raphodo/rapid.py:1764
+#: ../raphodo/devices.py:912 ../raphodo/rapid.py:1807
 msgid "Select Source"
 msgstr "Вибір джерела"
 
-#: ../raphodo/devices.py:936 ../raphodo/devices.py:947
+#: ../raphodo/devices.py:943 ../raphodo/devices.py:954
 #, python-format
 msgid "%(device1)s + %(device2)s"
 msgstr ""
 
 #. Number of cameras e.g. 3 Cameras
-#: ../raphodo/devices.py:958
+#: ../raphodo/devices.py:965
 #, python-format
 msgid "%(no_cameras)s Cameras"
 msgstr "%(no_cameras)s камер(а,и)"
 
-#: ../raphodo/devices.py:963
+#: ../raphodo/devices.py:970
 #, python-format
 msgid "%(no_devices)s Devices"
 msgstr "%(no_devices)s пристрій(ої,оїв)"
 
 #. Translators: two folder names, separated by a plus sign
-#: ../raphodo/devices.py:1258
+#: ../raphodo/devices.py:1265
 #, python-format
 msgid "%s + %s"
 msgstr "%s + %s"
 
-#: ../raphodo/didyouknow.py:44
+#: ../raphodo/didyouknow.py:45
 msgid "Click on a file's checkbox to mark or unmark it for download."
 msgstr ""
 "Клацніть прапорець файлу, щоб вибрати або скасувати його вибір для "
 "звантаження."
 
-#: ../raphodo/didyouknow.py:50
+#: ../raphodo/didyouknow.py:51
 msgid ""
 "Files that have already been downloaded are remembered. You can still mark "
 "previously downloaded files to download again, but they are unchecked by "
@@ -286,34 +647,67 @@ msgstr ""
 "мініатюри затінюються, щоб їх було легше відрізнити від тих, що ще мають "
 "звантажуватись."
 
-#: ../raphodo/didyouknow.py:59
+#: ../raphodo/didyouknow.py:60
 msgid ""
 "If more than one file is selected, they'll all take the mark of the file "
 "whose checkbox was clicked, regardless of whether they previously had a "
 "checkmark or not."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:67
+#: ../raphodo/didyouknow.py:68
 msgid ""
 "Click on a device's checkbox to quickly mark or unmark all its files for "
 "downloading."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:74
+#: ../raphodo/didyouknow.py:75
+msgid ""
+"After a download finishes, an icon replaces the thumbnail's checkbox. The "
+"icon's color indicates whether the download was successful (green), had file "
+"renaming problems (yellow/orange), or failed (red)."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:83
+msgid ""
+"\n"
+"            In case of any problems, a red icon will appear at the bottom of "
+"the window\n"
+"            indicating how many error reports there are. Clicking on it "
+"opens the Error Report \n"
+"            window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:91
+msgid ""
+"\n"
+"            The Error Report window lists any problems encountered before, "
+"during or after the \n"
+"            download. An orange triangle represents a warning, a red circle "
+"indicates a failure, \n"
+"            and a black circle indicates more serious failures. You can "
+"click on the hyperlinks to \n"
+"            open its file or device in a file manager. You can also search "
+"the reports using the \n"
+"            search box in the lower left of the Error Report window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:103
 msgid ""
 "You can simultaneously download from multiple cameras, smartphones, memory "
 "cards, and hard drives&mdash;as many devices as your computer can handle at "
 "one time."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:81
+#: ../raphodo/didyouknow.py:110
 msgid ""
 "The <b>Timeline</b> groups photos and videos based on how much time elapsed "
 "between consecutive shots. Use it to identify photos and videos taken at "
 "different periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:88
+#: ../raphodo/didyouknow.py:117
 msgid ""
 "\n"
 "<p>In the illustration above, the first row of the Timeline is black because "
@@ -325,7 +719,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:99
+#: ../raphodo/didyouknow.py:128
 msgid ""
 "To view photos and videos for a particular time range, use the mouse "
 "(optionally in combination with the <tt>Shift</tt> or <tt>Ctrl</tt> keys) to "
@@ -333,20 +727,20 @@ msgid ""
 "the left side of the main window will be highlighted."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:106
+#: ../raphodo/didyouknow.py:135
 msgid ""
 "A download always includes all files that are checked for download, "
 "including those that are not currently displayed because the Timeline is "
 "being used."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:113
+#: ../raphodo/didyouknow.py:142
 msgid ""
 "You can hide or display the download sources by clicking on the name of the "
 "device you're downloading from at the top left of the program window."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:120
+#: ../raphodo/didyouknow.py:149
 msgid ""
 "\n"
 "          Thumbnails can be sorted using a variety of criteria:\n"
@@ -365,33 +759,33 @@ msgid ""
 "</ol> "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:137
+#: ../raphodo/didyouknow.py:166
 msgid ""
 "One of Rapid Photo Downloader's most useful features is its ability to "
 "automatically generate download subfolders and rename files as it downloads, "
 "using a scheme of your choosing."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:143
+#: ../raphodo/didyouknow.py:172
 msgid ""
 "To specify where you want your files downloaded and how you want them named, "
 "open the appropriate panel on the right-side of the application window: "
 "<b>Destination</b>, <b>Rename</b>, or <b>Job Code</b>."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:150
+#: ../raphodo/didyouknow.py:179
 msgid ""
 "\n"
 "When thinking about your download directory structure, keep in mind two "
 "different types\n"
 "of directory:\n"
 "<ol>\n"
-"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, &quot;"
-"Photos&quot;, or\n"
+"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, "
+"&quot;Photos&quot;, or\n"
 "&quot;Videos&quot;. This directory should already exist on your computer. In "
 "the illustration \n"
-"below, the destination folders are &quot;Pictures&quot; and &quot;"
-"Videos&quot;. The\n"
+"below, the destination folders are &quot;Pictures&quot; and "
+"&quot;Videos&quot;. The\n"
 "name of the destination folder is displayed in the grey bar directly above "
 "the folder tree, \n"
 "with a folder icon to its left and a gear icon to its far right.</li>\n"
@@ -404,7 +798,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:167
+#: ../raphodo/didyouknow.py:196
 msgid ""
 "\n"
 "You can download photos and videos to the same destination folder, or "
@@ -417,14 +811,14 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:177
+#: ../raphodo/didyouknow.py:206
 msgid ""
 "Automatically generated download subfolders can contain further "
 "automatically generated subfolders if need be. A common scheme is to create "
 "a year subfolder and then a series of year-month-day subfolders within it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:186
+#: ../raphodo/didyouknow.py:215
 msgid ""
 "\n"
 "Whenever possible, the program previews the download subfolders of photos "
@@ -442,7 +836,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:201
+#: ../raphodo/didyouknow.py:230
 msgid ""
 "\n"
 "Download subfolder names are typically generated using some or all of the "
@@ -466,7 +860,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:219
+#: ../raphodo/didyouknow.py:248
 msgid ""
 "\n"
 "To automatically create download subfolders as you download, \n"
@@ -476,7 +870,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:227
+#: ../raphodo/didyouknow.py:256
 msgid ""
 "\n"
 "Using the drop-down menu, select a built-in preset or click on <b>Custom</b> "
@@ -486,20 +880,20 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:237
+#: ../raphodo/didyouknow.py:266
 msgid ""
 "It's easy to download raw images into one folder, and jpeg images into "
 "another. Simply use the <b>Filename Extension</b> as part of your download "
 "subfolder generation scheme:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:242
+#: ../raphodo/didyouknow.py:271
 msgid ""
 "This illustration shows a saved custom preset named &quot;My custom "
 "preset&quot;."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:246
+#: ../raphodo/didyouknow.py:275
 msgid ""
 "\n"
 "You do not have to create nested download subfolders. This illustration "
@@ -510,7 +904,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:256
+#: ../raphodo/didyouknow.py:285
 msgid ""
 "\n"
 "Although there are many built-in date/time naming options, you may find that "
@@ -524,7 +918,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:265
+#: ../raphodo/didyouknow.py:294
 msgid ""
 "\n"
 "Read more about all the ways you can generate download subfolder names and "
@@ -534,7 +928,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:273
+#: ../raphodo/didyouknow.py:302
 msgid ""
 "\n"
 "<b>Job Codes</b> let you easily enter text that describes sets of photos and "
@@ -546,7 +940,7 @@ msgid ""
 "&quot;Green Bazaar&quot;: \n"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:282
+#: ../raphodo/didyouknow.py:311
 msgid ""
 "\n"
 "You can apply new or existing Job Codes before you start a download. If "
@@ -557,36 +951,36 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:291
+#: ../raphodo/didyouknow.py:320
 msgid "Look for hints to guide you when working with Job Codes:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:295
+#: ../raphodo/didyouknow.py:324
 msgid ""
 "Hints will vary depending on the context, such as when the mouse is hovering "
 "over a button."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:301
+#: ../raphodo/didyouknow.py:330
 msgid ""
 "\n"
 "When you give your photos and videos unique filenames, you'll never be "
 "confused as to \n"
 "which file is which. Using <b>sequence numbers</b> to make filenames unique "
 "is highly \n"
-"recommended!.\n"
+"recommended!\n"
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:309
+#: ../raphodo/didyouknow.py:338
 msgid ""
 "\n"
 "<p>Four types of sequence values are available to help you assign unique "
 "names to your photos and \n"
 "videos:\n"
 "<ol>\n"
-"<li><b>Downloads today</b>: tracks downloads completed during that day.</"
-"li>\n"
+"<li><b>Downloads today</b>: tracks downloads completed during that "
+"day.</li>\n"
 "<li><b>Stored number</b>: similar to Downloads today, but it is remembered "
 "from the last time the  \n"
 "program was run.</li>\n"
@@ -600,7 +994,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:327
+#: ../raphodo/didyouknow.py:356
 msgid ""
 "\n"
 "The <b>Rename</b> panel allows you to configure file renaming. To rename "
@@ -609,7 +1003,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:334
+#: ../raphodo/didyouknow.py:363
 msgid ""
 "\n"
 "<p>The <b>Synchronize RAW + JPEG</b> option is useful if you use the RAW + "
@@ -628,7 +1022,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:348
+#: ../raphodo/didyouknow.py:377
 msgid ""
 "\n"
 "You can have your photos and videos backed up to multiple locations as they "
@@ -639,13 +1033,13 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:356
+#: ../raphodo/didyouknow.py:385
 msgid ""
 "In this example, the drive <b>photobackup</b> does not contain a folder "
 "named <tt>Videos</tt>, so videos will not be backed up to it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:362
+#: ../raphodo/didyouknow.py:391
 msgid ""
 "\n"
 "Several of the program's preferences can be set from the command line, "
@@ -656,7 +1050,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:372
+#: ../raphodo/didyouknow.py:396
+msgid "You can also import program preferences from the older 0.4 version."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:401
 msgid ""
 "\n"
 "Rapid Photo Downloader deals with three types of cache:\n"
@@ -666,8 +1064,8 @@ msgid ""
 "memory cards, and other devices.</li>\n"
 "<li>A <b>temporary cache</b> of files downloaded from a camera, one for "
 "photos and another for \n"
-"videos. They are located in temporary subfolders in the download destination."
-"</li>\n"
+"videos. They are located in temporary subfolders in the download "
+"destination.</li>\n"
 "<li>The <b>desktop's thumbnail cache</b>, in which Rapid Photo Downloader "
 "stores thumbnails of \n"
 "RAW and TIFF photos once they have been downloaded. File browsers like Gnome "
@@ -682,23 +1080,23 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:431
+#: ../raphodo/didyouknow.py:460
 msgid "Tip of the Day"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:439
+#: ../raphodo/didyouknow.py:468
 msgid "Did you know...?"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:466
+#: ../raphodo/didyouknow.py:495
 msgid "Show tips on startup"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:470
+#: ../raphodo/didyouknow.py:499
 msgid "&Next"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:471
+#: ../raphodo/didyouknow.py:500
 msgid "&Previous"
 msgstr ""
 
@@ -805,68 +1203,68 @@ msgstr ""
 msgid "%(days)d days, %(hours)d hours"
 msgstr ""
 
-#: ../raphodo/errorlog.py:65
+#: ../raphodo/errorlog.py:66
 msgid "Find"
 msgstr ""
 
-#: ../raphodo/errorlog.py:135
+#: ../raphodo/errorlog.py:136
 msgid "Error Reports - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/errorlog.py:170
+#: ../raphodo/errorlog.py:171
 msgid "Find in reports"
 msgstr ""
 
-#: ../raphodo/errorlog.py:187
+#: ../raphodo/errorlog.py:188
 msgid "Find the previous occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:192
+#: ../raphodo/errorlog.py:193
 msgid "Find the next occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:194
+#: ../raphodo/errorlog.py:195
 msgid "&Highlight All"
 msgstr ""
 
-#: ../raphodo/errorlog.py:195
+#: ../raphodo/errorlog.py:196
 msgid "Highlight all occurrences of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:196
+#: ../raphodo/errorlog.py:197
 msgid "&Match Case"
 msgstr ""
 
-#: ../raphodo/errorlog.py:197
+#: ../raphodo/errorlog.py:198
 msgid "Search with case sensitivity"
 msgstr ""
 
-#: ../raphodo/errorlog.py:198
+#: ../raphodo/errorlog.py:199
 msgid "&Whole Words"
 msgstr ""
 
-#: ../raphodo/errorlog.py:199
+#: ../raphodo/errorlog.py:200
 msgid "Search whole words only"
 msgstr ""
 
-#: ../raphodo/errorlog.py:209 ../raphodo/errorlog.py:341
+#: ../raphodo/errorlog.py:210 ../raphodo/errorlog.py:345
 #, python-format
 msgid "%s of %s matches"
 msgstr ""
 
-#: ../raphodo/errorlog.py:228
+#: ../raphodo/errorlog.py:232
 msgid "Clear"
 msgstr ""
 
-#: ../raphodo/errorlog.py:328
+#: ../raphodo/errorlog.py:332
 msgid "Phrase not found"
 msgstr ""
 
-#: ../raphodo/errorlog.py:487
+#: ../raphodo/errorlog.py:491
 msgid "Search pending..."
 msgstr ""
 
-#: ../raphodo/errorlog.py:535
+#: ../raphodo/errorlog.py:539
 msgid ""
 "The number of new entries added to the Error Report since it was last open. "
 "Click to open the Error Report."
@@ -880,8 +1278,8 @@ msgstr ""
 #, python-brace-format
 msgid ""
 "<b>A problem occurred in Rapid Photo Downloader</b><br><br>\n"
-"    Please report the problem at <a href=\"{website}\">{website}</a>."
-"<br><br>\n"
+"    Please report the problem at <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
 "    Attach the log file <i>{log_file}</i> to your bug report (click\n"
 "    <a href=\"{log_path}\">here</a> to open the log directory).<br><br>If "
 "the same problem occurs\n"
@@ -902,7 +1300,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1601
+#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1643
 msgid "Open in File Browser..."
 msgstr ""
 
@@ -920,531 +1318,531 @@ msgstr ""
 msgid "%s (location does not exist)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:186
+#: ../raphodo/generatenameconfig.py:190
 msgid "Date time"
 msgstr "Дата і час"
 
-#: ../raphodo/generatenameconfig.py:187
+#: ../raphodo/generatenameconfig.py:191
 msgid "Text"
 msgstr "Текст"
 
-#: ../raphodo/generatenameconfig.py:188 ../raphodo/rapid.py:2053
+#: ../raphodo/generatenameconfig.py:192 ../raphodo/rapid.py:2125
 msgid "Filename"
 msgstr "Назва файлу"
 
-#: ../raphodo/generatenameconfig.py:189 ../raphodo/preferencedialog.py:488
+#: ../raphodo/generatenameconfig.py:193 ../raphodo/preferencedialog.py:724
 msgid "Metadata"
 msgstr "Метадані"
 
-#: ../raphodo/generatenameconfig.py:190
+#: ../raphodo/generatenameconfig.py:194
 msgid "Sequences"
 msgstr "Послідовності"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: ../raphodo/generatenameconfig.py:193
+#: ../raphodo/generatenameconfig.py:197
 msgid "Job code"
 msgstr "Мітка"
 
-#: ../raphodo/generatenameconfig.py:194
+#: ../raphodo/generatenameconfig.py:198
 msgid "Image date"
 msgstr "Дата фото"
 
-#: ../raphodo/generatenameconfig.py:195
+#: ../raphodo/generatenameconfig.py:199
 msgid "Video date"
 msgstr "Дата відео"
 
-#: ../raphodo/generatenameconfig.py:196
+#: ../raphodo/generatenameconfig.py:200
 msgid "Today"
 msgstr "Сьогодні"
 
-#: ../raphodo/generatenameconfig.py:197
+#: ../raphodo/generatenameconfig.py:201
 msgid "Yesterday"
 msgstr "Вчора"
 
 #. Translators: Download time is the time and date that the download started (when the
 #. user clicked the Download button)
-#: ../raphodo/generatenameconfig.py:200
+#: ../raphodo/generatenameconfig.py:204
 msgid "Download time"
 msgstr "Час та дата завантаження"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:203
+#: ../raphodo/generatenameconfig.py:207
 msgid "Name"
 msgstr "Назва"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:206 ../raphodo/rapid.py:2054
+#: ../raphodo/generatenameconfig.py:210 ../raphodo/rapid.py:2126
 msgid "Extension"
 msgstr "Розширення"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:209
+#: ../raphodo/generatenameconfig.py:213
 msgid "Image number"
 msgstr "Номер фото"
 
-#: ../raphodo/generatenameconfig.py:210
+#: ../raphodo/generatenameconfig.py:214
 msgid "Video number"
 msgstr "Номер відео"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:213
+#: ../raphodo/generatenameconfig.py:217
 msgid "Aperture"
 msgstr "Діафрагма"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:216
+#: ../raphodo/generatenameconfig.py:220
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:219
+#: ../raphodo/generatenameconfig.py:223
 msgid "Exposure time"
 msgstr "Час експозиції"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:222
+#: ../raphodo/generatenameconfig.py:226
 msgid "Focal length"
 msgstr "Фокусна відстань"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:225
+#: ../raphodo/generatenameconfig.py:229
 msgid "Camera make"
 msgstr "Виробник камери"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:228
+#: ../raphodo/generatenameconfig.py:232
 msgid "Camera model"
 msgstr "Модель камери"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:231
+#: ../raphodo/generatenameconfig.py:235
 msgid "Short camera model"
 msgstr "Скорочена назва камери"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:234
+#: ../raphodo/generatenameconfig.py:238
 msgid "Hyphenated short camera model"
 msgstr "Написана через дефіс коротка назва моделі"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:237
+#: ../raphodo/generatenameconfig.py:241
 msgid "Serial number"
 msgstr "Серійний номер"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:240
+#: ../raphodo/generatenameconfig.py:244
 msgid "Shutter count"
 msgstr "Кількість затворів"
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: ../raphodo/generatenameconfig.py:242
+#: ../raphodo/generatenameconfig.py:246
 msgid "File number"
 msgstr "Номер файлу"
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:244
+#: ../raphodo/generatenameconfig.py:248
 msgid "Folder only"
 msgstr "Лише тека"
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:246
+#: ../raphodo/generatenameconfig.py:250
 msgid "Folder and file"
 msgstr "Тека та файл"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:249
+#: ../raphodo/generatenameconfig.py:253
 msgid "Owner name"
 msgstr "Ім’я власника"
 
-#: ../raphodo/generatenameconfig.py:250
+#: ../raphodo/generatenameconfig.py:254
 msgid "Codec"
 msgstr "Кодек"
 
-#: ../raphodo/generatenameconfig.py:251
+#: ../raphodo/generatenameconfig.py:255
 msgid "Width"
 msgstr "Ширина"
 
-#: ../raphodo/generatenameconfig.py:252
+#: ../raphodo/generatenameconfig.py:256
 msgid "Height"
 msgstr "Висота"
 
-#: ../raphodo/generatenameconfig.py:253
+#: ../raphodo/generatenameconfig.py:257
 msgid "Length"
 msgstr "Тривалість"
 
-#: ../raphodo/generatenameconfig.py:254
+#: ../raphodo/generatenameconfig.py:258
 msgid "Frames Per Second"
 msgstr "Кадрів за секунду"
 
-#: ../raphodo/generatenameconfig.py:255
+#: ../raphodo/generatenameconfig.py:259
 msgid "Artist"
 msgstr "Виконавець"
 
-#: ../raphodo/generatenameconfig.py:256
+#: ../raphodo/generatenameconfig.py:260
 msgid "Copyright"
 msgstr "Авторське право"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:259
+#: ../raphodo/generatenameconfig.py:263
 msgid "Downloads today"
 msgstr "Завантажень сьогодні"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:262
+#: ../raphodo/generatenameconfig.py:266
 msgid "Session number"
 msgstr "Номер сеансу"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:265
+#: ../raphodo/generatenameconfig.py:269
 msgid "Subfolder number"
 msgstr "Номер підтеки"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:268
+#: ../raphodo/generatenameconfig.py:272
 msgid "Stored number"
 msgstr "Номер збереження"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: ../raphodo/generatenameconfig.py:271
+#: ../raphodo/generatenameconfig.py:275
 msgid "Sequence letter"
 msgstr "Послідовність знаків"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:274
+#: ../raphodo/generatenameconfig.py:278
 msgid "All digits"
 msgstr "Всі цифри"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:277
+#: ../raphodo/generatenameconfig.py:281
 msgid "Last digit"
 msgstr "Остання цифра"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:280
+#: ../raphodo/generatenameconfig.py:284
 msgid "Last 2 digits"
 msgstr "Останні 2 цифри"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:283
+#: ../raphodo/generatenameconfig.py:287
 msgid "Last 3 digits"
 msgstr "Останні 3 цифри"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:286
+#: ../raphodo/generatenameconfig.py:290
 msgid "Last 4 digits"
 msgstr "Останні 4 цифри"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:289
+#: ../raphodo/generatenameconfig.py:293
 msgid "Original Case"
 msgstr "Початковий регістр"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:292
+#: ../raphodo/generatenameconfig.py:296
 msgid "UPPERCASE"
 msgstr "ВЕРХНІЙ РЕГІСТР"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:295
+#: ../raphodo/generatenameconfig.py:299
 msgid "lowercase"
 msgstr "нижній регістр"
 
-#: ../raphodo/generatenameconfig.py:296
+#: ../raphodo/generatenameconfig.py:300
 msgid "One digit"
 msgstr "Одна цифра"
 
-#: ../raphodo/generatenameconfig.py:297
+#: ../raphodo/generatenameconfig.py:301
 msgid "Two digits"
 msgstr "Дві цифри"
 
-#: ../raphodo/generatenameconfig.py:298
+#: ../raphodo/generatenameconfig.py:302
 msgid "Three digits"
 msgstr "Три цифри"
 
-#: ../raphodo/generatenameconfig.py:299
+#: ../raphodo/generatenameconfig.py:303
 msgid "Four digits"
 msgstr "Чотири цифри"
 
-#: ../raphodo/generatenameconfig.py:300
+#: ../raphodo/generatenameconfig.py:304
 msgid "Five digits"
 msgstr "П’ять цифр"
 
-#: ../raphodo/generatenameconfig.py:301
+#: ../raphodo/generatenameconfig.py:305
 msgid "Six digits"
 msgstr "Шість цифр"
 
-#: ../raphodo/generatenameconfig.py:302
+#: ../raphodo/generatenameconfig.py:306
 msgid "Seven digits"
 msgstr "Сім цифр"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:305
+#: ../raphodo/generatenameconfig.py:309
 msgid "Subseconds"
 msgstr "Підсекунди"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:308 ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:312 ../raphodo/generatenameconfig.py:393
 msgid "YYYYMMDD"
 msgstr "РРРРММДД"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:311 ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:315 ../raphodo/generatenameconfig.py:394
 msgid "YYYY-MM-DD"
 msgstr "РРРР-ММ-ДД"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:314 ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:318 ../raphodo/generatenameconfig.py:395
 msgid "YYYY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:317
+#: ../raphodo/generatenameconfig.py:321
 msgid "YYMMDD"
 msgstr "РРММДД"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:320
+#: ../raphodo/generatenameconfig.py:324
 msgid "YY-MM-DD"
 msgstr "РР-ММ-ДД"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:323
+#: ../raphodo/generatenameconfig.py:327
 msgid "YY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:326
+#: ../raphodo/generatenameconfig.py:330
 msgid "MMDDYYYY"
 msgstr "ММДДРРРР"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:329
+#: ../raphodo/generatenameconfig.py:333
 msgid "MMDDYY"
 msgstr "ММДДРР"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:332
+#: ../raphodo/generatenameconfig.py:336
 msgid "MMDD"
 msgstr "ММДД"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:335
+#: ../raphodo/generatenameconfig.py:339
 msgid "DDMMYYYY"
 msgstr "ДДММГГГГ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:338
+#: ../raphodo/generatenameconfig.py:342
 msgid "DDMMYY"
 msgstr "ДДММРР"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:341 ../raphodo/generatenameconfig.py:389
-#: ../raphodo/generatenameconfig.py:390 ../raphodo/generatenameconfig.py:391
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:345 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:394 ../raphodo/generatenameconfig.py:395
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:397
 msgid "YYYY"
 msgstr "РРРР"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:344
+#: ../raphodo/generatenameconfig.py:348
 msgid "YY"
 msgstr "РР"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:347
+#: ../raphodo/generatenameconfig.py:351
 msgid "MM"
 msgstr "ММ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:350
+#: ../raphodo/generatenameconfig.py:354
 msgid "DD"
 msgstr "ДД"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:353
+#: ../raphodo/generatenameconfig.py:357
 msgid "Month (full)"
 msgstr "Місяць (повністю)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:356
+#: ../raphodo/generatenameconfig.py:360
 msgid "Month (abbreviated)"
 msgstr "Місяць (коротко)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:359
+#: ../raphodo/generatenameconfig.py:363
 msgid "HHMMSS"
 msgstr "ГГХХСС"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:362
+#: ../raphodo/generatenameconfig.py:366
 msgid "HHMM"
 msgstr "ГГХХ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:365
+#: ../raphodo/generatenameconfig.py:369
 msgid "HH-MM-SS"
 msgstr "ГГ-ХХ-СС"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:368
+#: ../raphodo/generatenameconfig.py:372
 msgid "HH-MM"
 msgstr "ГГ-ХХ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:371
+#: ../raphodo/generatenameconfig.py:375
 msgid "HH"
 msgstr "ГГ"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:374
+#: ../raphodo/generatenameconfig.py:378
 msgid "MM (minutes)"
 msgstr "ХХ (хвилин)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:377
+#: ../raphodo/generatenameconfig.py:381
 msgid "SS"
 msgstr "СС"
 
-#: ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:393
 msgid "Date"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:394
 msgid "Date (hyphens)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:395
 msgid "Date (underscores)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:438
-#: ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:442
+#: ../raphodo/generatenameconfig.py:537
 msgid "Date and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392
+#: ../raphodo/generatenameconfig.py:396
 msgid "YYYYMM_Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "Date and Job Code Subfolder"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "YYYYMM"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393 ../raphodo/jobcodepanel.py:198
-#: ../raphodo/nameeditor.py:827 ../raphodo/rapid.py:1809
+#: ../raphodo/generatenameconfig.py:397 ../raphodo/jobcodepanel.py:199
+#: ../raphodo/nameeditor.py:833 ../raphodo/rapid.py:1852
 #: ../raphodo/renamepanel.py:83 ../raphodo/renamepanel.py:241
 msgid "Job Code"
 msgstr "Мітка"
 
-#: ../raphodo/generatenameconfig.py:433 ../raphodo/generatenameconfig.py:512
+#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:532
 msgid "Original Filename"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "Date-Time and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "YYYYMMDD-HHMM-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "Date and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "YYYYMMDD-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "Date-Time and Image number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "YYYYMMDD-1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "Date-Time and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "YYYYMMDD-HHMM-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:442 ../raphodo/generatenameconfig.py:537
 msgid "YYYYMMDD-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "Date-Time and Video number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "YYYYMMDD_1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "Resolution"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "YYYYMMDD-HHMM-1-1920x1080"
 msgstr ""
 
@@ -1503,76 +1901,77 @@ msgstr ""
 msgid "&Remember this choice"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:185
+#: ../raphodo/jobcodepanel.py:186
 msgid ""
 "Select photos and videos to be able to apply a new or existing Job Code to "
 "them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:186
-msgid "The new Job Code will be applied to all selected photos and/or videos."
+#: ../raphodo/jobcodepanel.py:187
+msgid ""
+"The new Job Code will be applied to all selected photos and/or videos."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:187
+#: ../raphodo/jobcodepanel.py:188
 msgid ""
 "Click the Apply button to apply the current Job Code to all selected photos "
 "and/or videos. You can also simply double click the Job Code."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:189
+#: ../raphodo/jobcodepanel.py:190
 msgid ""
 "Removing a Job Code removes it only from the list of saved Job Codes, not "
 "from any photos or videos that it may have been applied to."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:191
+#: ../raphodo/jobcodepanel.py:192
 msgid ""
 "If you want to use Job Codes, configure file renaming or destination "
 "subfolder names to use them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:197
+#: ../raphodo/jobcodepanel.py:198
 msgid "Last Used"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:202
+#: ../raphodo/jobcodepanel.py:203
 msgid "Job Code Sort:"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:205 ../raphodo/rapid.py:2061
+#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2133
 msgid "Ascending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2062
+#: ../raphodo/jobcodepanel.py:207 ../raphodo/rapid.py:2134
 msgid "Descending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:216
+#: ../raphodo/jobcodepanel.py:217
 msgid "&New..."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:220
+#: ../raphodo/jobcodepanel.py:221
 msgid "&Apply"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:224
+#: ../raphodo/jobcodepanel.py:225
 msgid "&Remove"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:228 ../raphodo/preferencedialog.py:125
-#: ../raphodo/preferencedialog.py:154 ../raphodo/preferencedialog.py:433
+#: ../raphodo/jobcodepanel.py:229 ../raphodo/preferencedialog.py:200
+#: ../raphodo/preferencedialog.py:229 ../raphodo/preferencedialog.py:531
 msgid "Remove All"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:427
+#: ../raphodo/jobcodepanel.py:428
 msgid "Do you really want to remove all the Job Codes?"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:429
+#: ../raphodo/jobcodepanel.py:430
 msgid "Remove all Job Codes"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:492
+#: ../raphodo/jobcodepanel.py:493
 msgid "Job Codes"
 msgstr "Мітки"
 
@@ -1583,42 +1982,58 @@ msgstr "Мітки"
 msgid "<i><b>Hint:</b> %(message)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:418 ../raphodo/nameeditor.py:432
+#: ../raphodo/nameeditor.py:423 ../raphodo/nameeditor.py:437
 #, python-format
 msgid "%(description)s - %(elements)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:512
+#: ../raphodo/nameeditor.py:517
 msgid "Save New Custom Preset..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:513
+#: ../raphodo/nameeditor.py:518
 msgid "Remove All Custom Presets..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:559
+#: ../raphodo/nameeditor.py:564
 msgid "(New Custom Preset)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:576
+#: ../raphodo/nameeditor.py:581
 #, python-format
 msgid "%s (edited)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:579 ../raphodo/nameeditor.py:1370
+#: ../raphodo/nameeditor.py:584 ../raphodo/nameeditor.py:1379
 #, python-format
 msgid "Update Custom Preset \"%s\""
 msgstr ""
 
-#: ../raphodo/nameeditor.py:667
+#: ../raphodo/nameeditor.py:672
 msgid "Save New Custom Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:675
+#: ../raphodo/nameeditor.py:680
 msgid "Preset Name:"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:836
+#: ../raphodo/nameeditor.py:799
+msgid "Photo Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:805
+msgid "Video Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:811
+msgid "Photo Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:817
+msgid "Video Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:842
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>There is insufficient data to "
 "fully generate the name. Please use other renaming options.</i>"
@@ -1627,7 +2042,7 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees.
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:846
+#: ../raphodo/nameeditor.py:853
 #, python-format
 msgid "The character</i> %(separator)s <i>creates a new subfolder level."
 msgstr ""
@@ -1635,50 +2050,50 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:851
+#: ../raphodo/nameeditor.py:858
 #, python-format
 msgid ""
 "There is no need start or end with the folder separator </i> "
 "%(separator)s<i>, because it is added automatically."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:859
+#: ../raphodo/nameeditor.py:866
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>Unique filenames may not be "
 "generated. Make filenames unique by using Sequence values.</i>"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:882 ../raphodo/renamepanel.py:121
+#: ../raphodo/nameeditor.py:889 ../raphodo/renamepanel.py:121
 msgid "Preset:"
 msgstr ""
 
 #. Translators: appears in a combobox, e.g. Image Date (YYYY)
-#: ../raphodo/nameeditor.py:959 ../raphodo/nameeditor.py:980
+#: ../raphodo/nameeditor.py:966 ../raphodo/nameeditor.py:987
 #, python-brace-format
 msgid "{choice} ({variant})"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1005 ../raphodo/preferencedialog.py:530
+#: ../raphodo/nameeditor.py:1012 ../raphodo/preferencedialog.py:783
 msgid "Get help online..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1025
+#: ../raphodo/nameeditor.py:1034
 msgid "Insert"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1351
+#: ../raphodo/nameeditor.py:1360
 msgid "Save Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1356
+#: ../raphodo/nameeditor.py:1365
 msgid ""
-"<b>Do you want to save the changes in a new custom preset?</"
-"b><br><br>Creating a custom preset is not required, but can help you keep "
-"organized.<br><br>The changes to the preferences will still be applied "
-"regardless of whether you create a new custom preset or not."
+"<b>Do you want to save the changes in a new custom "
+"preset?</b><br><br>Creating a custom preset is not required, but can help "
+"you keep organized.<br><br>The changes to the preferences will still be "
+"applied regardless of whether you create a new custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1365
+#: ../raphodo/nameeditor.py:1374
 msgid ""
 "<b>Do you want to save the changes in a custom preset?</b><br><br>If you "
 "like, you can create a new custom preset or update the existing custom "
@@ -1686,136 +2101,167 @@ msgid ""
 "regardless of whether you save a custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1372
+#: ../raphodo/nameeditor.py:1381
 msgid "Save New Custom Preset"
 msgstr ""
 
-#: ../raphodo/newversion.py:306
+#: ../raphodo/newversion.py:312
 msgid "Checking for new version..."
 msgstr ""
 
-#: ../raphodo/newversion.py:307
+#: ../raphodo/newversion.py:313
 msgid "You are running the latest version."
 msgstr ""
 
-#: ../raphodo/newversion.py:308
+#: ../raphodo/newversion.py:314
 msgid "Failed to contact the update server."
 msgstr ""
 
-#: ../raphodo/newversion.py:310
+#: ../raphodo/newversion.py:316
 #, python-format
 msgid "A new version of Rapid Photo Downloader (%s) is available."
 msgstr ""
 
-#: ../raphodo/newversion.py:312
+#: ../raphodo/newversion.py:318
 msgid "Do you want to download the new version?"
 msgstr ""
 
-#: ../raphodo/newversion.py:313
+#: ../raphodo/newversion.py:319
 #, python-format
 msgid "Changes in the new release can be viewed <a href=\"%s\">here</a>."
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the s key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:340 ../raphodo/newversion.py:353
+#: ../raphodo/newversion.py:348 ../raphodo/newversion.py:363
 msgid "&Skip this release"
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the o key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:356
+#: ../raphodo/newversion.py:366
 msgid "&Open Download Page"
 msgstr ""
 
-#: ../raphodo/newversion.py:376
+#: ../raphodo/newversion.py:386
 msgid "Rapid Photo Downloader updates"
 msgstr ""
 
 #. Translators: shows how much of a file has been downloaded e.g  123 KB of 1.3 MB
-#: ../raphodo/newversion.py:478
+#: ../raphodo/newversion.py:488
 #, python-format
 msgid "%(downloaded)s of %(total)s"
 msgstr ""
 
-#: ../raphodo/newversion.py:495
+#: ../raphodo/newversion.py:507
 msgid "Downloading..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:76
+#: ../raphodo/preferencedialog.py:86
 msgid "Preferences"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Automation"
 msgstr "Автоматизація"
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Thumbnails"
 msgstr "Мініатюри"
 
-#: ../raphodo/preferencedialog.py:85 ../raphodo/preferencedialog.py:343
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/preferencedialog.py:428
 msgid "Error Handling"
 msgstr "Обробка помилок"
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:109
+msgid "Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:109 ../raphodo/preferencedialog.py:119
 msgid "Miscellaneous"
 msgstr "Інше"
 
-#: ../raphodo/preferencedialog.py:94
+#: ../raphodo/preferencedialog.py:147
 msgid "Device Scanning"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:96
+#: ../raphodo/preferencedialog.py:148
 msgid "Scan only external devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:98
+#: ../raphodo/preferencedialog.py:150
 msgid ""
 "Scan for photos and videos only on devices that are external to the "
 "computer,\n"
 "including cameras, memory cards, external hard drives, and USB flash drives."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:102
-msgid "Scan non-camera devices lacking a DCIM folder"
+#: ../raphodo/preferencedialog.py:153
+msgid "Scan only specific folders on devices"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:155
+msgid ""
+"Scan for photos and videos only in the folders specified below (except "
+"paths\n"
+"specified in Ignored Paths).\n"
+"\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:161
+msgid "Folders to scan:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:164
+msgid ""
+"Folders at the base level of device file systems that will be scanned\n"
+"for photos and videos."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:104
+#: ../raphodo/preferencedialog.py:167 ../raphodo/preferencedialog.py:219
+msgid "Add..."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:169
 msgid ""
-"Scan the entirety of a device for photos and videos, irrespective of whether "
-"it contains a DCIM folder,\n"
-"as opposed to only scanning within a DCIM folder.\n"
+"Add a folder to the list of folders to scan for photos and videos.\n"
 "\n"
-"Changing this setting causes all devices to be scanned again.\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:172 ../raphodo/preferencedialog.py:198
+#: ../raphodo/preferencedialog.py:224 ../raphodo/preferencedialog.py:529
+msgid "Remove"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:174
+msgid ""
+"Remove a folder from the list of folders to scan for photos and videos.\n"
 "\n"
-"Note: With cameras, only the DCIM folder is scanned."
+"Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:116
+#: ../raphodo/preferencedialog.py:191
 msgid "Devices that have been set to automatically ignore or download from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:117
+#: ../raphodo/preferencedialog.py:192
 msgid "Remembered Devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:121
+#: ../raphodo/preferencedialog.py:196
 msgid ""
 "Remove a device from the list of devices to automatically ignore or download "
 "from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:123 ../raphodo/preferencedialog.py:149
-#: ../raphodo/preferencedialog.py:431
-msgid "Remove"
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:127
+#: ../raphodo/preferencedialog.py:202
 msgid ""
 "Clear the list of devices from which to automatically ignore or download "
 "from.\n"
@@ -1823,315 +2269,436 @@ msgid ""
 "Note: Changes take effect when the computer is next scanned for devices."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:140
+#: ../raphodo/preferencedialog.py:215
 msgid "Ignored Paths"
 msgstr "Ігноровані розміщення"
 
-#: ../raphodo/preferencedialog.py:141
+#: ../raphodo/preferencedialog.py:216
 msgid ""
 "The end part of a path that should never be scanned for photos or videos."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:144
-msgid "Add..."
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:146
+#: ../raphodo/preferencedialog.py:221
 msgid ""
 "Add a path to the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:151
+#: ../raphodo/preferencedialog.py:226
 msgid ""
 "Remove a path from the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:156
+#: ../raphodo/preferencedialog.py:231
 msgid ""
 "Clear the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:164
+#: ../raphodo/preferencedialog.py:239
 msgid ""
-"Use python-style <a href=\"http://damonlynch.net/rapid/documentation/"
-"#regularexpressions\">regular expressions</a>"
+"Use python-style <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">regula"
+"r expressions</a>"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:168
+#: ../raphodo/preferencedialog.py:243
 msgid ""
 "Use regular expressions in the list of ignored paths.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:208
+#: ../raphodo/preferencedialog.py:283
 msgid "Program Automation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:209
+#: ../raphodo/preferencedialog.py:284
 msgid "Start downloading at program startup"
 msgstr "Розпочинати завантаження під час запуску програми"
 
-#: ../raphodo/preferencedialog.py:210
+#: ../raphodo/preferencedialog.py:285
 msgid "Start downloading upon device insertion"
 msgstr "Розпочинати завантаження після під’єднання пристрою"
 
-#: ../raphodo/preferencedialog.py:211
+#: ../raphodo/preferencedialog.py:286
 msgid "Unmount (eject) device upon download completion"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:212
+#: ../raphodo/preferencedialog.py:287
 msgid "Exit program when download completes"
 msgstr "Закінчити програму після завантаження"
 
-#: ../raphodo/preferencedialog.py:213
+#: ../raphodo/preferencedialog.py:288
 msgid "Exit program even if download had warnings or errors"
 msgstr "Закінчити програму навіть при помилках завантаження"
 
-#: ../raphodo/preferencedialog.py:240
+#: ../raphodo/preferencedialog.py:315
 msgid "Thumbnail Generation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:241
+#: ../raphodo/preferencedialog.py:316
 msgid "Generate thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:242
+#: ../raphodo/preferencedialog.py:318
 msgid "Generate thumbnails to show in the main program window"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:244
+#: ../raphodo/preferencedialog.py:320
 msgid "Cache thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:245
+#: ../raphodo/preferencedialog.py:323
 msgid ""
 "Save thumbnails shown in the main program window in a thumbnail cache unique "
 "to Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:247
+#: ../raphodo/preferencedialog.py:327
 msgid "Generate system thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:248
+#: ../raphodo/preferencedialog.py:330
 msgid ""
 "While downloading, save thumbnails that can be used by desktop file managers "
 "and other programs"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:255
+#: ../raphodo/preferencedialog.py:339
 msgid "Number of CPU cores used to generate thumbnails."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:256
+#: ../raphodo/preferencedialog.py:340
 msgid "CPU cores:"
 msgstr ""
 
 #. Translators: the * acts as an asterisk to denote a reference to an annotation
 #. such as '* Takes effect upon program restart'
-#: ../raphodo/preferencedialog.py:271 ../raphodo/preferencedialog.py:317
+#: ../raphodo/preferencedialog.py:355 ../raphodo/preferencedialog.py:401
 msgid "*"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:294
+#: ../raphodo/preferencedialog.py:378
 msgid "Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:296
+#: ../raphodo/preferencedialog.py:380
 msgid "Calculating..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:302
+#: ../raphodo/preferencedialog.py:386
 msgid "days"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:303
+#: ../raphodo/preferencedialog.py:387
 msgid "forever"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:308
+#: ../raphodo/preferencedialog.py:392
 msgid "Cache size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:310
+#: ../raphodo/preferencedialog.py:394
 msgid "Number of thumbnails:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:312
+#: ../raphodo/preferencedialog.py:396
 msgid "Database size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:314
+#: ../raphodo/preferencedialog.py:398
 msgid "Cache unaccessed thumbnails for:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:322
+#: ../raphodo/preferencedialog.py:406
 msgid "Purge Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:323
+#: ../raphodo/preferencedialog.py:408
 msgid "Optimize Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:336
+#: ../raphodo/preferencedialog.py:421
 msgid "* Takes effect upon program restart"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:346
+#: ../raphodo/preferencedialog.py:431
 msgid "Skip download"
 msgstr "Пропустити завантаження"
 
-#: ../raphodo/preferencedialog.py:347
+#: ../raphodo/preferencedialog.py:432
 msgid "Don't download the file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:348
+#: ../raphodo/preferencedialog.py:433
 msgid "Add unique identifier"
 msgstr "Додати унікальний ідентифікатор"
 
-#: ../raphodo/preferencedialog.py:349
+#: ../raphodo/preferencedialog.py:436
 msgid ""
 "Add an identifier like _1 or _2 to the end of the filename, immediately "
 "before the file's extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:355
+#: ../raphodo/preferencedialog.py:444
 msgid "Overwrite"
 msgstr "Перезаписати"
 
-#: ../raphodo/preferencedialog.py:356
+#: ../raphodo/preferencedialog.py:445
 msgid "Overwrite the previously backed up file"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:357
+#: ../raphodo/preferencedialog.py:446
 msgid "Skip"
 msgstr "Пропустити"
 
-#: ../raphodo/preferencedialog.py:358
+#: ../raphodo/preferencedialog.py:448
 msgid "Don't overwrite the backup file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:364
+#: ../raphodo/preferencedialog.py:455
 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 identifier:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:378
+#: ../raphodo/preferencedialog.py:464
+msgid ""
+"Using sequence numbers to automatically generate unique filenames is "
+"strongly recommended. Configure file renaming in the Rename panel in the "
+"main window."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:473
 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 ""
 
-#: ../raphodo/preferencedialog.py:398
+#: ../raphodo/preferencedialog.py:494
 msgid "Program Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:399
+#: ../raphodo/preferencedialog.py:495
 msgid "Show a warning when:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:402
+#: ../raphodo/preferencedialog.py:498
 msgid "Downloading files currently not displayed"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:403
+#: ../raphodo/preferencedialog.py:499
 msgid ""
 "Warn when about to download files that are not displayed in the main window."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:405
+#: ../raphodo/preferencedialog.py:501
 msgid "Backup destinations are missing"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:406
-msgid "Warn before starting a download if it is not possible to back up files."
+#: ../raphodo/preferencedialog.py:502
+msgid ""
+"Warn before starting a download if it is not possible to back up files."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:408
+#: ../raphodo/preferencedialog.py:504
 msgid "Program libraries are missing or broken"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:409
+#: ../raphodo/preferencedialog.py:505
 msgid ""
 "Warn if a software library used by Rapid Photo Downloader is missing or not "
 "functioning."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:412
+#: ../raphodo/preferencedialog.py:508
 msgid "Filesystem metadata cannot be set"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:413
+#: ../raphodo/preferencedialog.py:509
 msgid ""
 "Warn if there is an error setting a file's filesystem metadata, such as its "
 "modification time."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:416
+#: ../raphodo/preferencedialog.py:512
 msgid "Encountering unhandled files"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:417
+#: ../raphodo/preferencedialog.py:513
 msgid ""
 "Warn after scanning a device or this computer if there are unrecognized "
 "files that will not be included in the download."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:420
+#: ../raphodo/preferencedialog.py:517
 msgid "Do not warn about unhandled files with extensions:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:424
+#: ../raphodo/preferencedialog.py:522
 msgid ""
 "File extensions are case insensitive and do not need to include the leading "
 "dot."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:427
+#: ../raphodo/preferencedialog.py:525
 msgid "Add"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:428
+#: ../raphodo/preferencedialog.py:526
 msgid ""
 "Add a file extension to the list of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:430
+#: ../raphodo/preferencedialog.py:528
 msgid ""
 "Remove a file extension from the list of unhandled file types to not warn "
 "about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:434
+#: ../raphodo/preferencedialog.py:532
 msgid ""
 "Clear the list of file extensions of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:469
+#: ../raphodo/preferencedialog.py:568
+msgid "Photo and Video Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:571
+msgid "Consolidate files across devices and downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:574
+msgid ""
+"Analyze the results of device scans looking for duplicate files and matching "
+"RAW and JPEG pairs,\n"
+"comparing them across multiple devices and download sessions."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:580
+msgid "Treat matching RAW and JPEG files as:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:581
+msgid "One photo"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:582
+msgid "Two photos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:584
+msgid ""
+"Display matching pairs of RAW and JPEG photos as one photo, and if marked, "
+"download both."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:589
+msgid ""
+"Display matching pairs of RAW and JPEG photos as two different photos. You "
+"can still synchronize their sequence numbers."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:598
+msgid "With matching RAW and JPEG photos:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:600
+msgid "Do not mark JPEG for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:601
+msgid "Do not mark RAW for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:602
+msgid "Mark both for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:609
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"JPEG for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:614
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"RAW for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:619
+msgid ""
+"When matching RAW and JPEG photos are found, automatically mark both for "
+"download."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:625
+msgid ""
+"If you disable file consolidation, choose what to do when a download device "
+"is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:631
+msgid ""
+"When a download device is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:642
+msgid "Clear completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:643
+msgid "Keep displaying completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:644
+msgid "Prompt for what to do"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:649
+msgid ""
+"Automatically clear the display of completed downloads whenever a new "
+"download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:654
+msgid ""
+"Keep displaying completed downloads whenever a new download device is "
+"inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:658
+msgid ""
+"Prompt whether to keep displaying completed downloads or clear them whenever "
+"a new download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:702
 msgid "Version Check"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:470
+#: ../raphodo/preferencedialog.py:703
 msgid "Check for new version at startup"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:471
+#: ../raphodo/preferencedialog.py:705
 msgid "Check for a new version of the program each time the program starts."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:473
+#: ../raphodo/preferencedialog.py:707
 msgid "Include development releases"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:474
+#: ../raphodo/preferencedialog.py:709
 msgid ""
 "Include alpha, beta and other development releases when checking for a new "
 "version of the program.\n"
@@ -2140,11 +2707,11 @@ msgid ""
 "occur."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:489
+#: ../raphodo/preferencedialog.py:725
 msgid "Ignore DNG date/time metadata on MTP devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:490
+#: ../raphodo/preferencedialog.py:727
 msgid ""
 "Ignore date/time metadata in DNG files located on MTP devices, and use the "
 "file's modification time instead.\n"
@@ -2153,72 +2720,88 @@ msgid ""
 "metadata."
 msgstr ""
 
+#: ../raphodo/preferencedialog.py:741
+msgid "Completed Downloads"
+msgstr ""
+
 #. Translators: substituted value is a description for the set of preferences
 #. shown in the preference dialog window, e.g. Devices, Automation, etc.
 #. This string is shown in a tooltip for the "Restore Defaults" button
-#: ../raphodo/preferencedialog.py:710
+#: ../raphodo/preferencedialog.py:1067
 #, python-format
 msgid "Restores default %s preference values"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:832
+#: ../raphodo/preferencedialog.py:1208
 msgid ""
 "Do you want to purge the thumbnail cache? The cache will be purged when the "
 "program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:835
+#: ../raphodo/preferencedialog.py:1212
 msgid "Purge Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:847
+#: ../raphodo/preferencedialog.py:1225
 msgid ""
 "Do you want to optimize the thumbnail cache? The cache will be optimized "
 "when the program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:850
+#: ../raphodo/preferencedialog.py:1229
 msgid "Optimize Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1045
+#: ../raphodo/preferencedialog.py:1481
+msgid "Enter a Folder to Scan"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1482
+msgid "Specify a folder that will be scanned for photos and videos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1483
+msgid "Folder:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1497
 msgid "Enter a Path to Ignore"
 msgstr "Введіть розміщення, яке бажаєте ігнорувати"
 
-#: ../raphodo/preferencedialog.py:1046
+#: ../raphodo/preferencedialog.py:1498
 msgid "Specify a path that will never be scanned for photos or videos"
 msgstr ""
 "Вкажіть  розміщення, яке не буде скануватися на наявність фотографій або "
 "відеофрагментів"
 
-#: ../raphodo/preferencedialog.py:1047
+#: ../raphodo/preferencedialog.py:1499
 msgid "Path:"
 msgstr "Шлях:"
 
-#: ../raphodo/preferencedialog.py:1061
+#: ../raphodo/preferencedialog.py:1513
 msgid "Enter a File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1062
+#: ../raphodo/preferencedialog.py:1514
 msgid "Specify a file extension (without the leading dot)"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1063 ../raphodo/renamepanel.py:122
+#: ../raphodo/preferencedialog.py:1515 ../raphodo/renamepanel.py:122
 msgid "Extension:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1078
+#: ../raphodo/preferencedialog.py:1530
 msgid "Invalid File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1079
+#: ../raphodo/preferencedialog.py:1531
 #, python-format
 msgid ""
 "The file extension <b>%s</b> is recognized by Rapid Photo Downloader, so it "
 "makes no sense to warn about its presence."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1081
+#: ../raphodo/preferencedialog.py:1533
 #, python-format
 msgid ""
 "Recognized file types:\n"
@@ -2244,104 +2827,103 @@ msgstr ""
 msgid "Birthday"
 msgstr ""
 
-#: ../raphodo/preferences.py:614
+#: ../raphodo/preferences.py:624
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "Параметри підтеки не повинні починатись з %s"
 
-#: ../raphodo/preferences.py:617
+#: ../raphodo/preferences.py:627
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "Параметри підтеки не повинні завершуватись %s"
 
-#: ../raphodo/preferences.py:622
+#: ../raphodo/preferences.py:632
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr "Параметри підтеки не повинні містити два %s одне за одним"
 
-#. self.setFlat(True)
 #: ../raphodo/primarybutton.py:72
 msgid "Download 8 Photos and 10 Videos"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:86 ../raphodo/problemnotification.py:208
+#: ../raphodo/problemnotification.py:87 ../raphodo/problemnotification.py:209
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:89
+#: ../raphodo/problemnotification.py:90
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:116
+#: ../raphodo/problemnotification.py:117
 #, python-format
 msgid "GPhoto2 Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:124
+#: ../raphodo/problemnotification.py:125
 msgid ""
 "Unable to initialize the camera, probably because another program is using "
 "it. No files were copied from it."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:134
+#: ../raphodo/problemnotification.py:135
 #, python-format
 msgid "Unable to read directory %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:140
+#: ../raphodo/problemnotification.py:141
 #, python-format
 msgid "Unable to access modification time or size from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:146
+#: ../raphodo/problemnotification.py:147
 #, python-format
 msgid "Unable to read file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:152
+#: ../raphodo/problemnotification.py:153
 #, python-format
 msgid "Unable to write file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:158
+#: ../raphodo/problemnotification.py:159
 #, python-format
 msgid "Unable to move file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:164
+#: ../raphodo/problemnotification.py:165
 #, python-format
 msgid "Unable to remove file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:170
+#: ../raphodo/problemnotification.py:171
 #, python-format
 msgid "Unable to copy file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:176
+#: ../raphodo/problemnotification.py:177
 #, python-format
 msgid "Zero length file %s will not be downloaded"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:182
+#: ../raphodo/problemnotification.py:183
 #, python-format
 msgid "Could not determine filesystem modification time for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:188
+#: ../raphodo/problemnotification.py:189
 #, python-format
 msgid "Unable to load metadata from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:194
+#: ../raphodo/problemnotification.py:195
 #, python-format
 msgid ""
 "Unable to load metadata from %(name)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:202
+#: ../raphodo/problemnotification.py:203
 #, python-format
 msgid ""
 "An error occurred setting a file's filesystem metadata on the filesystem %s. "
@@ -2349,78 +2931,78 @@ msgid ""
 "again."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:216
+#: ../raphodo/problemnotification.py:217
 #, python-format
 msgid "Encountered unhandled file %s. It will not be downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:223
+#: ../raphodo/problemnotification.py:224
 #, python-format
 msgid "%(filetype)s %(destination)s already exists."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:234 ../raphodo/problemnotification.py:262
+#: ../raphodo/problemnotification.py:235 ../raphodo/problemnotification.py:263
 #, python-format
 msgid ""
 "The existing %(filetype)s %(destination)s was last modified on %(date)s at "
 "%(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:245
+#: ../raphodo/problemnotification.py:246
 #, python-format
 msgid "The %(filetype)s %(source)s was not downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:273
+#: ../raphodo/problemnotification.py:274
 #, python-format
 msgid "The %(filetype)s %(source)s was downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:282
+#: ../raphodo/problemnotification.py:283
 #, python-format
 msgid "The unique identifier '%s' was added to the filename."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:298
+#: ../raphodo/problemnotification.py:299
 #, python-format
 msgid ""
 "The existing backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:309
+#: ../raphodo/problemnotification.py:310
 #, python-format
 msgid "The %(filetype)s %(source)s was not backed up from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:326
+#: ../raphodo/problemnotification.py:327
 #, python-format
 msgid ""
 "The previous backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:337
+#: ../raphodo/problemnotification.py:338
 #, python-format
 msgid ""
 "The %(filetype)s %(source)s from %(device)s was backed up, overwriting the "
 "previous backup %(filetype)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:356
+#: ../raphodo/problemnotification.py:357
 #, python-format
 msgid ""
 "When synchronizing RAW + JPEG sequence values, a duplicate %(filetype)s "
 "%(file)s was encountered, and was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:366
+#: ../raphodo/problemnotification.py:367
 msgid ""
 "When synchronizing RAW + JPEG sequence values, photos were detected with the "
 "same filenames, but taken at different times:"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:373
+#: ../raphodo/problemnotification.py:374
 #, python-format
 msgid ""
 "%(image1)s was taken on %(image1_date)s at %(image1_time)s, and %(image2)s "
@@ -2429,134 +3011,134 @@ msgstr ""
 "%(image1)s було створено %(image1_date)s у %(image1_time)s та %(image2)s "
 "створено %(image2_date)s у %(image2_time)s."
 
-#: ../raphodo/problemnotification.py:389
+#: ../raphodo/problemnotification.py:390
 #, python-format
 msgid "Unable to finalize the filename for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:424
+#: ../raphodo/problemnotification.py:425
 #, python-format
 msgid ""
 "The filename %(destination)s was not fully generated for %(filetype)s "
 "%(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:433
+#: ../raphodo/problemnotification.py:434
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr "У метаданих пропущено %(type)s"
 
-#: ../raphodo/problemnotification.py:439
+#: ../raphodo/problemnotification.py:440
 #, python-format
 msgid "The following metadata is missing: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:445
+#: ../raphodo/problemnotification.py:446
 #, python-format
 msgid "Date/time conversion failed: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:451
+#: ../raphodo/problemnotification.py:452
 msgid ""
 "Could not extract valid date/time metadata or determine the file "
 "modification time."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:457
+#: ../raphodo/problemnotification.py:458
 msgid "Filename does not have an extension."
 msgstr "В імені файлу відсутнє розширення"
 
-#: ../raphodo/problemnotification.py:460
+#: ../raphodo/problemnotification.py:461
 msgid "Filename does not have a number component."
 msgstr "В імені файлу відсутній числовий компонент."
 
-#: ../raphodo/problemnotification.py:464
+#: ../raphodo/problemnotification.py:465
 #, python-format
 msgid "Error generating component %(component)s. Error: %(error)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:477
+#: ../raphodo/problemnotification.py:478
 #, python-format
 msgid ""
 "The download subfolders %(folder)s were only partially generated for "
 "%(filetype)s %(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:486
+#: ../raphodo/problemnotification.py:487
 #, python-format
 msgid ""
 "There is no data with which to generate the %(subfolder_file)s for "
 "%(filename)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:499
+#: ../raphodo/problemnotification.py:500
 #, python-format
 msgid ""
 "Unable to create the %(filetype)s %(destination)s in %(folder)s. The "
 "download file was %(source)s in %(device)s. It was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:514
+#: ../raphodo/problemnotification.py:515
 #, python-format
 msgid "Unable to create the download subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:526
+#: ../raphodo/problemnotification.py:527
 #, python-format
 msgid "Unable to create the backup subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:577
+#: ../raphodo/problemnotification.py:578
 #, python-format
 msgid "Problems scanning %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:584
+#: ../raphodo/problemnotification.py:585
 #, python-format
 msgid "Problems copying from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:591
+#: ../raphodo/problemnotification.py:592
 msgid "Problems while finalizing filenames and generating subfolders"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:598
+#: ../raphodo/problemnotification.py:599
 #, python-format
 msgid "Problems backing up to %s"
 msgstr ""
 
-#. Translators: for example Nov 3 or Dec 31
-#. The start and end dates are on a different day
-#. Translators: for example Nov 3 or Dec 31
-#: ../raphodo/proximity.py:105 ../raphodo/proximity.py:221
-#: ../raphodo/proximity.py:224 ../raphodo/proximity.py:828
+#. Translators: for example Nov 3 2015, 11:25 AM
+#. Translators: for example, Nov 3, 12:15 PM
+#: ../raphodo/proximity.py:188 ../raphodo/proximity.py:213
+#: ../raphodo/proximity.py:236 ../raphodo/proximity.py:239
 #, python-format
-msgid "%(month)s %(numeric_day)s"
+msgid "%(date)s, %(time)s"
 msgstr ""
 
-#. Translators: for example Nov 15 2015
-#. Translators: for example Nov 3 2015
-#: ../raphodo/proximity.py:109 ../raphodo/proximity.py:230
-#: ../raphodo/proximity.py:231 ../raphodo/proximity.py:831
+#: ../raphodo/proximity.py:204
 #, python-format
-msgid "%(date)s %(year)s"
+msgid "%(starttime)s - %(endtime)s"
 msgstr ""
 
-#. Translators: for example Nov 3 2015, 11:25 AM
-#. Translators: for example, Nov 3, 12:15 PM
-#: ../raphodo/proximity.py:197 ../raphodo/proximity.py:215
-#: ../raphodo/proximity.py:234 ../raphodo/proximity.py:236
+#. The start and end dates are on a different day
+#. Translators: for example Nov 3 or Dec 31
+#: ../raphodo/proximity.py:221 ../raphodo/proximity.py:225
+#: ../raphodo/proximity.py:980 ../raphodo/timeutils.py:105
 #, python-format
-msgid "%(date)s, %(time)s"
+msgid "%(month)s %(numeric_day)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:209
+#. Translators: for example Nov 3 2015
+#. Translators: for example Nov 2 2015
+#. Translators: for example Nov 15 2015
+#: ../raphodo/proximity.py:232 ../raphodo/proximity.py:233
+#: ../raphodo/proximity.py:985 ../raphodo/timeutils.py:110
 #, python-format
-msgid "%(starttime)s - %(endtime)s"
+msgid "%(date)s %(year)s"
 msgstr ""
 
 #. Translators: for example, Nov 3, 12:15 PM - Nov 4, 1:00 AM
-#: ../raphodo/proximity.py:241
+#: ../raphodo/proximity.py:245
 #, python-format
 msgid "%(earlier_time)s - %(later_time)s"
 msgstr ""
@@ -2565,25 +3147,25 @@ msgstr ""
 #. Nov 3 2012, 12:15 PM -
 #. Nov 4 2012, 1:00 AM
 #. (please keep the line break signified by \n)
-#: ../raphodo/proximity.py:248
+#: ../raphodo/proximity.py:253
 #, python-format
 msgid ""
 "%(earlier_time)s -\n"
 "%(later_time)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:359
+#: ../raphodo/proximity.py:382
 #, python-format
 msgid "%(month)s  %(year)s"
 msgstr ""
 
 #. Translators: for example Nov 2015
-#: ../raphodo/proximity.py:833
+#: ../raphodo/proximity.py:987
 #, python-format
 msgid "%(month)s %(year)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:1344
+#: ../raphodo/proximity.py:1595
 msgid ""
 "The time elapsed between consecutive photos and videos that is used to build "
 "the Timeline"
@@ -2593,47 +3175,47 @@ msgstr ""
 #. Replace the very last character (after the d) with the correct
 #. localized value, keeping everything else. In other words, change
 #. only the m character.
-#: ../raphodo/proximity.py:1406
+#: ../raphodo/proximity.py:1652
 #, python-format
 msgid "%(minutes)dm"
 msgstr ""
 
 #. Translators: i.e. "1.5h", which is short for 1.5 hours.
 #. Replace the entire string with the correct localized value
-#: ../raphodo/proximity.py:1410
+#: ../raphodo/proximity.py:1656
 msgid "1.5h"
 msgstr ""
 
 #. Translators: e.g. "5h", which is short for 5 hours.
 #. Replace the very last character (after the d) with the correct localized value,
 #. keeping everything else. In other words, change only the h character.
-#: ../raphodo/proximity.py:1415
+#: ../raphodo/proximity.py:1661
 #, python-format
 msgid "%(hours)dh"
 msgstr ""
 
-#: ../raphodo/proximity.py:1461
+#: ../raphodo/proximity.py:1710
 msgid ""
 "The Timeline groups photos and videos based on how much time elapsed between "
 "consecutive shots. Use it to identify photos and videos taken at different "
 "periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/proximity.py:1464
+#: ../raphodo/proximity.py:1715
 msgid ""
 "Use the slider (below) to adjust the time elapsed between consecutive shots "
 "that is used to build the Timeline."
 msgstr ""
 
-#: ../raphodo/proximity.py:1466
+#: ../raphodo/proximity.py:1718
 msgid "Timeline build pending..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1467
+#: ../raphodo/proximity.py:1719
 msgid "Timeline is building..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1468
+#: ../raphodo/proximity.py:1721
 msgid ""
 "The Timeline needs to be rebuilt because the file modification time does not "
 "match the time a shot was taken for one or more shots.<br><br>The Timeline "
@@ -2645,61 +3227,61 @@ msgid ""
 "downloading, which is when the metadata is read."
 msgstr ""
 
-#: ../raphodo/rapid.py:485 ../raphodo/rapid.py:2461 ../raphodo/rapid.py:3728
-#: ../raphodo/rapid.py:3846 ../raphodo/rapid.py:3850 ../raphodo/rapid.py:3870
-#: ../raphodo/rapid.py:3874 ../raphodo/rapid.py:3998 ../raphodo/rapid.py:4007
-#: ../raphodo/rapid.py:4495 ../raphodo/rapid.py:4888 ../raphodo/rapid.py:5722
-#: ../raphodo/rememberthisdialog.py:97
+#: ../raphodo/rapid.py:493 ../raphodo/rapid.py:2555 ../raphodo/rapid.py:3934
+#: ../raphodo/rapid.py:4065 ../raphodo/rapid.py:4069 ../raphodo/rapid.py:4092
+#: ../raphodo/rapid.py:4096 ../raphodo/rapid.py:4226 ../raphodo/rapid.py:4237
+#: ../raphodo/rapid.py:4743 ../raphodo/rapid.py:5195 ../raphodo/rapid.py:5997
+#: ../raphodo/rememberthisdialog.py:99
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:3
 msgid "Rapid Photo Downloader"
 msgstr "Rapid Photo Downloader"
 
-#: ../raphodo/rapid.py:1100
+#: ../raphodo/rapid.py:1131
 msgid ""
 "<b>ExifTool has a problem</b><br><br> Rapid Photo Downloader uses ExifTool "
 "to get metadata from videos and photos. The program will run without it, but "
 "installing it is <b>highly</b> recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1110 ../raphodo/rapid.py:1130
+#: ../raphodo/rapid.py:1141 ../raphodo/rapid.py:1161
 msgid "Problem with libmediainfo"
 msgstr ""
 
-#: ../raphodo/rapid.py:1119
+#: ../raphodo/rapid.py:1150
 msgid ""
 "<b>The library libmediainfo appears to be missing</b><br><br> Rapid Photo "
 "Downloader uses libmediainfo to get the date and time a video was shot. The "
 "program will run  without it, but installing it is recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1417
+#: ../raphodo/rapid.py:1448
 msgid "Download failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1419
+#: ../raphodo/rapid.py:1450
 msgid ""
 "Sorry, the download of the new version of Rapid Photo Downloader failed."
 msgstr ""
 
-#: ../raphodo/rapid.py:1425
+#: ../raphodo/rapid.py:1457
 msgid ""
 "The new version was successfully downloaded. Do you want to close Rapid "
 "Photo Downloader and install it now?"
 msgstr ""
 
-#: ../raphodo/rapid.py:1428
+#: ../raphodo/rapid.py:1461
 msgid "Update Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:1432
+#: ../raphodo/rapid.py:1465
 msgid "Install"
 msgstr ""
 
-#: ../raphodo/rapid.py:1450
+#: ../raphodo/rapid.py:1483
 msgid "New version saved"
 msgstr ""
 
-#: ../raphodo/rapid.py:1451
+#: ../raphodo/rapid.py:1485
 #, python-format
 msgid ""
 "The tar file and installer script are saved at:\n"
@@ -2707,163 +3289,163 @@ msgid ""
 " %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:1468
+#: ../raphodo/rapid.py:1502
 msgid "Upgrade failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1469
+#: ../raphodo/rapid.py:1505
 msgid ""
 "Sorry, upgrading Rapid Photo Downloader failed because there was an error "
 "opening the installer."
 msgstr ""
 
-#: ../raphodo/rapid.py:1667 ../raphodo/rapid.py:2331
+#: ../raphodo/rapid.py:1709 ../raphodo/rapid.py:2425
 msgid "Download"
 msgstr "Завантажити"
 
-#: ../raphodo/rapid.py:1671
+#: ../raphodo/rapid.py:1713
 msgid "&Refresh..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1675
+#: ../raphodo/rapid.py:1717
 msgid "&Preferences"
 msgstr ""
 
-#: ../raphodo/rapid.py:1679
+#: ../raphodo/rapid.py:1721
 msgid "&Quit"
 msgstr ""
 
-#: ../raphodo/rapid.py:1683
+#: ../raphodo/rapid.py:1725
 msgid "Error &Reports"
 msgstr ""
 
-#: ../raphodo/rapid.py:1687
+#: ../raphodo/rapid.py:1729
 msgid "Clear Completed Downloads"
 msgstr ""
 
-#: ../raphodo/rapid.py:1691
+#: ../raphodo/rapid.py:1733
 msgid "Get Help Online..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1695
+#: ../raphodo/rapid.py:1737
 msgid "&Tip of the Day..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1699
+#: ../raphodo/rapid.py:1741
 msgid "Report a Problem..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1703
+#: ../raphodo/rapid.py:1745
 msgid "Make a Donation..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1707
+#: ../raphodo/rapid.py:1749
 msgid "Translate this Application..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1711
+#: ../raphodo/rapid.py:1753
 msgid "&About..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1715
+#: ../raphodo/rapid.py:1757
 msgid "Check for Updates..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1797
+#: ../raphodo/rapid.py:1840
 msgid "Timeline"
 msgstr ""
 
-#: ../raphodo/rapid.py:1807
+#: ../raphodo/rapid.py:1850
 msgid "Destination"
 msgstr ""
 
-#: ../raphodo/rapid.py:1808
+#: ../raphodo/rapid.py:1851
 msgid "Rename"
 msgstr ""
 
-#: ../raphodo/rapid.py:1810
+#: ../raphodo/rapid.py:1853
 msgid "Back Up"
 msgstr ""
 
 #. Devices Header and View
-#: ../raphodo/rapid.py:1926
+#: ../raphodo/rapid.py:1977
 msgid ""
 "Turn on or off the use of devices attached to this computer as download "
 "sources"
 msgstr ""
 
 #. This Computer Header and View
-#: ../raphodo/rapid.py:1940
+#: ../raphodo/rapid.py:1994
 msgid ""
 "Turn on or off the use of a folder on this computer as a download source"
 msgstr ""
 
-#: ../raphodo/rapid.py:1941
+#: ../raphodo/rapid.py:1996
 msgid "This Computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:1952
+#: ../raphodo/rapid.py:2009
 msgid "Select a source folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:1975
+#: ../raphodo/rapid.py:2038
 msgid "Projected Storage Use"
 msgstr ""
 
-#: ../raphodo/rapid.py:1989 ../raphodo/rapid.py:1997
+#: ../raphodo/rapid.py:2056 ../raphodo/rapid.py:2068
 msgid "Select a destination folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:2045
+#: ../raphodo/rapid.py:2117
 msgid "All"
 msgstr ""
 
-#: ../raphodo/rapid.py:2046
+#: ../raphodo/rapid.py:2118
 msgid "New"
 msgstr ""
 
-#: ../raphodo/rapid.py:2048
+#: ../raphodo/rapid.py:2120
 msgid "Show:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2051
+#: ../raphodo/rapid.py:2123
 msgid "Modification Time"
 msgstr ""
 
-#: ../raphodo/rapid.py:2052
+#: ../raphodo/rapid.py:2124
 msgid "Checked State"
 msgstr ""
 
-#: ../raphodo/rapid.py:2055
+#: ../raphodo/rapid.py:2127
 msgid "File Type"
 msgstr ""
 
-#: ../raphodo/rapid.py:2056
+#: ../raphodo/rapid.py:2128
 msgid "Device"
 msgstr "Пристрій"
 
-#: ../raphodo/rapid.py:2058
+#: ../raphodo/rapid.py:2130
 msgid "Sort:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2069
+#: ../raphodo/rapid.py:2141
 msgid "Select All:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2311
+#: ../raphodo/rapid.py:2405
 #, python-format
 msgid "Download %(files)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2327
+#: ../raphodo/rapid.py:2421
 msgid "Resume Download"
 msgstr ""
 
-#: ../raphodo/rapid.py:2329
+#: ../raphodo/rapid.py:2423
 msgid "Pause"
 msgstr "Призупинити"
 
-#: ../raphodo/rapid.py:2417
+#: ../raphodo/rapid.py:2511
 #, python-brace-format
 msgid ""
 "Please report the problem at <a href=\"{website}\">{website}</a>.<br><br>\n"
@@ -2872,11 +3454,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/rapid.py:2431
+#: ../raphodo/rapid.py:2525
 msgid "Thank you for reporting a problem in Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:2529
+#: ../raphodo/rapid.py:2624
 #, python-format
 msgid ""
 "<b>Changing This Computer source path</b><br><br>Do you really want to "
@@ -2885,30 +3467,29 @@ msgid ""
 "from This Computer will be cancelled."
 msgstr ""
 
-#: ../raphodo/rapid.py:2595
+#: ../raphodo/rapid.py:2694
 msgid "You cannot change the download destination while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:2604
+#: ../raphodo/rapid.py:2704
 #, python-format
 msgid ""
 "<b>Confirm Download Destination</b><br><br>Are you sure you want to set the "
 "%(file_type)s download destination to %(path)s?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2682
+#: ../raphodo/rapid.py:2785
 msgid ""
+"\n"
 "<b>Downloading all files</b><br><br>\n"
-"                    A download always includes all files that are checked "
-"for download,\n"
-"                    including those that are not currently displayed because "
-"the Timeline\n"
-"                    is being used or because only new files are being shown."
-"<br><br>\n"
-"                    Do you want to proceed with the download?"
+"A download always includes all files that are checked for download,\n"
+"including those that are not currently displayed because the Timeline\n"
+"is being used or because only new files are being shown.<br><br>\n"
+"Do you want to proceed with the download?\n"
+"                        "
 msgstr ""
 
-#: ../raphodo/rapid.py:2820
+#: ../raphodo/rapid.py:2937
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -2919,7 +3500,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: ../raphodo/rapid.py:2824
+#: ../raphodo/rapid.py:2940
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -2928,199 +3509,193 @@ msgstr ""
 "Ці каталоги завантаження є некоректними:\n"
 "%s"
 
-#: ../raphodo/rapid.py:2827
+#: ../raphodo/rapid.py:2943
 msgid "Download Failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:2828
+#: ../raphodo/rapid.py:2944
 msgid "The download cannot proceed."
 msgstr ""
 
-#: ../raphodo/rapid.py:2842
+#: ../raphodo/rapid.py:2962
 msgid ""
 "Photos and videos will not be backed up because there is nowhere to back "
 "them up. Do you still want to start the download?"
 msgstr ""
 
-#. Translators: filetype will be replaced with 'photos' or 'videos'
-#: ../raphodo/rapid.py:2847 ../raphodo/rapid.py:2854
+#: ../raphodo/rapid.py:2969 ../raphodo/rapid.py:2979
 #, python-format
 msgid ""
 "No backup device exists for backing up %(filetype)s. Do you still want to "
 "start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2848 ../raphodo/rpdfile.py:228
+#: ../raphodo/rapid.py:2971 ../raphodo/rpdfile.py:228
 msgid "photos"
 msgstr "фото"
 
-#: ../raphodo/rapid.py:2855 ../raphodo/rpdfile.py:223
+#: ../raphodo/rapid.py:2981 ../raphodo/rpdfile.py:223
 msgid "videos"
 msgstr "відео"
 
-#: ../raphodo/rapid.py:2861
+#: ../raphodo/rapid.py:2989
 msgid ""
 "<b>The photo and video backup destinations do not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2869 ../raphodo/rapid.py:2876
+#: ../raphodo/rapid.py:2999 ../raphodo/rapid.py:3008
 #, python-format
 msgid ""
 "<b>The %(filetype)s backup destination does not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2871 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:818
+#: ../raphodo/rapid.py:3001 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:843
 msgid "photo"
 msgstr "фото"
 
-#: ../raphodo/rapid.py:2878 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:858
+#: ../raphodo/rapid.py:3010 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:883
 msgid "video"
 msgstr "відео"
 
-#: ../raphodo/rapid.py:2886
+#: ../raphodo/rapid.py:3018
 msgid "Backup problem"
 msgstr ""
 
-#. Translators - in the middle is a unicode em dash - please retain it
-#. This string is displayed in the status bar when the download is running
-#: ../raphodo/rapid.py:3571
+#: ../raphodo/rapid.py:3756
 #, python-format
 msgid "%(downloading_from)s — %(time_left)s left (%(speed)s)"
 msgstr ""
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3640
+#: ../raphodo/rapid.py:3828
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "Завантажено %(noFiles)s %(filetypes)s"
 
-#. Translators: e.g. 2 videos failed to download
-#: ../raphodo/rapid.py:3645
+#: ../raphodo/rapid.py:3836
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "%(noFiles)s %(filetypes)s не вдалось завантажити"
 
-#: ../raphodo/rapid.py:3650 ../raphodo/rapid.py:3723
+#: ../raphodo/rapid.py:3842 ../raphodo/rapid.py:3927
 msgid "warnings"
 msgstr "застереження"
 
-#: ../raphodo/rapid.py:3679
+#: ../raphodo/rapid.py:3873
 msgid "All downloads complete"
 msgstr "Всі завантаження завершені"
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3686 ../raphodo/rapid.py:3695 ../raphodo/rapid.py:3704
-#: ../raphodo/rapid.py:3713 ../raphodo/rapid.py:3721
+#: ../raphodo/rapid.py:3881 ../raphodo/rapid.py:3892 ../raphodo/rapid.py:3903
+#: ../raphodo/rapid.py:3914 ../raphodo/rapid.py:3924
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: ../raphodo/rapid.py:3688 ../raphodo/rapid.py:3706
+#: ../raphodo/rapid.py:3884 ../raphodo/rapid.py:3906
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s завантажено"
 
-#: ../raphodo/rapid.py:3697 ../raphodo/rapid.py:3715
+#: ../raphodo/rapid.py:3895 ../raphodo/rapid.py:3917
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "%(filetype)s не вдалось завантажити"
 
-#: ../raphodo/rapid.py:3742
+#: ../raphodo/rapid.py:3950
 msgid "1 failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:3744
+#: ../raphodo/rapid.py:3952
 #, python-format
 msgid "%d failures"
 msgstr ""
 
-#: ../raphodo/rapid.py:3749
+#: ../raphodo/rapid.py:3957
 msgid "1 warning"
 msgstr ""
 
-#: ../raphodo/rapid.py:3751
+#: ../raphodo/rapid.py:3959
 #, python-format
 msgid "%d warnings"
 msgstr ""
 
-#: ../raphodo/rapid.py:3771
+#: ../raphodo/rapid.py:3981
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3774
+#: ../raphodo/rapid.py:3985
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3779
+#: ../raphodo/rapid.py:3989
 #, python-format
 msgid "No files downloaded — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3781
+#: ../raphodo/rapid.py:3991
 msgid "No files downloaded"
 msgstr ""
 
-#: ../raphodo/rapid.py:3805
+#: ../raphodo/rapid.py:4021
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3809
+#: ../raphodo/rapid.py:4026
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3812
+#: ../raphodo/rapid.py:4031
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3820
+#: ../raphodo/rapid.py:4039
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3833
+#: ../raphodo/rapid.py:4052
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3837
+#: ../raphodo/rapid.py:4056
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3841
+#: ../raphodo/rapid.py:4060
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices"
 msgstr ""
 
-#: ../raphodo/rapid.py:3867
+#: ../raphodo/rapid.py:4087
 msgid "The Destination subfolders and Timeline have been rebuilt"
 msgstr ""
 
-#: ../raphodo/rapid.py:3922
+#: ../raphodo/rapid.py:4144
 msgid "Program preferences are invalid"
 msgstr "Налаштування програми є хибними"
 
-#: ../raphodo/rapid.py:3999
+#: ../raphodo/rapid.py:4228
 #, python-format
 msgid ""
 "<b>All files on the %(camera)s are inaccessible</b>.<br><br>It may be locked "
@@ -3130,179 +3705,205 @@ msgid ""
 "ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4008
+#: ../raphodo/rapid.py:4239
 #, python-format
 msgid ""
-"<b>The %(camera)s appears to be in use by another application.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again.<br><br>Alternatively, you can ignore this "
-"device."
+"<b>The %(camera)s appears to be in use by another "
+"application.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again.<br><br>Alternatively, you "
+"can ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4019
+#: ../raphodo/rapid.py:4250
 msgid "&Try Again"
 msgstr ""
 
-#: ../raphodo/rapid.py:4020
+#: ../raphodo/rapid.py:4251
 msgid "&Ignore This Device"
 msgstr ""
 
-#: ../raphodo/rapid.py:4086
+#: ../raphodo/rapid.py:4323
 #, python-format
 msgid "Sorry, an unexpected problem occurred while scanning %s."
 msgstr ""
 
-#: ../raphodo/rapid.py:4087
+#: ../raphodo/rapid.py:4324
 msgid "Unfortunately you cannot download from this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4091
+#: ../raphodo/rapid.py:4328
 msgid ""
 "A possible workaround for the problem might be downloading from the camera's "
 "memory card using a card reader."
 msgstr ""
 
-#: ../raphodo/rapid.py:4096
+#: ../raphodo/rapid.py:4333
 msgid "Device scan failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:4472
+#: ../raphodo/rapid.py:4720
 #, python-format
 msgid ""
-"<b>The %(camera)s cannot be scanned because it cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again."
+"<b>The %(camera)s cannot be scanned because it cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again."
 msgstr ""
 
-#: ../raphodo/rapid.py:4496
+#: ../raphodo/rapid.py:4745
 #, python-format
 msgid ""
-"<b>The download cannot start because the %(camera)s cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again, and choose which files you want to "
-"download from it."
+"<b>The download cannot start because the %(camera)s cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again, and choose which files "
+"you want to download from it."
+msgstr ""
+
+#: ../raphodo/rapid.py:4842
+msgid "Completed Downloads Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4844
+#, python-format
+msgid "%s whose download have completed are displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4846
+msgid "Do you want to clear the completed downloads?"
 msgstr ""
 
-#: ../raphodo/rapid.py:4635
+#: ../raphodo/rapid.py:4848
+msgid "Completed Download Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4850
+#, python-format
+msgid "%s whose download has completed is displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4852
+msgid "Do you want to clear the completed download?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4933
 #, python-format
 msgid ""
 "Do you want to download photos and videos from the device <i>%(device)s</i>?"
 msgstr ""
 
-#: ../raphodo/rapid.py:4877
+#: ../raphodo/rapid.py:5183
 #, python-format
 msgid "<b>Do you want to ignore the %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4879
+#: ../raphodo/rapid.py:5186
 msgid ""
 "All cameras, phones and tablets with the same model name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:4883
+#: ../raphodo/rapid.py:5190
 #, python-format
 msgid ""
 "<b>Do you want to ignore the device %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4885
+#: ../raphodo/rapid.py:5192
 msgid "Any device with the same name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:5178
+#: ../raphodo/rapid.py:5492
 #, python-format
 msgid "Downloading from %(location)s on This Computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5180
+#: ../raphodo/rapid.py:5496
 msgid ""
 "Do you really want to download from here?<br><br>On some systems, scanning "
 "this location can take a very long time."
 msgstr ""
 
-#: ../raphodo/rapid.py:5224
+#: ../raphodo/rapid.py:5537
 #, python-format
 msgid "Generating thumbnails for %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5227
+#: ../raphodo/rapid.py:5540
 #, python-format
 msgid "Scanning %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5237
+#: ../raphodo/rapid.py:5551
 #, python-format
 msgid ""
 "%(number)s of %(available files)s checked for download (%(hidden)s hidden)"
 msgstr ""
 
-#: ../raphodo/rapid.py:5243
+#: ../raphodo/rapid.py:5559
 #, python-format
 msgid "%(number)s of %(available files)s checked for download"
 msgstr ""
 
-#: ../raphodo/rapid.py:5494
+#: ../raphodo/rapid.py:5764
 msgid "Display program information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5496
+#: ../raphodo/rapid.py:5766
 msgid "Display debugging information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5499
+#: ../raphodo/rapid.py:5769
 msgid "List photo and video file extensions the program recognizes and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5502
+#: ../raphodo/rapid.py:5772
 msgid "Turn on or off the the renaming of photos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5504
+#: ../raphodo/rapid.py:5774
 msgid "turn on or off the the renaming of videos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5506
+#: ../raphodo/rapid.py:5776
 msgid ""
 "Turn on or off the automatic detection of devices from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5510
+#: ../raphodo/rapid.py:5780
 msgid "Turn on or off downloading from this computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5512 ../raphodo/rapid.py:5515 ../raphodo/rapid.py:5518
-#: ../raphodo/rapid.py:5539 ../raphodo/rapid.py:5543
+#: ../raphodo/rapid.py:5782 ../raphodo/rapid.py:5785 ../raphodo/rapid.py:5788
+#: ../raphodo/rapid.py:5809 ../raphodo/rapid.py:5813
 msgid "PATH"
 msgstr ""
 
-#: ../raphodo/rapid.py:5513
+#: ../raphodo/rapid.py:5783
 msgid "The PATH on this computer from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5516
+#: ../raphodo/rapid.py:5786
 msgid "The PATH where photos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5519
+#: ../raphodo/rapid.py:5789
 msgid "The PATH where videos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5521
+#: ../raphodo/rapid.py:5791
 msgid "Turn on or off the backing up of photos and videos while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:5525
+#: ../raphodo/rapid.py:5795
 msgid "Turn on or off the automatic detection of backup devices."
 msgstr ""
 
-#: ../raphodo/rapid.py:5527 ../raphodo/rapid.py:5533
+#: ../raphodo/rapid.py:5797 ../raphodo/rapid.py:5803
 msgid "FOLDER"
 msgstr ""
 
-#: ../raphodo/rapid.py:5528
+#: ../raphodo/rapid.py:5798
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected photo "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3310,7 +3911,7 @@ msgid ""
 "photos up to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5534
+#: ../raphodo/rapid.py:5804
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected video "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3318,115 +3919,124 @@ msgid ""
 "up videos to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5540
+#: ../raphodo/rapid.py:5810
 msgid ""
 "The PATH where photos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5544
+#: ../raphodo/rapid.py:5814
 msgid ""
 "The PATH where videos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5547
+#: ../raphodo/rapid.py:5817
 #, python-format
 msgid "Ignore photos with the following extensions: %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5551
-msgid "Turn on or off starting downloads as soon as the program itself starts."
+#: ../raphodo/rapid.py:5821
+msgid ""
+"Turn on or off starting downloads as soon as the program itself starts."
 msgstr ""
 
-#: ../raphodo/rapid.py:5554
+#: ../raphodo/rapid.py:5824
 msgid "Turn on or off starting downloads as soon as a device is inserted."
 msgstr ""
 
-#: ../raphodo/rapid.py:5557
+#: ../raphodo/rapid.py:5827
 msgid ""
 "Turn on or off use of the Rapid Photo Downloader Thumbnail Cache. Turning it "
 "off does not delete existing cache contents."
 msgstr ""
 
-#: ../raphodo/rapid.py:5561
+#: ../raphodo/rapid.py:5831
 msgid ""
 "Delete all thumbnails in the Rapid Photo Downloader Thumbnail Cache, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5565
+#: ../raphodo/rapid.py:5835
 msgid "Forget which files have been previously downloaded, and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5568
+#: ../raphodo/rapid.py:5838
 msgid ""
 "Import preferences from an old program version and exit. Requires the "
 "command line program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5571
+#: ../raphodo/rapid.py:5841
 msgid ""
 "Reset all program settings to their default values, delete all thumbnails in "
 "the Thumbnail cache, forget which files have been previously downloaded, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5575
+#: ../raphodo/rapid.py:5845
 msgid "Include gphoto2 debugging information in log files."
 msgstr ""
 
-#: ../raphodo/rapid.py:5579
+#: ../raphodo/rapid.py:5849
 msgid "Print information to the terminal about attached cameras and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5640
+#: ../raphodo/rapid.py:5911
 msgid ""
 "To import preferences from the old version of Rapid Photo Downloader, you "
 "must install the program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5649
+#: ../raphodo/rapid.py:5920
 msgid "No prior program preferences detected: exiting"
 msgstr ""
 
-#: ../raphodo/rapid.py:5652
+#: ../raphodo/rapid.py:5923
 #, python-format
 msgid "Importing preferences from Rapid Photo Downloader %(version)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5714
+#: ../raphodo/rapid.py:5989
 #, python-format
-msgid "Do you want to copy the stored sequence number, which has the value %d?"
+msgid ""
+"Do you want to copy the stored sequence number, which has the value %d?"
 msgstr ""
 
-#: ../raphodo/rapid.py:5726
+#: ../raphodo/rapid.py:6000
 msgid "Program aborting."
 msgstr ""
 
-#: ../raphodo/rapid.py:5736
+#: ../raphodo/rapid.py:6010
 msgid "Never run this program as the sudo / root user."
 msgstr ""
 
-#: ../raphodo/rapid.py:5740
+#: ../raphodo/rapid.py:6014
 msgid "You must install ExifTool to run Rapid Photo Downloader."
 msgstr ""
 
-#: ../raphodo/rapid.py:5794
+#: ../raphodo/rapid.py:6026
+msgid ""
+"Rapid Photo Downloader is installed in multiple locations.\n"
+"\n"
+"Uninstall all copies except the version you want to run."
+msgstr ""
+
+#: ../raphodo/rapid.py:6083
 msgid ""
 "When specifying a path on the command line, do not also specify an\n"
 "option for device auto detection or a path on \"This Computer\"."
 msgstr ""
 
-#: ../raphodo/rapid.py:5950
+#: ../raphodo/rapid.py:6243
 msgid "All settings and caches have been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5958
+#: ../raphodo/rapid.py:6251
 msgid "Thumbnail Cache has been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5964
+#: ../raphodo/rapid.py:6257
 msgid "Remembered files have been forgotten"
 msgstr ""
 
@@ -3442,15 +4052,15 @@ msgstr ""
 msgid "&Don't warn me again about missing or broken program libraries"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:546
+#: ../raphodo/renameandmovefile.py:554
 msgid "subfolder and filename"
 msgstr "підтека та назва файлу"
 
-#: ../raphodo/renameandmovefile.py:548
+#: ../raphodo/renameandmovefile.py:556
 msgid "filename"
 msgstr "назва файлу"
 
-#: ../raphodo/renameandmovefile.py:550
+#: ../raphodo/renameandmovefile.py:558
 msgid "subfolder"
 msgstr "підтека"
 
@@ -3530,160 +4140,237 @@ msgstr "фото та відео"
 msgid "photos or videos"
 msgstr "фото або відео"
 
-#: ../raphodo/rpdfile.py:306
+#: ../raphodo/rpdfile.py:315
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: ../raphodo/rpdfile.py:318
+#. translators: natural language expression signifying a single video
+#: ../raphodo/rpdfile.py:337
+msgid "a video"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:339
 msgid "1 Video"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:323
+#. translators: natural language expression signifying a single photo
+#: ../raphodo/rpdfile.py:346
+msgid "a photo"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:348
 msgid "1 Photo"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:803
+#: ../raphodo/rpdfile.py:828
 #, python-format
 msgid "%(path)s on %(camera)s"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:819
+#: ../raphodo/rpdfile.py:844
 msgid "Photo"
 msgstr "Фото"
 
-#: ../raphodo/rpdfile.py:859
+#: ../raphodo/rpdfile.py:884
 msgid "Video"
 msgstr "Відео"
 
-#: ../raphodo/storage.py:138
+#: ../raphodo/storage.py:141
 msgid "File system root"
 msgstr ""
 
 #. translators: the name of the Pictures folder
-#: ../raphodo/storage.py:433
+#: ../raphodo/storage.py:437
 msgid "Pictures"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:426
+#: ../raphodo/thumbnaildisplay.py:432
 #, python-format
 msgid "Taken on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:431
+#: ../raphodo/thumbnaildisplay.py:439
 #, python-format
 msgid "Modified on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:437 ../raphodo/thumbnaildisplay.py:466
+#: ../raphodo/thumbnaildisplay.py:447 ../raphodo/thumbnaildisplay.py:481
 #, python-format
 msgid "%(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:451
+#: ../raphodo/thumbnaildisplay.py:464
 #, python-format
 msgid "Memory cards: %s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:457
+#: ../raphodo/thumbnaildisplay.py:468
+#, python-format
+msgid "Memory card: %s"
+msgstr ""
+
+#: ../raphodo/thumbnaildisplay.py:473
 msgid "Downloaded as:"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:472
+#: ../raphodo/thumbnaildisplay.py:489
 #, python-format
 msgid "<br><br>Previous download:<br>%(filename)s<br>%(path)s<br>%(date)s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:1603
+#: ../raphodo/thumbnaildisplay.py:1645
 msgid "Copy Path"
 msgstr ""
 
+#. Translators: these values are file size suffixes like B representing bytes, KB representing
+#. kilobytes, etc.
+#: ../raphodo/utilities.py:170
+msgid "B"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "KB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "MB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "GB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "TB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "PB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "EB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "ZB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "YB"
+msgstr ""
+
 #. two things in a list e.g. "device1 and device2"
-#: ../raphodo/utilities.py:391
+#: ../raphodo/utilities.py:394
 #, python-format
 msgid "%(first_item)s and %(last_item)s"
 msgstr ""
 
-#: ../raphodo/utilities.py:464
+#: ../raphodo/utilities.py:468
 msgid "one"
 msgstr ""
 
-#: ../raphodo/utilities.py:465
+#: ../raphodo/utilities.py:469
 msgid "two"
 msgstr ""
 
-#: ../raphodo/utilities.py:466
+#: ../raphodo/utilities.py:470
 msgid "three"
 msgstr ""
 
-#: ../raphodo/utilities.py:467
+#: ../raphodo/utilities.py:471
 msgid "four"
 msgstr ""
 
-#: ../raphodo/utilities.py:468
+#: ../raphodo/utilities.py:472
 msgid "five"
 msgstr ""
 
-#: ../raphodo/utilities.py:469
+#: ../raphodo/utilities.py:473
 msgid "six"
 msgstr ""
 
-#: ../raphodo/utilities.py:470
+#: ../raphodo/utilities.py:474
 msgid "seven"
 msgstr ""
 
-#: ../raphodo/utilities.py:471
+#: ../raphodo/utilities.py:475
 msgid "eight"
 msgstr ""
 
-#: ../raphodo/utilities.py:472
+#: ../raphodo/utilities.py:476
 msgid "nine"
 msgstr ""
 
-#: ../raphodo/utilities.py:473
+#: ../raphodo/utilities.py:477
 msgid "ten"
 msgstr ""
 
-#: ../raphodo/utilities.py:474
+#: ../raphodo/utilities.py:478
 msgid "eleven"
 msgstr ""
 
-#: ../raphodo/utilities.py:475
+#: ../raphodo/utilities.py:479
 msgid "twelve"
 msgstr ""
 
-#: ../raphodo/utilities.py:476
+#: ../raphodo/utilities.py:480
 msgid "thirteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:477
+#: ../raphodo/utilities.py:481
 msgid "fourteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:478
+#: ../raphodo/utilities.py:482
 msgid "fifteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:479
+#: ../raphodo/utilities.py:483
 msgid "sixteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:480
+#: ../raphodo/utilities.py:484
 msgid "seventeen"
 msgstr ""
 
-#: ../raphodo/utilities.py:481
+#: ../raphodo/utilities.py:485
 msgid "eighteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:482
+#: ../raphodo/utilities.py:486
 msgid "ninenteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:483
+#: ../raphodo/utilities.py:487
 msgid "twenty"
 msgstr ""
 
+#: ../raphodo/viewutils.py:240
+msgid "&OK"
+msgstr ""
+
+#: ../raphodo/viewutils.py:243
+msgid "&Save"
+msgstr ""
+
+#: ../raphodo/viewutils.py:244
+msgid "&Help"
+msgstr ""
+
+#: ../raphodo/viewutils.py:245
+msgid "Restore Defaults"
+msgstr ""
+
+#: ../raphodo/viewutils.py:246
+msgid "&Yes"
+msgstr ""
+
+#: ../raphodo/viewutils.py:247
+msgid "&No"
+msgstr ""
+
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:1
 msgid ""
 "Rapid Photo Downloader imports photos and videos from cameras, phones, "
@@ -3737,8 +4424,8 @@ msgstr ""
 #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:5
 msgid ""
-"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;"
-"memory;card;"
+"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;memory"
+";card;"
 msgstr ""
 
 #: ../data/kde/net.damonlynch.rapid-photo-downloader.desktop.in.h:1
@@ -3814,6 +4501,7 @@ msgstr ""
 #~ msgid "Select a folder to download videos to"
 #~ msgstr "Виберіть теку для завантаження відео"
 
+#, python-format
 #~ msgid "Select a folder containing %(file_types)s"
 #~ msgstr "Виберіть теку, що містить %(file_types)s"
 
@@ -3831,9 +4519,11 @@ msgstr ""
 #~ "<i><b>Увага:</b> Недостатньо метаданих для повного створення підтек. "
 #~ "Використовуйте інші варіанти найменування підтек.</i>"
 
+#, python-format
 #~ msgid "<i>Example: %s</i>"
 #~ msgstr "<i>Приклад: %s</i>"
 
+#, python-format
 #~ msgid ""
 #~ "The %(filetype)s subfolder preferences entered are invalid and cannot be "
 #~ "used.\n"
@@ -3855,6 +4545,7 @@ msgstr ""
 #~ msgid "Download cannot proceed"
 #~ msgstr "Неможливо продовжити завантаження"
 
+#, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
 #~ "Destination: %(destination)s"
@@ -3862,15 +4553,18 @@ msgstr ""
 #~ "Джерело: %(source)s\n"
 #~ "Адресат: %(destination)s"
 
+#, python-format
 #~ msgid "Source: %(source)s"
 #~ msgstr "Джерело: %(source)s"
 
 #~ msgid "Backing up error"
 #~ msgstr "Помилка резервного копіювання"
 
+#, python-format
 #~ msgid "Destination directory could not be created: %(directory)s\n"
 #~ msgstr "Не вдалось створити теку адресата: %(directory)s\n"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s"
 #~ msgstr "%(number)s з %(total)s %(filetypes)s"
 
@@ -3886,8 +4580,8 @@ msgstr ""
 #~ msgid ""
 #~ "Should this device or partition be used to download photos or videos from?"
 #~ msgstr ""
-#~ "Чи використовувати цей пристрій або розділ для вивантаження з нього фото "
-#~ "та відео?"
+#~ "Чи використовувати цей пристрій або розділ для вивантаження з нього фото та "
+#~ "відео?"
 
 #~ msgid "_Remember this choice"
 #~ msgstr "_Пам’ятати цей вибір"
@@ -3913,6 +4607,7 @@ msgstr ""
 #~ msgid "Using backup device"
 #~ msgstr "Використання пристрою для резервного копіювання"
 
+#, python-format
 #~ msgid "Backing up to %(path)s"
 #~ msgstr "Резервне копіювання до %(path)s"
 
@@ -3922,29 +4617,30 @@ msgstr ""
 #~ msgid "About 1 second remaining"
 #~ msgstr "Залишилось біля 1 секунди"
 
+#, python-format
 #~ msgid "About %i seconds remaining"
 #~ msgstr "Залишилось біля %i секунд"
 
 #~ msgid "About 1 minute remaining"
 #~ msgstr "Залишилось біля 1 хвилини"
 
+#, python-format
 #~ msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 #~ msgstr "Залишилось біля %(minutes)i:%(seconds)02i"
 
+#, python-format
 #~ msgid ""
 #~ "display program information on the command line as the program runs "
 #~ "(default: %default)"
 #~ msgstr ""
-#~ "показати дані програми в командному рядку під час запуску (типово: "
-#~ "%default)"
+#~ "показати дані програми в командному рядку під час запуску (типово: %default)"
 
 #~ msgid "only output errors to the command line"
 #~ msgstr "виводити в командний рядок лише помилки"
 
 #~ msgid "list photo and video file extensions the program recognizes and exit"
 #~ msgstr ""
-#~ "вивести список розширень фото та відео файлів, розпізнаних програмою і "
-#~ "вийти"
+#~ "вивести список розширень фото та відео файлів, розпізнаних програмою і вийти"
 
 #~ msgid "reset all program settings and preferences and exit"
 #~ msgstr "скинути всі параметри та налаштування програми і вийти"
@@ -3955,6 +4651,7 @@ msgstr ""
 #~ msgid "Videos:"
 #~ msgstr "Відео:"
 
+#, python-format
 #~ msgid "and %s"
 #~ msgstr "та %s"
 
@@ -4046,8 +4743,7 @@ msgstr ""
 #~ "<span weight=\"bold\" size=\"x-large\">Теки для завантаження відео</span>"
 
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Video Rename</span>\t"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Перейменування відео</span>\t"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Перейменування відео</span>\t"
 
 #~ msgid "Backup"
 #~ msgstr "Резервне копіювання"
@@ -4100,8 +4796,8 @@ msgstr ""
 #~ "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>"
+#~ "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 ""
 #~ "Вкажіть каталог, в якому зберігатимуться резервні копії на пристрої.  \n"
 #~ "\n"
@@ -4114,15 +4810,15 @@ msgstr ""
 #~ "Specify the time in 24 hour format at which the <i>Downloads today</i> "
 #~ "sequence number should be reset."
 #~ msgstr ""
-#~ "Вкажіть час в 24-годинному форматі, коли буде скинута послідовність "
-#~ "номерів для параметра <i>Завантажень сьогодні</i>."
+#~ "Вкажіть час в 24-годинному форматі, коли буде скинута послідовність номерів "
+#~ "для параметра <i>Завантажень сьогодні</i>."
 
 #~ msgid ""
 #~ "Specify whether photo, video and folder names should have any characters "
 #~ "removed that are not allowed by other operating systems."
 #~ msgstr ""
-#~ "Вкажіть, чи вилучати з назв фото, відео та тек всі символи, що не "
-#~ "дозволені в інших операційних системах."
+#~ "Вкажіть, чи вилучати з назв фото, відео та тек всі символи, що не дозволені "
+#~ "в інших операційних системах."
 
 #~ msgid "Synchronize RAW + JPEG sequence numbers"
 #~ msgstr "Синхронізувати послідовність номерів RAW + JPEG"
@@ -4173,12 +4869,15 @@ msgstr ""
 #~ msgid "_View"
 #~ msgstr "_Перегляд"
 
+#, python-format
 #~ msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
+#, python-format
 #~ msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
+#, python-format
 #~ msgid ""
 #~ "%(date)s\n"
 #~ "%(time)s"
@@ -4186,20 +4885,22 @@ msgstr ""
 #~ "%(date)s\n"
 #~ "%(time)s"
 
+#, python-format
 #~ msgid "%(date)s %(time)s"
 #~ msgstr "%(date)s %(time)s"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s (%(remaining)s remaining)"
 #~ msgstr "%(number)s з %(total)s %(filetypes)s (%(remaining)s залишилось)"
 
+#, python-format
 #~ msgid "Error: %(inst)s"
 #~ msgstr "Помилка: %(inst)s"
 
 #~ msgid "Photo has already been downloaded"
 #~ msgstr "Фото вже були завантажені"
 
-#~ msgid ""
-#~ "Photos detected with the same filenames, but taken at different times"
+#~ msgid "Photos detected with the same filenames, but taken at different times"
 #~ msgstr "Виявлені фото з однаковою назвою, але зроблені в різний час"
 
 #~ msgid "Select All Wit_h Job Code"
@@ -4214,6 +4915,7 @@ msgstr ""
 #~ msgid "_Select"
 #~ msgstr "_Вибрати"
 
+#, python-format
 #~ msgid "%(freespace)s. %(backuppaths)s."
 #~ msgstr "%(freespace)s. %(backuppaths)s."
 
@@ -4230,24 +4932,31 @@ msgstr ""
 #~ msgid "."
 #~ msgstr ","
 
+#, python-format
 #~ msgid "(%(file_type)s)"
 #~ msgstr "(%(file_type)s)"
 
+#, python-format
 #~ msgid "%(free)s %(file_type)s"
 #~ msgstr "%(free)s %(file_type)s"
 
+#, python-format
 #~ msgid "Folder: %s"
 #~ msgstr "Каталог: %s"
 
+#, python-format
 #~ msgid "%(file_type)s download folder is invalid"
 #~ msgstr "%(file_type)s каталог завантаження є хибним"
 
+#, python-format
 #~ msgid "%(file_type)s download folder does not exist"
 #~ msgstr "%(file_type)s каталог завантаження не існує"
 
+#, python-format
 #~ msgid "%(file_type)s download folder is not writable"
 #~ msgstr "%(file_type)s каталог завантаження не доступний для запису"
 
+#, python-format
 #~ msgid ""
 #~ "%(problem)s\n"
 #~ "File: %(file)s"
@@ -4255,44 +4964,55 @@ msgstr ""
 #~ "%(problem)s\n"
 #~ "Файл: %(file)s"
 
+#, python-format
 #~ msgid "%(free)s free"
 #~ msgstr "%(free)s вільно"
 
+#, python-format
 #~ msgid ""
 #~ "%(filetype)s could not be backed up because no suitable backup locations "
 #~ "were found."
 #~ msgstr ""
-#~ "%(filetype)s не може бути збережений в резервну копію, тому, що не "
-#~ "вказано місце для збереження резервних копій."
+#~ "%(filetype)s не може бути збережений в резервну копію, тому, що не вказано "
+#~ "місце для збереження резервних копій."
 
+#, python-format
 #~ msgid "%(filetype)s was already downloaded"
 #~ msgstr "%(filetype)s вже було завантажено"
 
+#, python-format
 #~ msgid "%(filetype)s metadata cannot be read"
 #~ msgstr "%(filetype)s не можливо прочитати метадані"
 
+#, python-format
 #~ msgid "Error generating component %s."
 #~ msgstr "Помилка створення компонента %s."
 
+#, python-format
 #~ msgid "%(filetype)s %(area)s could not be generated"
 #~ msgstr "%(filetype)s %(area)s не може бути згенерованим"
 
+#, python-format
 #~ msgid "%(filetype)s already exists"
 #~ msgstr "%(filetype)s вже існує"
 
+#, python-format
 #~ msgid "The existing %(filetype)s was last modified on %(date)s at %(time)s."
 #~ msgstr "Існуючий фал %(filetype)s було модифіковано %(date)s в %(time)s."
 
+#, python-format
 #~ msgid ""
-#~ "The existing %(filetype)s was last modified on %(date)s at %(time)s. "
-#~ "Unique identifier '%(identifier)s' added."
+#~ "The existing %(filetype)s was last modified on %(date)s at %(time)s. Unique "
+#~ "identifier '%(identifier)s' added."
 #~ msgstr ""
 #~ "Існуючий фал %(filetype)s було модифіковано %(date)s в %(time)s. Додано "
 #~ "унікальний ідентифікатор '%(identifier)s' ."
 
+#, python-format
 #~ msgid "There is no data with which to name the %(filetype)s."
 #~ msgstr "Не існує даних з ім’ям %(filetype)s."
 
+#, python-format
 #~ msgid "Error: %(errorno)s %(strerror)s"
 #~ msgstr "Помилка: %(errorno)s %(strerror)s"
 
@@ -4304,50 +5024,61 @@ msgstr ""
 #~ "downloaded."
 #~ msgstr "Файл, розширення та Exif інформація вже були завантажені."
 
+#, python-format
 #~ msgid " It was backed up to %(volume)s"
 #~ msgstr " Було створено резервну копію на %(volume)s"
 
 #~ msgid " It was backed up to these devices: "
 #~ msgstr " Було створено резервну копію на цих пристроях: "
 
+#, python-format
 #~ msgid "%s, "
 #~ msgstr "%s, "
 
+#, python-format
 #~ msgid "%(volumes)s and %(final_volume)s."
 #~ msgstr "%(volumes)s та %(final_volume)s."
 
+#, python-format
 #~ msgid "%(volume)s, "
 #~ msgstr "%(volume)s, "
 
+#, python-format
 #~ msgid "%(volume)s (%(inst)s), "
 #~ msgstr "%(volume)s (%(inst)s), "
 
+#, python-format
 #~ msgid "An error occurred when backing up on %(volume)s."
 #~ msgstr "Сталася помилка при створенні резервної копії на %(volume)s."
 
 #~ msgid "Backups already exist in these locations: "
 #~ msgstr "Резервна копія вже існує на: "
 
+#, python-format
 #~ msgid "Backup already exists on %(volume)s."
 #~ msgstr "Резервна копія вже існує на %(volume)s."
 
+#, python-format
 #~ msgid "%(volumes)s and %(volume)s."
 #~ msgstr "%(volumes)s та %(volume)s."
 
+#, python-format
 #~ msgid ""
 #~ "Photos detected with the same filenames, but taken at different times: "
 #~ "%(details)s"
 #~ msgstr ""
-#~ "Виявлені файли з однаковими назвами, проте створені в різний час: "
-#~ "%(details)s"
+#~ "Виявлені файли з однаковими назвами, проте створені в різний час: %(details)s"
 
+#, python-format
 #~ msgid "An error occurred when backing up on %(volume)s: %(inst)s."
 #~ msgstr ""
 #~ "Сталася помилка при створенні резервної копії на %(volume)s: %(inst)s."
 
+#, python-format
 #~ msgid "%(volumes)s and %(volume)s (%(inst)s)."
 #~ msgstr "%(volumes)s та %(volume)s (%(inst)s)."
 
+#, python-format
 #~ msgid "%(device)s did not unmount"
 #~ msgstr "%(device)s не від’єднано"
 
@@ -4358,9 +5089,10 @@ msgstr ""
 #~ "Do you really want to download from here? On some systems, scanning this "
 #~ "location can take a very long time."
 #~ msgstr ""
-#~ "Ви справді бажаєте завантажити звідси? На деяких системах сканування "
-#~ "цього місцезнаходження може зайняти багато часу."
+#~ "Ви справді бажаєте завантажити звідси? На деяких системах сканування цього "
+#~ "місцезнаходження може зайняти багато часу."
 
+#, python-format
 #~ msgid "Downloading from %(location)s."
 #~ msgstr "Завантаження з %(location)s."
 
@@ -4379,10 +5111,12 @@ msgstr ""
 #~ msgid "To"
 #~ msgstr "До"
 
+#, python-format
 #~ msgid "Backing up photos to %(path)s and videos to %(path2)s"
 #~ msgstr ""
 #~ "Резервне копіювання фотографій до %(path)s та відеозаписів до %(path2)s"
 
+#, python-format
 #~ msgid "Backing up photos and videos to %(path)s"
 #~ msgstr "Резервне копіювання фотографій та відеозаписів до %(path)s"
 
@@ -4395,8 +5129,8 @@ msgstr ""
 #~ "використовуйте відразу обидва варіанти."
 
 #~ msgid ""
-#~ "manually specify the PATH of the device from which to download, "
-#~ "overwriting existing program preferences"
+#~ "manually specify the PATH of the device from which to download, overwriting "
+#~ "existing program preferences"
 #~ msgstr ""
 #~ "самостійно вкажіть розміщення (PATH) пристрою, з якого буде виконуватися "
 #~ "завантаження, замінюючи налаштування програми що існують"
@@ -4411,8 +5145,7 @@ msgstr ""
 #~ msgstr "Чи має бути вилучено усі ігноровані розміщення?"
 
 #~ msgid "Select a folder in which to backup videos"
-#~ msgstr ""
-#~ "Оберіть теку у якій будуть зберігатися резервні копії відеофрагметів"
+#~ msgstr "Оберіть теку у якій будуть зберігатися резервні копії відеофрагметів"
 
 #~ msgid "Select a folder in which to backup photos"
 #~ msgstr "Оберіть теку у якій будуть зберігатися резервні копії фотографій"
@@ -4420,6 +5153,7 @@ msgstr ""
 #~ msgid "Invalid regular expression"
 #~ msgstr "Неприпустимий регулярний вираз"
 
+#, python-format
 #~ msgid ""
 #~ "The following regular expressions are invalid, and will be removed unless "
 #~ "you correct them:\n"
@@ -4429,63 +5163,71 @@ msgstr ""
 #~ "виправите їх:\n"
 #~ " %s"
 
+#, python-format
 #~ msgid ""
-#~ "This regular expression is invalid, and will be removed unless you "
-#~ "correct it:\n"
+#~ "This regular expression is invalid, and will be removed unless you correct "
+#~ "it:\n"
 #~ " %s"
 #~ msgstr ""
-#~ "Регулярний вираз неприпустимий й буде вилучено, якщо ви не виправите "
-#~ "його:\n"
+#~ "Регулярний вираз неприпустимий й буде вилучено, якщо ви не виправите його:\n"
 #~ " %s"
 
 #~ msgid "Manila"
 #~ msgstr "Маніла"
 
+#, python-format
 #~ msgid "Date time value %s appears invalid."
 #~ msgstr "Значення дати та часу %s встановлено неправильно."
 
 #~ msgid "Backups overwritten on these devices: "
 #~ msgstr "Перезаписано резервну копію на пристрої: "
 
+#, python-format
 #~ msgid "Backup overwritten on %(volume)s."
 #~ msgstr "Резервну копію на %(volume)s перезаписано."
 
 #~ msgid "The following metadata is missing: "
 #~ msgstr "Ці метадані пропущено: "
 
-#~ msgid ""
-#~ "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
+#, python-format
+#~ msgid "%(missing_metadata_elements)s and %(final_missing_metadata_element)s."
 #~ msgstr "%(missing_metadata_elements)s, %(final_missing_metadata_element)s."
 
+#, python-format
 #~ msgid " Furthermore, there was a %(problem)s."
 #~ msgstr " До того ж була %(problem)s."
 
+#, python-format
 #~ msgid "%(previousproblem)s Additionally, %(newproblem)s"
 #~ msgstr "У доповнення до %(previousproblem)s: %(newproblem)s"
 
+#, python-format
 #~ msgid " Furthermore, there were %(problems)s."
 #~ msgstr " До того ж є %(problems)s."
 
+#, python-format
 #~ msgid "An error occurred when creating directories on %(volume)s: %(inst)s."
 #~ msgstr "Сталася помилка при створені каталогів на %(volume)s: %(inst)s."
 
 #~ msgid ""
-#~ "Errors occurred when creating directories on the following backup "
-#~ "devices: "
+#~ "Errors occurred when creating directories on the following backup devices: "
 #~ msgstr "Сталася помилка при створені каталогів на наступних пристроях: "
 
+#, python-format
 #~ msgid "Problem in %s generation"
 #~ msgstr "Помилка %s при створенні"
 
+#, python-format
 #~ msgid "Problems in %s generation"
 #~ msgstr "Сталися помилки при створенні %s"
 
-#~ msgid ""
-#~ "An error occurred when copying the %(filetype)s, but it was backed up"
+#, python-format
+#~ msgid "An error occurred when copying the %(filetype)s, but it was backed up"
 #~ msgstr ""
 #~ "При копіюванні %(filetype)s сталася помилка, але резервна копія все одно "
 #~ "створена."
 
+#, python-format
 #~ msgid "%(filetype)s already exists, but it was backed up"
 #~ msgstr "Хоч %(filetype)s вже існує, резервна копія все одно створена."
 
@@ -4504,6 +5246,7 @@ msgstr ""
 #~ msgid "Problem in subfolder and filename generation"
 #~ msgstr "Помилка при створенні імені каталогу та файлу."
 
+#, python-format
 #~ msgid "%(previousproblem)s, and %(backinguperror)s"
 #~ msgstr "%(previousproblem)s, ще %(backinguperror)s"
 
@@ -4516,10 +5259,12 @@ msgstr ""
 #~ msgid "Failed to create download subfolder"
 #~ msgstr "Не вдалося створити каталог для завантаження"
 
+#, python-format
 #~ msgid "scanning (found %(photos)s photos and %(videos)s videos)..."
 #~ msgstr ""
 #~ "перевірка (знайдено %(photos)s фотографій та %(videos)s відеозаписів)..."
 
+#, python-format
 #~ msgid "Path: %s"
 #~ msgstr "Шлях: %s"
 
@@ -4542,13 +5287,13 @@ msgstr ""
 #~ "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"
+#~ "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>"
+#~ "<i>Downloading directly from cameras is currently an experimental feature. "
+#~ "If downloading directly from your camera works poorly or not at all, try "
+#~ "setting it to PTP mode. If that is not possible, a card reader must be "
+#~ "used.</i>"
 #~ msgstr ""
 #~ "Пристрої - з них завантажується фото та відео, наприклад, камера, карта "
 #~ "пам’яті або переносний накопичувач.\n"
@@ -4558,58 +5303,55 @@ msgstr ""
 #~ "\n"
 #~ "<i>Завантаження напряму з камери поки що є пробною можливістю. Якщо "
 #~ "завантаження напряму з камери працює погано або не працює взагалі, "
-#~ "перемикніть її у режим PTP. Якщо це неможливо, використовуйте пристрій "
-#~ "для читання карт пам’яті.</i>"
+#~ "перемикніть її у режим PTP. Якщо це неможливо, використовуйте пристрій для "
+#~ "читання карт пам’яті.</i>"
 
 #~ msgid "Remembered Paths"
 #~ msgstr "Розміщення які запам’ятовано"
 
 #~ msgid ""
-#~ "If you disable automatic detection, choose the exact location of the "
-#~ "photos and videos."
+#~ "If you disable automatic detection, choose the exact location of the photos "
+#~ "and videos."
 #~ msgstr ""
-#~ "Якщо ви вимикаєте автовизначення, оберіть містце для резервного "
-#~ "копіювання фото та відео."
+#~ "Якщо ви вимикаєте автовизначення, оберіть містце для резервного копіювання "
+#~ "фото та відео."
 
 #~ 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."
+#~ "When this option is enabled, and a potential device is detected, you will be "
+#~ "prompted to determine if it should be scanned or not."
 #~ msgstr ""
-#~ "Якщо ви увімкнули автовизначення переносного накопичувача, буде "
-#~ "проскановано увесь накопичувач. На пристроях більшої ємності це може "
-#~ "зайняти час\n"
+#~ "Якщо ви увімкнули автовизначення переносного накопичувача, буде проскановано "
+#~ "увесь накопичувач. На пристроях більшої ємності це може зайняти час\n"
 #~ "\n"
 #~ "Коли цей параметр увімкнено, й відповідний пристрій знайдено, програма "
 #~ "спитає вас, чи потрібно  його сканувати."
 
 #~ msgid "<span weight=\"bold\" size=\"x-large\">Device Options</span>"
-#~ msgstr ""
-#~ "<span weight=\"bold\" size=\"x-large\">Налаштування пристроїв</span>"
+#~ msgstr "<span weight=\"bold\" size=\"x-large\">Налаштування пристроїв</span>"
 
 #~ 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."
+#~ "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 ""
-#~ "Запам’ятованими адресами є ті, які асоціюються з пристроями вибраними "
-#~ "вами для виконання їх постійного сканування або ігнорування, при "
-#~ "залученій можливості автоматичного визначення Портативного пристрою "
-#~ "зберігання."
+#~ "Запам’ятованими адресами є ті, які асоціюються з пристроями вибраними вами "
+#~ "для виконання їх постійного сканування або ігнорування, при залученій "
+#~ "можливості автоматичного визначення Портативного пристрою зберігання."
 
 #~ msgid "Automatically detect Portable Storage Devices"
 #~ msgstr "Автоматично виявляти портативні пристрої зберігання"
 
 #~ 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."
+#~ "devices for photos or videos. Any path ending with the values below will not "
+#~ "be scanned."
 #~ msgstr ""
-#~ "Вкажіть кінцівку будь-якої адреси, яку ви бажаєте ігнорувати при "
-#~ "скануванні пристроїв, на вміст фотографій та відеозаписів. Усі адреси що "
-#~ "закінчуються значеннями вказаними нижче, скануватися не будуть."
+#~ "Вкажіть кінцівку будь-якої адреси, яку ви бажаєте ігнорувати при скануванні "
+#~ "пристроїв, на вміст фотографій та відеозаписів. Усі адреси що закінчуються "
+#~ "значеннями вказаними нижче, скануватися не будуть."
 
 #~ msgid "Automatically detect devices"
 #~ msgstr "Автоматично виявляти пристрої"
@@ -4645,6 +5387,7 @@ msgstr ""
 #~ msgid "Should all remembered paths be removed?"
 #~ msgstr "Чи має бути вилучено усі заппам’ятовані розміщення?"
 
+#, python-format
 #~ msgid "An error occurred when copying the %(filetype)s"
 #~ msgstr "Сталася помилка при копіюванні %(filetype)s"
 
@@ -4659,18 +5402,17 @@ msgstr ""
 #~ msgstr "_Завантажити"
 
 #~ 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>."
+#~ "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 ""
 #~ "Вибачте, але стягнення відео вимкнено. Для того щоб мати можливість "
-#~ "завантажувати відео, будь-ласка, встановіть пакунки <i>hachoir metadata</"
-#~ "i> та <i>kaa metadata</i> для Пітона або <i>exiftool</i>."
+#~ "завантажувати відео, будь-ласка, встановіть пакунки <i>hachoir metadata</i> "
+#~ "та <i>kaa metadata</i> для Пітона або <i>exiftool</i>."
 
 #~ 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."
+#~ "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 ""
 #~ "Коли фото або відео з такою ж назвою вже завантажені, виберіть, чи "
 #~ "пропустити завантаження цього файлу, чи додати унікальний ідентифікатор."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 08470fd..a1d194d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,136 +7,496 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rapid\n"
 "Report-Msgid-Bugs-To: damonlynch@gmail.com\n"
-"POT-Creation-Date: 2017-07-08 19:16-0500\n"
-"PO-Revision-Date: 2017-07-04 11:06+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2017-09-12 17:01-0400\n"
+"PO-Revision-Date: 2017-09-13 18:36+0000\n"
+"Last-Translator: Damon Lynch <damonlynch@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2017-07-05 23:04+0000\n"
-"X-Generator: Launchpad (build 18419)\n"
+"X-Launchpad-Export-Date: 2017-09-26 22:04+0000\n"
+"X-Generator: Launchpad (build 18463)\n"
+"Language: \n"
+
+#: ../install.py:65
+msgid "Rapid Photo Downloader installer"
+msgstr ""
+
+#: ../install.py:66
+msgid "Download and install latest version of Rapid Photo Downloader."
+msgstr ""
+
+#: ../install.py:236 ../install.py:1732
+msgid "Installer not found:"
+msgstr ""
+
+#. Translators: do not translate the term tar.gz
+#: ../install.py:240 ../install.py:1736
+msgid "Installer not in tar.gz format:"
+msgstr ""
+
+#: ../install.py:465
+msgid ""
+"Incorrect folder ownership detected. Changing ownership of and resetting "
+"permissions for"
+msgstr ""
+
+#: ../install.py:540
+msgid "The following command will be run:"
+msgstr ""
+
+#: ../install.py:543 ../install.py:1479 ../install.py:1484
+msgid "sudo may prompt you for the sudo password."
+msgstr ""
+
+#: ../install.py:547
+msgid "Would you like to run the command now?"
+msgstr ""
+
+#: ../install.py:549
+msgid "Answer is not yes, exiting."
+msgstr ""
+
+#: ../install.py:559 ../install.py:751 ../install.py:966
+msgid "Command failed"
+msgstr ""
+
+#: ../install.py:561 ../install.py:752 ../install.py:967
+msgid "Exiting"
+msgstr ""
+
+#: ../install.py:582
+msgid "The Universe repository must be enabled."
+msgstr "通用仓库必须启用。"
+
+#: ../install.py:606
+msgid ""
+"Do you want to to uninstall the previous version of Rapid Photo Downloader:"
+msgstr "您想卸载上一个版本的Rapid Photo Downloader吗："
+
+#: ../install.py:715 ../install.py:740
+msgid ""
+"Querying package system to see if an older version of Rapid Photo Downloader "
+"is installed (this may take a while)..."
+msgstr ""
+
+#: ../install.py:726
+msgid ""
+"Unable to query package system. Please check your Internet connection and "
+"try again"
+msgstr ""
+
+#: ../install.py:756
+msgid "Checking if previous version installed with pip..."
+msgstr ""
+
+#: ../install.py:850
+msgid "The following package is unknown on your system: {}\n"
+msgstr ""
+
+#: ../install.py:857 ../install.py:929 ../install.py:974
+msgid ""
+"To continue, some packages required to run the application will be installed."
+msgstr ""
+
+#: ../install.py:886
+msgid "Querying installed and available packages (this may take a while)"
+msgstr ""
+
+#: ../install.py:958
+msgid ""
+"Querying zypper to see if any required packages are already installed (this "
+"may take a while)... "
+msgstr ""
+
+#: ../install.py:1004
+msgid "Query to confirm action at each step."
+msgstr ""
+
+#: ../install.py:1011
+msgid ""
+"When downloading the latest version, install the development version if it "
+"is newer than the stable version."
+msgstr ""
+
+#: ../install.py:1020
+msgid ""
+"Optional tar.gz Rapid Photo Downloader installer archive. If not specified, "
+"the latest version is downloaded from the Internet."
+msgstr ""
+
+#: ../install.py:1043
+msgid ""
+"Do not run the installer in the tar.gz Rapid Photo Downloader installer "
+"archive if it is newer than this version ({}). The default is to run "
+"whichever installer is newer."
+msgstr ""
+
+#: ../install.py:1050
+msgid ""
+"Uninstall Rapid Photo Downloader that was installed with pip, keeping its "
+"dependencies."
+msgstr ""
+
+#: ../install.py:1054
+msgid ""
+"Uninstall the dependencies installed by pip during Rapid Photo Downloader's "
+"installation, and Rapid Photo Downloader itself, then exit."
+msgstr ""
+
+#: ../install.py:1059
+msgid ""
+"Note: this will not uninstall any version of Rapid Photo Downloader "
+"installed by your Linux distribution's package manager."
+msgstr ""
+
+#: ../install.py:1066
+msgid ""
+"Dependencies will only be removed if they are not required by other programs."
+msgstr ""
+
+#: ../install.py:1072
+msgid ""
+"Note: this option will remove the dependencies regardless of whether they "
+"are required by another program pip has installed. Upgrade to pip 9.0 or "
+"above if you want to avoid this behavior. You can do so using the command "
+"'python3 -m pip install pip -U --user'. Also note that any version of Rapid "
+"Photo Downloader installed by your Linux distribution's package manager will "
+"not be uninstalled."
+msgstr ""
+
+#: ../install.py:1122
+msgid "Failed to download versions file"
+msgstr ""
+
+#: ../install.py:1126
+msgid "Got error code {} while accessing versions file"
+msgstr ""
+
+#: ../install.py:1234
+msgid ""
+"Sorry, could not locate installer. Please check your Internet connection and "
+"verify if you can reach https://www.damonlynch.net\n"
+"\n"
+"Exiting.\n"
+msgstr ""
+
+#: ../install.py:1408
+msgid "Installing application requirements..."
+msgstr ""
+
+#: ../install.py:1424
+msgid "Received error code"
+msgstr ""
+
+#: ../install.py:1425
+msgid "Failed to install application requirements: exiting"
+msgstr ""
+
+#: ../install.py:1428
+msgid "Installing application..."
+msgstr "正在安装应用..."
+
+#: ../install.py:1441
+msgid "Failed to install application: exiting..."
+msgstr "无法安装应用：退出..."
+
+#: ../install.py:1465
+msgid ""
+"You may have to restart the computer to be able to run the program from the "
+"commmand line or application launcher."
+msgstr "您可能需要重新启动计算机，以便能够从命令行或应用程序启动器运行程序。"
+
+#: ../install.py:1476
+msgid "Do you want to install the application's man pages?"
+msgstr "您想安装这个应用的man说明页吗？"
+
+#: ../install.py:1477
+msgid "They will be installed into {}"
+msgstr "将被安装到{}"
+
+#: ../install.py:1478 ../install.py:1483
+msgid "If you uninstall the application, remove these manpages yourself."
+msgstr "如果您卸载了应用程序，您需要自己删除man说明页。"
+
+#: ../install.py:1480
+msgid "Do want to install the man pages?"
+msgstr "您想安装man说明页吗？"
+
+#: ../install.py:1482
+msgid "Installing man pages into {}"
+msgstr "正在把man说明页安装到{}"
+
+#: ../install.py:1499
+msgid "Failed to create man page directory: exiting"
+msgstr "无法创建man说明页：退出"
+
+#: ../install.py:1511
+msgid "Failed to copy man page."
+msgstr "无法复制man说明页。"
+
+#: ../install.py:1521
+msgid "(If a segmentation fault occurs at exit, you can ignore it...)"
+msgstr ""
+
+#: ../install.py:1534
+msgid ""
+"The python3 tool pip is required to uninstall a version of Rapid Photo "
+"Downloader that was installed with pip.\n"
+"Cannot continue. Exiting."
+msgstr ""
+
+#: ../install.py:1575
+msgid ""
+"Do not run this installer script as sudo / root user.\n"
+"Run it using the user who will run the program.\n"
+msgstr ""
+
+#: ../install.py:1585 ../install.py:1599
+msgid "Do not include any other command line arguments when specifying"
+msgstr ""
+
+#: ../install.py:1614
+msgid ""
+"Sorry, this installer does not support a custom python installation.\n"
+"Exiting..."
+msgstr ""
+
+#: ../install.py:1620
+msgid "Restarting script using system python..."
+msgstr ""
+
+#: ../install.py:1651
+msgid "Exiting..."
+msgstr ""
+
+#. Translators: do not translate the term python3-apt
+#: ../install.py:1670
+msgid "To continue, the package python3-apt must be installed."
+msgstr ""
+
+#: ../install.py:1689
+msgid ""
+"Install the following packages using your Linux distribution's standard "
+"package manager, and then rerun this installer"
+msgstr ""
+
+#: ../install.py:1698
+msgid ""
+"To run this program, programs to assist Python 3 and its package management "
+"must be installed."
+msgstr ""
+
+#. Translators: do not translate the terms Python 3, pip and setuptools
+#: ../install.py:1713
+msgid "Python 3's pip and setuptools must be upgraded for your user."
+msgstr ""
+
+#. Translators: do not translate the term python or requests
+#: ../install.py:1726
+msgid "Installing python requests"
+msgstr ""
+
+#: ../upgrade.py:79
+msgid "Upgrade Rapid Photo Downloader"
+msgstr ""
+
+#: ../upgrade.py:401 ../raphodo/viewutils.py:242
+msgid "&Cancel"
+msgstr ""
+
+#: ../upgrade.py:405
+msgid "&Upgrade"
+msgstr ""
+
+#: ../upgrade.py:410
+#, python-format
+msgid "Click the Upgrade button to upgrade to version %s."
+msgstr ""
+
+#: ../upgrade.py:413
+msgid "Click the Upgrade button to start the upgrade."
+msgstr ""
+
+#: ../upgrade.py:416 ../upgrade.py:422 ../raphodo/viewutils.py:241
+msgid "&Close"
+msgstr ""
+
+#: ../upgrade.py:417
+msgid "&Run"
+msgstr ""
+
+#: ../upgrade.py:447
+msgid "Close Rapid Photo Downloader before running this upgrade"
+msgstr ""
+
+#: ../upgrade.py:450
+msgid "Upgrade running..."
+msgstr ""
+
+#: ../upgrade.py:486
+#, python-format
+msgid ""
+"Successfully upgraded to %s. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:491
+msgid ""
+"Upgrade finished successfully. Click Close to exit, or Run to start the "
+"program."
+msgstr ""
+
+#: ../upgrade.py:495
+msgid "Upgrade failed. Click Close to exit."
+msgstr ""
 
-#. type: QPushButton
-#: ../raphodo/aboutdialog.py:217
+#: ../upgrade.py:6967
+#, python-format
+msgid "Upgrading %s..."
+msgstr ""
+
+#: ../upgrade.py:6969
+msgid "Press any key to continue..."
+msgstr ""
+
+#: ../upgrade.py:6982
+msgid "Rapid Photo Downloader upgrade failed"
+msgstr ""
+
+#: ../upgrade.py:6984
+#, python-format
+msgid ""
+"The python package %s could not be updated. The upgrade cannot continue."
+msgstr ""
+
+#: ../raphodo/aboutdialog.py:225
 msgid "Credits"
 msgstr "鸣谢"
 
-#: ../raphodo/backuppanel.py:239
+#: ../raphodo/backuppanel.py:240
 msgid "Backups are not configured"
 msgstr "尚未进行备份配置"
 
-#: ../raphodo/backuppanel.py:241
+#: ../raphodo/backuppanel.py:242
 msgid "No backup devices detected"
 msgstr "没有检测到备份驱动器"
 
-#: ../raphodo/backuppanel.py:243
+#: ../raphodo/backuppanel.py:244
 msgid "Valid backup locations not yet specified"
 msgstr "尚未指定有效的备份位置"
 
-#: ../raphodo/backuppanel.py:401
+#: ../raphodo/backuppanel.py:404
 msgid ""
 "You can have your photos and videos backed up to multiple locations as they "
 "are downloaded, e.g. external hard drives."
 msgstr "下载后你可以把照片或视频备份到多个位置，比如：外置硬盘。"
 
-#: ../raphodo/backuppanel.py:407
+#: ../raphodo/backuppanel.py:412
 msgid "Back up photos and videos when downloading"
 msgstr "下载时备份照片和视频"
 
-#: ../raphodo/backuppanel.py:413
+#: ../raphodo/backuppanel.py:418
 msgid "Automatically detect backup devices"
 msgstr "自动检测备份设备"
 
-#: ../raphodo/backuppanel.py:417
+#: ../raphodo/backuppanel.py:424
 msgid ""
-"Specify the folder in which backups are stored on the device."
-"<br><br><i>Note: the presence of a folder with this name is used to "
+"Specify the folder in which backups are stored on the "
+"device.<br><br><i>Note: the presence of a folder with this name is used to "
 "determine if 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 folder names. By "
 "adding both folders, the same device can be used to back up both photos and "
 "videos.</i>"
 msgstr ""
 
-#: ../raphodo/backuppanel.py:428
+#: ../raphodo/backuppanel.py:439
 msgid "Photo folder name:"
 msgstr "照片文件夹名称："
 
-#: ../raphodo/backuppanel.py:433
+#: ../raphodo/backuppanel.py:444
 msgid "Video folder name:"
 msgstr "视频文件夹名称："
 
-#: ../raphodo/backuppanel.py:438 ../raphodo/nameeditor.py:883
+#: ../raphodo/backuppanel.py:449 ../raphodo/nameeditor.py:890
 #: ../raphodo/renamepanel.py:123
 msgid "Example:"
-msgstr ""
+msgstr "例子"
 
-#: ../raphodo/backuppanel.py:448
-msgid "If you disable automatic detection, choose the exact backup locations."
+#: ../raphodo/backuppanel.py:460
+msgid ""
+"If you disable automatic detection, choose the exact backup locations."
 msgstr "如果你选择关闭自动检测功能，请选择确切的备份位置。"
 
-#: ../raphodo/backuppanel.py:452
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:468
 msgid "Photo backup location:"
 msgstr "照片备份位置"
 
-#: ../raphodo/backuppanel.py:454
+#: ../raphodo/backuppanel.py:474
 msgid "Select Photo Backup Location"
 msgstr "选择照片备份位置"
 
-#: ../raphodo/backuppanel.py:460
+#. Translators: the word 'location' is optional in your translation. The left
+#. side of the folder chooser combo box will always line up with the left side of the
+#. the text entry boxes where the user can enter the photo folder name and the video
+#. folder name. See http://damonlynch.net/rapid/documentation/thumbnails/backup.png
+#: ../raphodo/backuppanel.py:485
 msgid "Video backup location:"
 msgstr "视频备份位置"
 
-#: ../raphodo/backuppanel.py:462
+#: ../raphodo/backuppanel.py:491
 msgid "Select Video Backup Location"
 msgstr "选择视频备份位置"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:564
+#: ../raphodo/backuppanel.py:595
 msgid "drive1"
 msgstr "驱动器1"
 
 #. Translators: this value is used as an example device when automatic backup device
 #. detection is enabled. You should translate this.
-#: ../raphodo/backuppanel.py:567
+#: ../raphodo/backuppanel.py:598
 msgid "drive2"
 msgstr "驱动器2"
 
-#: ../raphodo/backuppanel.py:628
+#: ../raphodo/backuppanel.py:663
 msgid "Projected Backup Storage Use"
 msgstr "预计备份大小"
 
-#: ../raphodo/backuppanel.py:632
+#: ../raphodo/backuppanel.py:669
 msgid "Backup Options"
-msgstr ""
+msgstr "备份选项"
 
 #. translators: refers to the video thumbnail file that some
 #. cameras generate -- it has a .THM file extension
-#: ../raphodo/copyfiles.py:476
+#: ../raphodo/copyfiles.py:491
 msgid "video THM"
 msgstr "视频缩略图"
 
-#: ../raphodo/copyfiles.py:482
+#: ../raphodo/copyfiles.py:497
 msgid "audio"
 msgstr "音频"
 
 #: ../raphodo/destinationdisplay.py:78 ../raphodo/devicedisplay.py:1079
-#: ../raphodo/rpdfile.py:321
+#: ../raphodo/rpdfile.py:342
 #, python-format
 msgid "%(no_photos)s Photos"
 msgstr "%(no_photos)s 张照片"
 
 #: ../raphodo/destinationdisplay.py:82 ../raphodo/devicedisplay.py:1081
-#: ../raphodo/rpdfile.py:316
+#: ../raphodo/rpdfile.py:333
 #, python-format
 msgid "%(no_videos)s Videos"
 msgstr "%(no_videos)s 段视频"
 
 #: ../raphodo/destinationdisplay.py:92
 msgid "Used"
-msgstr ""
+msgstr "已使用"
 
 #: ../raphodo/destinationdisplay.py:93
 msgid "Excess"
@@ -144,12 +504,12 @@ msgstr ""
 
 #: ../raphodo/destinationdisplay.py:102
 msgid "Device size unknown"
-msgstr ""
+msgstr "设备空间未知"
 
 #: ../raphodo/destinationdisplay.py:112
 #, python-format
 msgid "No space free on %(size_total)s device"
-msgstr ""
+msgstr "在 %(size_total)s 设备上没有空间"
 
 #: ../raphodo/destinationdisplay.py:119
 #, python-format
@@ -157,15 +517,15 @@ msgid "%(size_free)s free of %(size_total)s"
 msgstr ""
 
 #: ../raphodo/destinationdisplay.py:190 ../raphodo/devicedisplay.py:993
-#: ../raphodo/rapid.py:1964 ../raphodo/rapid.py:2079 ../raphodo/rapid.py:5753
-#: ../raphodo/rpdfile.py:905
+#: ../raphodo/rapid.py:2023 ../raphodo/rapid.py:2151 ../raphodo/rapid.py:6043
+#: ../raphodo/rpdfile.py:930
 msgid "Photos"
 msgstr ""
 
 #. translators: the name of the Videos folder
 #: ../raphodo/destinationdisplay.py:191 ../raphodo/devicedisplay.py:994
-#: ../raphodo/rapid.py:1967 ../raphodo/rapid.py:2080 ../raphodo/rapid.py:5754
-#: ../raphodo/rpdfile.py:933 ../raphodo/storage.py:445
+#: ../raphodo/rapid.py:2028 ../raphodo/rapid.py:2152 ../raphodo/rapid.py:6044
+#: ../raphodo/rpdfile.py:958 ../raphodo/storage.py:449
 msgid "Videos"
 msgstr ""
 
@@ -173,7 +533,7 @@ msgstr ""
 msgid "Projected storage use after download"
 msgstr "预计下载使用存储空间"
 
-#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:516
+#: ../raphodo/destinationdisplay.py:327 ../raphodo/nameeditor.py:521
 msgid "Custom..."
 msgstr "自定义..."
 
@@ -211,57 +571,58 @@ msgstr "重新扫描"
 msgid "%s full"
 msgstr "已使用 %s"
 
-#: ../raphodo/devices.py:459
+#: ../raphodo/devices.py:463
 msgid "Cameras"
 msgstr "相机"
 
-#: ../raphodo/devices.py:460 ../raphodo/devices.py:920
-#: ../raphodo/preferencedialog.py:85 ../raphodo/rapid.py:1927
+#: ../raphodo/devices.py:464 ../raphodo/devices.py:927
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/rapid.py:1979
 msgid "Devices"
 msgstr "设备"
 
-#: ../raphodo/devices.py:720
+#: ../raphodo/devices.py:724
 #, python-format
 msgid "Downloading from %(device_names)s"
-msgstr "从 %(device_names)s 下载中"
+msgstr "正在从 %(device_names)s 下载"
 
 #. Translators: e.g. Three Devices
-#: ../raphodo/devices.py:780
+#: ../raphodo/devices.py:784
 #, python-format
 msgid "%(no_devices)s %(device_type)s"
 msgstr "%(no_devices)s 台 %(device_type)s 设备"
 
-#: ../raphodo/devices.py:905 ../raphodo/rapid.py:1764
+#: ../raphodo/devices.py:912 ../raphodo/rapid.py:1807
 msgid "Select Source"
 msgstr "选择来源"
 
-#: ../raphodo/devices.py:936 ../raphodo/devices.py:947
+#: ../raphodo/devices.py:943 ../raphodo/devices.py:954
 #, python-format
 msgid "%(device1)s + %(device2)s"
 msgstr ""
 
 #. Number of cameras e.g. 3 Cameras
-#: ../raphodo/devices.py:958
+#: ../raphodo/devices.py:965
 #, python-format
 msgid "%(no_cameras)s Cameras"
 msgstr "%(no_cameras)s 台相机"
 
-#: ../raphodo/devices.py:963
+#: ../raphodo/devices.py:970
 #, python-format
 msgid "%(no_devices)s Devices"
 msgstr "%(no_devices)s 台设备"
 
 #. Translators: two folder names, separated by a plus sign
-#: ../raphodo/devices.py:1258
+#: ../raphodo/devices.py:1265
 #, python-format
 msgid "%s + %s"
 msgstr "%s + %s"
 
-#: ../raphodo/didyouknow.py:44
+#: ../raphodo/didyouknow.py:45
 msgid "Click on a file's checkbox to mark or unmark it for download."
 msgstr "单击复选框以确认或取消下载。"
 
-#: ../raphodo/didyouknow.py:50
+#: ../raphodo/didyouknow.py:51
 msgid ""
 "Files that have already been downloaded are remembered. You can still mark "
 "previously downloaded files to download again, but they are unchecked by "
@@ -269,34 +630,67 @@ msgid ""
 "files that are yet to be downloaded."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:59
+#: ../raphodo/didyouknow.py:60
 msgid ""
 "If more than one file is selected, they'll all take the mark of the file "
 "whose checkbox was clicked, regardless of whether they previously had a "
 "checkmark or not."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:67
+#: ../raphodo/didyouknow.py:68
 msgid ""
 "Click on a device's checkbox to quickly mark or unmark all its files for "
 "downloading."
 msgstr "单击设备前的复选框以确认或取消下载设备上所有的文件。"
 
-#: ../raphodo/didyouknow.py:74
+#: ../raphodo/didyouknow.py:75
+msgid ""
+"After a download finishes, an icon replaces the thumbnail's checkbox. The "
+"icon's color indicates whether the download was successful (green), had file "
+"renaming problems (yellow/orange), or failed (red)."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:83
+msgid ""
+"\n"
+"            In case of any problems, a red icon will appear at the bottom of "
+"the window\n"
+"            indicating how many error reports there are. Clicking on it "
+"opens the Error Report \n"
+"            window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:91
+msgid ""
+"\n"
+"            The Error Report window lists any problems encountered before, "
+"during or after the \n"
+"            download. An orange triangle represents a warning, a red circle "
+"indicates a failure, \n"
+"            and a black circle indicates more serious failures. You can "
+"click on the hyperlinks to \n"
+"            open its file or device in a file manager. You can also search "
+"the reports using the \n"
+"            search box in the lower left of the Error Report window.\n"
+"            "
+msgstr ""
+
+#: ../raphodo/didyouknow.py:103
 msgid ""
 "You can simultaneously download from multiple cameras, smartphones, memory "
 "cards, and hard drives&mdash;as many devices as your computer can handle at "
 "one time."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:81
+#: ../raphodo/didyouknow.py:110
 msgid ""
 "The <b>Timeline</b> groups photos and videos based on how much time elapsed "
 "between consecutive shots. Use it to identify photos and videos taken at "
 "different periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:88
+#: ../raphodo/didyouknow.py:117
 msgid ""
 "\n"
 "<p>In the illustration above, the first row of the Timeline is black because "
@@ -308,7 +702,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:99
+#: ../raphodo/didyouknow.py:128
 msgid ""
 "To view photos and videos for a particular time range, use the mouse "
 "(optionally in combination with the <tt>Shift</tt> or <tt>Ctrl</tt> keys) to "
@@ -316,20 +710,20 @@ msgid ""
 "the left side of the main window will be highlighted."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:106
+#: ../raphodo/didyouknow.py:135
 msgid ""
 "A download always includes all files that are checked for download, "
 "including those that are not currently displayed because the Timeline is "
 "being used."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:113
+#: ../raphodo/didyouknow.py:142
 msgid ""
 "You can hide or display the download sources by clicking on the name of the "
 "device you're downloading from at the top left of the program window."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:120
+#: ../raphodo/didyouknow.py:149
 msgid ""
 "\n"
 "          Thumbnails can be sorted using a variety of criteria:\n"
@@ -348,35 +742,33 @@ msgid ""
 "</ol> "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:137
+#: ../raphodo/didyouknow.py:166
 msgid ""
 "One of Rapid Photo Downloader's most useful features is its ability to "
 "automatically generate download subfolders and rename files as it downloads, "
 "using a scheme of your choosing."
-msgstr ""
-"Rapid Photo Downloader的最强大功能之一就是在下载过程中可以根据你选择的方案自"
-"动新建子文件夹并重命名文件。"
+msgstr "Rapid Photo Downloader的最强大功能之一就是在下载过程中可以根据你选择的方案自动新建子文件夹并重命名文件。"
 
-#: ../raphodo/didyouknow.py:143
+#: ../raphodo/didyouknow.py:172
 msgid ""
 "To specify where you want your files downloaded and how you want them named, "
 "open the appropriate panel on the right-side of the application window: "
 "<b>Destination</b>, <b>Rename</b>, or <b>Job Code</b>."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:150
+#: ../raphodo/didyouknow.py:179
 msgid ""
 "\n"
 "When thinking about your download directory structure, keep in mind two "
 "different types\n"
 "of directory:\n"
 "<ol>\n"
-"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, &quot;"
-"Photos&quot;, or\n"
+"<li>The <b>destination folder</b>, e.g. &quot;Pictures&quot;, "
+"&quot;Photos&quot;, or\n"
 "&quot;Videos&quot;. This directory should already exist on your computer. In "
 "the illustration \n"
-"below, the destination folders are &quot;Pictures&quot; and &quot;"
-"Videos&quot;. The\n"
+"below, the destination folders are &quot;Pictures&quot; and "
+"&quot;Videos&quot;. The\n"
 "name of the destination folder is displayed in the grey bar directly above "
 "the folder tree, \n"
 "with a folder icon to its left and a gear icon to its far right.</li>\n"
@@ -389,7 +781,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:167
+#: ../raphodo/didyouknow.py:196
 msgid ""
 "\n"
 "You can download photos and videos to the same destination folder, or "
@@ -402,16 +794,14 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:177
+#: ../raphodo/didyouknow.py:206
 msgid ""
 "Automatically generated download subfolders can contain further "
 "automatically generated subfolders if need be. A common scheme is to create "
 "a year subfolder and then a series of year-month-day subfolders within it."
-msgstr ""
-"如果需要，自动生成的文件夹内同样可自动新建子文件夹。常见方案如在代表某一年的"
-"子文件夹内按不用的日期建立子文件夹。"
+msgstr "如果需要，自动生成的文件夹内同样可自动新建子文件夹。常见方案如在代表某一年的子文件夹内按不用的日期建立子文件夹。"
 
-#: ../raphodo/didyouknow.py:186
+#: ../raphodo/didyouknow.py:215
 msgid ""
 "\n"
 "Whenever possible, the program previews the download subfolders of photos "
@@ -429,7 +819,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:201
+#: ../raphodo/didyouknow.py:230
 msgid ""
 "\n"
 "Download subfolder names are typically generated using some or all of the "
@@ -453,7 +843,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:219
+#: ../raphodo/didyouknow.py:248
 msgid ""
 "\n"
 "To automatically create download subfolders as you download, \n"
@@ -463,7 +853,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:227
+#: ../raphodo/didyouknow.py:256
 msgid ""
 "\n"
 "Using the drop-down menu, select a built-in preset or click on <b>Custom</b> "
@@ -473,20 +863,20 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:237
+#: ../raphodo/didyouknow.py:266
 msgid ""
 "It's easy to download raw images into one folder, and jpeg images into "
 "another. Simply use the <b>Filename Extension</b> as part of your download "
 "subfolder generation scheme:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:242
+#: ../raphodo/didyouknow.py:271
 msgid ""
 "This illustration shows a saved custom preset named &quot;My custom "
 "preset&quot;."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:246
+#: ../raphodo/didyouknow.py:275
 msgid ""
 "\n"
 "You do not have to create nested download subfolders. This illustration "
@@ -497,7 +887,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:256
+#: ../raphodo/didyouknow.py:285
 msgid ""
 "\n"
 "Although there are many built-in date/time naming options, you may find that "
@@ -511,7 +901,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:265
+#: ../raphodo/didyouknow.py:294
 msgid ""
 "\n"
 "Read more about all the ways you can generate download subfolder names and "
@@ -521,7 +911,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:273
+#: ../raphodo/didyouknow.py:302
 msgid ""
 "\n"
 "<b>Job Codes</b> let you easily enter text that describes sets of photos and "
@@ -533,7 +923,7 @@ msgid ""
 "&quot;Green Bazaar&quot;: \n"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:282
+#: ../raphodo/didyouknow.py:311
 msgid ""
 "\n"
 "You can apply new or existing Job Codes before you start a download. If "
@@ -544,36 +934,36 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:291
+#: ../raphodo/didyouknow.py:320
 msgid "Look for hints to guide you when working with Job Codes:"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:295
+#: ../raphodo/didyouknow.py:324
 msgid ""
 "Hints will vary depending on the context, such as when the mouse is hovering "
 "over a button."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:301
+#: ../raphodo/didyouknow.py:330
 msgid ""
 "\n"
 "When you give your photos and videos unique filenames, you'll never be "
 "confused as to \n"
 "which file is which. Using <b>sequence numbers</b> to make filenames unique "
 "is highly \n"
-"recommended!.\n"
+"recommended!\n"
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:309
+#: ../raphodo/didyouknow.py:338
 msgid ""
 "\n"
 "<p>Four types of sequence values are available to help you assign unique "
 "names to your photos and \n"
 "videos:\n"
 "<ol>\n"
-"<li><b>Downloads today</b>: tracks downloads completed during that day.</"
-"li>\n"
+"<li><b>Downloads today</b>: tracks downloads completed during that "
+"day.</li>\n"
 "<li><b>Stored number</b>: similar to Downloads today, but it is remembered "
 "from the last time the  \n"
 "program was run.</li>\n"
@@ -587,7 +977,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:327
+#: ../raphodo/didyouknow.py:356
 msgid ""
 "\n"
 "The <b>Rename</b> panel allows you to configure file renaming. To rename "
@@ -596,7 +986,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:334
+#: ../raphodo/didyouknow.py:363
 msgid ""
 "\n"
 "<p>The <b>Synchronize RAW + JPEG</b> option is useful if you use the RAW + "
@@ -615,7 +1005,7 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:348
+#: ../raphodo/didyouknow.py:377
 msgid ""
 "\n"
 "You can have your photos and videos backed up to multiple locations as they "
@@ -626,13 +1016,13 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:356
+#: ../raphodo/didyouknow.py:385
 msgid ""
 "In this example, the drive <b>photobackup</b> does not contain a folder "
 "named <tt>Videos</tt>, so videos will not be backed up to it."
 msgstr ""
 
-#: ../raphodo/didyouknow.py:362
+#: ../raphodo/didyouknow.py:391
 msgid ""
 "\n"
 "Several of the program's preferences can be set from the command line, "
@@ -643,7 +1033,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:372
+#: ../raphodo/didyouknow.py:396
+msgid "You can also import program preferences from the older 0.4 version."
+msgstr ""
+
+#: ../raphodo/didyouknow.py:401
 msgid ""
 "\n"
 "Rapid Photo Downloader deals with three types of cache:\n"
@@ -653,8 +1047,8 @@ msgid ""
 "memory cards, and other devices.</li>\n"
 "<li>A <b>temporary cache</b> of files downloaded from a camera, one for "
 "photos and another for \n"
-"videos. They are located in temporary subfolders in the download destination."
-"</li>\n"
+"videos. They are located in temporary subfolders in the download "
+"destination.</li>\n"
 "<li>The <b>desktop's thumbnail cache</b>, in which Rapid Photo Downloader "
 "stores thumbnails of \n"
 "RAW and TIFF photos once they have been downloaded. File browsers like Gnome "
@@ -669,34 +1063,34 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/didyouknow.py:431
+#: ../raphodo/didyouknow.py:460
 msgid "Tip of the Day"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:439
+#: ../raphodo/didyouknow.py:468
 msgid "Did you know...?"
-msgstr ""
+msgstr "你知道吗？"
 
-#: ../raphodo/didyouknow.py:466
+#: ../raphodo/didyouknow.py:495
 msgid "Show tips on startup"
-msgstr ""
+msgstr "在启动时显示此消息"
 
-#: ../raphodo/didyouknow.py:470
+#: ../raphodo/didyouknow.py:499
 msgid "&Next"
 msgstr ""
 
-#: ../raphodo/didyouknow.py:471
+#: ../raphodo/didyouknow.py:500
 msgid "&Previous"
 msgstr ""
 
 #: ../raphodo/downloadtracker.py:402
 msgid "MB/sec"
-msgstr ""
+msgstr "兆字节/秒"
 
 #. Be friendly in the last few seconds
 #: ../raphodo/downloadtracker.py:532
 msgid "A few seconds"
-msgstr ""
+msgstr "几分钟后"
 
 #: ../raphodo/downloadtracker.py:588
 msgid "1 second"
@@ -756,7 +1150,7 @@ msgstr ""
 
 #: ../raphodo/downloadtracker.py:828
 msgid "1 hour, 1 minute"
-msgstr ""
+msgstr "1小时，1分钟"
 
 #: ../raphodo/downloadtracker.py:830
 #, python-format
@@ -766,7 +1160,7 @@ msgstr ""
 #: ../raphodo/downloadtracker.py:833
 #, python-format
 msgid "%d hours, 1 minute"
-msgstr ""
+msgstr "%d小时，1分钟"
 
 #: ../raphodo/downloadtracker.py:835
 #, python-format
@@ -792,68 +1186,68 @@ msgstr ""
 msgid "%(days)d days, %(hours)d hours"
 msgstr ""
 
-#: ../raphodo/errorlog.py:65
+#: ../raphodo/errorlog.py:66
 msgid "Find"
 msgstr ""
 
-#: ../raphodo/errorlog.py:135
+#: ../raphodo/errorlog.py:136
 msgid "Error Reports - Rapid Photo Downloader"
-msgstr ""
+msgstr "错误报告 - Rapid Photo Downloader"
 
-#: ../raphodo/errorlog.py:170
+#: ../raphodo/errorlog.py:171
 msgid "Find in reports"
-msgstr ""
+msgstr "在报告中查找"
 
-#: ../raphodo/errorlog.py:187
+#: ../raphodo/errorlog.py:188
 msgid "Find the previous occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:192
+#: ../raphodo/errorlog.py:193
 msgid "Find the next occurrence of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:194
+#: ../raphodo/errorlog.py:195
 msgid "&Highlight All"
 msgstr ""
 
-#: ../raphodo/errorlog.py:195
+#: ../raphodo/errorlog.py:196
 msgid "Highlight all occurrences of the phrase"
 msgstr ""
 
-#: ../raphodo/errorlog.py:196
+#: ../raphodo/errorlog.py:197
 msgid "&Match Case"
 msgstr ""
 
-#: ../raphodo/errorlog.py:197
+#: ../raphodo/errorlog.py:198
 msgid "Search with case sensitivity"
 msgstr ""
 
-#: ../raphodo/errorlog.py:198
+#: ../raphodo/errorlog.py:199
 msgid "&Whole Words"
 msgstr ""
 
-#: ../raphodo/errorlog.py:199
+#: ../raphodo/errorlog.py:200
 msgid "Search whole words only"
 msgstr ""
 
-#: ../raphodo/errorlog.py:209 ../raphodo/errorlog.py:341
+#: ../raphodo/errorlog.py:210 ../raphodo/errorlog.py:345
 #, python-format
 msgid "%s of %s matches"
 msgstr ""
 
-#: ../raphodo/errorlog.py:228
+#: ../raphodo/errorlog.py:232
 msgid "Clear"
 msgstr ""
 
-#: ../raphodo/errorlog.py:328
+#: ../raphodo/errorlog.py:332
 msgid "Phrase not found"
 msgstr ""
 
-#: ../raphodo/errorlog.py:487
+#: ../raphodo/errorlog.py:491
 msgid "Search pending..."
 msgstr ""
 
-#: ../raphodo/errorlog.py:535
+#: ../raphodo/errorlog.py:539
 msgid ""
 "The number of new entries added to the Error Report since it was last open. "
 "Click to open the Error Report."
@@ -861,14 +1255,14 @@ msgstr ""
 
 #: ../raphodo/excepthook.py:77
 msgid "Problem in Rapid Photo Downloader"
-msgstr ""
+msgstr "在Rapid Photo Downloader中的错误"
 
 #: ../raphodo/excepthook.py:81
 #, python-brace-format
 msgid ""
 "<b>A problem occurred in Rapid Photo Downloader</b><br><br>\n"
-"    Please report the problem at <a href=\"{website}\">{website}</a>."
-"<br><br>\n"
+"    Please report the problem at <a "
+"href=\"{website}\">{website}</a>.<br><br>\n"
 "    Attach the log file <i>{log_file}</i> to your bug report (click\n"
 "    <a href=\"{log_path}\">here</a> to open the log directory).<br><br>If "
 "the same problem occurs\n"
@@ -888,10 +1282,14 @@ msgid ""
 "    Attach the log file to your bug report, found at {log_path}\n"
 "\n"
 msgstr ""
+"请将该问题报告到{website}\n"
+"\n"
+"    请把日志文件附加到您的错误报告中，您可以在{log_path}中找到。\n"
+"\n"
 
-#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1601
+#: ../raphodo/filebrowse.py:124 ../raphodo/thumbnaildisplay.py:1643
 msgid "Open in File Browser..."
-msgstr ""
+msgstr "在文件浏览器中打开..."
 
 #: ../raphodo/foldercombo.py:120
 msgid "File System"
@@ -907,531 +1305,531 @@ msgstr ""
 msgid "%s (location does not exist)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:186
+#: ../raphodo/generatenameconfig.py:190
 msgid "Date time"
 msgstr "日期时间"
 
-#: ../raphodo/generatenameconfig.py:187
+#: ../raphodo/generatenameconfig.py:191
 msgid "Text"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:188 ../raphodo/rapid.py:2053
+#: ../raphodo/generatenameconfig.py:192 ../raphodo/rapid.py:2125
 msgid "Filename"
 msgstr "文件名"
 
-#: ../raphodo/generatenameconfig.py:189 ../raphodo/preferencedialog.py:488
+#: ../raphodo/generatenameconfig.py:193 ../raphodo/preferencedialog.py:724
 msgid "Metadata"
 msgstr "元数据"
 
-#: ../raphodo/generatenameconfig.py:190
+#: ../raphodo/generatenameconfig.py:194
 msgid "Sequences"
 msgstr "序列"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#jobcode
-#: ../raphodo/generatenameconfig.py:193
+#: ../raphodo/generatenameconfig.py:197
 msgid "Job code"
 msgstr "任务代码"
 
-#: ../raphodo/generatenameconfig.py:194
+#: ../raphodo/generatenameconfig.py:198
 msgid "Image date"
 msgstr "图像日期"
 
-#: ../raphodo/generatenameconfig.py:195
+#: ../raphodo/generatenameconfig.py:199
 msgid "Video date"
 msgstr "视频日期"
 
-#: ../raphodo/generatenameconfig.py:196
+#: ../raphodo/generatenameconfig.py:200
 msgid "Today"
 msgstr "今日"
 
-#: ../raphodo/generatenameconfig.py:197
+#: ../raphodo/generatenameconfig.py:201
 msgid "Yesterday"
 msgstr "昨天"
 
 #. Translators: Download time is the time and date that the download started (when the
 #. user clicked the Download button)
-#: ../raphodo/generatenameconfig.py:200
+#: ../raphodo/generatenameconfig.py:204
 msgid "Download time"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:203
+#: ../raphodo/generatenameconfig.py:207
 msgid "Name"
-msgstr ""
+msgstr "名称"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:206 ../raphodo/rapid.py:2054
+#: ../raphodo/generatenameconfig.py:210 ../raphodo/rapid.py:2126
 msgid "Extension"
 msgstr "扩展名"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:209
+#: ../raphodo/generatenameconfig.py:213
 msgid "Image number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:210
+#: ../raphodo/generatenameconfig.py:214
 msgid "Video number"
 msgstr "视频数量"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:213
+#: ../raphodo/generatenameconfig.py:217
 msgid "Aperture"
 msgstr "光圈"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:216
+#: ../raphodo/generatenameconfig.py:220
 msgid "ISO"
 msgstr "ISO"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:219
+#: ../raphodo/generatenameconfig.py:223
 msgid "Exposure time"
 msgstr "曝光时间"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:222
+#: ../raphodo/generatenameconfig.py:226
 msgid "Focal length"
 msgstr "焦距"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:225
+#: ../raphodo/generatenameconfig.py:229
 msgid "Camera make"
 msgstr "相机制造商"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:228
+#: ../raphodo/generatenameconfig.py:232
 msgid "Camera model"
 msgstr "相机型号"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:231
+#: ../raphodo/generatenameconfig.py:235
 msgid "Short camera model"
 msgstr "相机型号缩写"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:234
+#: ../raphodo/generatenameconfig.py:238
 msgid "Hyphenated short camera model"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:237
+#: ../raphodo/generatenameconfig.py:241
 msgid "Serial number"
 msgstr "序列号"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:240
+#: ../raphodo/generatenameconfig.py:244
 msgid "Shutter count"
 msgstr "快门数"
 
 #. File number currently refers to the Exif value Exif.Canon.FileNumber
-#: ../raphodo/generatenameconfig.py:242
+#: ../raphodo/generatenameconfig.py:246
 msgid "File number"
 msgstr ""
 
 #. Only the folder component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:244
+#: ../raphodo/generatenameconfig.py:248
 msgid "Folder only"
 msgstr ""
 
 #. The folder and file component of the Exif.Canon.FileNumber value
-#: ../raphodo/generatenameconfig.py:246
+#: ../raphodo/generatenameconfig.py:250
 msgid "Folder and file"
-msgstr ""
+msgstr "文件和文件夹"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamemetadata
-#: ../raphodo/generatenameconfig.py:249
+#: ../raphodo/generatenameconfig.py:253
 msgid "Owner name"
 msgstr "机主姓名"
 
-#: ../raphodo/generatenameconfig.py:250
+#: ../raphodo/generatenameconfig.py:254
 msgid "Codec"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:251
+#: ../raphodo/generatenameconfig.py:255
 msgid "Width"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:252
+#: ../raphodo/generatenameconfig.py:256
 msgid "Height"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:253
+#: ../raphodo/generatenameconfig.py:257
 msgid "Length"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:254
+#: ../raphodo/generatenameconfig.py:258
 msgid "Frames Per Second"
 msgstr "每秒帧数"
 
-#: ../raphodo/generatenameconfig.py:255
+#: ../raphodo/generatenameconfig.py:259
 msgid "Artist"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:256
+#: ../raphodo/generatenameconfig.py:260
 msgid "Copyright"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:259
+#: ../raphodo/generatenameconfig.py:263
 msgid "Downloads today"
 msgstr "今日下载"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:262
+#: ../raphodo/generatenameconfig.py:266
 msgid "Session number"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:265
+#: ../raphodo/generatenameconfig.py:269
 msgid "Subfolder number"
 msgstr "子目录编号"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequencenumbers
-#: ../raphodo/generatenameconfig.py:268
+#: ../raphodo/generatenameconfig.py:272
 msgid "Stored number"
 msgstr "存储编号"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#sequenceletters
-#: ../raphodo/generatenameconfig.py:271
+#: ../raphodo/generatenameconfig.py:275
 msgid "Sequence letter"
 msgstr "序列字母"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:274
+#: ../raphodo/generatenameconfig.py:278
 msgid "All digits"
 msgstr "所有位数"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:277
+#: ../raphodo/generatenameconfig.py:281
 msgid "Last digit"
 msgstr "最后1位"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:280
+#: ../raphodo/generatenameconfig.py:284
 msgid "Last 2 digits"
 msgstr "最后2位"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:283
+#: ../raphodo/generatenameconfig.py:287
 msgid "Last 3 digits"
 msgstr "最后3位"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamefilename
-#: ../raphodo/generatenameconfig.py:286
+#: ../raphodo/generatenameconfig.py:290
 msgid "Last 4 digits"
 msgstr "最后4位"
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:289
+#: ../raphodo/generatenameconfig.py:293
 msgid "Original Case"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:292
+#: ../raphodo/generatenameconfig.py:296
 msgid "UPPERCASE"
 msgstr ""
 
 #. Translators: please not the capitalization of this text, and keep it the same if your
 #. language features capitalization
-#: ../raphodo/generatenameconfig.py:295
+#: ../raphodo/generatenameconfig.py:299
 msgid "lowercase"
 msgstr "小写"
 
-#: ../raphodo/generatenameconfig.py:296
+#: ../raphodo/generatenameconfig.py:300
 msgid "One digit"
 msgstr "一位"
 
-#: ../raphodo/generatenameconfig.py:297
+#: ../raphodo/generatenameconfig.py:301
 msgid "Two digits"
 msgstr "两位"
 
-#: ../raphodo/generatenameconfig.py:298
+#: ../raphodo/generatenameconfig.py:302
 msgid "Three digits"
 msgstr "三位"
 
-#: ../raphodo/generatenameconfig.py:299
+#: ../raphodo/generatenameconfig.py:303
 msgid "Four digits"
 msgstr "四位"
 
-#: ../raphodo/generatenameconfig.py:300
+#: ../raphodo/generatenameconfig.py:304
 msgid "Five digits"
 msgstr "五位"
 
-#: ../raphodo/generatenameconfig.py:301
+#: ../raphodo/generatenameconfig.py:305
 msgid "Six digits"
 msgstr "六位"
 
-#: ../raphodo/generatenameconfig.py:302
+#: ../raphodo/generatenameconfig.py:306
 msgid "Seven digits"
 msgstr "七位"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:305
+#: ../raphodo/generatenameconfig.py:309
 msgid "Subseconds"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:308 ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:312 ../raphodo/generatenameconfig.py:393
 msgid "YYYYMMDD"
 msgstr "YYYYMMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:311 ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:315 ../raphodo/generatenameconfig.py:394
 msgid "YYYY-MM-DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:314 ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:318 ../raphodo/generatenameconfig.py:395
 msgid "YYYY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:317
+#: ../raphodo/generatenameconfig.py:321
 msgid "YYMMDD"
 msgstr "YYMMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:320
+#: ../raphodo/generatenameconfig.py:324
 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
-#: ../raphodo/generatenameconfig.py:323
+#: ../raphodo/generatenameconfig.py:327
 msgid "YY_MM_DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:326
+#: ../raphodo/generatenameconfig.py:330
 msgid "MMDDYYYY"
 msgstr "MMDDYYYY"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:329
+#: ../raphodo/generatenameconfig.py:333
 msgid "MMDDYY"
 msgstr "MMDDYY"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:332
+#: ../raphodo/generatenameconfig.py:336
 msgid "MMDD"
 msgstr "MMDD"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:335
+#: ../raphodo/generatenameconfig.py:339
 msgid "DDMMYYYY"
 msgstr "DDMMYYYY"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:338
+#: ../raphodo/generatenameconfig.py:342
 msgid "DDMMYY"
 msgstr "DDMMYY"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:341 ../raphodo/generatenameconfig.py:389
-#: ../raphodo/generatenameconfig.py:390 ../raphodo/generatenameconfig.py:391
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:345 ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:394 ../raphodo/generatenameconfig.py:395
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:397
 msgid "YYYY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:344
+#: ../raphodo/generatenameconfig.py:348
 msgid "YY"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:347
+#: ../raphodo/generatenameconfig.py:351
 msgid "MM"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:350
+#: ../raphodo/generatenameconfig.py:354
 msgid "DD"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:353
+#: ../raphodo/generatenameconfig.py:357
 msgid "Month (full)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:356
+#: ../raphodo/generatenameconfig.py:360
 msgid "Month (abbreviated)"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:359
+#: ../raphodo/generatenameconfig.py:363
 msgid "HHMMSS"
 msgstr "HHMMSS"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:362
+#: ../raphodo/generatenameconfig.py:366
 msgid "HHMM"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:365
+#: ../raphodo/generatenameconfig.py:369
 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
-#: ../raphodo/generatenameconfig.py:368
+#: ../raphodo/generatenameconfig.py:372
 msgid "HH-MM"
 msgstr "HH-MM"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:371
+#: ../raphodo/generatenameconfig.py:375
 msgid "HH"
 msgstr ""
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:374
+#: ../raphodo/generatenameconfig.py:378
 msgid "MM (minutes)"
 msgstr "MM (分钟)"
 
 #. Translators: for an explanation of what this means,
 #. see http://damonlynch.net/rapid/documentation/index.html#renamedateandtime
-#: ../raphodo/generatenameconfig.py:377
+#: ../raphodo/generatenameconfig.py:381
 msgid "SS"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:389
+#: ../raphodo/generatenameconfig.py:393
 msgid "Date"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:390
+#: ../raphodo/generatenameconfig.py:394
 msgid "Date (hyphens)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:391
+#: ../raphodo/generatenameconfig.py:395
 msgid "Date (underscores)"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392 ../raphodo/generatenameconfig.py:438
-#: ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:396 ../raphodo/generatenameconfig.py:442
+#: ../raphodo/generatenameconfig.py:537
 msgid "Date and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:392
+#: ../raphodo/generatenameconfig.py:396
 msgid "YYYYMM_Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "Date and Job Code Subfolder"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393
+#: ../raphodo/generatenameconfig.py:397
 msgid "YYYYMM"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:393 ../raphodo/jobcodepanel.py:198
-#: ../raphodo/nameeditor.py:827 ../raphodo/rapid.py:1809
+#: ../raphodo/generatenameconfig.py:397 ../raphodo/jobcodepanel.py:199
+#: ../raphodo/nameeditor.py:833 ../raphodo/rapid.py:1852
 #: ../raphodo/renamepanel.py:83 ../raphodo/renamepanel.py:241
 msgid "Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:433 ../raphodo/generatenameconfig.py:512
+#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:532
 msgid "Original Filename"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "Date-Time and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:434 ../raphodo/generatenameconfig.py:513
+#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:533
 msgid "YYYYMMDD-HHMM-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "Date and Downloads today"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:435 ../raphodo/generatenameconfig.py:514
+#: ../raphodo/generatenameconfig.py:439 ../raphodo/generatenameconfig.py:534
 msgid "YYYYMMDD-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "Date-Time and Image number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:436
+#: ../raphodo/generatenameconfig.py:440
 msgid "YYYYMMDD-1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "Date-Time and Job Code"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:437 ../raphodo/generatenameconfig.py:516
+#: ../raphodo/generatenameconfig.py:441 ../raphodo/generatenameconfig.py:536
 msgid "YYYYMMDD-HHMM-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:438 ../raphodo/generatenameconfig.py:517
+#: ../raphodo/generatenameconfig.py:442 ../raphodo/generatenameconfig.py:537
 msgid "YYYYMMDD-Job Code-1"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "Date-Time and Video number"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:515
+#: ../raphodo/generatenameconfig.py:535
 msgid "YYYYMMDD_1234"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "Resolution"
 msgstr ""
 
-#: ../raphodo/generatenameconfig.py:518
+#: ../raphodo/generatenameconfig.py:538
 msgid "YYYYMMDD-HHMM-1-1920x1080"
 msgstr ""
 
@@ -1490,76 +1888,77 @@ msgstr ""
 msgid "&Remember this choice"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:185
+#: ../raphodo/jobcodepanel.py:186
 msgid ""
 "Select photos and videos to be able to apply a new or existing Job Code to "
 "them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:186
-msgid "The new Job Code will be applied to all selected photos and/or videos."
+#: ../raphodo/jobcodepanel.py:187
+msgid ""
+"The new Job Code will be applied to all selected photos and/or videos."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:187
+#: ../raphodo/jobcodepanel.py:188
 msgid ""
 "Click the Apply button to apply the current Job Code to all selected photos "
 "and/or videos. You can also simply double click the Job Code."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:189
+#: ../raphodo/jobcodepanel.py:190
 msgid ""
 "Removing a Job Code removes it only from the list of saved Job Codes, not "
 "from any photos or videos that it may have been applied to."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:191
+#: ../raphodo/jobcodepanel.py:192
 msgid ""
 "If you want to use Job Codes, configure file renaming or destination "
 "subfolder names to use them."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:197
+#: ../raphodo/jobcodepanel.py:198
 msgid "Last Used"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:202
+#: ../raphodo/jobcodepanel.py:203
 msgid "Job Code Sort:"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:205 ../raphodo/rapid.py:2061
+#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2133
 msgid "Ascending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:206 ../raphodo/rapid.py:2062
+#: ../raphodo/jobcodepanel.py:207 ../raphodo/rapid.py:2134
 msgid "Descending"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:216
+#: ../raphodo/jobcodepanel.py:217
 msgid "&New..."
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:220
+#: ../raphodo/jobcodepanel.py:221
 msgid "&Apply"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:224
+#: ../raphodo/jobcodepanel.py:225
 msgid "&Remove"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:228 ../raphodo/preferencedialog.py:125
-#: ../raphodo/preferencedialog.py:154 ../raphodo/preferencedialog.py:433
+#: ../raphodo/jobcodepanel.py:229 ../raphodo/preferencedialog.py:200
+#: ../raphodo/preferencedialog.py:229 ../raphodo/preferencedialog.py:531
 msgid "Remove All"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:427
+#: ../raphodo/jobcodepanel.py:428
 msgid "Do you really want to remove all the Job Codes?"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:429
+#: ../raphodo/jobcodepanel.py:430
 msgid "Remove all Job Codes"
 msgstr ""
 
-#: ../raphodo/jobcodepanel.py:492
+#: ../raphodo/jobcodepanel.py:493
 msgid "Job Codes"
 msgstr ""
 
@@ -1570,42 +1969,58 @@ msgstr ""
 msgid "<i><b>Hint:</b> %(message)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:418 ../raphodo/nameeditor.py:432
+#: ../raphodo/nameeditor.py:423 ../raphodo/nameeditor.py:437
 #, python-format
 msgid "%(description)s - %(elements)s"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:512
+#: ../raphodo/nameeditor.py:517
 msgid "Save New Custom Preset..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:513
+#: ../raphodo/nameeditor.py:518
 msgid "Remove All Custom Presets..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:559
+#: ../raphodo/nameeditor.py:564
 msgid "(New Custom Preset)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:576
+#: ../raphodo/nameeditor.py:581
 #, python-format
 msgid "%s (edited)"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:579 ../raphodo/nameeditor.py:1370
+#: ../raphodo/nameeditor.py:584 ../raphodo/nameeditor.py:1379
 #, python-format
 msgid "Update Custom Preset \"%s\""
 msgstr ""
 
-#: ../raphodo/nameeditor.py:667
+#: ../raphodo/nameeditor.py:672
 msgid "Save New Custom Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:675
+#: ../raphodo/nameeditor.py:680
 msgid "Preset Name:"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:836
+#: ../raphodo/nameeditor.py:799
+msgid "Photo Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:805
+msgid "Video Subfolder Generation Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:811
+msgid "Photo Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:817
+msgid "Video Renaming Editor"
+msgstr ""
+
+#: ../raphodo/nameeditor.py:842
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>There is insufficient data to "
 "fully generate the name. Please use other renaming options.</i>"
@@ -1614,7 +2029,7 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees.
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:846
+#: ../raphodo/nameeditor.py:853
 #, python-format
 msgid "The character</i> %(separator)s <i>creates a new subfolder level."
 msgstr ""
@@ -1622,50 +2037,50 @@ msgstr ""
 #. Translators: please do not modify, change the order of or leave out html formatting
 #. tags like <i> and <b>. These are used to format the text the users sees
 #. In this case, the </i> really is supposed to come before the <i>.
-#: ../raphodo/nameeditor.py:851
+#: ../raphodo/nameeditor.py:858
 #, python-format
 msgid ""
 "There is no need start or end with the folder separator </i> "
 "%(separator)s<i>, because it is added automatically."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:859
+#: ../raphodo/nameeditor.py:866
 msgid ""
 "<b><font color=\"red\">Warning:</font></b> <i>Unique filenames may not be "
 "generated. Make filenames unique by using Sequence values.</i>"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:882 ../raphodo/renamepanel.py:121
+#: ../raphodo/nameeditor.py:889 ../raphodo/renamepanel.py:121
 msgid "Preset:"
 msgstr ""
 
 #. Translators: appears in a combobox, e.g. Image Date (YYYY)
-#: ../raphodo/nameeditor.py:959 ../raphodo/nameeditor.py:980
+#: ../raphodo/nameeditor.py:966 ../raphodo/nameeditor.py:987
 #, python-brace-format
 msgid "{choice} ({variant})"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1005 ../raphodo/preferencedialog.py:530
+#: ../raphodo/nameeditor.py:1012 ../raphodo/preferencedialog.py:783
 msgid "Get help online..."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1025
+#: ../raphodo/nameeditor.py:1034
 msgid "Insert"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1351
+#: ../raphodo/nameeditor.py:1360
 msgid "Save Preset - Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1356
+#: ../raphodo/nameeditor.py:1365
 msgid ""
-"<b>Do you want to save the changes in a new custom preset?</"
-"b><br><br>Creating a custom preset is not required, but can help you keep "
-"organized.<br><br>The changes to the preferences will still be applied "
-"regardless of whether you create a new custom preset or not."
+"<b>Do you want to save the changes in a new custom "
+"preset?</b><br><br>Creating a custom preset is not required, but can help "
+"you keep organized.<br><br>The changes to the preferences will still be "
+"applied regardless of whether you create a new custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1365
+#: ../raphodo/nameeditor.py:1374
 msgid ""
 "<b>Do you want to save the changes in a custom preset?</b><br><br>If you "
 "like, you can create a new custom preset or update the existing custom "
@@ -1673,136 +2088,167 @@ msgid ""
 "regardless of whether you save a custom preset or not."
 msgstr ""
 
-#: ../raphodo/nameeditor.py:1372
+#: ../raphodo/nameeditor.py:1381
 msgid "Save New Custom Preset"
 msgstr ""
 
-#: ../raphodo/newversion.py:306
+#: ../raphodo/newversion.py:312
 msgid "Checking for new version..."
 msgstr ""
 
-#: ../raphodo/newversion.py:307
+#: ../raphodo/newversion.py:313
 msgid "You are running the latest version."
 msgstr ""
 
-#: ../raphodo/newversion.py:308
+#: ../raphodo/newversion.py:314
 msgid "Failed to contact the update server."
 msgstr ""
 
-#: ../raphodo/newversion.py:310
+#: ../raphodo/newversion.py:316
 #, python-format
 msgid "A new version of Rapid Photo Downloader (%s) is available."
 msgstr ""
 
-#: ../raphodo/newversion.py:312
+#: ../raphodo/newversion.py:318
 msgid "Do you want to download the new version?"
 msgstr ""
 
-#: ../raphodo/newversion.py:313
+#: ../raphodo/newversion.py:319
 #, python-format
 msgid "Changes in the new release can be viewed <a href=\"%s\">here</a>."
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the s key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:340 ../raphodo/newversion.py:353
+#: ../raphodo/newversion.py:348 ../raphodo/newversion.py:363
 msgid "&Skip this release"
 msgstr ""
 
 #. Translators: this text appears in a button - the & sets the o key in combination with
 #. the alt key to act as the keyboard shortcut
-#: ../raphodo/newversion.py:356
+#: ../raphodo/newversion.py:366
 msgid "&Open Download Page"
 msgstr ""
 
-#: ../raphodo/newversion.py:376
+#: ../raphodo/newversion.py:386
 msgid "Rapid Photo Downloader updates"
 msgstr ""
 
 #. Translators: shows how much of a file has been downloaded e.g  123 KB of 1.3 MB
-#: ../raphodo/newversion.py:478
+#: ../raphodo/newversion.py:488
 #, python-format
 msgid "%(downloaded)s of %(total)s"
 msgstr ""
 
-#: ../raphodo/newversion.py:495
+#: ../raphodo/newversion.py:507
 msgid "Downloading..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:76
+#: ../raphodo/preferencedialog.py:86
 msgid "Preferences"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Automation"
 msgstr "自动"
 
-#: ../raphodo/preferencedialog.py:85
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:85 ../raphodo/preferencedialog.py:343
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
+#: ../raphodo/preferencedialog.py:428
 msgid "Error Handling"
 msgstr "错误处理"
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:108 ../raphodo/preferencedialog.py:118
 msgid "Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:86
+#: ../raphodo/preferencedialog.py:109
+msgid "Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:109 ../raphodo/preferencedialog.py:119
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:94
+#: ../raphodo/preferencedialog.py:147
 msgid "Device Scanning"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:96
+#: ../raphodo/preferencedialog.py:148
 msgid "Scan only external devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:98
+#: ../raphodo/preferencedialog.py:150
 msgid ""
 "Scan for photos and videos only on devices that are external to the "
 "computer,\n"
 "including cameras, memory cards, external hard drives, and USB flash drives."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:102
-msgid "Scan non-camera devices lacking a DCIM folder"
+#: ../raphodo/preferencedialog.py:153
+msgid "Scan only specific folders on devices"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:155
+msgid ""
+"Scan for photos and videos only in the folders specified below (except "
+"paths\n"
+"specified in Ignored Paths).\n"
+"\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:161
+msgid "Folders to scan:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:104
+#: ../raphodo/preferencedialog.py:164
 msgid ""
-"Scan the entirety of a device for photos and videos, irrespective of whether "
-"it contains a DCIM folder,\n"
-"as opposed to only scanning within a DCIM folder.\n"
+"Folders at the base level of device file systems that will be scanned\n"
+"for photos and videos."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:167 ../raphodo/preferencedialog.py:219
+msgid "Add..."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:169
+msgid ""
+"Add a folder to the list of folders to scan for photos and videos.\n"
 "\n"
-"Changing this setting causes all devices to be scanned again.\n"
+"Changing this setting causes all devices to be scanned again."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:172 ../raphodo/preferencedialog.py:198
+#: ../raphodo/preferencedialog.py:224 ../raphodo/preferencedialog.py:529
+msgid "Remove"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:174
+msgid ""
+"Remove a folder from the list of folders to scan for photos and videos.\n"
 "\n"
-"Note: With cameras, only the DCIM folder is scanned."
+"Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:116
+#: ../raphodo/preferencedialog.py:191
 msgid "Devices that have been set to automatically ignore or download from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:117
+#: ../raphodo/preferencedialog.py:192
 msgid "Remembered Devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:121
+#: ../raphodo/preferencedialog.py:196
 msgid ""
 "Remove a device from the list of devices to automatically ignore or download "
 "from."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:123 ../raphodo/preferencedialog.py:149
-#: ../raphodo/preferencedialog.py:431
-msgid "Remove"
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:127
+#: ../raphodo/preferencedialog.py:202
 msgid ""
 "Clear the list of devices from which to automatically ignore or download "
 "from.\n"
@@ -1810,315 +2256,436 @@ msgid ""
 "Note: Changes take effect when the computer is next scanned for devices."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:140
+#: ../raphodo/preferencedialog.py:215
 msgid "Ignored Paths"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:141
+#: ../raphodo/preferencedialog.py:216
 msgid ""
 "The end part of a path that should never be scanned for photos or videos."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:144
-msgid "Add..."
-msgstr ""
-
-#: ../raphodo/preferencedialog.py:146
+#: ../raphodo/preferencedialog.py:221
 msgid ""
 "Add a path to the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:151
+#: ../raphodo/preferencedialog.py:226
 msgid ""
 "Remove a path from the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:156
+#: ../raphodo/preferencedialog.py:231
 msgid ""
 "Clear the list of paths to ignore.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:164
+#: ../raphodo/preferencedialog.py:239
 msgid ""
-"Use python-style <a href=\"http://damonlynch.net/rapid/documentation/"
-"#regularexpressions\">regular expressions</a>"
+"Use python-style <a "
+"href=\"http://damonlynch.net/rapid/documentation/#regularexpressions\">regula"
+"r expressions</a>"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:168
+#: ../raphodo/preferencedialog.py:243
 msgid ""
 "Use regular expressions in the list of ignored paths.\n"
 "\n"
 "Changing this setting causes all devices to be scanned again."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:208
+#: ../raphodo/preferencedialog.py:283
 msgid "Program Automation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:209
+#: ../raphodo/preferencedialog.py:284
 msgid "Start downloading at program startup"
 msgstr "程序启动时开始下载"
 
-#: ../raphodo/preferencedialog.py:210
+#: ../raphodo/preferencedialog.py:285
 msgid "Start downloading upon device insertion"
 msgstr "设备插入后自动开始下载"
 
-#: ../raphodo/preferencedialog.py:211
+#: ../raphodo/preferencedialog.py:286
 msgid "Unmount (eject) device upon download completion"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:212
+#: ../raphodo/preferencedialog.py:287
 msgid "Exit program when download completes"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:213
+#: ../raphodo/preferencedialog.py:288
 msgid "Exit program even if download had warnings or errors"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:240
+#: ../raphodo/preferencedialog.py:315
 msgid "Thumbnail Generation"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:241
+#: ../raphodo/preferencedialog.py:316
 msgid "Generate thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:242
+#: ../raphodo/preferencedialog.py:318
 msgid "Generate thumbnails to show in the main program window"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:244
+#: ../raphodo/preferencedialog.py:320
 msgid "Cache thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:245
+#: ../raphodo/preferencedialog.py:323
 msgid ""
 "Save thumbnails shown in the main program window in a thumbnail cache unique "
 "to Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:247
+#: ../raphodo/preferencedialog.py:327
 msgid "Generate system thumbnails"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:248
+#: ../raphodo/preferencedialog.py:330
 msgid ""
 "While downloading, save thumbnails that can be used by desktop file managers "
 "and other programs"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:255
+#: ../raphodo/preferencedialog.py:339
 msgid "Number of CPU cores used to generate thumbnails."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:256
+#: ../raphodo/preferencedialog.py:340
 msgid "CPU cores:"
 msgstr ""
 
 #. Translators: the * acts as an asterisk to denote a reference to an annotation
 #. such as '* Takes effect upon program restart'
-#: ../raphodo/preferencedialog.py:271 ../raphodo/preferencedialog.py:317
+#: ../raphodo/preferencedialog.py:355 ../raphodo/preferencedialog.py:401
 msgid "*"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:294
+#: ../raphodo/preferencedialog.py:378
 msgid "Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:296
+#: ../raphodo/preferencedialog.py:380
 msgid "Calculating..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:302
+#: ../raphodo/preferencedialog.py:386
 msgid "days"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:303
+#: ../raphodo/preferencedialog.py:387
 msgid "forever"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:308
+#: ../raphodo/preferencedialog.py:392
 msgid "Cache size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:310
+#: ../raphodo/preferencedialog.py:394
 msgid "Number of thumbnails:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:312
+#: ../raphodo/preferencedialog.py:396
 msgid "Database size:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:314
+#: ../raphodo/preferencedialog.py:398
 msgid "Cache unaccessed thumbnails for:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:322
+#: ../raphodo/preferencedialog.py:406
 msgid "Purge Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:323
+#: ../raphodo/preferencedialog.py:408
 msgid "Optimize Cache..."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:336
+#: ../raphodo/preferencedialog.py:421
 msgid "* Takes effect upon program restart"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:346
+#: ../raphodo/preferencedialog.py:431
 msgid "Skip download"
 msgstr "跳过下载"
 
-#: ../raphodo/preferencedialog.py:347
+#: ../raphodo/preferencedialog.py:432
 msgid "Don't download the file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:348
+#: ../raphodo/preferencedialog.py:433
 msgid "Add unique identifier"
 msgstr "添加唯一标识符"
 
-#: ../raphodo/preferencedialog.py:349
+#: ../raphodo/preferencedialog.py:436
 msgid ""
 "Add an identifier like _1 or _2 to the end of the filename, immediately "
 "before the file's extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:355
+#: ../raphodo/preferencedialog.py:444
 msgid "Overwrite"
 msgstr "覆盖"
 
-#: ../raphodo/preferencedialog.py:356
+#: ../raphodo/preferencedialog.py:445
 msgid "Overwrite the previously backed up file"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:357
+#: ../raphodo/preferencedialog.py:446
 msgid "Skip"
 msgstr "跳过"
 
-#: ../raphodo/preferencedialog.py:358
+#: ../raphodo/preferencedialog.py:448
 msgid "Don't overwrite the backup file, and issue an error message"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:364
+#: ../raphodo/preferencedialog.py:455
 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 identifier:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:378
+#: ../raphodo/preferencedialog.py:464
+msgid ""
+"Using sequence numbers to automatically generate unique filenames is "
+"strongly recommended. Configure file renaming in the Rename panel in the "
+"main window."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:473
 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 ""
 
-#: ../raphodo/preferencedialog.py:398
+#: ../raphodo/preferencedialog.py:494
 msgid "Program Warnings"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:399
+#: ../raphodo/preferencedialog.py:495
 msgid "Show a warning when:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:402
+#: ../raphodo/preferencedialog.py:498
 msgid "Downloading files currently not displayed"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:403
+#: ../raphodo/preferencedialog.py:499
 msgid ""
 "Warn when about to download files that are not displayed in the main window."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:405
+#: ../raphodo/preferencedialog.py:501
 msgid "Backup destinations are missing"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:406
-msgid "Warn before starting a download if it is not possible to back up files."
+#: ../raphodo/preferencedialog.py:502
+msgid ""
+"Warn before starting a download if it is not possible to back up files."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:408
+#: ../raphodo/preferencedialog.py:504
 msgid "Program libraries are missing or broken"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:409
+#: ../raphodo/preferencedialog.py:505
 msgid ""
 "Warn if a software library used by Rapid Photo Downloader is missing or not "
 "functioning."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:412
+#: ../raphodo/preferencedialog.py:508
 msgid "Filesystem metadata cannot be set"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:413
+#: ../raphodo/preferencedialog.py:509
 msgid ""
 "Warn if there is an error setting a file's filesystem metadata, such as its "
 "modification time."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:416
+#: ../raphodo/preferencedialog.py:512
 msgid "Encountering unhandled files"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:417
+#: ../raphodo/preferencedialog.py:513
 msgid ""
 "Warn after scanning a device or this computer if there are unrecognized "
 "files that will not be included in the download."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:420
+#: ../raphodo/preferencedialog.py:517
 msgid "Do not warn about unhandled files with extensions:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:424
+#: ../raphodo/preferencedialog.py:522
 msgid ""
 "File extensions are case insensitive and do not need to include the leading "
 "dot."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:427
+#: ../raphodo/preferencedialog.py:525
 msgid "Add"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:428
+#: ../raphodo/preferencedialog.py:526
 msgid ""
 "Add a file extension to the list of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:430
+#: ../raphodo/preferencedialog.py:528
 msgid ""
 "Remove a file extension from the list of unhandled file types to not warn "
 "about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:434
+#: ../raphodo/preferencedialog.py:532
 msgid ""
 "Clear the list of file extensions of unhandled file types to not warn about."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:469
+#: ../raphodo/preferencedialog.py:568
+msgid "Photo and Video Consolidation"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:571
+msgid "Consolidate files across devices and downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:574
+msgid ""
+"Analyze the results of device scans looking for duplicate files and matching "
+"RAW and JPEG pairs,\n"
+"comparing them across multiple devices and download sessions."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:580
+msgid "Treat matching RAW and JPEG files as:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:581
+msgid "One photo"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:582
+msgid "Two photos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:584
+msgid ""
+"Display matching pairs of RAW and JPEG photos as one photo, and if marked, "
+"download both."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:589
+msgid ""
+"Display matching pairs of RAW and JPEG photos as two different photos. You "
+"can still synchronize their sequence numbers."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:598
+msgid "With matching RAW and JPEG photos:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:600
+msgid "Do not mark JPEG for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:601
+msgid "Do not mark RAW for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:602
+msgid "Mark both for download"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:609
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"JPEG for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:614
+msgid ""
+"When matching RAW and JPEG photos are found, do not automatically mark the "
+"RAW for\n"
+"download. You can still mark it for download yourself."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:619
+msgid ""
+"When matching RAW and JPEG photos are found, automatically mark both for "
+"download."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:625
+msgid ""
+"If you disable file consolidation, choose what to do when a download device "
+"is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:631
+msgid ""
+"When a download device is inserted while completed downloads are displayed:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:642
+msgid "Clear completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:643
+msgid "Keep displaying completed downloads"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:644
+msgid "Prompt for what to do"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:649
+msgid ""
+"Automatically clear the display of completed downloads whenever a new "
+"download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:654
+msgid ""
+"Keep displaying completed downloads whenever a new download device is "
+"inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:658
+msgid ""
+"Prompt whether to keep displaying completed downloads or clear them whenever "
+"a new download device is inserted."
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:702
 msgid "Version Check"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:470
+#: ../raphodo/preferencedialog.py:703
 msgid "Check for new version at startup"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:471
+#: ../raphodo/preferencedialog.py:705
 msgid "Check for a new version of the program each time the program starts."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:473
+#: ../raphodo/preferencedialog.py:707
 msgid "Include development releases"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:474
+#: ../raphodo/preferencedialog.py:709
 msgid ""
 "Include alpha, beta and other development releases when checking for a new "
 "version of the program.\n"
@@ -2127,11 +2694,11 @@ msgid ""
 "occur."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:489
+#: ../raphodo/preferencedialog.py:725
 msgid "Ignore DNG date/time metadata on MTP devices"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:490
+#: ../raphodo/preferencedialog.py:727
 msgid ""
 "Ignore date/time metadata in DNG files located on MTP devices, and use the "
 "file's modification time instead.\n"
@@ -2140,70 +2707,86 @@ msgid ""
 "metadata."
 msgstr ""
 
+#: ../raphodo/preferencedialog.py:741
+msgid "Completed Downloads"
+msgstr ""
+
 #. Translators: substituted value is a description for the set of preferences
 #. shown in the preference dialog window, e.g. Devices, Automation, etc.
 #. This string is shown in a tooltip for the "Restore Defaults" button
-#: ../raphodo/preferencedialog.py:710
+#: ../raphodo/preferencedialog.py:1067
 #, python-format
 msgid "Restores default %s preference values"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:832
+#: ../raphodo/preferencedialog.py:1208
 msgid ""
 "Do you want to purge the thumbnail cache? The cache will be purged when the "
 "program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:835
+#: ../raphodo/preferencedialog.py:1212
 msgid "Purge Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:847
+#: ../raphodo/preferencedialog.py:1225
 msgid ""
 "Do you want to optimize the thumbnail cache? The cache will be optimized "
 "when the program is next started."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:850
+#: ../raphodo/preferencedialog.py:1229
 msgid "Optimize Thumbnail Cache"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1045
+#: ../raphodo/preferencedialog.py:1481
+msgid "Enter a Folder to Scan"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1482
+msgid "Specify a folder that will be scanned for photos and videos"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1483
+msgid "Folder:"
+msgstr ""
+
+#: ../raphodo/preferencedialog.py:1497
 msgid "Enter a Path to Ignore"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1046
+#: ../raphodo/preferencedialog.py:1498
 msgid "Specify a path that will never be scanned for photos or videos"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1047
+#: ../raphodo/preferencedialog.py:1499
 msgid "Path:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1061
+#: ../raphodo/preferencedialog.py:1513
 msgid "Enter a File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1062
+#: ../raphodo/preferencedialog.py:1514
 msgid "Specify a file extension (without the leading dot)"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1063 ../raphodo/renamepanel.py:122
+#: ../raphodo/preferencedialog.py:1515 ../raphodo/renamepanel.py:122
 msgid "Extension:"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1078
+#: ../raphodo/preferencedialog.py:1530
 msgid "Invalid File Extension"
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1079
+#: ../raphodo/preferencedialog.py:1531
 #, python-format
 msgid ""
 "The file extension <b>%s</b> is recognized by Rapid Photo Downloader, so it "
 "makes no sense to warn about its presence."
 msgstr ""
 
-#: ../raphodo/preferencedialog.py:1081
+#: ../raphodo/preferencedialog.py:1533
 #, python-format
 msgid ""
 "Recognized file types:\n"
@@ -2229,104 +2812,103 @@ msgstr ""
 msgid "Birthday"
 msgstr ""
 
-#: ../raphodo/preferences.py:614
+#: ../raphodo/preferences.py:624
 #, python-format
 msgid "Subfolder preferences should not start with a %s"
 msgstr "子目录首选项不应以 %s 开头"
 
-#: ../raphodo/preferences.py:617
+#: ../raphodo/preferences.py:627
 #, python-format
 msgid "Subfolder preferences should not end with a %s"
 msgstr "子目录首选项不应以 %s 结尾"
 
-#: ../raphodo/preferences.py:622
+#: ../raphodo/preferences.py:632
 #, python-format
 msgid "Subfolder preferences should not contain two %s one after the other"
 msgstr "子目录首选项不应包含两个相邻的 %s"
 
-#. self.setFlat(True)
 #: ../raphodo/primarybutton.py:72
 msgid "Download 8 Photos and 10 Videos"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:86 ../raphodo/problemnotification.py:208
+#: ../raphodo/problemnotification.py:87 ../raphodo/problemnotification.py:209
 #, python-format
 msgid "Error: %(errno)s %(strerror)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:89
+#: ../raphodo/problemnotification.py:90
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:116
+#: ../raphodo/problemnotification.py:117
 #, python-format
 msgid "GPhoto2 Error: %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:124
+#: ../raphodo/problemnotification.py:125
 msgid ""
 "Unable to initialize the camera, probably because another program is using "
 "it. No files were copied from it."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:134
+#: ../raphodo/problemnotification.py:135
 #, python-format
 msgid "Unable to read directory %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:140
+#: ../raphodo/problemnotification.py:141
 #, python-format
 msgid "Unable to access modification time or size from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:146
+#: ../raphodo/problemnotification.py:147
 #, python-format
 msgid "Unable to read file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:152
+#: ../raphodo/problemnotification.py:153
 #, python-format
 msgid "Unable to write file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:158
+#: ../raphodo/problemnotification.py:159
 #, python-format
 msgid "Unable to move file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:164
+#: ../raphodo/problemnotification.py:165
 #, python-format
 msgid "Unable to remove file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:170
+#: ../raphodo/problemnotification.py:171
 #, python-format
 msgid "Unable to copy file %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:176
+#: ../raphodo/problemnotification.py:177
 #, python-format
 msgid "Zero length file %s will not be downloaded"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:182
+#: ../raphodo/problemnotification.py:183
 #, python-format
 msgid "Could not determine filesystem modification time for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:188
+#: ../raphodo/problemnotification.py:189
 #, python-format
 msgid "Unable to load metadata from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:194
+#: ../raphodo/problemnotification.py:195
 #, python-format
 msgid ""
 "Unable to load metadata from %(name)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:202
+#: ../raphodo/problemnotification.py:203
 #, python-format
 msgid ""
 "An error occurred setting a file's filesystem metadata on the filesystem %s. "
@@ -2334,212 +2916,212 @@ msgid ""
 "again."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:216
+#: ../raphodo/problemnotification.py:217
 #, python-format
 msgid "Encountered unhandled file %s. It will not be downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:223
+#: ../raphodo/problemnotification.py:224
 #, python-format
 msgid "%(filetype)s %(destination)s already exists."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:234 ../raphodo/problemnotification.py:262
+#: ../raphodo/problemnotification.py:235 ../raphodo/problemnotification.py:263
 #, python-format
 msgid ""
 "The existing %(filetype)s %(destination)s was last modified on %(date)s at "
 "%(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:245
+#: ../raphodo/problemnotification.py:246
 #, python-format
 msgid "The %(filetype)s %(source)s was not downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:273
+#: ../raphodo/problemnotification.py:274
 #, python-format
 msgid "The %(filetype)s %(source)s was downloaded from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:282
+#: ../raphodo/problemnotification.py:283
 #, python-format
 msgid "The unique identifier '%s' was added to the filename."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:298
+#: ../raphodo/problemnotification.py:299
 #, python-format
 msgid ""
 "The existing backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:309
+#: ../raphodo/problemnotification.py:310
 #, python-format
 msgid "The %(filetype)s %(source)s was not backed up from %(device)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:326
+#: ../raphodo/problemnotification.py:327
 #, python-format
 msgid ""
 "The previous backup %(filetype)s %(destination)s was last modified on "
 "%(date)s at %(time)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:337
+#: ../raphodo/problemnotification.py:338
 #, python-format
 msgid ""
 "The %(filetype)s %(source)s from %(device)s was backed up, overwriting the "
 "previous backup %(filetype)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:356
+#: ../raphodo/problemnotification.py:357
 #, python-format
 msgid ""
 "When synchronizing RAW + JPEG sequence values, a duplicate %(filetype)s "
 "%(file)s was encountered, and was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:366
+#: ../raphodo/problemnotification.py:367
 msgid ""
 "When synchronizing RAW + JPEG sequence values, photos were detected with the "
 "same filenames, but taken at different times:"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:373
+#: ../raphodo/problemnotification.py:374
 #, 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 ""
 
-#: ../raphodo/problemnotification.py:389
+#: ../raphodo/problemnotification.py:390
 #, python-format
 msgid "Unable to finalize the filename for %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:424
+#: ../raphodo/problemnotification.py:425
 #, python-format
 msgid ""
 "The filename %(destination)s was not fully generated for %(filetype)s "
 "%(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:433
+#: ../raphodo/problemnotification.py:434
 #, python-format
 msgid "The %(type)s metadata is missing."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:439
+#: ../raphodo/problemnotification.py:440
 #, python-format
 msgid "The following metadata is missing: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:445
+#: ../raphodo/problemnotification.py:446
 #, python-format
 msgid "Date/time conversion failed: %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:451
+#: ../raphodo/problemnotification.py:452
 msgid ""
 "Could not extract valid date/time metadata or determine the file "
 "modification time."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:457
+#: ../raphodo/problemnotification.py:458
 msgid "Filename does not have an extension."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:460
+#: ../raphodo/problemnotification.py:461
 msgid "Filename does not have a number component."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:464
+#: ../raphodo/problemnotification.py:465
 #, python-format
 msgid "Error generating component %(component)s. Error: %(error)s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:477
+#: ../raphodo/problemnotification.py:478
 #, python-format
 msgid ""
 "The download subfolders %(folder)s were only partially generated for "
 "%(filetype)s %(source)s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:486
+#: ../raphodo/problemnotification.py:487
 #, python-format
 msgid ""
 "There is no data with which to generate the %(subfolder_file)s for "
 "%(filename)s. The %(filetype)s was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:499
+#: ../raphodo/problemnotification.py:500
 #, python-format
 msgid ""
 "Unable to create the %(filetype)s %(destination)s in %(folder)s. The "
 "download file was %(source)s in %(device)s. It was not downloaded."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:514
+#: ../raphodo/problemnotification.py:515
 #, python-format
 msgid "Unable to create the download subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:526
+#: ../raphodo/problemnotification.py:527
 #, python-format
 msgid "Unable to create the backup subfolder %s."
 msgstr ""
 
-#: ../raphodo/problemnotification.py:577
+#: ../raphodo/problemnotification.py:578
 #, python-format
 msgid "Problems scanning %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:584
+#: ../raphodo/problemnotification.py:585
 #, python-format
 msgid "Problems copying from %s"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:591
+#: ../raphodo/problemnotification.py:592
 msgid "Problems while finalizing filenames and generating subfolders"
 msgstr ""
 
-#: ../raphodo/problemnotification.py:598
+#: ../raphodo/problemnotification.py:599
 #, python-format
 msgid "Problems backing up to %s"
 msgstr ""
 
-#. Translators: for example Nov 3 or Dec 31
-#. The start and end dates are on a different day
-#. Translators: for example Nov 3 or Dec 31
-#: ../raphodo/proximity.py:105 ../raphodo/proximity.py:221
-#: ../raphodo/proximity.py:224 ../raphodo/proximity.py:828
+#. Translators: for example Nov 3 2015, 11:25 AM
+#. Translators: for example, Nov 3, 12:15 PM
+#: ../raphodo/proximity.py:188 ../raphodo/proximity.py:213
+#: ../raphodo/proximity.py:236 ../raphodo/proximity.py:239
 #, python-format
-msgid "%(month)s %(numeric_day)s"
+msgid "%(date)s, %(time)s"
 msgstr ""
 
-#. Translators: for example Nov 15 2015
-#. Translators: for example Nov 3 2015
-#: ../raphodo/proximity.py:109 ../raphodo/proximity.py:230
-#: ../raphodo/proximity.py:231 ../raphodo/proximity.py:831
+#: ../raphodo/proximity.py:204
 #, python-format
-msgid "%(date)s %(year)s"
+msgid "%(starttime)s - %(endtime)s"
 msgstr ""
 
-#. Translators: for example Nov 3 2015, 11:25 AM
-#. Translators: for example, Nov 3, 12:15 PM
-#: ../raphodo/proximity.py:197 ../raphodo/proximity.py:215
-#: ../raphodo/proximity.py:234 ../raphodo/proximity.py:236
+#. The start and end dates are on a different day
+#. Translators: for example Nov 3 or Dec 31
+#: ../raphodo/proximity.py:221 ../raphodo/proximity.py:225
+#: ../raphodo/proximity.py:980 ../raphodo/timeutils.py:105
 #, python-format
-msgid "%(date)s, %(time)s"
+msgid "%(month)s %(numeric_day)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:209
+#. Translators: for example Nov 3 2015
+#. Translators: for example Nov 2 2015
+#. Translators: for example Nov 15 2015
+#: ../raphodo/proximity.py:232 ../raphodo/proximity.py:233
+#: ../raphodo/proximity.py:985 ../raphodo/timeutils.py:110
 #, python-format
-msgid "%(starttime)s - %(endtime)s"
+msgid "%(date)s %(year)s"
 msgstr ""
 
 #. Translators: for example, Nov 3, 12:15 PM - Nov 4, 1:00 AM
-#: ../raphodo/proximity.py:241
+#: ../raphodo/proximity.py:245
 #, python-format
 msgid "%(earlier_time)s - %(later_time)s"
 msgstr ""
@@ -2548,25 +3130,25 @@ msgstr ""
 #. Nov 3 2012, 12:15 PM -
 #. Nov 4 2012, 1:00 AM
 #. (please keep the line break signified by \n)
-#: ../raphodo/proximity.py:248
+#: ../raphodo/proximity.py:253
 #, python-format
 msgid ""
 "%(earlier_time)s -\n"
 "%(later_time)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:359
+#: ../raphodo/proximity.py:382
 #, python-format
 msgid "%(month)s  %(year)s"
 msgstr ""
 
 #. Translators: for example Nov 2015
-#: ../raphodo/proximity.py:833
+#: ../raphodo/proximity.py:987
 #, python-format
 msgid "%(month)s %(year)s"
 msgstr ""
 
-#: ../raphodo/proximity.py:1344
+#: ../raphodo/proximity.py:1595
 msgid ""
 "The time elapsed between consecutive photos and videos that is used to build "
 "the Timeline"
@@ -2576,47 +3158,47 @@ msgstr ""
 #. Replace the very last character (after the d) with the correct
 #. localized value, keeping everything else. In other words, change
 #. only the m character.
-#: ../raphodo/proximity.py:1406
+#: ../raphodo/proximity.py:1652
 #, python-format
 msgid "%(minutes)dm"
 msgstr ""
 
 #. Translators: i.e. "1.5h", which is short for 1.5 hours.
 #. Replace the entire string with the correct localized value
-#: ../raphodo/proximity.py:1410
+#: ../raphodo/proximity.py:1656
 msgid "1.5h"
 msgstr ""
 
 #. Translators: e.g. "5h", which is short for 5 hours.
 #. Replace the very last character (after the d) with the correct localized value,
 #. keeping everything else. In other words, change only the h character.
-#: ../raphodo/proximity.py:1415
+#: ../raphodo/proximity.py:1661
 #, python-format
 msgid "%(hours)dh"
 msgstr ""
 
-#: ../raphodo/proximity.py:1461
+#: ../raphodo/proximity.py:1710
 msgid ""
 "The Timeline groups photos and videos based on how much time elapsed between "
 "consecutive shots. Use it to identify photos and videos taken at different "
 "periods in a single day or over consecutive days."
 msgstr ""
 
-#: ../raphodo/proximity.py:1464
+#: ../raphodo/proximity.py:1715
 msgid ""
 "Use the slider (below) to adjust the time elapsed between consecutive shots "
 "that is used to build the Timeline."
 msgstr ""
 
-#: ../raphodo/proximity.py:1466
+#: ../raphodo/proximity.py:1718
 msgid "Timeline build pending..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1467
+#: ../raphodo/proximity.py:1719
 msgid "Timeline is building..."
 msgstr ""
 
-#: ../raphodo/proximity.py:1468
+#: ../raphodo/proximity.py:1721
 msgid ""
 "The Timeline needs to be rebuilt because the file modification time does not "
 "match the time a shot was taken for one or more shots.<br><br>The Timeline "
@@ -2628,61 +3210,61 @@ msgid ""
 "downloading, which is when the metadata is read."
 msgstr ""
 
-#: ../raphodo/rapid.py:485 ../raphodo/rapid.py:2461 ../raphodo/rapid.py:3728
-#: ../raphodo/rapid.py:3846 ../raphodo/rapid.py:3850 ../raphodo/rapid.py:3870
-#: ../raphodo/rapid.py:3874 ../raphodo/rapid.py:3998 ../raphodo/rapid.py:4007
-#: ../raphodo/rapid.py:4495 ../raphodo/rapid.py:4888 ../raphodo/rapid.py:5722
-#: ../raphodo/rememberthisdialog.py:97
+#: ../raphodo/rapid.py:493 ../raphodo/rapid.py:2555 ../raphodo/rapid.py:3934
+#: ../raphodo/rapid.py:4065 ../raphodo/rapid.py:4069 ../raphodo/rapid.py:4092
+#: ../raphodo/rapid.py:4096 ../raphodo/rapid.py:4226 ../raphodo/rapid.py:4237
+#: ../raphodo/rapid.py:4743 ../raphodo/rapid.py:5195 ../raphodo/rapid.py:5997
+#: ../raphodo/rememberthisdialog.py:99
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:3
 msgid "Rapid Photo Downloader"
 msgstr "快速照片下载器"
 
-#: ../raphodo/rapid.py:1100
+#: ../raphodo/rapid.py:1131
 msgid ""
 "<b>ExifTool has a problem</b><br><br> Rapid Photo Downloader uses ExifTool "
 "to get metadata from videos and photos. The program will run without it, but "
 "installing it is <b>highly</b> recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1110 ../raphodo/rapid.py:1130
+#: ../raphodo/rapid.py:1141 ../raphodo/rapid.py:1161
 msgid "Problem with libmediainfo"
 msgstr ""
 
-#: ../raphodo/rapid.py:1119
+#: ../raphodo/rapid.py:1150
 msgid ""
 "<b>The library libmediainfo appears to be missing</b><br><br> Rapid Photo "
 "Downloader uses libmediainfo to get the date and time a video was shot. The "
 "program will run  without it, but installing it is recommended."
 msgstr ""
 
-#: ../raphodo/rapid.py:1417
+#: ../raphodo/rapid.py:1448
 msgid "Download failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1419
+#: ../raphodo/rapid.py:1450
 msgid ""
 "Sorry, the download of the new version of Rapid Photo Downloader failed."
 msgstr ""
 
-#: ../raphodo/rapid.py:1425
+#: ../raphodo/rapid.py:1457
 msgid ""
 "The new version was successfully downloaded. Do you want to close Rapid "
 "Photo Downloader and install it now?"
 msgstr ""
 
-#: ../raphodo/rapid.py:1428
+#: ../raphodo/rapid.py:1461
 msgid "Update Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:1432
+#: ../raphodo/rapid.py:1465
 msgid "Install"
 msgstr ""
 
-#: ../raphodo/rapid.py:1450
+#: ../raphodo/rapid.py:1483
 msgid "New version saved"
 msgstr ""
 
-#: ../raphodo/rapid.py:1451
+#: ../raphodo/rapid.py:1485
 #, python-format
 msgid ""
 "The tar file and installer script are saved at:\n"
@@ -2690,163 +3272,163 @@ msgid ""
 " %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:1468
+#: ../raphodo/rapid.py:1502
 msgid "Upgrade failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:1469
+#: ../raphodo/rapid.py:1505
 msgid ""
 "Sorry, upgrading Rapid Photo Downloader failed because there was an error "
 "opening the installer."
 msgstr ""
 
-#: ../raphodo/rapid.py:1667 ../raphodo/rapid.py:2331
+#: ../raphodo/rapid.py:1709 ../raphodo/rapid.py:2425
 msgid "Download"
 msgstr "下载"
 
-#: ../raphodo/rapid.py:1671
+#: ../raphodo/rapid.py:1713
 msgid "&Refresh..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1675
+#: ../raphodo/rapid.py:1717
 msgid "&Preferences"
 msgstr ""
 
-#: ../raphodo/rapid.py:1679
+#: ../raphodo/rapid.py:1721
 msgid "&Quit"
 msgstr ""
 
-#: ../raphodo/rapid.py:1683
+#: ../raphodo/rapid.py:1725
 msgid "Error &Reports"
 msgstr ""
 
-#: ../raphodo/rapid.py:1687
+#: ../raphodo/rapid.py:1729
 msgid "Clear Completed Downloads"
 msgstr ""
 
-#: ../raphodo/rapid.py:1691
+#: ../raphodo/rapid.py:1733
 msgid "Get Help Online..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1695
+#: ../raphodo/rapid.py:1737
 msgid "&Tip of the Day..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1699
+#: ../raphodo/rapid.py:1741
 msgid "Report a Problem..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1703
+#: ../raphodo/rapid.py:1745
 msgid "Make a Donation..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1707
+#: ../raphodo/rapid.py:1749
 msgid "Translate this Application..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1711
+#: ../raphodo/rapid.py:1753
 msgid "&About..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1715
+#: ../raphodo/rapid.py:1757
 msgid "Check for Updates..."
 msgstr ""
 
-#: ../raphodo/rapid.py:1797
+#: ../raphodo/rapid.py:1840
 msgid "Timeline"
 msgstr ""
 
-#: ../raphodo/rapid.py:1807
+#: ../raphodo/rapid.py:1850
 msgid "Destination"
 msgstr ""
 
-#: ../raphodo/rapid.py:1808
+#: ../raphodo/rapid.py:1851
 msgid "Rename"
 msgstr ""
 
-#: ../raphodo/rapid.py:1810
+#: ../raphodo/rapid.py:1853
 msgid "Back Up"
 msgstr ""
 
 #. Devices Header and View
-#: ../raphodo/rapid.py:1926
+#: ../raphodo/rapid.py:1977
 msgid ""
 "Turn on or off the use of devices attached to this computer as download "
 "sources"
 msgstr ""
 
 #. This Computer Header and View
-#: ../raphodo/rapid.py:1940
+#: ../raphodo/rapid.py:1994
 msgid ""
 "Turn on or off the use of a folder on this computer as a download source"
 msgstr ""
 
-#: ../raphodo/rapid.py:1941
+#: ../raphodo/rapid.py:1996
 msgid "This Computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:1952
+#: ../raphodo/rapid.py:2009
 msgid "Select a source folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:1975
+#: ../raphodo/rapid.py:2038
 msgid "Projected Storage Use"
 msgstr ""
 
-#: ../raphodo/rapid.py:1989 ../raphodo/rapid.py:1997
+#: ../raphodo/rapid.py:2056 ../raphodo/rapid.py:2068
 msgid "Select a destination folder"
 msgstr ""
 
-#: ../raphodo/rapid.py:2045
+#: ../raphodo/rapid.py:2117
 msgid "All"
 msgstr ""
 
-#: ../raphodo/rapid.py:2046
+#: ../raphodo/rapid.py:2118
 msgid "New"
 msgstr ""
 
-#: ../raphodo/rapid.py:2048
+#: ../raphodo/rapid.py:2120
 msgid "Show:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2051
+#: ../raphodo/rapid.py:2123
 msgid "Modification Time"
 msgstr ""
 
-#: ../raphodo/rapid.py:2052
+#: ../raphodo/rapid.py:2124
 msgid "Checked State"
 msgstr ""
 
-#: ../raphodo/rapid.py:2055
+#: ../raphodo/rapid.py:2127
 msgid "File Type"
 msgstr ""
 
-#: ../raphodo/rapid.py:2056
+#: ../raphodo/rapid.py:2128
 msgid "Device"
 msgstr "设备"
 
-#: ../raphodo/rapid.py:2058
+#: ../raphodo/rapid.py:2130
 msgid "Sort:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2069
+#: ../raphodo/rapid.py:2141
 msgid "Select All:"
 msgstr ""
 
-#: ../raphodo/rapid.py:2311
+#: ../raphodo/rapid.py:2405
 #, python-format
 msgid "Download %(files)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:2327
+#: ../raphodo/rapid.py:2421
 msgid "Resume Download"
 msgstr ""
 
-#: ../raphodo/rapid.py:2329
+#: ../raphodo/rapid.py:2423
 msgid "Pause"
 msgstr "暂停"
 
-#: ../raphodo/rapid.py:2417
+#: ../raphodo/rapid.py:2511
 #, python-brace-format
 msgid ""
 "Please report the problem at <a href=\"{website}\">{website}</a>.<br><br>\n"
@@ -2855,11 +3437,11 @@ msgid ""
 "            "
 msgstr ""
 
-#: ../raphodo/rapid.py:2431
+#: ../raphodo/rapid.py:2525
 msgid "Thank you for reporting a problem in Rapid Photo Downloader"
 msgstr ""
 
-#: ../raphodo/rapid.py:2529
+#: ../raphodo/rapid.py:2624
 #, python-format
 msgid ""
 "<b>Changing This Computer source path</b><br><br>Do you really want to "
@@ -2868,30 +3450,29 @@ msgid ""
 "from This Computer will be cancelled."
 msgstr ""
 
-#: ../raphodo/rapid.py:2595
+#: ../raphodo/rapid.py:2694
 msgid "You cannot change the download destination while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:2604
+#: ../raphodo/rapid.py:2704
 #, python-format
 msgid ""
 "<b>Confirm Download Destination</b><br><br>Are you sure you want to set the "
 "%(file_type)s download destination to %(path)s?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2682
+#: ../raphodo/rapid.py:2785
 msgid ""
+"\n"
 "<b>Downloading all files</b><br><br>\n"
-"                    A download always includes all files that are checked "
-"for download,\n"
-"                    including those that are not currently displayed because "
-"the Timeline\n"
-"                    is being used or because only new files are being shown."
-"<br><br>\n"
-"                    Do you want to proceed with the download?"
+"A download always includes all files that are checked for download,\n"
+"including those that are not currently displayed because the Timeline\n"
+"is being used or because only new files are being shown.<br><br>\n"
+"Do you want to proceed with the download?\n"
+"                        "
 msgstr ""
 
-#: ../raphodo/rapid.py:2820
+#: ../raphodo/rapid.py:2937
 #, python-format
 msgid ""
 "These download folders are invalid:\n"
@@ -2902,7 +3483,7 @@ msgstr ""
 "%(folder1)s\n"
 "%(folder2)s"
 
-#: ../raphodo/rapid.py:2824
+#: ../raphodo/rapid.py:2940
 #, python-format
 msgid ""
 "This download folder is invalid:\n"
@@ -2911,199 +3492,193 @@ msgstr ""
 "下列下载文件夹无效：\n"
 "%s"
 
-#: ../raphodo/rapid.py:2827
+#: ../raphodo/rapid.py:2943
 msgid "Download Failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:2828
+#: ../raphodo/rapid.py:2944
 msgid "The download cannot proceed."
 msgstr ""
 
-#: ../raphodo/rapid.py:2842
+#: ../raphodo/rapid.py:2962
 msgid ""
 "Photos and videos will not be backed up because there is nowhere to back "
 "them up. Do you still want to start the download?"
 msgstr ""
 
-#. Translators: filetype will be replaced with 'photos' or 'videos'
-#: ../raphodo/rapid.py:2847 ../raphodo/rapid.py:2854
+#: ../raphodo/rapid.py:2969 ../raphodo/rapid.py:2979
 #, python-format
 msgid ""
 "No backup device exists for backing up %(filetype)s. Do you still want to "
 "start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2848 ../raphodo/rpdfile.py:228
+#: ../raphodo/rapid.py:2971 ../raphodo/rpdfile.py:228
 msgid "photos"
 msgstr "相片"
 
-#: ../raphodo/rapid.py:2855 ../raphodo/rpdfile.py:223
+#: ../raphodo/rapid.py:2981 ../raphodo/rpdfile.py:223
 msgid "videos"
 msgstr "视频"
 
-#: ../raphodo/rapid.py:2861
+#: ../raphodo/rapid.py:2989
 msgid ""
 "<b>The photo and video backup destinations do not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2869 ../raphodo/rapid.py:2876
+#: ../raphodo/rapid.py:2999 ../raphodo/rapid.py:3008
 #, python-format
 msgid ""
 "<b>The %(filetype)s backup destination does not exist or cannot be written "
 "to.</b><br><br>Do you still want to start the download?"
 msgstr ""
 
-#: ../raphodo/rapid.py:2871 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:818
+#: ../raphodo/rapid.py:3001 ../raphodo/rpdfile.py:230 ../raphodo/rpdfile.py:843
 msgid "photo"
 msgstr "照片"
 
-#: ../raphodo/rapid.py:2878 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:858
+#: ../raphodo/rapid.py:3010 ../raphodo/rpdfile.py:225 ../raphodo/rpdfile.py:883
 msgid "video"
 msgstr "视频"
 
-#: ../raphodo/rapid.py:2886
+#: ../raphodo/rapid.py:3018
 msgid "Backup problem"
 msgstr "备份故障"
 
-#. Translators - in the middle is a unicode em dash - please retain it
-#. This string is displayed in the status bar when the download is running
-#: ../raphodo/rapid.py:3571
+#: ../raphodo/rapid.py:3756
 #, python-format
 msgid "%(downloading_from)s — %(time_left)s left (%(speed)s)"
 msgstr ""
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3640
+#: ../raphodo/rapid.py:3828
 #, python-format
 msgid "%(noFiles)s %(filetypes)s downloaded"
 msgstr "%(noFiles)s %(filetypes)s 已   下载"
 
-#. Translators: e.g. 2 videos failed to download
-#: ../raphodo/rapid.py:3645
+#: ../raphodo/rapid.py:3836
 #, python-format
 msgid "%(noFiles)s %(filetypes)s failed to download"
 msgstr "%(noFiles)s %(filetypes)s 下载失败"
 
-#: ../raphodo/rapid.py:3650 ../raphodo/rapid.py:3723
+#: ../raphodo/rapid.py:3842 ../raphodo/rapid.py:3927
 msgid "warnings"
 msgstr "警告"
 
-#: ../raphodo/rapid.py:3679
+#: ../raphodo/rapid.py:3873
 msgid "All downloads complete"
 msgstr "所有下载已完成"
 
-#. Translators: e.g. 23 photos downloaded
-#: ../raphodo/rapid.py:3686 ../raphodo/rapid.py:3695 ../raphodo/rapid.py:3704
-#: ../raphodo/rapid.py:3713 ../raphodo/rapid.py:3721
+#: ../raphodo/rapid.py:3881 ../raphodo/rapid.py:3892 ../raphodo/rapid.py:3903
+#: ../raphodo/rapid.py:3914 ../raphodo/rapid.py:3924
 #, python-format
 msgid "%(number)s %(numberdownloaded)s"
 msgstr "%(number)s %(numberdownloaded)s"
 
-#: ../raphodo/rapid.py:3688 ../raphodo/rapid.py:3706
+#: ../raphodo/rapid.py:3884 ../raphodo/rapid.py:3906
 #, python-format
 msgid "%(filetype)s downloaded"
 msgstr "%(filetype)s 已下载"
 
-#: ../raphodo/rapid.py:3697 ../raphodo/rapid.py:3715
+#: ../raphodo/rapid.py:3895 ../raphodo/rapid.py:3917
 #, python-format
 msgid "%(filetype)s failed to download"
 msgstr "%(filetype)s 下载失败"
 
-#: ../raphodo/rapid.py:3742
+#: ../raphodo/rapid.py:3950
 msgid "1 failure"
 msgstr ""
 
-#: ../raphodo/rapid.py:3744
+#: ../raphodo/rapid.py:3952
 #, python-format
 msgid "%d failures"
 msgstr ""
 
-#: ../raphodo/rapid.py:3749
+#: ../raphodo/rapid.py:3957
 msgid "1 warning"
 msgstr ""
 
-#: ../raphodo/rapid.py:3751
+#: ../raphodo/rapid.py:3959
 #, python-format
 msgid "%d warnings"
 msgstr ""
 
-#: ../raphodo/rapid.py:3771
+#: ../raphodo/rapid.py:3981
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3774
+#: ../raphodo/rapid.py:3985
 #, python-format
 msgid "Downloaded %(no_files_and_types)s from %(devices)s — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3779
+#: ../raphodo/rapid.py:3989
 #, python-format
 msgid "No files downloaded — %(failures)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3781
+#: ../raphodo/rapid.py:3991
 msgid "No files downloaded"
 msgstr ""
 
-#: ../raphodo/rapid.py:3805
+#: ../raphodo/rapid.py:4021
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3809
+#: ../raphodo/rapid.py:4026
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3812
+#: ../raphodo/rapid.py:4031
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:3820
+#: ../raphodo/rapid.py:4039
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3833
+#: ../raphodo/rapid.py:4052
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for the %(camera)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3837
+#: ../raphodo/rapid.py:4056
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(device)s and this computer"
 msgstr ""
 
-#: ../raphodo/rapid.py:3841
+#: ../raphodo/rapid.py:4060
 #, python-format
 msgid ""
 "The Destination subfolders and Timeline will be rebuilt after all thumbnails "
 "have been generated for %(number_devices)s devices"
 msgstr ""
 
-#: ../raphodo/rapid.py:3867
+#: ../raphodo/rapid.py:4087
 msgid "The Destination subfolders and Timeline have been rebuilt"
 msgstr ""
 
-#: ../raphodo/rapid.py:3922
+#: ../raphodo/rapid.py:4144
 msgid "Program preferences are invalid"
 msgstr ""
 
-#: ../raphodo/rapid.py:3999
+#: ../raphodo/rapid.py:4228
 #, python-format
 msgid ""
 "<b>All files on the %(camera)s are inaccessible</b>.<br><br>It may be locked "
@@ -3113,179 +3688,205 @@ msgid ""
 "ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4008
+#: ../raphodo/rapid.py:4239
 #, python-format
 msgid ""
-"<b>The %(camera)s appears to be in use by another application.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again.<br><br>Alternatively, you can ignore this "
-"device."
+"<b>The %(camera)s appears to be in use by another "
+"application.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again.<br><br>Alternatively, you "
+"can ignore this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4019
+#: ../raphodo/rapid.py:4250
 msgid "&Try Again"
 msgstr ""
 
-#: ../raphodo/rapid.py:4020
+#: ../raphodo/rapid.py:4251
 msgid "&Ignore This Device"
 msgstr ""
 
-#: ../raphodo/rapid.py:4086
+#: ../raphodo/rapid.py:4323
 #, python-format
 msgid "Sorry, an unexpected problem occurred while scanning %s."
 msgstr ""
 
-#: ../raphodo/rapid.py:4087
+#: ../raphodo/rapid.py:4324
 msgid "Unfortunately you cannot download from this device."
 msgstr ""
 
-#: ../raphodo/rapid.py:4091
+#: ../raphodo/rapid.py:4328
 msgid ""
 "A possible workaround for the problem might be downloading from the camera's "
 "memory card using a card reader."
 msgstr ""
 
-#: ../raphodo/rapid.py:4096
+#: ../raphodo/rapid.py:4333
 msgid "Device scan failed"
 msgstr ""
 
-#: ../raphodo/rapid.py:4472
+#: ../raphodo/rapid.py:4720
 #, python-format
 msgid ""
-"<b>The %(camera)s cannot be scanned because it cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again."
+"<b>The %(camera)s cannot be scanned because it cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again."
 msgstr ""
 
-#: ../raphodo/rapid.py:4496
+#: ../raphodo/rapid.py:4745
 #, python-format
 msgid ""
-"<b>The download cannot start because the %(camera)s cannot be unmounted.</"
-"b><br><br>You can close any other application (such as a file browser) that "
-"is using it and try again. If that does not work, unplug the %(camera)s from "
-"the computer and plug it in again, and choose which files you want to "
-"download from it."
+"<b>The download cannot start because the %(camera)s cannot be "
+"unmounted.</b><br><br>You can close any other application (such as a file "
+"browser) that is using it and try again. If that does not work, unplug the "
+"%(camera)s from the computer and plug it in again, and choose which files "
+"you want to download from it."
+msgstr ""
+
+#: ../raphodo/rapid.py:4842
+msgid "Completed Downloads Present"
 msgstr ""
 
-#: ../raphodo/rapid.py:4635
+#: ../raphodo/rapid.py:4844
+#, python-format
+msgid "%s whose download have completed are displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4846
+msgid "Do you want to clear the completed downloads?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4848
+msgid "Completed Download Present"
+msgstr ""
+
+#: ../raphodo/rapid.py:4850
+#, python-format
+msgid "%s whose download has completed is displayed."
+msgstr ""
+
+#: ../raphodo/rapid.py:4852
+msgid "Do you want to clear the completed download?"
+msgstr ""
+
+#: ../raphodo/rapid.py:4933
 #, python-format
 msgid ""
 "Do you want to download photos and videos from the device <i>%(device)s</i>?"
 msgstr ""
 
-#: ../raphodo/rapid.py:4877
+#: ../raphodo/rapid.py:5183
 #, python-format
 msgid "<b>Do you want to ignore the %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4879
+#: ../raphodo/rapid.py:5186
 msgid ""
 "All cameras, phones and tablets with the same model name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:4883
+#: ../raphodo/rapid.py:5190
 #, python-format
 msgid ""
 "<b>Do you want to ignore the device %s whenever this program is run?</b>"
 msgstr ""
 
-#: ../raphodo/rapid.py:4885
+#: ../raphodo/rapid.py:5192
 msgid "Any device with the same name will be ignored."
 msgstr ""
 
-#: ../raphodo/rapid.py:5178
+#: ../raphodo/rapid.py:5492
 #, python-format
 msgid "Downloading from %(location)s on This Computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5180
+#: ../raphodo/rapid.py:5496
 msgid ""
 "Do you really want to download from here?<br><br>On some systems, scanning "
 "this location can take a very long time."
 msgstr ""
 
-#: ../raphodo/rapid.py:5224
+#: ../raphodo/rapid.py:5537
 #, python-format
 msgid "Generating thumbnails for %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5227
+#: ../raphodo/rapid.py:5540
 #, python-format
 msgid "Scanning %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5237
+#: ../raphodo/rapid.py:5551
 #, python-format
 msgid ""
 "%(number)s of %(available files)s checked for download (%(hidden)s hidden)"
 msgstr ""
 
-#: ../raphodo/rapid.py:5243
+#: ../raphodo/rapid.py:5559
 #, python-format
 msgid "%(number)s of %(available files)s checked for download"
 msgstr ""
 
-#: ../raphodo/rapid.py:5494
+#: ../raphodo/rapid.py:5764
 msgid "Display program information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5496
+#: ../raphodo/rapid.py:5766
 msgid "Display debugging information when run from the command line."
 msgstr ""
 
-#: ../raphodo/rapid.py:5499
+#: ../raphodo/rapid.py:5769
 msgid "List photo and video file extensions the program recognizes and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5502
+#: ../raphodo/rapid.py:5772
 msgid "Turn on or off the the renaming of photos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5504
+#: ../raphodo/rapid.py:5774
 msgid "turn on or off the the renaming of videos."
 msgstr ""
 
-#: ../raphodo/rapid.py:5506
+#: ../raphodo/rapid.py:5776
 msgid ""
 "Turn on or off the automatic detection of devices from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5510
+#: ../raphodo/rapid.py:5780
 msgid "Turn on or off downloading from this computer."
 msgstr ""
 
-#: ../raphodo/rapid.py:5512 ../raphodo/rapid.py:5515 ../raphodo/rapid.py:5518
-#: ../raphodo/rapid.py:5539 ../raphodo/rapid.py:5543
+#: ../raphodo/rapid.py:5782 ../raphodo/rapid.py:5785 ../raphodo/rapid.py:5788
+#: ../raphodo/rapid.py:5809 ../raphodo/rapid.py:5813
 msgid "PATH"
 msgstr ""
 
-#: ../raphodo/rapid.py:5513
+#: ../raphodo/rapid.py:5783
 msgid "The PATH on this computer from which to download."
 msgstr ""
 
-#: ../raphodo/rapid.py:5516
+#: ../raphodo/rapid.py:5786
 msgid "The PATH where photos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5519
+#: ../raphodo/rapid.py:5789
 msgid "The PATH where videos will be downloaded to."
 msgstr ""
 
-#: ../raphodo/rapid.py:5521
+#: ../raphodo/rapid.py:5791
 msgid "Turn on or off the backing up of photos and videos while downloading."
 msgstr ""
 
-#: ../raphodo/rapid.py:5525
+#: ../raphodo/rapid.py:5795
 msgid "Turn on or off the automatic detection of backup devices."
 msgstr ""
 
-#: ../raphodo/rapid.py:5527 ../raphodo/rapid.py:5533
+#: ../raphodo/rapid.py:5797 ../raphodo/rapid.py:5803
 msgid "FOLDER"
 msgstr ""
 
-#: ../raphodo/rapid.py:5528
+#: ../raphodo/rapid.py:5798
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected photo "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3293,7 +3894,7 @@ msgid ""
 "photos up to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5534
+#: ../raphodo/rapid.py:5804
 msgid ""
 "The FOLDER in which backups are stored on the automatically detected video "
 "backup device, with the folder's name being used to identify whether or not "
@@ -3301,115 +3902,124 @@ msgid ""
 "up videos to, create a folder on it with this name."
 msgstr ""
 
-#: ../raphodo/rapid.py:5540
+#: ../raphodo/rapid.py:5810
 msgid ""
 "The PATH where photos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5544
+#: ../raphodo/rapid.py:5814
 msgid ""
 "The PATH where videos will be backed up when automatic detection of backup "
 "devices is turned off."
 msgstr ""
 
-#: ../raphodo/rapid.py:5547
+#: ../raphodo/rapid.py:5817
 #, python-format
 msgid "Ignore photos with the following extensions: %s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5551
-msgid "Turn on or off starting downloads as soon as the program itself starts."
+#: ../raphodo/rapid.py:5821
+msgid ""
+"Turn on or off starting downloads as soon as the program itself starts."
 msgstr ""
 
-#: ../raphodo/rapid.py:5554
+#: ../raphodo/rapid.py:5824
 msgid "Turn on or off starting downloads as soon as a device is inserted."
 msgstr ""
 
-#: ../raphodo/rapid.py:5557
+#: ../raphodo/rapid.py:5827
 msgid ""
 "Turn on or off use of the Rapid Photo Downloader Thumbnail Cache. Turning it "
 "off does not delete existing cache contents."
 msgstr ""
 
-#: ../raphodo/rapid.py:5561
+#: ../raphodo/rapid.py:5831
 msgid ""
 "Delete all thumbnails in the Rapid Photo Downloader Thumbnail Cache, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5565
+#: ../raphodo/rapid.py:5835
 msgid "Forget which files have been previously downloaded, and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5568
+#: ../raphodo/rapid.py:5838
 msgid ""
 "Import preferences from an old program version and exit. Requires the "
 "command line program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5571
+#: ../raphodo/rapid.py:5841
 msgid ""
 "Reset all program settings to their default values, delete all thumbnails in "
 "the Thumbnail cache, forget which files have been previously downloaded, and "
 "exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5575
+#: ../raphodo/rapid.py:5845
 msgid "Include gphoto2 debugging information in log files."
 msgstr ""
 
-#: ../raphodo/rapid.py:5579
+#: ../raphodo/rapid.py:5849
 msgid "Print information to the terminal about attached cameras and exit."
 msgstr ""
 
-#: ../raphodo/rapid.py:5640
+#: ../raphodo/rapid.py:5911
 msgid ""
 "To import preferences from the old version of Rapid Photo Downloader, you "
 "must install the program gconftool-2."
 msgstr ""
 
-#: ../raphodo/rapid.py:5649
+#: ../raphodo/rapid.py:5920
 msgid "No prior program preferences detected: exiting"
 msgstr ""
 
-#: ../raphodo/rapid.py:5652
+#: ../raphodo/rapid.py:5923
 #, python-format
 msgid "Importing preferences from Rapid Photo Downloader %(version)s"
 msgstr ""
 
-#: ../raphodo/rapid.py:5714
+#: ../raphodo/rapid.py:5989
 #, python-format
-msgid "Do you want to copy the stored sequence number, which has the value %d?"
+msgid ""
+"Do you want to copy the stored sequence number, which has the value %d?"
 msgstr ""
 
-#: ../raphodo/rapid.py:5726
+#: ../raphodo/rapid.py:6000
 msgid "Program aborting."
 msgstr ""
 
-#: ../raphodo/rapid.py:5736
+#: ../raphodo/rapid.py:6010
 msgid "Never run this program as the sudo / root user."
 msgstr ""
 
-#: ../raphodo/rapid.py:5740
+#: ../raphodo/rapid.py:6014
 msgid "You must install ExifTool to run Rapid Photo Downloader."
 msgstr ""
 
-#: ../raphodo/rapid.py:5794
+#: ../raphodo/rapid.py:6026
+msgid ""
+"Rapid Photo Downloader is installed in multiple locations.\n"
+"\n"
+"Uninstall all copies except the version you want to run."
+msgstr ""
+
+#: ../raphodo/rapid.py:6083
 msgid ""
 "When specifying a path on the command line, do not also specify an\n"
 "option for device auto detection or a path on \"This Computer\"."
 msgstr ""
 
-#: ../raphodo/rapid.py:5950
+#: ../raphodo/rapid.py:6243
 msgid "All settings and caches have been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5958
+#: ../raphodo/rapid.py:6251
 msgid "Thumbnail Cache has been reset"
 msgstr ""
 
-#: ../raphodo/rapid.py:5964
+#: ../raphodo/rapid.py:6257
 msgid "Remembered files have been forgotten"
 msgstr ""
 
@@ -3425,15 +4035,15 @@ msgstr ""
 msgid "&Don't warn me again about missing or broken program libraries"
 msgstr ""
 
-#: ../raphodo/renameandmovefile.py:546
+#: ../raphodo/renameandmovefile.py:554
 msgid "subfolder and filename"
 msgstr "子文件夹和文件名"
 
-#: ../raphodo/renameandmovefile.py:548
+#: ../raphodo/renameandmovefile.py:556
 msgid "filename"
 msgstr "文件名"
 
-#: ../raphodo/renameandmovefile.py:550
+#: ../raphodo/renameandmovefile.py:558
 msgid "subfolder"
 msgstr "子目录"
 
@@ -3513,160 +4123,237 @@ msgstr "图片和视频"
 msgid "photos or videos"
 msgstr "照片或视频"
 
-#: ../raphodo/rpdfile.py:306
+#: ../raphodo/rpdfile.py:315
 #, python-format
 msgid "%(number)s %(filetypes)s"
 msgstr "%(number)s %(filetypes)s"
 
-#: ../raphodo/rpdfile.py:318
+#. translators: natural language expression signifying a single video
+#: ../raphodo/rpdfile.py:337
+msgid "a video"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:339
 msgid "1 Video"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:323
+#. translators: natural language expression signifying a single photo
+#: ../raphodo/rpdfile.py:346
+msgid "a photo"
+msgstr ""
+
+#: ../raphodo/rpdfile.py:348
 msgid "1 Photo"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:803
+#: ../raphodo/rpdfile.py:828
 #, python-format
 msgid "%(path)s on %(camera)s"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:819
+#: ../raphodo/rpdfile.py:844
 msgid "Photo"
 msgstr ""
 
-#: ../raphodo/rpdfile.py:859
+#: ../raphodo/rpdfile.py:884
 msgid "Video"
 msgstr "视频"
 
-#: ../raphodo/storage.py:138
+#: ../raphodo/storage.py:141
 msgid "File system root"
 msgstr ""
 
 #. translators: the name of the Pictures folder
-#: ../raphodo/storage.py:433
+#: ../raphodo/storage.py:437
 msgid "Pictures"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:426
+#: ../raphodo/thumbnaildisplay.py:432
 #, python-format
 msgid "Taken on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:431
+#: ../raphodo/thumbnaildisplay.py:439
 #, python-format
 msgid "Modified on %(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:437 ../raphodo/thumbnaildisplay.py:466
+#: ../raphodo/thumbnaildisplay.py:447 ../raphodo/thumbnaildisplay.py:481
 #, python-format
 msgid "%(date_time)s (%(human_readable)s)"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:451
+#: ../raphodo/thumbnaildisplay.py:464
 #, python-format
 msgid "Memory cards: %s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:457
+#: ../raphodo/thumbnaildisplay.py:468
+#, python-format
+msgid "Memory card: %s"
+msgstr ""
+
+#: ../raphodo/thumbnaildisplay.py:473
 msgid "Downloaded as:"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:472
+#: ../raphodo/thumbnaildisplay.py:489
 #, python-format
 msgid "<br><br>Previous download:<br>%(filename)s<br>%(path)s<br>%(date)s"
 msgstr ""
 
-#: ../raphodo/thumbnaildisplay.py:1603
+#: ../raphodo/thumbnaildisplay.py:1645
 msgid "Copy Path"
 msgstr ""
 
+#. Translators: these values are file size suffixes like B representing bytes, KB representing
+#. kilobytes, etc.
+#: ../raphodo/utilities.py:170
+msgid "B"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "KB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "MB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "GB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "TB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "PB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "EB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "ZB"
+msgstr ""
+
+#: ../raphodo/utilities.py:170
+msgid "YB"
+msgstr ""
+
 #. two things in a list e.g. "device1 and device2"
-#: ../raphodo/utilities.py:391
+#: ../raphodo/utilities.py:394
 #, python-format
 msgid "%(first_item)s and %(last_item)s"
 msgstr ""
 
-#: ../raphodo/utilities.py:464
+#: ../raphodo/utilities.py:468
 msgid "one"
 msgstr ""
 
-#: ../raphodo/utilities.py:465
+#: ../raphodo/utilities.py:469
 msgid "two"
 msgstr ""
 
-#: ../raphodo/utilities.py:466
+#: ../raphodo/utilities.py:470
 msgid "three"
 msgstr ""
 
-#: ../raphodo/utilities.py:467
+#: ../raphodo/utilities.py:471
 msgid "four"
 msgstr ""
 
-#: ../raphodo/utilities.py:468
+#: ../raphodo/utilities.py:472
 msgid "five"
 msgstr ""
 
-#: ../raphodo/utilities.py:469
+#: ../raphodo/utilities.py:473
 msgid "six"
 msgstr ""
 
-#: ../raphodo/utilities.py:470
+#: ../raphodo/utilities.py:474
 msgid "seven"
 msgstr ""
 
-#: ../raphodo/utilities.py:471
+#: ../raphodo/utilities.py:475
 msgid "eight"
 msgstr ""
 
-#: ../raphodo/utilities.py:472
+#: ../raphodo/utilities.py:476
 msgid "nine"
 msgstr ""
 
-#: ../raphodo/utilities.py:473
+#: ../raphodo/utilities.py:477
 msgid "ten"
 msgstr ""
 
-#: ../raphodo/utilities.py:474
+#: ../raphodo/utilities.py:478
 msgid "eleven"
 msgstr ""
 
-#: ../raphodo/utilities.py:475
+#: ../raphodo/utilities.py:479
 msgid "twelve"
 msgstr ""
 
-#: ../raphodo/utilities.py:476
+#: ../raphodo/utilities.py:480
 msgid "thirteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:477
+#: ../raphodo/utilities.py:481
 msgid "fourteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:478
+#: ../raphodo/utilities.py:482
 msgid "fifteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:479
+#: ../raphodo/utilities.py:483
 msgid "sixteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:480
+#: ../raphodo/utilities.py:484
 msgid "seventeen"
 msgstr ""
 
-#: ../raphodo/utilities.py:481
+#: ../raphodo/utilities.py:485
 msgid "eighteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:482
+#: ../raphodo/utilities.py:486
 msgid "ninenteen"
 msgstr ""
 
-#: ../raphodo/utilities.py:483
+#: ../raphodo/utilities.py:487
 msgid "twenty"
 msgstr ""
 
+#: ../raphodo/viewutils.py:240
+msgid "&OK"
+msgstr ""
+
+#: ../raphodo/viewutils.py:243
+msgid "&Save"
+msgstr ""
+
+#: ../raphodo/viewutils.py:244
+msgid "&Help"
+msgstr ""
+
+#: ../raphodo/viewutils.py:245
+msgid "Restore Defaults"
+msgstr ""
+
+#: ../raphodo/viewutils.py:246
+msgid "&Yes"
+msgstr ""
+
+#: ../raphodo/viewutils.py:247
+msgid "&No"
+msgstr ""
+
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:1
 msgid ""
 "Rapid Photo Downloader imports photos and videos from cameras, phones, "
@@ -3691,8 +4378,8 @@ msgid ""
 "configured without the need for complicated codes. Common tasks can be "
 "automated, such as unmounting a memory card when the download is complete."
 msgstr ""
-"Rapid Photo Downloader配置方便易于使用，同为摄影师作者兼顾专业和业余摄影师的"
-"需求。 它复杂的代码来配置，自动执行常规任务，如下载完成后弹出记忆卡。"
+"Rapid Photo Downloader配置方便易于使用，同为摄影师作者兼顾专业和业余摄影师的需求。 "
+"它复杂的代码来配置，自动执行常规任务，如下载完成后弹出记忆卡。"
 
 #: ../data/net.damonlynch.rapid-photo-downloader.appdata.xml.in.h:4
 msgid "The main window"
@@ -3722,11 +4409,11 @@ msgstr "照片下载器"
 #. TRANSLATORS: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 #: ../data/net.damonlynch.rapid-photo-downloader.desktop.in.h:5
 msgid ""
-"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;"
-"memory;card;"
+"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;memory"
+";card;"
 msgstr ""
-"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;"
-"memory;card;"
+"photo;download;photography;import;video;RAW;camera;phone;ingest;backup;memory"
+";card;"
 
 #: ../data/kde/net.damonlynch.rapid-photo-downloader.desktop.in.h:1
 msgid "Download Photos and Videos with Rapid Photo Downloader"
@@ -3792,6 +4479,7 @@ msgstr "使用Rapid Photo Downloader下载照片和视频。"
 #~ msgid "Select a folder to download videos to"
 #~ msgstr "选择下载视频的目录..."
 
+#, python-format
 #~ msgid "Select a folder containing %(file_types)s"
 #~ msgstr "选择目录保存 %(file_types)s"
 
@@ -3810,16 +4498,14 @@ msgstr "使用Rapid Photo Downloader下载照片和视频。"
 #~ 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>"
+#~ msgstr "<i><b>警告:</b> 没有足够的数据来完成命名, 请使用其它的重命名选项.</i>"
 
 #~ 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>"
+#~ msgstr "<i><b>警告:</b> 没有足够的数据来完成自文件夹命名, 请使用其它的重命名文件夹选项.</i>"
 
+#, python-format
 #~ msgid "<i>Example: %s</i>"
 #~ msgstr "<i>范例: %s</i>"
 
@@ -3838,13 +4524,13 @@ msgstr "使用Rapid Photo Downloader下载照片和视频。"
 #~ msgid "Photo has already been downloaded"
 #~ msgstr "照片已经下载过"
 
-#~ msgid ""
-#~ "Photos detected with the same filenames, but taken at different times"
+#~ msgid "Photos detected with the same filenames, but taken at different times"
 #~ msgstr "检测到文件名相同，但拍摄时间不同的照片。"
 
 #~ msgid "Backing up error"
 #~ msgstr "备份错误"
 
+#, python-format
 #~ msgid ""
 #~ "%(date)s\n"
 #~ "%(time)s"
@@ -3852,24 +4538,31 @@ msgstr "使用Rapid Photo Downloader下载照片和视频。"
 #~ "%(date)s\n"
 #~ "%(time)s"
 
+#, python-format
 #~ msgid "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
+#, python-format
 #~ msgid "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 #~ msgstr "%(date)s %(hour)s:%(minute)s:%(second)s:%(subsecond)s"
 
+#, python-format
 #~ msgid "%(date)s %(time)s"
 #~ msgstr "%(date)s %(time)s"
 
+#, python-format
 #~ msgid "Source: %(source)s"
 #~ msgstr "源: %(source)s"
 
+#, python-format
 #~ msgid "Destination directory could not be created: %(directory)s\n"
 #~ msgstr "目标目录不能被创建: %(directory)s\n"
 
+#, python-format
 #~ msgid "Error: %(inst)s"
 #~ msgstr "错误: %(inst)s"
 
+#, python-format
 #~ msgid ""
 #~ "Source: %(source)s\n"
 #~ "Destination: %(destination)s"
@@ -3887,6 +4580,7 @@ msgstr "使用Rapid Photo Downloader下载照片和视频。"
 #~ msgid "Device Detected"
 #~ msgstr "检测到驱动器"
 
+#, python-format
 #~ msgid "Backing up to %(path)s"
 #~ msgstr "备份至 %(path)s"
 
@@ -3896,9 +4590,11 @@ msgstr "使用Rapid Photo Downloader下载照片和视频。"
 #~ msgid "Using backup devices"
 #~ msgstr "正在使用备份驱动器"
 
+#, python-format
 #~ msgid "About %(minutes)i:%(seconds)02i minutes remaining"
 #~ msgstr "约剩余 %(minutes)i:%(seconds)02i 分钟"
 
+#, python-format
 #~ msgid "About %i seconds remaining"
 #~ msgstr "约剩余 %i 秒"
 
@@ -3911,6 +4607,7 @@ msgstr "使用Rapid Photo Downloader下载照片和视频。"
 #~ msgid "About 1 second remaining"
 #~ msgstr "剩余约1秒钟"
 
+#, python-format
 #~ msgid ""
 #~ "display program information on the command line as the program runs "
 #~ "(default: %default)"
@@ -4003,8 +4700,7 @@ msgstr "使用Rapid Photo Downloader下载照片和视频。"
 #~ msgid ""
 #~ "Choose the download folder. Subfolders for the downloaded photos will be "
 #~ "automatically created in this folder using the structure specified below."
-#~ msgstr ""
-#~ "选择下载目录。下载照片的子目录将使用下列指定结构在此目录内自动创建。"
+#~ msgstr "选择下载目录。下载照片的子目录将使用下列指定结构在此目录内自动创建。"
 
 #~ msgid "Backup"
 #~ msgstr "备份"
@@ -4012,8 +4708,7 @@ msgstr "使用Rapid Photo Downloader下载照片和视频。"
 #~ msgid ""
 #~ "Choose the download folder. Subfolders for the downloaded videos will be "
 #~ "automatically created in this folder using the structure specified below."
-#~ msgstr ""
-#~ "选择下载目录。下载视频的子目录将使用下列指定结构在此目录内自动创建。"
+#~ msgstr "选择下载目录。下载视频的子目录将使用下列指定结构在此目录内自动创建。"
 
 #~ msgid "Download / Pause"
 #~ msgstr "下载 / 暂停"
@@ -4098,18 +4793,16 @@ msgstr "使用Rapid Photo Downloader下载照片和视频。"
 #~ "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>"
+#~ "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 ""
 #~ "指定备份存储于设备的目录。  \n"
 #~ "\n"
-#~ "<i>注意：这还会被用来确认一个设备是否用来备份。请对每一个希望用于备份的设"
-#~ "备创建一个有以上名称的目录。</i>"
+#~ "<i>注意：这还会被用来确认一个设备是否用来备份。请对每一个希望用于备份的设备创建一个有以上名称的目录。</i>"
 
 #~ 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."
+#~ "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 "当同名照片或视频已存在时，选择忽略下载或者增加唯一标识符。"
 
 #~ msgid "_Add..."
@@ -4145,15 +4838,18 @@ msgstr "使用Rapid Photo Downloader下载照片和视频。"
 #~ msgid "Size"
 #~ msgstr "容量"
 
+#, python-format
 #~ msgid "and %s"
 #~ msgstr "和 %s"
 
+#, python-format
 #~ msgid "%(number)s of %(total)s %(filetypes)s"
 #~ msgstr "%(number)s/%(total)s %(filetypes)s"
 
 #~ msgid "_View"
 #~ msgstr "查看(_V)"
 
+#, python-format
 #~ msgid ""
 #~ "The %(filetype)s subfolder preferences entered are invalid and cannot be "
 #~ "used.\n"
@@ -4165,9 +4861,11 @@ msgstr "使用Rapid Photo Downloader下载照片和视频。"
 #~ msgid "the root of the file system"
 #~ msgstr "文件系统根目录"
 
+#, python-format
 #~ msgid "Downloading from %(location)s."
 #~ msgstr "从  %(location)s 下载"
 
+#, python-format
 #~ msgid "%(device)s did not unmount"
 #~ msgstr "%(device)s 并未卸载"
 
@@ -4176,5 +4874,6 @@ msgstr "使用Rapid Photo Downloader下载照片和视频。"
 #~ "location can take a very long time."
 #~ msgstr "您确定从这儿下载吗？在某些系统上，扫描该位置需要消耗非常长的时间。"
 
+#, python-format
 #~ msgid "No backup device contains a valid folder for backing up %(filetype)s"
 #~ msgstr "备份设备上没有可用的文件夹以供备份 %(filetype)s 文件"